[MKDoc-commit] i18n updates

chris at mkdoc.demon.co.uk chris at mkdoc.demon.co.uk
Wed Apr 6 17:29:23 BST 2005


Log Message:
-----------
i18n updates

Modified Files:
--------------
    mkd/resources/templates/account/preferences:
        en.html

-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/account/preferences/en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lresources/templates/account/preferences/en.html -Lresources/templates/account/preferences/en.html -u -r1.4 -r1.5
--- resources/templates/account/preferences/en.html
+++ resources/templates/account/preferences/en.html
@@ -52,8 +52,9 @@
 
   <head>
     <title
-      petal:content="structure string:${self/parent_alternate_title}${string:sitemap}"
+      petal:content="structure string:${self/parent_alternate_title}${string:account-preferences}"
     >
+      Account Preferences
     </title>
     <meta 
       http-equiv="Content-Type" 
@@ -80,11 +81,11 @@
       title="Screen style sheet"
       metal:use-macro="/macros/style/#content"
     >
-      @import url(../../css/public.ltr.css);
-      @import url(../../css/public.css);
-      @import url(../../css/colours.css);
-      @import url(../../css/admin.ltr.css);
-      @import url(../../css/admin.css);
+      @import url(../../../css/public.ltr.css);
+      @import url(../../../css/public.css);
+      @import url(../../../css/colours.css);
+      @import url(../../../css/admin.ltr.css);
+      @import url(../../../css/admin.css);
     </style>
     <link 
       rel="shortcut icon" 
@@ -117,517 +118,692 @@
     />
   </head>
 
+  <body>
 
-  <body 
-    lang="en"
-    xml:lang="en"
-    dir="ltr"
-    petal:attributes="lang lang; xml:lang lang; dir dir;"
-  >
+    <!--? Admin Fragment ?-->
+    <div
+      class="admin"
+      petal:condition="true: self/user; 
+                       true: self/user/is_editor"
+      metal:use-macro="/macros/menu_admin/#content"
+    >
+      <!--? Mockup content - this will be replaced by the result of the macro ?-->
+      <form accept-charset="utf-8" action="#" method="post">
+        <a lang="en"  xml:lang="en" dir="ltr" href="#">Document</a>
+        <bdo dir="ltr">|</bdo>
+        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+          title="Modify the Title, Description, and other Properties of this document.">Properties</a>
+        <bdo dir="ltr">|</bdo>
+        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+          title="Edit the Content of of this document.">Content</a>
+        <bdo dir="ltr">|</bdo>
+        <a lang="en" xml:lang="en" dir="ltr" href="#" title="Find documents.">Finder</a>
+        <bdo dir="ltr">|</bdo>
+        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+          title="Modify the Sort order of the child documents of this document.">Sort</a>
+        <bdo dir="ltr">|</bdo>
+        <a lang="en" xml:lang="en" dir="ltr" href="#" title="Move this document.">Move</a>
+        <bdo dir="ltr">|</bdo>
+        <a lang="en" xml:lang="en" dir="ltr" href="#" title="Copy this document.">Copy</a>
+        <bdo dir="ltr">|</bdo>
+        <a lang="en" xml:lang="en" dir="ltr" href="#" title="Create a new child document.">New</a>
+        <bdo dir="ltr">|</bdo>
+        <a lang="en" xml:lang="en" dir="ltr" href="#" title="Delete this document.">Delete</a>
+      </form>
+      <!--? / Mockup content ?-->
+    </div>
+    <!--? / Admin Fragment ?-->
 
-<!--? This is the header it contains the navigational elements at the top of the page. ?-->
-<?include file="/fragments/header/"?>
+    <!--? This is the header it contains the navigational elements at the top of the page. ?-->
+    <div
+      class="header"
+    >
 
-    <div class="content">
+      <!--? Skip Navigation Fragment ?-->
+      <div
+        metal:use-macro="/macros/menu_no-css/#content"
+        class="no-css"
+      >
+        <!--? Mockup content - this will be replaced by the result of the macro ?-->
+        <p>
+          <a title="Skip the navigation and jump straight to the page content [ Accesskey S ]" 
+            accesskey="S" lang="en" href="#page_content" xml:lang="en">Skip Navigation</a>
+        </p>
+      </div>
 
