[Cluster-devel] conga/luci cluster/index_html homebase/index_h ...

Wed Jul 5 20:26:02 UTC 2006

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-07-05 20:26:01

Modified files:
	luci/cluster   : index_html 
	luci/homebase  : index_html 
	luci/storage   : index_html 
Removed files:
	luci/cluster   : main_footer main_logo 
	luci/homebase  : main_footer main_logo 

Log message:
	remove header and footer duplication

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/main_footer.diff?cvsroot=cluster&r1=1.2&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/main_logo.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/index_html.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/main_footer.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/main_logo.diff?cvsroot=cluster&r1=1.4&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/index_html.diff?cvsroot=cluster&r1=1.1&r2=1.2

--- conga/luci/cluster/index_html	2006/07/05 20:13:03	1.2
+++ conga/luci/cluster/index_html	2006/07/05 20:26:00	1.3
@@ -108,7 +108,7 @@
                The quicksearch box, normally placed at the top right
              </div>
 -->
-             <a metal:use-macro="here/main_logo/macros/main_portal_logo">
+             <a metal:use-macro="here/global_logo/macros/portal_logo">
                The portal logo, linked to the portal root
              </a>
 <!--
@@ -226,7 +226,7 @@
 
       <metal:block i18n:domain="plone">
 
-        <metal:footer use-macro="here/main_footer/macros/portal_footer">
+        <metal:footer use-macro="here/footer/macros/portal_footer">
           Footer
         </metal:footer>
 
--- conga/luci/homebase/index_html	2006/06/30 18:06:10	1.10
+++ conga/luci/homebase/index_html	2006/07/05 20:26:00	1.11
@@ -15,7 +15,7 @@
 					xml:lang language">
 
 <tal:comment replace="nothing">
-	$Id: index_html,v 1.10 2006/06/30 18:06:10 rmccabe Exp $
+	$Id: index_html,v 1.11 2006/07/05 20:26:00 rmccabe Exp $
 </tal:comment>
 
 <head metal:use-macro="here/header/macros/html_header">
@@ -82,7 +82,7 @@
 				tal:attributes="href string:${request/ACTUAL_URL}#portlet-navigation-tree"
 				i18n:translate="label_skiptonavigation">Skip to navigation</a>
 
-			 <a metal:use-macro="here/main_logo/macros/main_portal_logo">
+			 <a metal:use-macro="here/global_logo/macros/portal_logo">
 				The portal logo, linked to the portal root
 			 </a>
 
@@ -185,7 +185,7 @@
 
 	  <metal:block i18n:domain="plone">
 
-		<metal:footer use-macro="here/main_footer/macros/portal_footer">
+		<metal:footer use-macro="here/footer/macros/portal_footer">
 		  Footer
 		</metal:footer>
 
--- conga/luci/storage/index_html	2006/06/30 17:00:02	1.1
+++ conga/luci/storage/index_html	2006/07/05 20:26:01	1.2
@@ -151,7 +151,7 @@
                The quicksearch box, normally placed at the top right
              </div>
 -->
-             <a metal:use-macro="here/main_logo/macros/main_portal_logo">
+             <a metal:use-macro="here/global_logo/macros/portal_logo">
                The portal logo, linked to the portal root
              </a>
 <!--
@@ -276,7 +276,7 @@
 
       <metal:block i18n:domain="plone">
 
-        <metal:footer use-macro="here/main_footer/macros/portal_footer">
+        <metal:footer use-macro="here/footer/macros/portal_footer">
           Footer
         </metal:footer>
 


