[MKDoc-commit] Various small tweaks and also some (not yet complete) i18n /

chris at mkdoc.demon.co.uk chris at mkdoc.demon.co.uk
Fri Oct 29 17:57:53 BST 2004


Log Message:
-----------
Various small tweaks and also some (not yet complete) i18n / macro'ization updates

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/finder:
        en.html

-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/audience_list/en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lresources/templates/admin/audience_list/en.html -Lresources/templates/admin/audience_list/en.html -u -r1.5 -r1.6
--- resources/templates/admin/audience_list/en.html
+++ resources/templates/admin/audience_list/en.html
@@ -32,6 +32,9 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 
+  This is just here in case something has been forgotton, it can be deleted
+  if everyuthing seems to work OK:
+
   petal:define="
     uri                        self/uri;
     title                      string:Audiences;
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/component_copy/en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lresources/templates/admin/component_copy/en.html -Lresources/templates/admin/component_copy/en.html -u -r1.4 -r1.5
--- resources/templates/admin/component_copy/en.html
+++ resources/templates/admin/component_copy/en.html
@@ -32,6 +32,10 @@
   along with MKDoc; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+
+  This is just here in case something has been forgotton, it can be deleted
+  if everyuthing seems to work OK:
+
   petal:define="
     here                  self;
     uri                   self/uri;
@@ -259,11 +263,7 @@
               i18n:translate="copy-component"
             >Copy Component</a>
           </legend>
-          <p 
-            lang="en"
-            xml:lang="en"
-            dir="ltr"
-          >
+          <p>
             <label
               for="to"
               lang="en"
@@ -285,7 +285,8 @@
                 value="some_id"
                 title="Foo"
                 petal:repeat="record self/movable_document_list"
-                petal:attributes="value record/ID; title record/Title"
+                petal:attributes="value record/ID; 
+                                  title record/Title;"
                 petal:content="record/Full_Path"
               >/bar/foo/</option>
             </select>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/component_move/en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lresources/templates/admin/component_move/en.html -Lresources/templates/admin/component_move/en.html -u -r1.4 -r1.5
--- resources/templates/admin/component_move/en.html
+++ resources/templates/admin/component_move/en.html
@@ -261,15 +261,19 @@
             >Move Component</a>
           </legend>
 
-          <p 
-            lang="en"
-            xml:lang="en"
-            dir="ltr"
-          >
+          <p>
             <label
               for="to"
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              class="mandatory"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="move-to"
             >
-              New document
+              Move to
             </label>
             <br />
             <select 
@@ -279,17 +283,14 @@
               <option
                 value="some_id"
                 petal:repeat="record self/movable_document_list"
-                petal:attributes="value record/ID"
+                petal:attributes="value record/ID;
+                                  title record/Title;"
                 petal:content="record/Full_Path"
               >Foo</option>
             </select>
           </p>
         </fieldset>
-        <p 
-          lang="en"
-          xml:lang="en"
-          dir="ltr"
-        >
+        <p>
 	  <input 
             type="hidden" 
             name="pos" 
@@ -297,10 +298,18 @@
             petal:attributes="value self/cgi/param --pos"
           />
           <input 
+            lang="en"
+            xml:lang="en"
+            dir="ltr"
             type="submit" 
             value="Move Component"
             class="input-submit"
-            title="Move component to the selected document."
+            title="Move component to the selected location."
+            i18n:attributes="lang     two-letter-language-code;
+                             xml:lang two-letter-language-code;
+                             dir      text-direction;
+                             value    move-component;
+                             title    move-component-to-the-selected-location;"
           /> 
         </p>
       </form>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/content/en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lresources/templates/admin/content/en.html -Lresources/templates/admin/content/en.html -u -r1.5 -r1.6
--- resources/templates/admin/content/en.html
+++ resources/templates/admin/content/en.html
@@ -9,6 +9,8 @@
 
   This template is used for editing the content of documents. 
 
+  It contains javascript for loading the HTML WYSIWYG editor.
+
   $Id$
 
   Author: Chris Croome <chris at webarchitects.co.uk>
@@ -247,8 +249,7 @@
            </ul>
         </div>
   
-        <!--? This dive will be replaced by the various components ?-->
-
+        <!--? This div will be replaced by the various components ?-->
         <div 
           petal:replace="structure self/editor/edit" 
         />
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/copy/en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lresources/templates/admin/copy/en.html -Lresources/templates/admin/copy/en.html -u -r1.7 -r1.8
--- resources/templates/admin/copy/en.html
+++ resources/templates/admin/copy/en.html
@@ -294,7 +294,8 @@
                 value="some_id"
                 title="Foo"
                 petal:repeat="record self/copiable_document_list"