-      <h1 
-        lang="en"
-        xml:lang="en"
-        dir="ltr"
-        align="left"
-        petal:attributes="align align"
+      <!--? Logo Fragment ?-->
+      <div
+        metal:use-macro="/macros/logo/#content"
+        class="logo"
       >
+        <!--? Mockup content - this will be replaced by the result of the macro ?-->
+        <p>
+          <a href="http://www.example.com/" hreflang="en"><img 
+            alt="Home Page" src="../../../css/logo.png" 
+            border="0" /></a>
+        </p>
+      </div>
+
+      <!--? Navigation Menu Fragment ?-->
+      <div
+        metal:use-macro="/macros/menu/#content"
+        class="menu"
+      >
+        <!--? Mockup content - this will be replaced by the result of the macro ?-->
+        <p>
+          <a accesskey="1" lang="en" xml:lang="en" hreflang="en" dir="ltr" 
+            href="http://www.example.com/" title="The home page [Accesskey 1 ].">Home</a>
+          <bdo dir="ltr">|</bdo>
+          <a accesskey="3" lang="en" xml:lang="en" hreflang="en" dir="ltr" 
+            href="http://www.example.com/.sitemap.html" 
+            title="The sitemap [Accesskey 3 ].">Sitemap</a>
+        </p>
+      </div>
+      <!--? Navigation Search Fragment ?-->
+      <div
+        metal:use-macro="/macros/search/#content"
+        class="search"
+      >
+        <!--? Mockup content - this will be replaced by the result of the macro ?-->
+        <form accept-charset="utf-8" enctype="application/x-www-form-urlencoded" 
+          action="http://www.example.com/.search.html" method="get">
+          <p>
+            <label lang="en" xml:lang="en" for="q">Search</label>
+            <input accesskey="4" value="Keyword(s)" name="q" size="12" type="text" 
+              onblur="if(this.value=='')this.value='Keyword(s)';" 
+              onfocus="if(this.value=='Keyword(s)')this.value='';" 
+              title="Enter your search term(s) here [ Accesskey 4 ]" id="q" />
+            <input value="Search" type="submit" 
+              title="Submit your search term(s) to the search engine" />
+          </p>
+        </form>
+      </div>
+
+      <!--? Bread Crumb Trail Document Fragment ?-->
+      <div
+        metal:use-macro="/sitemap/macros/breadcrumb/#content"
+        class="breadcrumb"
+      >
+        <!--? Mockup content ?-->
+        <p>
+          <span lang="en" xml:lang="en">You are here</span>
+          <bdo dir="ltr">:</bdo>
+          <a lang="en" href="http://www.example.com/" xml:lang="en" hreflang="en">Foo</a>
+          <bdo dir="ltr">/</bdo>
+          <a lang="en" href="http://www.example.com/bar/" xml:lang="en" hreflang="en">Bar</a>
+          <bdo dir="ltr">/</bdo>
+          <a lang="en" href="http://www.example.com/bar/baz/" xml:lang="en" hreflang="en">Baz</a>
+          <bdo dir="ltr">/</bdo>
+          <strong lang="en" xml:lang="en">Account Preferences</strong>
+        </p>
+      </div>
+
+    </div>
+
+    <div 
+      class="sidebar1"
+    >
+      <!--?  ?-->
+    </div>
+
+    <div 
+      class="sidebar2"
+    >
+      <!--?  ?-->
+    </div>
+
+    <div class="content">
+
+      <h1>
         <a
           id="page_content"
           name="page_content"
-          petal:content="title"
+          i18n:attributes="xml:lang two-letter-language-code; 
+                           lang     two-letter-language-code;
+                           dir      text-direction"
+          i18n:translate="account-preferences"
         >
          Account Preferences
         </a>
       </h1>
 
-      <xi:include href="/error/" />
+      <!--? Error Fragment ?-->
+      <div
+        class="error"
+        metal:use-macro="/error/#content"
+      >
+         <!--? Mockup content - this will be replaced by the result of the macro ?-->
+         <h2>
+           <a name="error" id="error">Error</a>
+         </h2>
+         <ul>
+           <li>Oh no! something has gone wrong :-/</li>
+         </ul>
+      </div>
 
