[MKDoc-commit] Various updates to 'dunny' content to ensure that CSS etc loads when

chris at mkdoc.demon.co.uk chris at mkdoc.demon.co.uk
Thu Nov 18 14:07:21 GMT 2004


Log Message:
-----------
Various updates to 'dunny' content to ensure that CSS etc loads when files are 
opened from the file system, and some other minor bux fixes.

Modified Files:
--------------
    mkd/resources/templates/admin/audience_list:
        en.html
    mkd/resources/templates/admin/component_copy:
        en.html
    mkd/resources/templates/admin/component_move:
        en.html
    mkd/resources/templates/admin/content:
        en.html
    mkd/resources/templates/admin/copy:
        en.html
    mkd/resources/templates/admin/delete:
        en.html
    mkd/resources/templates/admin/move:
        en.html
    mkd/resources/templates/admin/new:
        en.html
    mkd/resources/templates/admin/properties:
        en.html
    mkd/resources/templates/admin/sort:
        en.html
    mkd/resources/templates/admin/user_delete:
        en.html
    mkd/resources/templates/admin/user_list:
        en.html
    mkd/resources/templates/admin/user_modify:
        en.html

-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/move/en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lresources/templates/admin/move/en.html -Lresources/templates/admin/move/en.html -u -r1.9 -r1.10
--- resources/templates/admin/move/en.html
+++ resources/templates/admin/move/en.html
@@ -68,15 +68,15 @@
       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" 
-      href="../../css/favicon.ico" 
+      href="../../../css/favicon.ico" 
       type="image/x-icon" 
       petal:attributes="href string:${self/root/uri}favicon.ico"
       petal:condition="true: self/root/get --favicon.ico;"
@@ -121,26 +121,26 @@
     >
       <!--? 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>
+        <a lang="en"  xml:lang="en" dir="ltr" href="../../document/default/en.html">Document</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../properties/en.html" 
           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="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../content/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../finder/en.html" title="Find documents.">Finder</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../sort/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../move/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../copy/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../new/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../delete/en.html" title="Delete this document.">Delete</a>
       </form>
       <!--? / Mockup content ?-->
     </div>
@@ -190,7 +190,7 @@
       >
         You are trying to move 
         <a
-          href="./"
+          href="../../document/default/en.html"
           lang="en"
           xml:lang="en"
           dir="ltr"
@@ -209,7 +209,6 @@
         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;"
@@ -218,7 +217,7 @@
       >
         Please choose a new parent document for
         <a
-          href="./"
+          href="../../document/default/en.html"
           lang="en"
           xml:lang="en"
           dir="ltr"
@@ -249,7 +248,6 @@
         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;"
@@ -309,13 +307,18 @@
               i18n:attributes="title new-parent-document-for-the-document-that-is-being-moved"
             >
               <option
-                value="some_id"
+                value="1"
                 title="Foo"
                 petal:repeat="record self/movable_document_list"
                 petal:attributes="value record/ID; 
                                   title record/Title;"
                 petal:content="record/Full_Path"
-              >/bar/foo/</option>
+              >/foo/</option>
+              <option
+                petal:omit-tag=""
+                value="2"
+                title="Bar"
+              >/foo/bar/</option>
             </select>
           </p>
           <br />
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/new/en.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lresources/templates/admin/new/en.html -Lresources/templates/admin/new/en.html -u -r1.11 -r1.12
--- resources/templates/admin/new/en.html
+++ resources/templates/admin/new/en.html
@@ -42,6 +42,7 @@
   petal:attributes="lang     self/selected_lang/value; 
                     xml:lang self/selected_lang/value; 
                     dir      self/selected_lang/direction;"
+  xmlns:petal="http://purl.org/petal/1.0/"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns="http://www.w3.org/1999/xhtml"
@@ -69,11 +70,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" 
@@ -121,26 +122,26 @@
     >
       <!--? 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>
+        <a lang="en"  xml:lang="en" dir="ltr" href="../../document/default/en.html">Document</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../properties/en.html" 
           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="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../content/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../finder/en.html" title="Find documents.">Finder</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../sort/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../move/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../copy/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../new/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../delete/en.html" title="Delete this document.">Delete</a>
       </form>
       <!--? / Mockup content ?-->
     </div>
