[interchange-cvs] interchange - heins modified 6 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Fri May 13 10:12:33 EDT 2005


User:      heins
Date:      2005-05-13 14:12:33 GMT
Modified:  dist/standard/templates/regions LEFTONLY_TOP LEFTRIGHT_TOP
Modified:           NOLEFT_TOP
Modified:  dist/standard/variables COMMON_MENU LINE_MENU PAGE_INIT
Log:
* Regularize *_TOP region and PAGE_INIT so that they do the same things.

Revision  Changes    Path
1.3       +7 -23     interchange/dist/standard/templates/regions/LEFTONLY_TOP


rev 1.3, prev_rev 1.2
Index: LEFTONLY_TOP
===================================================================
RCS file: /var/cvs/interchange/dist/standard/templates/regions/LEFTONLY_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LEFTONLY_TOP	13 May 2005 13:45:34 -0000	1.2
+++ LEFTONLY_TOP	13 May 2005 14:12:32 -0000	1.3
@@ -1,30 +1,14 @@
 __PAGE_INIT__
-[output name=main_css][css name=THEME_CSS basefile=variables/THEME_CSS][output name="trash"]
-
-[if !scratch logo]
-[set logo]__LOGO__[/set]
-[/if]
-
-[if !scratch menu_bar]
-[set menu_bar]catalog/top[/set]
-[/if]
-
-[output name=line_menu]
-__LINE_MENU__
-
-[output name=top_menu]
-__COMMON_MENU__
-
-[output name=breadcrumbs]
-[breadcrumbs reset-on-product=1]
-
-[output name="trash"]
+[output name=main_css][css name=THEME_CSS basefile=variables/THEME_CSS][output name=trash]
+[output name=line_menu]__LINE_MENU__[output name=trash]
+[output name=top_menu]__COMMON_MENU__[output name=trash]
+[output name=breadcrumbs][breadcrumbs reset-on-product=1][output name=trash]
 [component group=vertical output="[control output left]"]
 [component group=vertical output="[control output left]"]
 [component group=vertical output="[control output left]"]
 [component group=content output="[control output top]"]
 [component group=content output="[control output bottom]"]
-[component group=vertical output="[control output right]"]
-[component group=vertical output="[control output right]"]
-[component group=vertical output="[control output right]"]
+[component group=vertical output="[control output left]"]
+[component group=vertical output="[control output left]"]
+[component group=vertical output="[control output left]"]
 [output name=""]



1.2       +12 -25    interchange/dist/standard/templates/regions/LEFTRIGHT_TOP


rev 1.2, prev_rev 1.1
Index: LEFTRIGHT_TOP
===================================================================
RCS file: /var/cvs/interchange/dist/standard/templates/regions/LEFTRIGHT_TOP,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LEFTRIGHT_TOP	25 Apr 2004 17:07:55 -0000	1.1
+++ LEFTRIGHT_TOP	13 May 2005 14:12:32 -0000	1.2
@@ -1,27 +1,14 @@
 __PAGE_INIT__
-[output name=main_css][css name=THEME_CSS basefile=variables/THEME_CSS][output name="trash"]
-
-[if !scratch logo]
-[set logo]__LOGO__[/set]
-[/if]
-[set top_menu][/set]
-[if !scratch menu_bar]
-[set menu_bar]catalog/top[/set]
-[/if]
-
-[output name=line_menu]
-__LINE_MENU__
-[output name=top_menu]
-__COMMON_MENU__
-[output name=breadcrumbs]
-[breadcrumbs reset-on-product=1]
-
-      [component group=vertical output="[control output left]"]
-      [component group=vertical output="[control output left]"]
-      [component group=vertical output="[control output left]"]
-	  [component group=content output="[control output top]"]
-	  [component group=content output="[control output bottom]"]
-	  [component group=vertical output="[control output right]"]
-	  [component group=vertical output="[control output right]"]
-	  [component group=vertical output="[control output right]"]
+[output name=main_css][css name=THEME_CSS basefile=variables/THEME_CSS][output name=trash]
+[output name=line_menu]__LINE_MENU__[output name=trash]
+[output name=top_menu]__COMMON_MENU__[output name=trash]
+[output name=breadcrumbs][breadcrumbs reset-on-product=1][output name=trash]
+[component group=vertical output="[control output left]"]
+[component group=vertical output="[control output left]"]
+[component group=vertical output="[control output left]"]
+[component group=content output="[control output top]"]
+[component group=content output="[control output bottom]"]
+[component group=vertical output="[control output right]"]
+[component group=vertical output="[control output right]"]
+[component group=vertical output="[control output right]"]
 [output name=""]