-      <!-- General preferences -->
+      <!--? General preference errors ?-->
       <div
+        class="error"
         petal:repeat="general self/preferences/generals"
+        petal:condition="true: errors; 
+                         true: errors/get --preferences.general"
       >
         <p 
           lang="en"
           xml:lang="en"
           dir="ltr"
-          align="left"
-          class="error"
-          petal:attributes="align align"
-          petal:if="errors; errors/get 'preferences.general'"
+          i18n:attributes="lang     two-letter-language-code;
+                           xml:lang two-letter-language-code;
+                           dir      text-direction;" 
+          i18n:translate="error-setting-general-preferences"
         >
           Error setting one or more general preferences.
         </p>
       </div>
 
-      <!-- Audience preferences -->
-      <p 
-        lang="en"
-        xml:lang="en"
-        dir="ltr"
-        align="left"
+      <!--? Audience preference errors ?-->
+      <div
         class="error"
-        petal:attributes="align align"
-        petal:if="errors; errors/get 'preferences.audience'"
+        petal:repeat="general self/preferences/generals"
+        petal:condition="true: errors; 
+                         true: errors/get --preferences.audience"
       >
-        Error setting one or more audience preferences.
-      </p>
+        <p 
+          lang="en"
+          xml:lang="en"
+          dir="ltr"
+          i18n:attributes="lang     two-letter-language-code;
+                           xml:lang two-letter-language-code;
+                           dir      text-direction;" 
+          i18n:translate="error-setting-general-preferences"
+        >
+          Error setting one or more audience preferences.
+        </p>
+      </div>
 
       <!-- Language preferences -->
-      <p 
-        lang="en"
-        xml:lang="en"
-        dir="ltr"
-        align="left"
+      <div
         class="error"
-        petal:attributes="align align"
-        petal:if="errors; errors/get 'preferences.language'"
+        petal:repeat="general self/preferences/generals"
+        petal:condition="true: errors; 
+                         true: errors/get --preferences.language"
       >
-        Error setting one or more language preferences.
-      </p>
+        <p 
+          lang="en"
+          xml:lang="en"
+          dir="ltr"
+          i18n:attributes="lang     two-letter-language-code;
+                           xml:lang two-letter-language-code;
+                           dir      text-direction;" 
+          i18n:translate="error-setting-language-preferences"
+        >
+          Error setting one or more language preferences.
+        </p>
+      </div>
 
-<!--? Report errors at the top of the page so user can see 'em 
-          <div
-            petal:if="true: $self/errors"
+      <form 
+        action="#"
+        method="post" 
+        accept-charset="UTF-8"
+        enctype="application/x-www-form-urlencoded"
+        petal:attributes="action uri"
+      >
+
+        <fieldset
+          class="newsletter-preferences"
+        >
+
+          <legend
           >
-            <p>
-              One or more errors have occured!
-            </p>
-            <p>
-              State:  
-              <strong 
-                class="error"
-                petal:inner="self/state"
-              >Error Message</strong>
-            </p>
-            <p>
-              Errors:   
-              <strong 
-                class="error"
-                petal:inner="self/errors"
-              >Error Message</strong>
-            </p>
-            <p>
-              User:   
-              <strong 
-                class="error"
-                petal:inner="self/user"
-              >Error Message</strong>
-            </p>
-            <p>
-              Prefs:     
-              <strong   
-                class="error"
-                petal:inner="self/preferences"
-              >Error Message</strong>
-            </p>
-            <p>
-              Options available:
-            </p>
-            <ul>
-              <li>
-                Generals: 
-                <strong   
-                  class="error"
-                  petal:inner="self/preferences/generals"
-                >Error Message</strong>
-              </li>
-              <li>Audiences: 
-                <strong   
-                  class="error"
-                  petal:inner="self/preferences/audiences"
-                >Error Message</strong>
-              </li>
-              <li>Languages: 
-                <strong   
-                  class="error"
-                  petal:inner="self/preferences/languages"
-                >Error Message</strong>
-              </li>
-	    </ul>
-          </div>
-?-->
+            <a 
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              id="newsletter-preferences"
+              name="newsletter-preferences"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;" 
+              i18n:translate="newsletter-preferences"
+            >Newsletter Preferences</a>
+          </legend>
+
           <p
             lang="en"
             xml:lang="en"
             dir="ltr"
