Rev 201: Incorporated suggestions from beuno. in http://bzr.daniel-watkins.co.uk/pqm/ui

Thu Jul 10 14:24:01 BST 2008

At http://bzr.daniel-watkins.co.uk/pqm/ui

------------------------------------------------------------
revno: 201
revision-id: daniel at daniel-watkins.co.uk-20080710132248-spgomd25jctavk50
parent: daniel at daniel-watkins.co.uk-20080710124846-dbcyynb0g4viumrk
committer: Daniel Watkins <daniel at daniel-watkins.co.uk>
branch nick: ui
timestamp: Thu 2008-07-10 14:22:48 +0100
message:
  Incorporated suggestions from beuno.
-------------- next part --------------
=== modified file 'pqm/ui/template.py'

--- a/pqm/ui/template.py	2008-07-10 12:48:14 +0000
+++ b/pqm/ui/template.py	2008-07-10 13:22:48 +0000
@@ -5,13 +5,13 @@
 
 <body>
 
-<h1>PQM Queue: <div tal:replace="python: len(messages)">0</div> scripts</h1>
+<h1>PQM Queue: <div tal:replace="python: len(messages)" /> scripts</h1>
 
 <h2 tal:condition="not: processing">PQM is not currently processing additional requests</h2>
 
-<p>Current time: <div tal:replace="current_time">foo</div></p>
+<p>Current time: <div tal:replace="current_time" /></p>
 
-<div tal:omit-tag="" tal:condition="python: len(messages)">
+<tal:block tal:condition="python: len(messages)">
     <h2>Now playing...</h2>
     <pre tal:condition="not: python: messages[0]['other']"
          tal:content="status_text"></pre>
@@ -21,10 +21,10 @@
                 A request for another project.
             </p>
             <p tal:condition="not: message/other">
-                <div tal:replace="message/submission_time"></div>: <div tal:replace="message/sender"></div>, '<div tal:replace="message/subject"></div>'
+                <div tal:replace="message/submission_time" />: <div tal:replace="message/sender" />, '<div tal:replace="message/subject" />'
                 <ol>
                     <li tal:repeat="command message/commands">
-                        <div tal:replace="command"></div>
+                        <div tal:replace="command" />
                     </li>
                 </ol>
             </p>
@@ -35,25 +35,25 @@
 
     <ol>
     <li tal:repeat="message python: messages[1:]">
-        <div tal:omit-tag="" tal:condition="message/pqm_managed">
+        <tal:block tal:condition="message/pqm_managed">
             <p tal:condition="message/other">
                 A request for another project.
             </p>
             <p tal:condition="not: message/other">
-                <div tal:replace="message/submission_time"></div>: <div tal:replace="message/sender"></div>, '<div tal:replace="message/subject"></div>'
+                <div tal:replace="message/submission_time" />: <div tal:replace="message/sender" />, '<div tal:replace="message/subject" />'
                 <ol>
                     <li tal:repeat="command message/commands">
-                        <div tal:replace="command"></div>
+                        <div tal:replace="command" />
                     </li>
                 </ol>
             </p>
-        </div>
-        <div tal:omit-tag="" tal:condition="not: message/pqm_managed">
-            <p><div tal:replace="message/submission_time"></div>: <div tal:replace="message/sender"></div>, Request for non-PQM managed branch.</p>
-        </div>
+        </tal:block>
+        <tal:block tal:condition="not: message/pqm_managed">
+            <p><div tal:replace="message/submission_time" />: <div tal:replace="message/sender" />, Request for non-PQM managed branch.</p>
+        </tal:block>
     </li>
     </ol>
-</div>
+</tal:block>
 
 </body>
 </html>"""