@@ -462,13 +463,37 @@
               id="audience-cats"
               value="12"
               class="input-checkbox"
-              title="Add $audience/label to this documents audience."
               petal:attributes="id      string:audience-$audience/id; 
                                 value   audience/id; 
                                 checked audience/checked;" 
             />
           </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/admin/audience_list/en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lresources/templates/admin/audience_list/en.html -Lresources/templates/admin/audience_list/en.html -u -r1.6 -r1.7
--- resources/templates/admin/audience_list/en.html
+++ resources/templates/admin/audience_list/en.html
@@ -197,7 +197,31 @@
         i18n:attributes="lang     two-letter-language-code;
                          xml:lang two-letter-language-code;
                          dir      text-direction;" 
+        i18n:translate="no-audiences-have-been-created-yet"
+        petal:condition="false: self/audiences"
+      >
+        No audiences have been created yet, if you would like to create one 
+        then use the 
+        <a
+          href="#"
+          petal:attributes="href audience_add/uri"
+          i18n:attributes="lang     two-letter-language-code;
+                           xml:lang two-letter-language-code;
+                           dir      text-direction;" 
+          i18n:translate="add"
+        >add</a>
+        function to create one.
+      </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="add-a-new-audience"
+        petal:condition="true: self/audiences"
       >
         You may 
         <a
@@ -212,14 +236,14 @@
         links in the following table.
       </p>
 
+
+
       <table
-        cellpadding="4"
-        cellspacing="0"
-        border="1"
         dir="ltr"
         summary="This table contains a list of the audiences and has links to pages that allow the editing and deletion of audiences."
         petal:attributes="dir self/dir"
         i18n:attributes="summary audience-table-summary;"
+        petal:condition="true: self/audiences"
       >
         <caption
           lang="en"
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/properties/en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lresources/templates/admin/properties/en.html -Lresources/templates/admin/properties/en.html -u -r1.10 -r1.11
--- resources/templates/admin/properties/en.html
+++ resources/templates/admin/properties/en.html
@@ -44,6 +44,7 @@
   petal:attributes="lang     self/selected_lang/value; 
                     xml:lang self/selected_lang/value; 
                     dir      self/selected_lang/direction;"
+  xmlns:petal="http://purl.org/petal/1.0/"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns="http://www.w3.org/1999/xhtml"
@@ -76,15 +77,15 @@
       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" 
-      href="../../css/favicon.ico" 
+      href="../../../css/favicon.ico" 
       type="image/x-icon" 
       petal:attributes="href string:${self/root/uri}favicon.ico"
       petal:condition="true: self/root/get --favicon.ico;"
@@ -128,26 +129,26 @@
     >
       <!--? 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>
+        <a lang="en"  xml:lang="en" dir="ltr" href="../../document/default/en.html">Document</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../properties/en.html" 
           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="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../content/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../finder/en.html" title="Find documents.">Finder</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../sort/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../move/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../copy/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../new/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../delete/en.html" title="Delete this document.">Delete</a>
       </form>
       <!--? / Mockup content ?-->
     </div>
@@ -513,7 +514,6 @@
               id="audience-cats"
               value="12"
               class="input-checkbox"
-              title="Add this to the list of audiences for this document."
               petal:attributes="id      string:audience-$audience/id; 
                                 value   audience/id; 
                                 checked audience/checked;"
@@ -521,6 +521,30 @@
             />
           </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/admin/component_copy/en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lresources/templates/admin/component_copy/en.html -Lresources/templates/admin/component_copy/en.html -u -r1.5 -r1.6
--- resources/templates/admin/component_copy/en.html
+++ resources/templates/admin/component_copy/en.html
@@ -69,6 +69,7 @@
   petal:attributes="lang     self/lang; 
                     xml:lang self/lang; 
                     dir      self/direction"
+  xmlns:petal="http://purl.org/petal/1.0/"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns="http://www.w3.org/1999/xhtml"
@@ -96,15 +97,15 @@
       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" 
-      href="../../css/favicon.ico" 
+      href="../../../css/favicon.ico" 
       type="image/x-icon" 
       petal:attributes="href string:${self/root/uri}favicon.ico"
       petal:condition="true: self/root/get --favicon.ico;"
@@ -148,26 +149,26 @@
     >
       <!--? 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>