-            align="left"
-            petal:attributes="align align"
+            class="help"
+            i18n:attributes="lang     two-letter-language-code;
+                             xml:lang two-letter-language-code;
+                             dir      text-direction;" 
+            i18n:translate="newsletter-preferences-help"
           >
-            This form is divided into several sections:
-            <br />
-            <a 
-              href="#newsletter-preferences"
-            >Newsletter Preferences</a> | 
-            <span
-              petal:condition="true: self/preferences/audiences"
-              petal:omit-tag="string:1"
-            >
-              <a 
-                href="#audience-preferences"
-              >Audience Preferences</a> | 
-            </span>
-            <span
-              petal:condition="self/preferences/languages"
-              petal:omit-tag="string:1"
-            >
-              <a 
-                href="#language-preferences"
-              >Language Preferences</a>
-            </span>
+            You may choose to receive regular email updates about new 
+            additions to this site. The email is customised based on 
+            the Audience and Language preferences you select.
           </p>
 
-          <form 
-            action="#"
-            method="post" 
-            accept-charset="UTF-8"
-            enctype="application/x-www-form-urlencoded"
-            petal:attributes="action uri"
+          <p
           >
-            <p
+            <label 
+              for="general_newsletter-daily"
               lang="en"
               xml:lang="en"
               dir="ltr"
-              align="left"
-              petal:attributes="align align"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;" 
+              i18n:translate="daily-newsletter"
+            >Daily Newsletter</label>
+            <br />
+            <select
+              name="general_newsletter-daily"
+              id="general_newsletter-daily"
+              petal:condition="true: self/preferences/is_selected --newsletter-daily"
             >
-              After making any changes don't forget to 
-              <input 
-                type="submit"
-                name="submit"
-                value="Save Changes"
-                class="input-submit"
-                title="Save the changes to your preferences."
-              />.
-            </p>
-          
-
-            <fieldset
-              class="newsletter-preferences"
+              <option 
+                value="1" 
+                selected="selected"
+                xml:lang="en"
+                dir="ltr"
+                i18n:attributes="lang     two-letter-language-code;
+                                 xml:lang two-letter-language-code;
+                                 dir      text-direction;" 
+                i18n:translate="yes"
+              >Yes</option>
+              <option 
+                value="0E0"
+                xml:lang="en"
+                dir="ltr"
+                i18n:attributes="lang     two-letter-language-code;
+                                 xml:lang two-letter-language-code;
+                                 dir      text-direction;" 
+                i18n:translate="no"
+              >No</option>
+            </select>
+            <select
+              name="general_newsletter-daily"
+              id="general_newsletter-daily"
+              petal:condition="false: self/preferences/is_selected --newsletter-daily"
             >
-
-              <legend
-                lang="en"
+              <option 
+                value="0E0" 
+                selected="selected"
                 xml:lang="en"
                 dir="ltr"
-              >
-                <a 
-                   id="newsletter-preferences"
-                   name="newsletter-preferences"
-                >Newsletter Preferences</a>
-              </legend>
-
-              <p
-                lang="en"
+                i18n:attributes="lang     two-letter-language-code;
+                                 xml:lang two-letter-language-code;
+                                 dir      text-direction;" 
+                i18n:translate="no"
+              >No</option>
+              <option 
+                value="1" 
                 xml:lang="en"
                 dir="ltr"
-                align="left"
-                class="help"
-                petal:attributes="align align"
-              >
-                This section of the form allows to you to choose to receive regular email updates
-                about new additions to this site. The email is customised based on the Audience 
-                and Language preferences you select.
-              </p>
+                i18n:attributes="lang     two-letter-language-code;
+                                 xml:lang two-letter-language-code;
+                                 dir      text-direction;" 
+                i18n:translate="yes"
+              >Yes</option>
+            </select>
+          </p>
 
