[MKDoc-commit] macros and i18n stuff

chris at mkdoc.demon.co.uk chris at mkdoc.demon.co.uk
Fri Nov 5 17:16:52 GMT 2004


Log Message:
-----------
macros and i18n stuff

Modified Files:
--------------
    mkd/resources/templates/admin/user_insert:
        en.html

-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/user_insert/en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lresources/templates/admin/user_insert/en.html -Lresources/templates/admin/user_insert/en.html -u -r1.4 -r1.5
--- resources/templates/admin/user_insert/en.html
+++ resources/templates/admin/user_insert/en.html
@@ -298,7 +298,7 @@
               value="" 
               id="login"
               name="login" 
-              size="20"
+              size="10"
               title="Enter a username."
               petal:attributes="value self/cgi/param --login" 
               i18n:attributes="title enter-a-username"
@@ -385,55 +385,81 @@
           </p>
   
           <p
-            lang="en"
-            xml:lang="en"
-            dir="ltr"
-            align="left"
-            petal:attributes="align align"
+            class="field"
           >
+            <label
+              for="email"
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              class="mandatory"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="email"
+            >Email</label>
             <em
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
               class="help"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="add-user-email-help"
             >
               The email address of the user, please double check that this is correct.
             </em>
-            <label
-              for="email"
-            >Email</label>
-            <br />
             <input 
               type="text" 
               value="" 
               id="email"
               name="email" 
-              size="40"
+              size="30"
+              title="Enter the users email address."
               petal:attributes="value self/cgi/param --email" 
+              i18n:attributes="title enter-email-address"
             />
+            <br />
           </p>
   
           <p
-            lang="en"
-            xml:lang="en"
-            dir="ltr"
-            align="left"
-            petal:attributes="align align"
+            class="field"
           >
+            <label
+              for="password"
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              class="mandatory"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="password"
+            >Password</label>
             <em
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
               class="help"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="add-user-password-help"
             >
               The password for the user, this shouldn't contain any spaces and it is case sensitive.
             </em>
-            <label
-              for="password"
-            >Password</label>
-            <br />
             <input 
               type="password" 
               value="" 
               id="password"
               name="password" 
-              size="15"
+              size="10"
+              title="Enter the password here."
               petal:attributes="value self/cgi/param --password" 
+              i18n:attributes="title enter-password"
             />
+            <br />
           </p>
 
         </fieldset>
@@ -442,70 +468,48 @@
           class="user-permissions"
         >
 
-          <legend
-            lang="en"
-            xml:lang="en"
-            dir="ltr"
-            align="left"
-            petal:attributes="align align"
-          >
-            User Permissions
+          <legend>
+            <a 
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              id="user-permissions" 
+              name="user-permissions"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="user-permissions"
+            >User Permissions</a>
           </legend>
 
           <p
-            lang="en"
-            xml:lang="en"
-            dir="ltr"
-            align="left"
-            petal:attributes="align align"
+            class="field"
           >
-            <em
-              class="help"
-            >
-              The base document(s) are the document(s) that this user is allowed to edit. 
-              If this user has no selected based document then they will not be allowed to edit any 
-              documents on this site. If one of more documents are selected then the user will be able 
-              edit those documents <strong>and</strong> any child documents that these documents might 
-              have. This means that if you want to allow someone to edit all documents you olny need to 
-              set / as their base document.
-            </em>
             <label
-              for="base_documents"
-            >Base Document(s)</label>
-            <br />
-            <select 
-              multiple="multiple" 
-              size="12"
-              id="base_documents"
-              name="base_documents"
-            >
-              <option>
-              </option>
-              <option 
-                petal:repeat="document self/documents"
-                petal:attributes="selected self/is_selected $document; value document/id"
-                petal:content="document/path"
-              >/foo/bar/</option>
-            </select>
-          </p>
-  
-          <p
-            lang="en"
-            xml:lang="en"
-            dir="ltr"
-            align="left"
-            petal:attributes="align align"
-          >
+              for="disabled"
+              for="title"
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              class="mandatory"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="account-status"
+            >Account Status</label>
             <em
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
               class="help"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="add-user-account-status-help"
             >
               Accounts can be enabled, which means that they can be used, or disabled which means that
               they can't be used.
             </em>
-            <label
-              for="disabled"
-            >Account Status</label>
-            <br />
             <select 
               id="disabled" 
               name="disabled" 
@@ -513,36 +517,90 @@
               <option 
                 value="1"
                 petal:condition="true: self/cgi/param --disabled"
+                i18n:translate="disabled"
               >Disabled</option>
               <option 
                 value="0"
                 petal:condition="true: self/cgi/param --disabled"
+                i18n:translate="enabled"
               >Enabled</option>
               <option 
                 value="0"
                 petal:condition="false: self/cgi/param --disabled"
+                i18n:translate="enabled"
               >Enabled</option>
               <option 
                 value="1"
                 petal:condition="false: self/cgi/param --disabled"
+                i18n:translate="disabled"
               >Disabled</option>
             </select>
+            <br />
           </p>
      
+          <p
+            class="widefield"
+          >
+            <label
+              for="base_documents"
+              for="title"
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              class="mandatory"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="base-documents"
+            >Base Document(s)</label>
+            <em
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              class="help"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="add-user-base-document-help"
+            >
+              The base document(s) are the document(s) that this user is allowed to edit. 
+              If this user has no selected based document then they will not be allowed to edit any 
+              documents on this site. If one of more documents are selected then the user will be able 
+              edit those documents <strong>and</strong> any child documents that these documents might 
+              have. This means that if you want to allow someone to edit all documents you only need to 
+              set / as their base document.
+            </em>
+            <select 
+              multiple="multiple" 
+              size="12"
+              id="base_documents"
+              name="base_documents"
+            >
+              <option 
+                value=""
+                title="None"
+                i18n:attributes="title none"
+              ></option>
+              <option 
+                petal:repeat="document self/documents"
+                petal:attributes="selected self/is_selected $document; 
+                                  value    document/id;
+                                  title    document/title;"
+                petal:content="document/path"
+              >/foo/bar/</option>
+            </select>
+            <br />
+          </p>
+  
         </fieldset>
 
-        <p
-          lang="en"
-          xml:lang="en"
-          dir="ltr"
-          align="left"
-          petal:attributes="align align"
-        >
+        <p>
           <input 
             type="submit" 
             value="Create User"
-            class="input-submit"
             title="Create a new user using values in this form."
+            i18n:attributes="value  create-user;
+                             title  create-a-new-user;"
           />
         </p>
 


More information about the MKDoc-commit mailing list