+        <a lang="en"  xml:lang="en" dir="ltr" href="../../document/default/en.html">Document</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../properties/en.html" 
           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="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../content/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../finder/en.html" title="Find documents.">Finder</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../sort/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../move/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../copy/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../new/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../delete/en.html" title="Delete this document.">Delete</a>
       </form>
       <!--? / Mockup content ?-->
     </div>
@@ -282,13 +283,18 @@
               id="to"
             >
               <option
-                value="some_id"
+                value="1"
                 title="Foo"
                 petal:repeat="record self/movable_document_list"
                 petal:attributes="value record/ID; 
                                   title record/Title;"
                 petal:content="record/Full_Path"
-              >/bar/foo/</option>
+              >/foo/</option>
+              <option
+                petal:omit-tag=""
+                value="2"
+                title="Bar"
+              >/foo/bar/</option>
             </select>
             <br />
           </p>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/sort/en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lresources/templates/admin/sort/en.html -Lresources/templates/admin/sort/en.html -u -r1.7 -r1.8
--- resources/templates/admin/sort/en.html
+++ resources/templates/admin/sort/en.html
@@ -79,15 +79,15 @@
       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" 
-      href="../../css/favicon.ico" 
+      href="../../../css/favicon.ico" 
       type="image/x-icon" 
       petal:attributes="href string:${self/root/uri}favicon.ico"
       petal:condition="true: self/root/get --favicon.ico;"
@@ -131,26 +131,26 @@
     >
       <!--? 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>
+        <a lang="en"  xml:lang="en" dir="ltr" href="../../document/default/en.html">Document</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../properties/en.html" 
           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="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../content/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../finder/en.html" title="Find documents.">Finder</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../sort/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../move/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../copy/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../new/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../delete/en.html" title="Delete this document.">Delete</a>
       </form>
       <!--? / Mockup content ?-->
     </div>
@@ -192,7 +192,6 @@
         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;"
@@ -200,7 +199,7 @@
         petal:condition="false: self/children"
       >
         <a
-          href="./"
+          href="../../document/default/en.html"
           lang="en"
           xml:lang="en"
           dir="ltr"
@@ -227,7 +226,7 @@
       >
         You can sort the child documents of 
         <a
-          href="./"
+          href="../../document/default/en.html"
           lang="en"
           xml:lang="en"
           dir="ltr"
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/component_move/en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lresources/templates/admin/component_move/en.html -Lresources/templates/admin/component_move/en.html -u -r1.5 -r1.6
--- resources/templates/admin/component_move/en.html
+++ resources/templates/admin/component_move/en.html
@@ -66,6 +66,7 @@
   petal:attributes="lang     self/lang; 
                     xml:lang self/lang; 
                     dir      self/direction"
+  xmlns:petal="http://purl.org/petal/1.0/"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns="http://www.w3.org/1999/xhtml"
@@ -93,15 +94,15 @@
       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" 
-      href="../../css/favicon.ico" 
+      href="../../../css/favicon.ico" 
       type="image/x-icon" 
       petal:attributes="href string:${self/root/uri}favicon.ico"
       petal:condition="true: self/root/get --favicon.ico;"
@@ -145,26 +146,26 @@
     >
       <!--? 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>
+        <a lang="en"  xml:lang="en" dir="ltr" href="../../document/default/en.html">Document</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../properties/en.html" 
           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="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../content/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../finder/en.html" title="Find documents.">Finder</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../sort/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../move/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../copy/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../new/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../delete/en.html" title="Delete this document.">Delete</a>
       </form>
       <!--? / Mockup content ?-->
     </div>
@@ -282,11 +283,17 @@
             >
               <option
                 value="some_id"
+                title="Foo"
                 petal:repeat="record self/movable_document_list"
                 petal:attributes="value record/ID;
                                   title record/Title;"
                 petal:content="record/Full_Path"
-              >Foo</option>
+              >/foo/</option>
+              <option
+                petal:omit-tag=""
+                value="2"
+                title="Bar"
+              >/foo/bar/</option>
             </select>
           </p>
         </fieldset>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/user_delete/en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lresources/templates/admin/user_delete/en.html -Lresources/templates/admin/user_delete/en.html -u -r1.4 -r1.5