-              <p
-                lang="en"
+          <p>
+            <label 
+              for="general_newsletter-weekly"
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;" 
+              i18n:translate="weekly-newsletter"
+            >Weekly Newsletter</label>
+            <br />
+            <select
+              name="general_newsletter-weekly"
+              id="general_newsletter-weekly"
+              petal:condition="true: self/preferences/is_selected --newsletter-weekly"
+            >
+              <option 
+                value="1" 
+                selected="selected"
                 xml:lang="en"
                 dir="ltr"
-                align="left"
-                petal:attributes="align align"
-              >
-                <label 
-                  for="general_newsletter-daily"
-                >Daily Newsletter</label>
-                <br />
-                <select
-                  name="general_newsletter-daily"
-                  id="general_newsletter-daily"
-                  petal:condition="true: self/preferences/is_selected --newsletter-daily"
-                >
-                  <option 
-                    value="1" 
-                    selected="selected"
-                  >Yes</option>
-                  <option 
-                    value="0E0"
-                  >No</option>
-                </select>
-                <select
-                  name="general_newsletter-daily"
-                  id="general_newsletter-daily"
-                  petal:condition="false: self/preferences/is_selected --newsletter-daily"
-                >
-                  <option 
-                    value="0E0" 
-                    selected="selected"
-                  >No</option>
-                  <option 
-                     value="1" 
-                  >Yes</option>
-                </select>
-              </p>
-
-              <p
-                lang="en"
+                i18n:attributes="lang     two-letter-language-code;
+                                 xml:lang two-letter-language-code;
+                                 dir      text-direction;" 
+                i18n:translate="yes"
+
+              >Yes</option>
+              <option 
+                value="0E0"
                 xml:lang="en"
                 dir="ltr"
-                align="left"
-                petal:attributes="align align"
-              >
-                <label 
-                  for="general_newsletter-weekly"
-                >Weekly Newsletter</label>
-                <br />
-                <select
-                  name="general_newsletter-weekly"
-                  id="general_newsletter-weekly"
-                  petal:condition="true: self/preferences/is_selected --newsletter-weekly"
-                >
-                  <option 
-                    value="1" 
-                    selected="selected"
-                  >Yes</option>
-                  <option 
-                    value="0E0"
-                  >No</option>
-                </select>
-                <select
-                  name="general_newsletter-weekly"
-                  id="general_newsletter-weekly"
-                  petal:condition="false: self/preferences/is_selected --newsletter-weekly"
-                >
-                  <option 
-                    value="0E0" 
-                    selected="selected"
-                  >No</option>
-                  <option 
-                    value="1" 
-                  >Yes</option>
-                </select>
-              </p>
-
-              <p
-                lang="en"
+                i18n:attributes="lang     two-letter-language-code;
+                                 xml:lang two-letter-language-code;
+                                 dir      text-direction;" 
+                i18n:translate="no"
+              >No</option>
+            </select>
+            <select
+              name="general_newsletter-weekly"
+              id="general_newsletter-weekly"
+              petal:condition="false: self/preferences/is_selected --newsletter-weekly"
+            >
+              <option 
+                value="0E0" 
+                selected="selected"
                 xml:lang="en"
                 dir="ltr"
-                align="left"
-                petal:attributes="align align"
-              >
-                <label 
-                  for="general_newsletter-monthly"
-                >Monthly Newsletter</label>
-                <br />
-                <select
-                  name="general_newsletter-monthly"
-                  id="general_newsletter-monthly"
-                  petal:condition="true: self/preferences/is_selected --newsletter-monthly"
-                >
-                  <option 
-                    value="1" 
-                    selected="selected"
-                  >Yes</option>
-                  <option 
-                    value="0E0"
-                  >No</option>
-                </select>
-                <select
-                  name="general_newsletter-monthly"
-                  id="general_newsletter-monthly"
-                  petal:condition="false: self/preferences/is_selected --newsletter-monthly"
-                >
-                  <option 
-                    value="0E0" 
-                    selected="selected"
-                  >No</option>
-                  <option 
-                    value="1" 
-                  >Yes</option>
-                </select>
-              </p>
-
-            </fieldset>
-
-            <fieldset
-              class="audience-preferences"
-              petal:condition="true: self/preferences/audiences"
+                i18n:attributes="lang     two-letter-language-code;
+                                 xml:lang two-letter-language-code;
+                                 dir      text-direction;" 
+                i18n:translate="no"
+              >No</option>
+              <option 
+                value="1" 
+                xml:lang="en"
+                dir="ltr"
+                i18n:attributes="lang     two-letter-language-code;
+                                 xml:lang two-letter-language-code;
+                                 dir      text-direction;" 
+                i18n:translate="yes"
+              >Yes</option>
+            </select>
+          </p>
+
+          <p>
+            <label 
+              for="general_newsletter-monthly"
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;" 
+              i18n:translate="monthly-newsletter"
+            >Monthly Newsletter</label>
+            <br />
+            <select
+              name="general_newsletter-monthly"
+              id="general_newsletter-monthly"
+              petal:condition="true: self/preferences/is_selected --newsletter-monthly"
             >