-                petal:attributes="value record/ID; title record/Title"
+                petal:attributes="value record/ID; 
+                                  title record/Title"
                 petal:content="record/Full_Path"
               >/foo/bar/</option>
             </select>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/delete/en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lresources/templates/admin/delete/en.html -Lresources/templates/admin/delete/en.html -u -r1.7 -r1.8
--- resources/templates/admin/delete/en.html
+++ resources/templates/admin/delete/en.html
@@ -266,7 +266,8 @@
                 value="some_id"
                 title="Foo"
                 petal:repeat="record self/redirectable_document_list"
-                petal:attributes="value record/ID; title record/Title;"
+                petal:attributes="value record/ID; 
+                                  title record/Title;"
                 petal:content="record/Full_Path"
               >/bar/foo/</option>
             </select>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/finder/en.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lresources/templates/admin/finder/en.html -Lresources/templates/admin/finder/en.html -u -r1.2 -r1.3
--- resources/templates/admin/finder/en.html
+++ resources/templates/admin/finder/en.html
@@ -1,4 +1,36 @@
-<html
+<!DOCTYPE html PUBLIC
+  "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+>
+<!--?
+
+  Finder Template
+  ===============
+
+  This template is used for the document finder. 
+
+  $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
+
   petal:define="
     uri                   self/uri;
     title                 string:Modify the Content of ${self/title};
@@ -8,210 +40,401 @@
     document_title        self/parent/title;
     document_lang         self/parent/lang;
                "
+
+?-->
+<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: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:document-finder}"
+    >
+    </title>
+    <meta 
+      http-equiv="Content-Type" 
+      content="text/html; charset=UTF-8" 
+    />
+    <meta 
+      http-equiv="Content-Language" 
+      content="en" 
+      petal:attributes="content self/lang"
+    />
+    <!--? 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/" />
+    <!--? 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 ?-->
 
