[zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo - macros_repository.html:1.2

Sidnei da Silva sidnei at x3ng.com.br
Fri May 17 05:07:55 EDT 2002 

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

Modified Files:
	macros_repository.html 
Log Message:
fixed the byline. now it uses one full line for each of object_actions, folder_actions and workflow_actions

=== Products/ZopeOrg-NV/skins/nzo/macros_repository.html 1.1 => 1.2 ===
 <body>
 
-<div id="ACTIONS_BAR" tal:condition="not: isAnon"
-     metal:define-macro="actions_bar">
-
-        <span tal:repeat="action object_actions">
-        <a href="" tal:attributes="href action/url"
-           tal:content="action/name">Edit</a><span
-    tal:condition="not: repeat/action/end">&nbsp;|&nbsp;</span>
-        </span>
-
- &nbsp;&nbsp;
-
-        <span tal:repeat="action folder_actions">
-        <a href="" tal:attributes="href action/url"
-           tal:content="action/name">Edit</a><span
-    tal:condition="not: repeat/action/end">&nbsp;|&nbsp;</span>
-        </span>
-
- &nbsp;&nbsp;
-
-        <span tal:repeat="action workflow_actions">
-        <a href="" tal:attributes="href action/url"
-           tal:content="action/name">Edit</a><span
-    tal:condition="not: repeat/action/end">&nbsp;|&nbsp;</span>
-        </span>
-
-</div>
-
-
 <!-- start byline - new action_box -->
 
-<div metal:define-macro="byline"
+<span id="ACTIONS_BAR" metal:define-macro="byline"
      tal:condition="python:not isAnon"
      tal:define="getIcon python:hasattr(here, 'getIcon') and here.getIcon();
                      icon python:getIcon or getattr(here, 'icon', '');
                      typ python:getattr(here, 'Type', '');
                      objID python:here.truncID( here.getId(), size=25 )">
-
-  <div id="objectinfo">
-  <h2 id="desktoptitle"><img tal:condition="icon" src=""
+  <div id="BYLINE_TITLE"><img tal:condition="icon" src=""
                              tal:attributes="src icon; alt typ">&nbsp;<span
-    tal:content="here/Title" tal:omit-tag="">Job Jar For Future Projects</span></h2>
-  </div>
+    tal:content="here/Title" tal:omit-tag="">Job Jar For Future Projects</span></div>
 
     <div>
     By <a href=""
@@ -59,34 +28,35 @@
          tal:condition="python:not isAnon and (len( object_actions ) &gt; 1 or len( folder_actions ) &gt; 1 or len( workflow_actions ) &gt; 1)">
 
 
-      <span tal:repeat="action object_actions"
+      <div tal:condition="python:len(object_actions) &gt; 1"><span tal:repeat="action object_actions"
             tal:omit-tag=""><a href=""
     tal:attributes="href action/url"
     tal:content="action/name">View</a><span
-    tal:condition="not:repeat/action/end" tal:omit-tag="">&nbsp;|</span></span>
-      <span tal:repeat="action folder_actions"
+    tal:condition="not:repeat/action/end" tal:omit-tag="">&nbsp;|&nbsp;</span></span></div>
+
+      <div tal:condition="python:len(folder_actions) &gt; 1"><span tal:repeat="action folder_actions"
             tal:omit-tag=""><a href=""
     tal:attributes="href action/url"
     tal:content="action/name">Edit</a><span
-    tal:condition="not:repeat/action/end" tal:omit-tag="">&nbsp;|</span></span>
+    tal:condition="not:repeat/action/end" tal:omit-tag="">&nbsp;|&nbsp;</span></span></div>
 
-      <span tal:condition="workflow_actions"
+      <div tal:condition="python:len(workflow_actions) &gt; 1"><span tal:condition="workflow_actions"
             class="ObjectStatus" tal:omit-tag="">Status: <span
-    tal:replace="python: wtool.getInfoFor(here,'review_state','')">Private</span></span>
-      <span tal:repeat="action workflow_actions"
+    tal:replace="python: wtool.getInfoFor(here,'review_state','')">Private
+</span></span>&nbsp;<span tal:repeat="action workflow_actions"
             tal:omit-tag=""><a href="content_submit_form"
     tal:attributes="href action/url"
     tal:content="action/name">Submit</a><span
-    tal:condition="not:repeat/action/end" tal:omit-tag="">&nbsp;|</span></span>
+    tal:condition="not:repeat/action/end" tal:omit-tag="">&nbsp;|&nbsp;</span></span></div>
     </div>
-</div>
+</span>
 
 <!-- end byline - new action_box -->
 
-<table align="center" border="1" style="font-size: 1em"
+<table align="center" border="1" id="BUGBOX"
        cellspacing="0" cellpadding="2"
        metal:define-macro="bugbox">
-<caption style="font-weight: bold">Temporary Area -- The Bug Box</caption>
+<caption>Temporary Area -- The Bug Box</caption>
   <tr>
   <td>
   <table align="center" border="0" cellspacing="0" cellpadding="4">
@@ -148,7 +118,7 @@
 	</td>
 	<td rowspan="3">
 	      	<strong>Description:</strong><br />
-		<textarea name="description" rows="5" cols="35"></textarea>
+		<textarea name="description" rows="5" cols="30"></textarea>
 	</td>
 	</tr>
 	<tr>
@@ -170,6 +140,38 @@
 	<tr>
 	<td align="right">
 	     	<input type="button" value="Add" />
+	</td>
+	<td colspan="2">	
+	      	<input type="button" value="Add and Confirm" onclick="addCollectorIssue();" />
+	</td>
+	</tr>
+	</table>
+      </form>
+    </td>
+  </tr>
+  </table>
+ </td>
+ </tr>
+  <tr>
+    <td align="center">
+      <a href="#">Collector Login</a> &nbsp;
+View open reports for:
+<a href="#">All</a>
+<a href="#">Design</a>
+<a href="#">System</a>
+<a href="#">Search</a>
+<a href="#">Content</a>
+<a href="#">Documentation</a>
+<a href="#">Products</a>
+</td>
+</tr>
+</table>
+
+<div id="FOOTER" align="center" metal:define-macro="copyright"><br />&copy; 2002
+<a href="http://www.zope.com/">Zope Corporation</a> All rights reserved.<br /></div>
+</body>
+</html>
+alue="Add" />
 	</td>
 	<td colspan="2">	
 	      	<input type="button" value="Add and Confirm" onclick="addCollectorIssue();" />

More information about the zopeorg-checkins mailing list