-              
-              <legend
-                lang="en"
+              <option 
+                value="1" 
+                selected="selected"
                 xml:lang="en"
                 dir="ltr"
-              >
-                <a 
-                   id="audience-preferences"
-                   name="audience-preferences"
-                >Audience Preferences</a>
-              </legend>
-
-              <p>
-                This section of the form allows you to indicate which audience keywords
-                best describe your interests. This information is used to generate 
-                customised email newsletters and listings of documents on the site.
-              </p>
-
-	      <!--? For all available audiences ?-->
-              <div
-                petal:repeat="audience self/preferences/audiences"
-                petal:omit-tag="string:1"
-              >
-                <p
-                  align="left"
-                  petal:attributes="align align"
-                  petal:set="id string:audience_${audience/name}"
-                >
-                  <label
-                    for="audience"
-                    petal:attributes="for id"
-                    petal:inner="audience/label"
-                  >Audience</label> 
-                  <br />
-                  <!--? Get the current value of the user's preference for this audience ?-->
-                  <select
-                    name="audience"
-                    id="audience"
-                    petal:attributes="name id; id id"
-                    petal:set="current_val self/preferences/audience_preference $audience/name"
-                  >
-                    <!--? Get the options available for audiences (preserving currently ?-->
-                    <!--? selected value), and generate options...                      ?-->
-                    <span 
-                      petal:repeat="option self/preferences/audience_options $current_val"
-                    >
-                      <option
-                        petal:condition="option/is_like"
-                        petal:attributes="value option/name; selected option/selected"
-                      >I like</option>
-                      <option
-                        petal:condition="option/is_dont_mind"
-                        petal:attributes="value option/name; selected option/selected"
-                      >I don't mind</option>
-                      <option
-                        petal:condition="option/is_hate"
-                        petal:attributes="value option/name; selected option/selected"
-                      >I dislike</option>
-                    </span>
-                  </select>
-                </p>
-
-              </div>
-            </fieldset>
-
-            <fieldset
-              class="language-preferences"
-              petal:condition="self/preferences/languages"
+                i18n:attributes="lang     two-letter-language-code;
+                                 xml:lang two-letter-language-code;
+                                 dir      text-direction;" 
+                i18n:translate="yes"
+              >Yes</option>
+              <option 
+                value="0E0"
+                xml:lang="en"
+                dir="ltr"
+                i18n:attributes="lang     two-letter-language-code;
+                                 xml:lang two-letter-language-code;
+                                 dir      text-direction;" 
+                i18n:translate="no"
+              >No</option>
+            </select>
+            <select
+              name="general_newsletter-monthly"
+              id="general_newsletter-monthly"
+              petal:condition="false: self/preferences/is_selected --newsletter-monthly"
             >
-
-              <legend
-                lang="en"
+              <option 
+                value="0E0" 
+                selected="selected"
+              >No</option>
+              <option 
+                value="1" 
                 xml:lang="en"
                 dir="ltr"
