[zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - macro_renderer.html:1.1 standard_html_footer.dtml:1.1 standard_html_header.dtml:1.1 index_html.html:1.2 main_template.html:1.13

Sidnei da Silva sidnei at x3ng.com.br
Sat Dec 28 07:53:06 EST 2002


Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv29529

Modified Files:
	index_html.html main_template.html 
Added Files:
	macro_renderer.html standard_html_footer.dtml 
	standard_html_header.dtml 
Log Message:
Share the skin with dtml objects

=== Added File Products/ZopeOrg-NV/skins/nzo/macro_renderer.html ===
<span tal:omit-tag=""
      tal:define="utool nocall:here/portal_url;
                  mtool here/portal_membership;
                  atool here/portal_actions;
                  wtool here/portal_workflow;
                  portal_object utool/getPortalObject;
                  portal_title portal_object/Title;
                  object_title here/Title;
                  portal_url here/portal_url;
                  member mtool/getAuthenticatedMember;
                  isAnon mtool/isAnonymousUser;
                  actions python: atool.listFilteredActionsFor( here );
                  user_actions actions/user;
  		  uname python: isAnon and 'Guest' or member.getUserName();
    object_actions actions/object;
    folder_actions actions/folder;
    workflow_actions actions/workflow;
                 ">
<div metal:use-macro="python:path('%(template)s/macros/%(macro)s' % ({'template': options.get('template', 'here/header'), 'macro':options.get('macro', 'html_header')} ) )" />
</span>

=== Added File Products/ZopeOrg-NV/skins/nzo/standard_html_footer.dtml ===
    </td>
  </tr>
</table>

<dtml-var "macro_renderer(template='here/main_template', macro='footer')" >

</body>

</html>

=== Added File Products/ZopeOrg-NV/skins/nzo/standard_html_header.dtml ===
<html>

<dtml-var "macro_renderer(template='here/main_template', macro='head')" >

<body>

<dtml-var "macro_renderer(template='here/main_template', macro='header')" >

<table width="100%" border="0" cellspacing="0" cellpadding="7">
  <tr>
    <td valign="top" nowrap width="120">
     
    <dtml-var "macro_renderer(template='here/main_template', macro='side_menu')" >

    </td>

    <td background="point_bckgrd2.jpg" width="1">&nbsp;</td>
    <td valign="top">

    <dtml-var "macro_renderer(template='here/main_template', macro='bread_byline')" >




=== Products/ZopeOrg-NV/skins/nzo/index_html.html 1.1 => 1.2 ===
 <html metal:use-macro="here/main_template/macros/master">
 <body> <div metal:fill-slot="main">
+<span tal:condition="python: 'index.html' in here.objectIds()">
+      <span tal:condition="python: hasattr(getattr(here, 'index.html'), 'CookedBody')"
+            tal:replace="structure python:getattr(here, 'index.html').CookedBody()">
+      </span>
+</span>
 <span metal:use-macro="here/local_html/macros/body|default">Locally defined HTML</span>
         <table tal:condition="python: 'local_html' not in here.objectIds()"
-               tal:define="raw_items python: here.contentValues( filter={'Subject': []
-                                            , 'Type': [ 'Folder'
-                                                      , 'Document'
-                                                      , 'Link'
-                                                      , 'Topic'
-                                                      ] });
+               tal:define="raw_items python: here.contentValues();
                         sort_items python: raw_items.sort(lambda a, b: cmp(a.getId(), b.getId()) );
                         items python: here.ZPT_skip_unauthorized( raw_items )">
             <tr tal:repeat="item items">
@@ -15,6 +15,14 @@
                     tal:attributes="href item/absolute_url" tal:content="item/title_or_id" class="bTitle">Title</a>
                 <br><span tal:condition="exists: item/Description"
                         tal:content="item/Description">Description</span>
+                </td>
+            </tr>
+	</table>
+</div>
+</body>
+</html>
+
+/span>
                 </td>
             </tr>
 	</table>


=== Products/ZopeOrg-NV/skins/nzo/main_template.html 1.12 => 1.13 ===
     workflow_actions actions/workflow;
                  ">
 
-<head>
+<head metal:define-macro='head'>
 
   <title tal:define="ob_title here/Title; portal_title container/title"
          tal:content="string:${portal_title}: ${ob_title}">New Zope.org</title>
@@ -40,8 +40,9 @@
 
 </head>
 
-<body bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<body>
 
+<span metal:define-macro='header'>
 <div id="TOP_NAVIG">
   <table width="100%" background="top_bckgrd.jpg" border="0" cellspacing="0" cellpadding="0">
     <tr>
@@ -60,9 +61,7 @@
       </td>
       <td background="top_bckgrd.jpg" nowrap="nowrap">
       <form action="search" method="get"
-            tal:define="portal_url here/portal_url"
-     tal:attributes="action string:${portal_url}/search">
-
+            tal:attributes="action string:${portal_url}/search">
 	<input type="text" name="SearchableText" value="Type your search here"
         size="20" onfocus="this.value='';" />
         <input type="submit" name="Submit" value="Go" />&nbsp;
@@ -97,12 +96,12 @@
 
 
 </table>
-
+</span>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="7">
   <tr>
     <td valign="top" nowrap width="120">
-        <div id="SIDE_MENU">
+        <div metal:define-macro="side_menu" id="SIDE_MENU">
 
           <h1><a href="#">About Zope</a></h1>
           <div><a href="#">What is Zope?</a></div>
@@ -157,12 +156,15 @@
 
     <td background="point_bckgrd2.jpg" width="1">&nbsp;</td>
     <td valign="top">
+      <span metal:define-macro='bread_byline'>
       <div id="Breadcrumbs" tal:condition="python: not here.getId() == utool.getPortalObject().getId()">
         Location: 
           <span tal:replace="structure python:here.shortBread(include_root=1)">
 			    <a href="#">Bread</a> > <a href="#">Crumbs</a></span>
       </div>
       <div metal:use-macro="container/macros_repository/macros/byline">Byline</div>
+    
+      </span>
 
       <div metal:define-slot="main">
 
@@ -296,6 +298,7 @@
     </td>
   </tr>
 </table>
+<span metal:define-macro="footer">
 <table align="center" border="0" cellspacing="0" cellpadding="0" width="100%" style="margin-top: 2em;margin-bottom: 2em">
 <tr>
 <td align="center" id="FOOTER_MENU">
@@ -316,6 +319,6 @@
 <div align="center" metal:use-macro="container/macros_repository/macros/copyright">
   Here goes the Copyright
 </div>
-
+</span>
 </body>
 </html>





More information about the zopeorg-checkins mailing list