-    <div>
-      <form>
-        <p>Find documents</p>
-        <table>
-          <tr>
-            <td>Containing</td>
-            <td><input type="text" name="q" /></td>
-          </tr>
-          <tr>
-            <td>Created By</td>
-            <td>
-              <select name="editor_created">
-                <option value="" petal:condition="false: self/cgi/param --editor_created">Anybody</option>
-                <span petal:omit-tag="" petal:repeat="editor self/editor_created_list">
-                  <option petal:attributes="value editor/id"
-                          petal:condition="true:editor/selected"
-                          petal:content="editor/real_name">Bruno Postle</option>
-                </span>
-                <span petal:omit-tag="" petal:repeat="editor self/editor_created_list">
-                  <option petal:attributes="value editor/id"
-                          petal:condition="false:editor/selected"
-                          petal:content="editor/real_name">Chris Croome</option>
-                </span>
-                <option value="" petal:condition="true: self/cgi/param --editor_created">Anybody</option>
-              </select>
-            </td>
-            <td>Last Modified By</td>
-            <td>
-              <select name="editor_last_modified">
-                <option value="" petal:condition="false: self/cgi/param --editor_last_modified">Anybody</option>
-                <span petal:omit-tag="" petal:repeat="editor self/editor_last_modified_list">
-                  <option petal:attributes="value editor/id"
-                          petal:condition="true:editor/selected"
-                          petal:content="editor/real_name">Bruno Postle</option>
-                </span>
-                <span petal:omit-tag="" petal:repeat="editor self/editor_last_modified_list">
-                  <option petal:attributes="value editor/id"
-                          petal:condition="false:editor/selected"
-                          petal:content="editor/real_name">Chris Croome</option>
-                </span>
-                <option value="" petal:condition="true: self/cgi/param --editor_last_modified">Anybody</option>
-              </select>
-            </td>
-          </tr>
+    <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="document-finder"
+        >Document Finder</a>
+      </h1>
+
+      <form
+        action="#" 
+        method="get" 
+        accept-charset="UTF-8"
+        enctype="application/x-www-form-urlencoded"
+        petal:attributes="action self/uri"
+      >
+        <fieldset
+          class="finder"
+        >
+          <legend>
+            <a 
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              id="document-finder" 
+              name="document-finder"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="find-documents"
+            >Find Documents</a>
+          </legend>
+          
+          <p
+            class="field"
+          >
+            <label
+              for="q"
+              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="containing"
+            >Containing</label>
+            <em
+              lang="en"
+              xml:lang="en"
+              dir="ltr"
+              class="help"
+              i18n:attributes="lang     two-letter-language-code;
+                               xml:lang two-letter-language-code;
+                               dir      text-direction;"
+              i18n:translate="document-title-help"
+            >
+              Enter some optional text that is in the document you want to find. 
+            </em>
+            <input 
+              type="text" 
+              name="q" 
+              id="q"
+              size="35" 
+              title="Enter the optional text that you want search for."
+              class="input-text"
+              i18n:attributes="title enter-the-optional-text-that-you-want-to-search-for"
+            />
+            <br />
+          </p>
+
+          <p
+            class="field"
+          >
+            <label
+              for="editor_created"
+              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="created-by"
+            >Created By</label>
+
+      
+                <select name="editor_created">
+                  <option value="" petal:condition="false: self/cgi/param --editor_created">Anybody</option>
+                  <span petal:omit-tag="" petal:repeat="editor self/editor_created_list">
+                    <option petal:attributes="value editor/id"
+                            petal:condition="true:editor/selected"
+                            petal:content="editor/real_name">Bruno Postle</option>
+                  </span>
+                  <span petal:omit-tag="" petal:repeat="editor self/editor_created_list">
+                    <option petal:attributes="value editor/id"
+                            petal:condition="false:editor/selected"
+                            petal:content="editor/real_name">Chris Croome</option>
+                  </span>
+                  <option value="" petal:condition="true: self/cgi/param --editor_created">Anybody</option>
+                </select>
+           </p>
+       
+              <td>Last Modified By</td>
+        
+                <select name="editor_last_modified">
+                  <option value="" petal:condition="false: self/cgi/param --editor_last_modified">Anybody</option>
+                  <span petal:omit-tag="" petal:repeat="editor self/editor_last_modified_list">
+                    <option petal:attributes="value editor/id"
+                            petal:condition="true:editor/selected"
+                            petal:content="editor/real_name">Bruno Postle</option>
+                  </span>
+                  <span petal:omit-tag="" petal:repeat="editor self/editor_last_modified_list">
+                    <option petal:attributes="value editor/id"
+                            petal:condition="false:editor/selected"
+                            petal:content="editor/real_name">Chris Croome</option>
+                  </span>
+                  <option value="" petal:condition="true: self/cgi/param --editor_last_modified">Anybody</option>
+                </select>
+         
+          
+          <table>
+            <tr>
+              <td>Language</td>
+              <td>
+                <select name="language">
+                  <option value="" petal:condition="false: self/cgi/param --language">Any</option>
+                  <span petal:omit-tag="" petal:repeat="language self/language_list">
+                    <option petal:attributes="value language/id"
+                            petal:condition="true:language/selected"
+                            petal:content="language/label">Bruno Postle</option>
+                  </span>
+                  <span petal:omit-tag="" petal:repeat="language self/language_list">
+                    <option petal:attributes="value language/id"
+                            petal:condition="false:language/selected"
+                            petal:content="language/label">Chris Croome</option>
+                  </span>
+                  <option value="" petal:condition="true: self/cgi/param --language">Any</option>
+                </select>
+              </td>
+              <td>Status</td>
+              <td>
+                <select name="status">
+                  <option value="" petal:condition="false: self/cgi/param --status">Any</option>
+                  <option value="deleted"
+                          selected="selected"
+                          petal:condition="true: self/cgi/param_eq --status --deleted">Deleted</option>
+                  <option value="deleted"
+                          petal:condition="false: self/cgi/param_eq --status --deleted">Deleted</option>
+                  <option value="modified"
+                          selected="selected"
+                          petal:condition="true: self/cgi/param_eq --status --modified">Versioned</option>
+                  <option value="modified"
+                          petal:condition="false: self/cgi/param_eq --status --modified">Versioned</option>
+                  <option value="hidden"
+                          selected="selected"
+                          petal:condition="true: self/cgi/param_eq --status --hidden">Hidden</option>
+                  <option value="hidden"
+                          petal:condition="false: self/cgi/param_eq --status --hidden">Hidden</option>
+                  <option value="live"
+                          selected="selected"
+                          petal:condition="true: self/cgi/param_eq --status --live">Live</option>
+                  <option value="live"
+                          petal:condition="false: self/cgi/param_eq --status --live">Live</option>
+                  <option value="" petal:condition="true: self/cgi/param --status">Any</option>
+                </select>
+              </td>
+            </tr>
+            <tr>
+              <td>Narrow</td>
+              <td>
+                <select name="narrow">
+                  <span
+                    petal:omit-tag="string:1"
+                    petal:repeat="ancestor self/ancestors"
+                  >
+                    <option
+                      value="/foo/"
+                      petal:condition="true:self/cgi/param_eq --narrow ancestor/path"
+                      petal:attributes="value ancestor/path"
+                      petal:content="ancestor/path"
+                    >/foo/</option>
+                  </span>
+                  <span
+                    petal:omit-tag="string:1"
+                    petal:repeat="ancestor self/ancestors"
+                  >
+                    <option
+                      value="/foo/"
+                      petal:condition="false:self/cgi/param_eq --narrow ancestor/path"
+                      petal:attributes="value ancestor/path"
+                      petal:content="ancestor/path"
+                    >/foo/bar/</option>
+                  </span>
+                </select>
+              </td>
+              <td>Results Per Page</td>
+              <td>
+                <select name="per_page">
+                  <option
+                    petal:condition="true:self/cgi/param --per_page"
+                    petal:attributes="value self/cgi/param --per_page"
+                    petal:content="self/cgi/param --per_page"
+                  >10</option>
+                  <option
+                    value="10"
+                    petal:condition="false:self/cgi/param_eq --per_page '10'"
+                  >10</option>
+                  <option
+                    value="20"
+                    petal:condition="false:self/cgi/param_eq --per_page '20'"
+                  >20</option>
+                  <option
+                    value="50"
+                    petal:condition="false:self/cgi/param_eq --per_page '50'"
+                  >50</option>
+                </select>
+              </td>
+            </tr>
+          </table>
+          <input type="submit" value="Find!" />
+        </fieldset>
+      </form>
+      <table border="1" cellpadding="2">
+        <tr>
+          <td><strong>ID</strong></td>
+          <td><strong>Title</strong></td>
+          <td><strong>Created By</strong></td>
+          <td><strong>Creation Date</strong></td>
+          <td><strong>Last Modified By</strong></td>
+          <td><strong>Modification Date</strong></td>
+          <td><strong>Language</strong></td>
+          <td><strong>Status</strong></td>
+        </tr>
+        <tr><td>&nbsp;</td></tr>
+        <span petal:repeat="document self/results" petal:omit-tag="">
           <tr>