+                i18n:attributes="lang     two-letter-language-code;
+                                 xml:lang two-letter-language-code;
+                                 dir      text-direction;" 
+                i18n:translate="yes"
+              >Yes</option>
+            </select>
+          </p>
+
+        </fieldset>
+
+        <fieldset
+          class="audience-preferences"
+          petal:condition="true: self/preferences/audiences"
+        >
+          
+          <legend>
+            <a 
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              id="audience-preferences"
+              name="audience-preferences"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;" 
+              i18n:translate="audience-preferences"
+            >Audience Preferences</a>
+          </legend>
+
+          <p
+            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="audience-preferences-help"
+          >
+            You may indicate which audience keywords best describe your interests. 
+            This information is used to generate customised email newsletters and 
+            listings of documents on the site.
+          </p>
+
+          <!--? For all available audiences ?-->
+          <div
+            petal:repeat="audience self/preferences/audiences"
+            petal:omit-tag=""
+          >
+            <p
+              petal:set="id string:audience_${audience/name}"
+            >
+              <label
+                for="audience"
+                petal:attributes="for id"
+                petal:content="audience/label"
+              >Audience</label> 
+              <br />
+              <!--? Get the current value of the user's preference for this audience ?-->
+              <select
+                name="audience"
+                id="audience"
+                petal:attributes="name id; 
+                                  id   id;"
+                petal:set="current_val self/preferences/audience_preference $audience/name"
               >
-                <a 
-                   id="language-preferences"
-                   name="language-preferences"
-                >Language Preferences</a>
-              </legend>
-
-              <p>
-                This section of the form allows you to indicate which languages you can
-                understand in order that the email newsletter only sends you updates about
-                documents that you can read.
-              </p>
-               
-	      <!--? This is a loop through all languages used on the site for which
-                    there is a label in the conf/languages.conf file. 
-              ?-->
-              <div
-                petal:repeat="language self/preferences/languages"
-                petal:omit-tag="string:1"
-              >
-                <p
-                  align="left"
-                  petal:attributes="align align"
-                  petal:set="id string:language_${language/name}"
-                  petal:condition="language/label"
+                <!--? Get the options available for audiences (preserving currently 
+                      selected value), and generate options...                      ?-->
+                <span 
+                  petal:omit-tag=""
+                  petal:repeat="option self/preferences/audience_options $current_val"
                 >
-                  <label
-                    for="lang"
-                    lang="en"
+                  <option
+                    petal:attributes="value option/name; 
+                                      selected option/selected"
+                    petal:condition="option/is_like"
+                    xml:lang="en"
+                    dir="ltr"
+                    i18n:attributes="lang     two-letter-language-code;
+                                     xml:lang two-letter-language-code;
+                                     dir      text-direction;" 
+                    i18n:translate="i-like"
+                  >I like</option>
+                  <option
+                    petal:attributes="value option/name; 
+                                      selected option/selected"
+                    petal:condition="option/is_dont_mind"
+                    xml:lang="en"
+                    dir="ltr"
+                    i18n:attributes="lang     two-letter-language-code;
+                                     xml:lang two-letter-language-code;
+                                     dir      text-direction;" 
+                    i18n:translate="i-dont-mind"
+                  >I don't mind</option>
+                  <option
+                    petal:attributes="value option/name; 
+                                      selected option/selected"
+                    petal:condition="option/is_hate"
                     xml:lang="en"
                     dir="ltr"
-                    petal:attributes="for id; lang language/name; xml:lang language/name; dir language/direction"
-                    petal:inner="language/label"
-                  >Language</label>
-                  <br />
-                  <!--? Get the current value of the user's preference for this language ?-->
-                  <select
-                    name="lang"
-                    id="lang"
-                    petal:attributes="name id; id id"
-                    petal:set="current_val self/preferences/language_preference $language/name"
-                  >
-                    <!--? Get the options available for languages (preserving currently ?-->
-                    <!--? selected value), and generate options...                      ?-->
-                    <span
-                      petal:omit-tag="string:1" 
-                      petal:repeat="option self/preferences/language_options $current_val"
-                    >
-                      <option
-                        petal:condition="option/is_like"
-                        petal:attributes="value option/name; selected option/selected"
-                      >I understand</option>
-                      <option
-                        petal:condition="option/is_dont_mind"
-                        petal:attributes="value option/name; selected option/selected"
-                      >I don't understand</option>
-                      <!--?
-                        This option has been removed for this release because of complications
-                        with SQL statements in the back-end.
-                        &lt;option
-                        petal:condition="option/is_hate"
-                        petal:attributes="value option/name; selected option/selected"
-                        &gt;I dislike&lt;/option&gt;
-                      ?-->
-                    </span>
-                  </select>
-                </p>
-              </div>
+                    i18n:attributes="lang     two-letter-language-code;
+                                     xml:lang two-letter-language-code;
+                                     dir      text-direction;" 
+                    i18n:translate="i-dislike"
+                  >I dislike</option>
+                </span>
+              </select>
+            </p>
+
+          </div>
+        </fieldset>
 
