[MKDoc-commit] Fixed relative links in dummy content so the CSS etc loads then the file

chris at mkdoc.demon.co.uk chris at mkdoc.demon.co.uk
Thu Nov 18 13:20:04 GMT 2004


Log Message:
-----------
Fixed relative links in dummy content so the CSS etc loads then the file is 
opened in a browser via the file sytem.

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

-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/user_list/en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lresources/templates/admin/user_list/en.html -Lresources/templates/admin/user_list/en.html -u -r1.4 -r1.5
--- resources/templates/admin/user_list/en.html
+++ resources/templates/admin/user_list/en.html
@@ -95,11 +95,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" 
@@ -147,26 +147,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>
@@ -209,9 +209,6 @@
       </p>
 
       <table
-        border="0" 
-        cellpadding="12"
-        cellspacing="6"
         dir="ltr"
         summary="This table contains a list of the users and links for deleting and editing users."
         i18n:attributes="summary this-table-contains-a-list-of-users"
@@ -231,7 +228,7 @@
               lang="en"
               xml:lang="en"
               dir="ltr"
-              title="Login name"
+              title="Users login name"
               id="username"
               i18n:attributes="lang     two-letter-language-code;
                                xml:lang two-letter-language-code;
@@ -245,7 +242,7 @@
               lang="en"
               xml:lang="en"
               dir="ltr"
-              title="User Full Name"
+              title="Users Full Name"
               id="full-name"
               i18n:attributes="lang     two-letter-language-code;
                                xml:lang two-letter-language-code;
@@ -273,108 +270,109 @@
           </tr>
         </thead>
         <tbody>
-          <tr 
+          <div
+            petal:omit-tag=""
             petal:repeat="user self/users"
           >
-
-            <!--? First the even row ?-->
-            <td 
-              headers="username"
-              class="even"
-              petal:content="user/login"
-              petal:condition="true: repeat/even"
-            >
-              admin
-            </td>
-            <td 
-              headers="fullname"
-              class="even"
-              petal:content="user/full_name"
-              petal:condition="true: repeat/even"
-            >
-              Lisa Simpson
-            </td>
-            <td 
-              headers="actions"
-              class="even"
-              petal:condition="true: repeat/even"
+            <!--? The odd row comes before the even row ?-->
+            <tr 
+              class="odd"
+              petal:condition="true: repeat/odd"
             >
-              <a 
-                href="#" 
-                petal:attributes="href string:${user_modify/uri}?id=${user/id};" 
-                i18n:content="edit-username"
+              <td 
+                headers="username"
+                class="odd"
+                petal:content="user/login"
+              >
+                bart
+              </td>
+              <td 
+                headers="fullname"
+                class="odd"
+                petal:content="user/full_name"
               >
-                Edit 
-                <span
-                  petal:content="user/login"
-                  i18n:name="username"
-                >username</span></a>
-            </td>
-            <td 
-              headers="actions"
+                Bart Simpson
+              </td>
+              <td 
+                headers="actions"
+                class="odd"
+              >
+                <a 
+                  href="../user_modify/en.html" 
+                  petal:attributes="href string:${user_modify/uri}?id=${user/id};" 
+                  i18n:content="edit-username"
+                >
+                  Edit 
+                  <span
+                    petal:content="user/login"
+                    i18n:name="username"
+                  >bart</span></a>
+              </td>
+              <td 
+                headers="actions"
+                class="odd"
+              >
+                <a 
+                  href="../user_delete/en.html" 
+                  petal:attributes="href string:${user_delete/uri}?id=${user/id};" 
+                  i18n:content="delete-username"
+                >Delete
+                  <span
+                    petal:content="user/login"
+                    i18n:name="username"
+                  >bart</span></a>
+              </td>
+            </tr>
+            <!--? The even row comes after the odd row ?-->
+            <tr 
               class="even"
               petal:condition="true: repeat/even"
             >
-              <a 
-                href="#" 
-                petal:attributes="href string:${user_delete/uri}?id=${user/id};" 
-                i18n:content="delete-username"
-              >Delete
-                <span
-                  petal:content="user/login"
-                  i18n:name="username"
-                >username</span></a>
-            </td>
-
-            <!--? Then the odd row ?-->
-            <td 
-              headers="username"
-              class="odd"
-              petal:content="user/login"
-              petal:condition="true: repeat/odd"
-            >
-              admin
-            </td>
-            <td 
-              headers="fullname"
-              class="odd"
-              petal:content="user/full_name"
-              petal:condition="true: repeat/odd"
-            >
-              Lisa Simpson
-            </td>
-            <td 
-              headers="actions"
-              class="odd"
-              petal:condition="true: repeat/odd"
-            >
-              <a 
-                href="#" 
-                petal:attributes="href string:${user_modify/uri}?id=${user/id};" 
-                i18n:content="edit-username"
+              <td 
+                headers="username"
+                class="even"
+                petal:content="user/login"
               >
-                Edit 
-                <span
-                  petal:content="user/login"
-                  i18n:name="username"
-                >username</span></a>
-            </td>
-            <td 
-              headers="actions"
-              class="odd"
-              petal:condition="true: repeat/odd"
-            >
-              <a 
-                href="#" 
-                petal:attributes="href string:${user_delete/uri}?id=${user/id};" 
-                i18n:content="delete-username"
-              >Delete
-                <span
-                  petal:content="user/login"
-                  i18n:name="username"
-                >username</span></a>
-            </td>
-          </tr>
+                lisa
+              </td>
+              <td 
+                headers="fullname"
+                class="even"
+                petal:content="user/full_name"
+              >
+                Lisa Simpson
+              </td>
+              <td 
+                headers="actions"
+                class="even"
+              >
+                <a 
+                  href="../user_modify/en.html" 
+                  petal:attributes="href string:${user_modify/uri}?id=${user/id};" 
+                  i18n:content="edit-username"
+                >
+                  Edit 
+                  <span
+                    petal:content="user/login"
+                    i18n:name="username"
+                  >lisa</span></a>
+              </td>
+              <td 
+                headers="actions"
+                class="even"
+              >
+                <a 
+                  href="../user_delete/en.html" 
+                  petal:attributes="href string:${user_delete/uri}?id=${user/id};" 
+                  i18n:content="delete-username"
+                >Delete
+                  <span
+                    petal:content="user/login"
+                    i18n:name="username"
+                  >lisa</span></a>
+              </td>
+            </tr>
+          </div>
         </tbody>
       </table>
 


More information about the MKDoc-commit mailing list