-            <td>Language</td>
-            <td>
-              <select name="language">
-                <option value="" petal:condition="false: self/cgi/param --language">Any</option>
-                <span petal:omit-tag="" petal:repeat="language self/language_list">
-                  <option petal:attributes="value language/id"
-                          petal:condition="true:language/selected"
-                          petal:content="language/label">Bruno Postle</option>
-                </span>
-                <span petal:omit-tag="" petal:repeat="language self/language_list">
-                  <option petal:attributes="value language/id"
-                          petal:condition="false:language/selected"
-                          petal:content="language/label">Chris Croome</option>
-                </span>
-                <option value="" petal:condition="true: self/cgi/param --language">Any</option>
-              </select>
-            </td>
-            <td>Status</td>
-            <td>
-              <select name="status">
-                <option value="" petal:condition="false: self/cgi/param --status">Any</option>
-                <option value="deleted"
-                        selected="selected"
-                        petal:condition="true: self/cgi/param_eq --status --deleted">Deleted</option>
-                <option value="deleted"
-                        petal:condition="false: self/cgi/param_eq --status --deleted">Deleted</option>
-                <option value="modified"
-                        selected="selected"
-                        petal:condition="true: self/cgi/param_eq --status --modified">Versioned</option>
-                <option value="modified"
-                        petal:condition="false: self/cgi/param_eq --status --modified">Versioned</option>
-                <option value="hidden"
-                        selected="selected"
-                        petal:condition="true: self/cgi/param_eq --status --hidden">Hidden</option>
-                <option value="hidden"
-                        petal:condition="false: self/cgi/param_eq --status --hidden">Hidden</option>
-                <option value="live"
-                        selected="selected"
-                        petal:condition="true: self/cgi/param_eq --status --live">Live</option>
-                <option value="live"
-                        petal:condition="false: self/cgi/param_eq --status --live">Live</option>
-                <option value="" petal:condition="true: self/cgi/param --status">Any</option>
-              </select>
-            </td>
+            <td colspan="7"><a href="#" petal:attributes="href document/uri" petal:content="document/uri">URI</a></td>
           </tr>
           <tr>
-            <td>Narrow</td>
+            <td petal:content="document/id">ID</td>
+            <td petal:content="document/title">Title</td>
+            <td petal:content="document/editor_created/real_name">Editor_Created</td>
+            <td petal:content="document/date_created">Created_Date</td>
+            <td petal:content="document/editor_last_modified/real_name">Editor_Last_Modified</td>
+            <td petal:content="document/date_last_modified">Date_Last_Modified</td>
+            <td petal:content="document/lang_label">Language_Label</td>
             <td>