--- resources/templates/admin/user_delete/en.html
+++ resources/templates/admin/user_delete/en.html
@@ -40,6 +40,7 @@
   petal:attributes="lang     self/lang; 
                     xml:lang self/lang; 
                     dir      self/direction;"
+  xmlns:petal="http://purl.org/petal/1.0/"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns="http://www.w3.org/1999/xhtml"
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/content/en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lresources/templates/admin/content/en.html -Lresources/templates/admin/content/en.html -u -r1.6 -r1.7
--- resources/templates/admin/content/en.html
+++ resources/templates/admin/content/en.html
@@ -68,15 +68,15 @@
       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" 
-      href="../../css/favicon.ico" 
+      href="../../../css/favicon.ico" 
       type="image/x-icon" 
       petal:attributes="href string:${self/root/uri}favicon.ico"
       petal:condition="true: self/root/get --favicon.ico;"
@@ -143,26 +143,26 @@
     >
       <!--? 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>
+        <a lang="en"  xml:lang="en" dir="ltr" href="../../document/default/en.html">Document</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../properties/en.html" 
           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="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../content/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../finder/en.html" title="Find documents.">Finder</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../sort/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../move/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../copy/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../new/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../delete/en.html" title="Delete this document.">Delete</a>
       </form>
       <!--? / Mockup content ?-->
     </div>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/user_list/en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lresources/templates/admin/user_list/en.html -Lresources/templates/admin/user_list/en.html -u -r1.5 -r1.6
--- resources/templates/admin/user_list/en.html
+++ resources/templates/admin/user_list/en.html
@@ -201,7 +201,7 @@
       >
         You may 
         <a
-          href="#"
+          href="../user_insert/en.html"
           petal:attributes="href user_add/uri"
           i18n:name="add"
         >add</a> 
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/copy/en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lresources/templates/admin/copy/en.html -Lresources/templates/admin/copy/en.html -u -r1.8 -r1.9
--- resources/templates/admin/copy/en.html
+++ resources/templates/admin/copy/en.html
@@ -68,15 +68,15 @@
       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" 
-      href="../../css/favicon.ico" 
+      href="../../../css/favicon.ico" 
       type="image/x-icon" 
       petal:attributes="href string:${self/root/uri}favicon.ico"
       petal:condition="true: self/root/get --favicon.ico;"
@@ -120,26 +120,26 @@
     >
       <!--? 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>
+        <a lang="en"  xml:lang="en" dir="ltr" href="../../document/default/en.html">Document</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../properties/en.html" 
           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="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../content/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../finder/en.html" title="Find documents.">Finder</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../sort/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../move/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../copy/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../new/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../delete/en.html" title="Delete this document.">Delete</a>
       </form>
       <!--? / Mockup content ?-->
     </div>
@@ -189,7 +189,7 @@
       >
         You are trying to copy
         <a
-          href="./"
+          href="../../document/default/en.html"
           lang="en"
           xml:lang="en"
           dir="ltr"
@@ -216,7 +216,7 @@
       >
         Please choose a parent document for the copy of        
         <a
-          href="./"
+          href="../../document/default/en.html"
           lang="en"
           xml:lang="en"
           dir="ltr"
@@ -291,12 +291,17 @@
               id="to"
             >
               <option
-                value="some_id"
+                value="1"
                 title="Foo"
                 petal:repeat="record self/copiable_document_list"
                 petal:attributes="value record/ID; 
                                   title record/Title"
                 petal:content="record/Full_Path"
+              >/foo/</option>
+              <option
+                petal:omit-tag=""
+                value="2"
+                title="Bar"
               >/foo/bar/</option>
             </select>
           </p>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/delete/en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lresources/templates/admin/delete/en.html -Lresources/templates/admin/delete/en.html -u -r1.8 -r1.9
--- resources/templates/admin/delete/en.html
+++ resources/templates/admin/delete/en.html
@@ -68,15 +68,15 @@
       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" 
-      href="../../css/favicon.ico" 
+      href="../../../css/favicon.ico" 
       type="image/x-icon" 
       petal:attributes="href string:${self/root/uri}favicon.ico"
       petal:condition="true: self/root/get --favicon.ico;"
@@ -121,26 +121,26 @@
     >
       <!--? 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>
