[MKDoc-commit] References to Dogs removed

[chris at mkdoc.demon.co.uk]

Log Message:
-----------
References to Dogs removed

Modified Files:
--------------
    mkd/resources/templates/admin/new:
        en.html
    mkd/resources/templates/admin/properties:
        en.html
    mkd/resources/templates/component/poll:
        en.html

-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/new/en.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lresources/templates/admin/new/en.html -Lresources/templates/admin/new/en.html -u -r1.15 -r1.16
--- resources/templates/admin/new/en.html
+++ resources/templates/admin/new/en.html
@@ -469,30 +469,6 @@
             />
           </p>
           <br />
-          <p
-            class="field"
-            petal:omit-tag=""
-          >
-            <label
-              for="audience-dogs"
-              lang="en"
-              xml:lang="en"
-              dir="ltr"
-              class="optional"
-              petal:omit-tag=""
-            >Dogs</label>
-            <input
-              type="checkbox"
-              name="audience"
-              id="audience-dogs"
-              value="12"
-              class="input-checkbox"
-              petal:omit-tag=""
-            />
-          </p>
-          <br 
-            petal:omit-tag=""
-          />
 
         </fieldset>
   
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/properties/en.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lresources/templates/admin/properties/en.html -Lresources/templates/admin/properties/en.html -u -r1.13 -r1.14
--- resources/templates/admin/properties/en.html
+++ resources/templates/admin/properties/en.html
@@ -523,30 +523,6 @@
             />
           </p>
           <br />
-          <p
-            class="field"
-            petal:omit-tag=""
-          >
-            <label
-              for="audience-dogs"
-              lang="en"
-              xml:lang="en"
-              dir="ltr"
-              class="optional"
-              petal:omit-tag=""
-            >Dogs</label>
-            <input
-              type="checkbox"
-              name="audience"
-              id="audience-dogs"
-              value="12"
-              class="input-checkbox"
-              petal:omit-tag=""
-            />
-          </p>
-          <br 
-            petal:omit-tag=""
-          />
         </fieldset>
   
         <fieldset
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/component/poll/en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lresources/templates/component/poll/en.html -Lresources/templates/component/poll/en.html -u -r1.3 -r1.4
--- resources/templates/component/poll/en.html
+++ resources/templates/component/poll/en.html
@@ -32,23 +32,24 @@
 <div
   class="poll"
   xmlns:petal="http://purl.org/petal/1.0/"
+  xmlns:petal="http://purl.org/petal/1.0/"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   petal:condition="self/question"
 >
 
+  <!--? This table is used for displayoing the results when the poll has finished. ?-->
   <table
     border="0"
     cellpadding="3"
     cellspacing="0"
     dir="ltr"
     summary="This table contains the poll results."
-    petal:condition="true:self/is_stopped; true:self/Results"
+    i18n:attributes="summary table-contains-poll-results"
     petal:attributes="dir self/direction"
+    petal:condition="true: self/is_stopped; 
+                     true: self/Results"
   >
     <caption 
-      xml:lang="en"
-      lang="en"
-      dir="ltr"
-      petal:attributes="xml:lang self/language; lang self/language; dir self/direction"
       petal:content="self/question"
     >Hello World?</caption>
     <thead>
@@ -57,16 +58,28 @@
           xml:lang="en"
           lang="en"
           dir="ltr"
+          i18n:attributes="lang     two-letter-language-code;
+                           xml:lang two-letter-language-code;
+                           dir      text-direction;"
+          i18n:translate="answer"
         >Answer</th>
         <th 
           xml:lang="en"
           lang="en"
           dir="ltr"
+          i18n:attributes="lang     two-letter-language-code;
+                           xml:lang two-letter-language-code;
+                           dir      text-direction;"
+          i18n:translate="votes"
         >Votes</th>
         <th 
           xml:lang="en"
           lang="en"
           dir="ltr"
+          i18n:attributes="lang     two-letter-language-code;
+                           xml:lang two-letter-language-code;
+                           dir      text-direction;"
+          i18n:translate="proportion"
         >Proportion</th>
       </tr>
     </thead>
@@ -76,16 +89,23 @@
           xml:lang="en"
           lang="en"
           dir="ltr"
+          i18n:attributes="lang     two-letter-language-code;
+                           xml:lang two-letter-language-code;
+                           dir      text-direction;"
+          i18n:translate="this-poll-has-ended"
           colspan="3"
         >This poll has ended, it ran from 
         <em
           petal:content="self/date_start"
+          i18m:name="startdate"
         >StartDate</em> to 
         <em
           petal:content="self/date_stop"
+          i18m:name="stopdate"
         >StopDate</em>. During this time 
         <em
           petal:content="self/count_votes"
+          i18m:name="votes"
         >Votes</em> vote(s) were cast.</td>
       </tr>
     </tfoot>
@@ -94,10 +114,6 @@
         petal:repeat="result self/results"
       >
         <td 
-          xml:lang="en"
-          lang="en"
-          dir="ltr"
-          petal:attributes="xml:lang self/language; lang self/language; dir self/direction"
           petal:content="result/Answer"
         >Some Answer</td>
         <td 
@@ -115,8 +131,10 @@
     </tbody>
   </table>
 
+  <!--? This is for started but not stopped polls. ?-->
   <div 
-    petal:condition="true:self/is_started; false:self/is_stopped"
+    petal:condition="true:  self/is_started; 
+                     false: self/is_stopped"
   >
 
     <form