-              <select name="narrow">
-                <span
-                  petal:omit-tag="string:1"
-                  petal:repeat="ancestor self/ancestors"
-                >
-                  <option
-                    value="/foo/"
-                    petal:condition="true:self/cgi/param_eq --narrow ancestor/path"
-                    petal:attributes="value ancestor/path"
-                    petal:content="ancestor/path"
-                  >/foo/</option>
+              <span petal:condition="true: document/is_hidden">Hidden</span>
+              <span petal:condition="false: document/is_hidden">
+                <span petal:condition="true: document/is_modified_version">Versioned</span>
+                <span petal:condition="false: document/is_modified_version">
+                  <span petal:condition="true: document/is_deleted_version">Deleted</span>
+                  <span petal:condition="false: document/is_deleted_version">Live</span>
                 </span>
-                <span
-                  petal:omit-tag="string:1"
-                  petal:repeat="ancestor self/ancestors"
-                >
-                  <option
-                    value="/foo/"
-                    petal:condition="false:self/cgi/param_eq --narrow ancestor/path"
-                    petal:attributes="value ancestor/path"
-                    petal:content="ancestor/path"
-                  >/foo/bar/</option>
-                </span>
-              </select>
-            </td>
-            <td>Results Per Page</td>
-            <td>
-              <select name="per_page">
-                <option
-                  petal:condition="true:self/cgi/param --per_page"
-                  petal:attributes="value self/cgi/param --per_page"
-                  petal:content="self/cgi/param --per_page"
-                >10</option>
-                <option
-                  value="10"
-                  petal:condition="false:self/cgi/param_eq --per_page '10'"
-                >10</option>
-                <option
-                  value="20"
-                  petal:condition="false:self/cgi/param_eq --per_page '20'"
-                >20</option>
-                <option
-                  value="50"
-                  petal:condition="false:self/cgi/param_eq --per_page '50'"
-                >50</option>
-              </select>
-            </td>
+              </span>
+            </td> 
           </tr>
-        </table>
-        <input type="submit" value="Find!" />
-      </form>
+          <tr><td>&nbsp;</td></tr>
+        </span>
+      </table>
+     
+      <p petal:condition="true:self/navbar">
+        <span
+          petal:repeat="element self/navbar"
+        >
+          <a
+            href="#"
+            petal:attributes="href element/uri"
+            petal:omit-tag="false:element/uri"
+            petal:content="element/page"
+          >1</a>
+        </span>
+      </p>
     </div>
-    <table border="1" cellpadding="2">
-      <tr>
-        <td><strong>ID</strong></td>
-        <td><strong>Title</strong></td>
-        <td><strong>Created By</strong></td>
-        <td><strong>Creation Date</strong></td>
-        <td><strong>Last Modified By</strong></td>
-        <td><strong>Modification Date</strong></td>
-        <td><strong>Language</strong></td>
-        <td><strong>Status</strong></td>
-      </tr>
-      <tr><td>&nbsp;</td></tr>
-      <span petal:repeat="document self/results" petal:omit-tag="">
-        <tr>
-          <td colspan="7"><a href="#" petal:attributes="href document/uri" petal:content="document/uri">URI</a></td>
-        </tr>
-        <tr>
-          <td petal:content="document/id">ID</td>
-          <td petal:content="document/title">Title</td>
-          <td petal:content="document/editor_created/real_name">Editor_Created</td>
-          <td petal:content="document/date_created">Created_Date</td>
-          <td petal:content="document/editor_last_modified/real_name">Editor_Last_Modified</td>
-          <td petal:content="document/date_last_modified">Date_Last_Modified</td>
-          <td petal:content="document/lang_label">Language_Label</td>
-          <td>
-            <span petal:condition="true: document/is_hidden">Hidden</span>
-            <span petal:condition="false: document/is_hidden">
-              <span petal:condition="true: document/is_modified_version">Versioned</span>
-              <span petal:condition="false: document/is_modified_version">
-                <span petal:condition="true: document/is_deleted_version">Deleted</span>
-                <span petal:condition="false: document/is_deleted_version">Live</span>
-              </span>
-            </span>
-          </td> 
-        </tr>
-        <tr><td>&nbsp;</td></tr>
-      </span>
-    </table>
-
-    <p petal:condition="true:self/navbar">
-      <span
-        petal:repeat="element self/navbar"
-      >
-        <a
-          href="#"
-          petal:attributes="href element/uri"
-          petal:omit-tag="false:element/uri"
-          petal:content="element/page"
-        >1</a>
-      </span>
-    </p>
   </body>
 </html>


More information about the MKDoc-commit mailing list