+        <a lang="en"  xml:lang="en" dir="ltr" href="../../document/default/en.html">Document</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../properties/en.html" 
           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="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../content/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../finder/en.html" title="Find documents.">Finder</a>
         <bdo dir="ltr">|</bdo>
-        <a lang="en" xml:lang="en" dir="ltr" href="#" 
+        <a lang="en" xml:lang="en" dir="ltr" href="../sort/en.html" 
           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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../move/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../copy/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../new/en.html" 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>
+        <a lang="en" xml:lang="en" dir="ltr" href="../delete/en.html" title="Delete this document.">Delete</a>
       </form>
       <!--? / Mockup content ?-->
     </div>
@@ -190,7 +190,7 @@
       >
         To delete 
         <a
-          href="./"
+          href="../../document/default/en.html"
           lang="en"
           xml:lang="en"
           dir="ltr"
@@ -263,13 +263,18 @@
               i18n:attributes="title address-of-document-that-requests-should-be-redirected-to"
             >
               <option
-                value="some_id"
+                value="1"
                 title="Foo"
                 petal:repeat="record self/redirectable_document_list"
                 petal:attributes="value record/ID; 
                                   title record/Title;"
                 petal:content="record/Full_Path"
-              >/bar/foo/</option>
+              >/foo/</option>
+              <option
+                petal:omit-tag=""
+                value="2"
+                title="Bar"
+              >/foo/bar/</option>
             </select>
           </p>
           <br />
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/user_modify/en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lresources/templates/admin/user_modify/en.html -Lresources/templates/admin/user_modify/en.html -u -r1.3 -r1.4
--- resources/templates/admin/user_modify/en.html
+++ resources/templates/admin/user_modify/en.html
@@ -4,14 +4,34 @@
 >
 <!--?
 
+  Edit User Template
+  ==================
+
+  This template is used for editing user accounts. 
+
+  $Id$
+
+
+  Authors: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and others
+  Copyright: (c) 2004, MKDoc Holdings Ltd.
+
+  This file is part of MKDoc. 
+  
+  MKDoc is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+  
+  MKDoc is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+  
+  You should have received a copy of the GNU General Public License
+  along with MKDoc; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-This template is used for editing user accounts. 
 
-?-->
-<html
-  lang="en"
-  xml:lang="en"
-  dir="ltr"
   petal:define="
     uri                        self/uri;
     title                      string:Edit a User;
@@ -30,54 +50,187 @@
     preferences                plugin: flo::plugin::Account::Preferences;
     edit_preferences_uri       string:./${preferences/name};
                " 
-  petal:attributes="lang lang; xml:lang lang; dir dir"
-  xmlns="http://www.w3.org/1999/xhtml"
+
+?-->
+<html
+  lang="en"
+  xml:lang="en"
+  dir="ltr"
+  petal:attributes="lang     self/lang; 
+                    xml:lang self/lang; 
+                    dir      self/direction;"
   xmlns:petal="http://purl.org/petal/1.0/"
-  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns="http://www.w3.org/1999/xhtml"
+  i18n:domain="mkdoc"
 >
 
-<!--? This is the <head> for admin documents ?-->
-<?include file="/fragments/head_admin/"?>
+  <head>
+    <title
+      petal:content="structure string:${self/parent_alternate_title}${string:edit-user}"
+    >
+    </title>
+    <meta 
+      http-equiv="Content-Type" 
+      content="text/html; charset=UTF-8" 
+    />
+    <meta 
+      http-equiv="Content-Language" 
+      content="en" 
+      petal:attributes="content self/lang"
+    />
+    <meta 
+      http-equiv="Content-Location" 
+      content="#" 
+      petal:attributes="content self/parent/uri"
+    />
+    <!--? CSS ?-->
+    <style 
+      media="screen" 
+      type="text/css"
+      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);
+    </style>
+    <link 
+      rel="shortcut icon" 
+      href="../../css/favicon.ico" 
+      type="image/x-icon" 
+      petal:attributes="href string:${self/root/uri}favicon.ico"
+      petal:condition="true: self/root/get --favicon.ico;"
+    />
+    <meta
+      name="generator"
+      content="MKDoc 1.8, see http://mkdoc.com/"
+    />
+    <!--? Document specific things ?-->
+    <link
+      rel="top"
+      href="/"
+      hreflang="en"
+      title="Root Document"
+      type="text/html"
+      petal:attributes="href     self/root/uri; 
+                        hreflang self/root/lang; 
+                        title    self/root/title;"
+      petal:condition="false: self/cgi/path_info_eq '/';"
+    />
+    <link
+      rel="parent"
+      href="#"
+      hreflang="en"
+      title="Document Parent Title"
+      type="text/html"
+      petal:attributes="href     self/parent/uri; 
+                        hreflang self/parent/lang; 
+                        title    self/parent/title"
+    />
+  </head>
 
   <body>
 