-            </fieldset>
+        <fieldset
+          class="language-preferences"
+          petal:condition="self/preferences/languages"
+        >
 
-            <p
+          <legend>
+            <a 
               lang="en"
               xml:lang="en"
               dir="ltr"
-              align="left"
-              petal:attributes="align align"
+              id="language-preferences"
+              name="language-preferences"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;" 
+              i18n:translate="language-preferences"
+            >Language Preferences</a>
+          </legend>
+
+          <p
+            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="language-preferences-help"
+          >
+            You may indicate which languages you can understand in order 
+            that the email newsletter only sends you updates about
+            documents that you can read.
+          </p>
+           
+          <!--? This is a loop through all languages used on the site for which
+                there is a label in the conf/languages.conf file. 
+          ?-->
+          <div
+            petal:omit-tag=""
+            petal:repeat="language self/preferences/languages"
+          >
+            <p
+              petal:set="id string:language_${language/name}"
+              petal:condition="language/label"
             >
-              <input 
-                type="submit"
-                name="submit"
-                value="Save Changes"
-                class="input-submit"
-                title="Save the changes to your preferences."
-              />
+              <label
+                for="lang"
+                lang="en"
+                xml:lang="en"
+                dir="ltr"
+                petal:attributes="for id; 
+                                  lang language/name; 
+                                  xml:lang language/name; 
+                                  dir language/direction;"
+                petal:content="language/label"
+              >Language</label>
+              <br />
+              <!--? Get the current value of the user's preference for this language ?-->
+              <select
+                name="lang"
+                id="lang"
+                petal:attributes="name id; 
+                                  id   id;"
+                petal:set="current_val self/preferences/language_preference $language/name"
+              >
+                <!--? Get the options available for languages (preserving currently 
+                      selected value), and generate options...                      ?-->
+                <span
+                  petal:repeat="option self/preferences/language_options $current_val"
+                  petal:omit-tag="" 
+                >
+                  <option
+                    xml:lang="en"
+                    dir="ltr"
+                    i18n:attributes="lang     two-letter-language-code;
+                                     xml:lang two-letter-language-code;
+                                     dir      text-direction;" 
+                    i18n:translate="i-understand"
+                    petal:attributes="value    option/name; 
+                                      selected option/selected;"
+                    petal:condition="option/is_like"
+                  >I understand</option>
+                  <option
+                    xml:lang="en"
+                    dir="ltr"
+                    i18n:attributes="lang     two-letter-language-code;
+                                     xml:lang two-letter-language-code;
+                                     dir      text-direction;" 
+                    i18n:translate="i-dont-understand"
+                    petal:condition="option/is_dont_mind"
+                    petal:attributes="value    option/name; 
+                                      selected option/selected;"
+                  >I don't understand</option>
+                  <!--?
+                    This option has been removed for this release because of complications
+                    with SQL statements in the back-end.
+                    &lt;option
+                    petal:condition="option/is_hate"
+                    petal:attributes="value option/name; selected option/selected"
+                    &gt;I dislike&lt;/option&gt;
+                  ?-->
+                </span>
+              </select>
             </p>
+          </div>
 
-      </form>
-
-    </div>
+        </fieldset>
 
-    <div class="sidebar">
+        <p>
+          <input 
+            lang="en"
+            xml:lang="en"
+            dir="ltr"
+            type="submit"
+            name="submit"
+            value="Save Changes"
+            class="input-submit"
+            title="Save the changes to your preferences."
+            i18n:attributes="lang     two-letter-language-code;
+                             xml:lang two-letter-language-code;
+                             dir      text-direction;
+                             value    save-changes;
+                             title    save-changes-to-preferences;"
+          />
+        </p>
 
-        <!--? This is the list of link components. ?-->
-        <?include file="/fragments/menu_quick_links/"?>
+      </form>
 
     </div>
+
   </body>
 </html>


More information about the MKDoc-commit mailing list