1.3       +4 -19     interchange/dist/standard/templates/regions/NOLEFT_TOP


rev 1.3, prev_rev 1.2
Index: NOLEFT_TOP
===================================================================
RCS file: /var/cvs/interchange/dist/standard/templates/regions/NOLEFT_TOP,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NOLEFT_TOP	26 Jan 2005 17:59:22 -0000	1.2
+++ NOLEFT_TOP	13 May 2005 14:12:32 -0000	1.3
@@ -1,23 +1,8 @@
 __PAGE_INIT__
-[output name=main_css][css name=THEME_CSS basefile=variables/THEME_CSS][output name="trash"]
-
-
-[if !scratch logo]
-[set logo]__LOGO__[/set]
-[/if]
-
-[if !scratch menu_bar]
-[set menu_bar]catalog/top[/set]
-[/if]
-
-[output name=line_menu]
-__LINE_MENU__
-[output name=top_menu]
-__COMMON_MENU__
-[output name=breadcrumbs]
-[breadcrumbs reset-on-product=1]
-
-[output name=""]
+[output name=main_css][css name=THEME_CSS basefile=variables/THEME_CSS][output name=trash]
+[output name=line_menu]__LINE_MENU__[output name=trash]
+[output name=top_menu]__COMMON_MENU__[output name=trash]
+[output name=breadcrumbs][breadcrumbs reset-on-product=1][output name=trash]
 [component group=content output="[control output top]"]
 [component group=content output="[control output bottom]"]
 [output name=""]



1.3       +1 -1      interchange/dist/standard/variables/COMMON_MENU


rev 1.3, prev_rev 1.2
Index: COMMON_MENU
===================================================================
RCS file: /var/cvs/interchange/dist/standard/variables/COMMON_MENU,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- COMMON_MENU	26 Jan 2005 18:01:26 -0000	1.2
+++ COMMON_MENU	13 May 2005 14:12:33 -0000	1.3
@@ -1,4 +1,4 @@
-[menu name="[scratch menu_bar]"
+[menu name="[either][scratch menu_bar][or]catalog/top[/either]"
 		menu-type=flyout
 		use-file=1
 		anchor_down=1



1.4       +1 -4      interchange/dist/standard/variables/LINE_MENU


rev 1.4, prev_rev 1.3
Index: LINE_MENU
===================================================================
RCS file: /var/cvs/interchange/dist/standard/variables/LINE_MENU,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LINE_MENU	28 Apr 2005 02:52:08 -0000	1.3
+++ LINE_MENU	13 May 2005 14:12:33 -0000	1.4
@@ -1,10 +1,7 @@
-[if !scratch line_menu]
-[tmpn line_menu]catalog/line[/tmpn]
-[/if]
 	<table cellpadding="0" cellspacing="0" class="linemenu" align="right">
 	<tr>
 [menu
-	name="[scratch line_menu]"
+	name="[either][scratch line_menu][or]catalog/line[/either]"
         inactive=inactive
 	full_interpolate=page
 	localize="name,description"



1.2       +3 -1      interchange/dist/standard/variables/PAGE_INIT


rev 1.2, prev_rev 1.1
Index: PAGE_INIT
===================================================================
RCS file: /var/cvs/interchange/dist/standard/variables/PAGE_INIT,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PAGE_INIT	25 Apr 2004 17:07:52 -0000	1.1
+++ PAGE_INIT	13 May 2005 14:12:33 -0000	1.2
@@ -7,4 +7,6 @@
 		$Tag->deliver({ location => $Tag->area('login')});
 	}
 	return;
-[/calc]
+[/calc][if !scratch logo]
+[seti logo][var LOGO][/seti]
+[/if]








More information about the interchange-cvs mailing list