-    <xi:include href="/fragments/admin/" />
-
-    <div class="admin-content">
-      <h1
-        lang="en"
-        xml:lang="en"
-        dir="ltr"
-        align="left"
-        petal:attributes="align align"
-        petal:content="title"
-      >Edit a User</h1>
+    <!--? 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 ?-->
 
-      <xi:include href="/error/" />
+    <div 
+      class="admin-content"
+    >
+
+      <h1>
+        <a 
+          id="page_content"
+          name="page_content"
+          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="edit-user"
+        >Edit User</a>
+      </h1>
+
+      <!--? 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>
 
       <p 
         lang="en"
         xml:lang="en"
         dir="ltr"
-        align="left"
-        petal:attributes="align align"
-        petal:condition="self/ok"
+        i18n:attributes="lang     two-letter-language-code;
+                         xml:lang two-letter-language-code;
+                         dir      text-direction;"
+        i18n:translate="user-modified-successfully"
+        petal:condition="true: self/ok"
       >
         User details have been successfully modified, if you wish to modify 
-        another user please return to the 
+        another user please return to the list of  
         <a
           href="#"
+          lang="en"
+          xml:lang="en"
+          dir="ltr"
+          i18n:attributes="href     user_list/uri;
+                           lang     two-letter-language-code;
+                           xml:lang two-letter-language-code;
+                           dir      text-direction;"
           title="List, edit, add and delete users."
           petal:attributes="href user_list/uri"
-        >user list</a>.
+        >Users</a>.
       </p>
 
       <p 
         lang="en"
         xml:lang="en"
         dir="ltr"
-        align="left"
-        petal:attributes="align align"
       >
         Edit the user details in the following form and then modify the user.
       </p>
@@ -104,8 +257,6 @@
             lang="en"
             xml:lang="en"
             dir="ltr"
-            align="left"
-            petal:attributes="align align"
           >
             User Details
           </legend>
@@ -114,8 +265,6 @@
             lang="en"
             xml:lang="en"
             dir="ltr"
-            align="left"
-            petal:attributes="align align"
           >
             <em
               class="help"
@@ -135,8 +284,6 @@
             lang="en"
             xml:lang="en"
             dir="ltr"
-            align="left"
-            petal:attributes="align align"
           >
             <em
               class="help"
@@ -161,8 +308,6 @@
             lang="en"
             xml:lang="en"
             dir="ltr"
-            align="left"
-            petal:attributes="align align"
           >
             <em
               class="help"
@@ -187,8 +332,6 @@
             lang="en"
             xml:lang="en"
             dir="ltr"
-            align="left"
-            petal:attributes="align align"
           >
             <em
               class="help"
@@ -213,8 +356,6 @@
             lang="en"
             xml:lang="en"
             dir="ltr"
-            align="left"
-            petal:attributes="align align"
           >
             <em
               class="help"
@@ -244,8 +385,6 @@
             lang="en"
             xml:lang="en"
             dir="ltr"
-            align="left"
-            petal:attributes="align align"
           >
             User Permissions
           </legend>
@@ -254,8 +393,6 @@
             lang="en"
             xml:lang="en"
             dir="ltr"
-            align="left"
-            petal:attributes="align align"
           >
             <em
               class="help"
@@ -290,8 +427,6 @@
             lang="en"
             xml:lang="en"
             dir="ltr"
-            align="left"
-            petal:attributes="align align"
           >
             <em
               class="help"
@@ -332,8 +467,6 @@
           lang="en"
           xml:lang="en"
           dir="ltr"
-          align="left"
-          petal:attributes="align align"
         >
           <input 
             type="submit" 


More information about the MKDoc-commit mailing list