[MKDoc-commit] Sorted out the finder form,
the results table still need redoing.
chris at mkdoc.demon.co.uk
chris at mkdoc.demon.co.uk
Mon Nov 1 14:42:51 GMT 2004
Log Message:
-----------
Sorted out the finder form, the results table still need redoing.
Modified Files:
--------------
mkd/resources/templates/admin/finder:
en.html
-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/finder/en.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lresources/templates/admin/finder/en.html -Lresources/templates/admin/finder/en.html -u -r1.3 -r1.4
--- resources/templates/admin/finder/en.html
+++ resources/templates/admin/finder/en.html
@@ -58,7 +58,7 @@
<head>
<title
- petal:content="structure string:${self/parent_alternate_title}${string:document-finder}"
+ petal:content="structure string:${self/parent_alternate_title}${string:find-documents}"
>
</title>
<meta
@@ -168,8 +168,8 @@
i18n:attributes="lang two-letter-language-code;
xml:lang two-letter-language-code;
dir text-direction;"
- i18n:translate="document-finder"
- >Document Finder</a>
+ i18n:translate="find-documents"
+ >Find Documents</a>
</h1>
<form
@@ -217,7 +217,7 @@
i18n:attributes="lang two-letter-language-code;
xml:lang two-letter-language-code;
dir text-direction;"
- i18n:translate="document-title-help"
+ i18n:translate="finder-document-title-help"
>
Enter some optional text that is in the document you want to find.
</em>
@@ -246,144 +246,408 @@
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>
+ <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="finder-created-by-help"
+ >
+ Only match documents created by the selected editor.
+ </em>
+ <select
+ name="editor_created"
+ id="editor_created"
+ >
+ <option
+ value=""
+ selected="selected"
+ title="Match all"
+ i18n:attributes="title match-all;"
+ i18n:translate="anyone"
+ petal:condition="false: self/cgi/param --editor_created"
+ >Anyone</option>
+ <option
+ value=""
+ title="Match all"
+ i18n:attributes="title match-all;"
+ petal:condition="true: self/cgi/param --editor_created"
+ >Anybody</option>
+ <div
+ petal:omit-tag=""
+ petal:repeat="editor self/editor_created_list"
+ >
+ <option
+ value="1"
+ selected="selected"
+ title="lisa"
+ petal:attributes="value editor/id;
+ title editor/login;"
+ petal:condition="true: editor/selected"
+ petal:content="editor/real_name"
+ >Lisa Simpson</option>
+ <option
+ value="2"
+ title="bart"
+ petal:attributes="value editor/id;
+ title editor/login;"
+ petal:condition="false: editor/selected"
+ petal:content="editor/real_name"
+ >Bart Simpson</option>
+ </div>
+ </select>
+ <br />
+ </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>
-
+ <p
+ class="field"
+ >
+ <label
+ for="editor_last_modified"
+ 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="last-modified-by"
+ >Last Modified By</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="finder-last-modified-by-help"
+ >
+ Only match documents last modified by the selected editor.
+ </em>
+ <select
+ name="editor_last_modified"
+ id="editor_last_modified"
+ >
+ <option
+ value=""
+ selected="selected"
+ title="Match all"
+ i18n:attributes="title match-all;"
+ petal:condition="false: self/cgi/param --editor_last_modified"
+ >Anybody</option>
+ <option
+ value=""
+ title="Match all"
+ i18n:attributes="title match-all;"
+ petal:condition="true: self/cgi/param --editor_last_modified"
+ >Anybody</option>
+ <div
+ petal:omit-tag=""
+ petal:repeat="editor self/editor_last_modified_list"
+ >
+ <option
+ value="1"
+ selected="selected"
+ title="lisa"
+ petal:attributes="value editor/id;
+ title editor/login;"
+ petal:condition="true: editor/selected"
+ petal:content="editor/real_name"
+ >Lisa Simpson</option>
+ <option
+ value="2"
+ title="bart"
+ petal:attributes="value editor/id;
+ title editor/login;"
+ petal:condition="false:editor/selected"
+ petal:content="editor/real_name"
+ >Bart Simpson</option>
+ </div>
+ </select>
+ <br />
+ </p>
- <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!" />
+ <p
+ class="field"
+ >
+ <label
+ for="language"
+ 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="language"
+ >Language</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="finder-language-help"
+ >
+ Only match documents in the selected language.
+ </em>
+ <select
+ name="language"
+ id="language"
+ >
+ <option
+ value=""
+ selected="selected"
+ title="Match all"
+ i18n:attributes="title match-all;"
+ petal:condition="false: self/cgi/param --language"
+ >Any</option>
+ <option
+ value=""
+ title="Match all"
+ i18n:attributes="title match-all;"
+ petal:condition="true: self/cgi/param --language"
+ >Any</option>
+ <div
+ petal:omit-tag=""
+ petal:repeat="language self/language_list"
+ >
+ <option
+ value="en"
+ title="en"
+ selected="selected"
+ petal:attributes="value language/id;
+ title language/id;"
+ petal:condition="true: language/selected;
+ true: language/label;"
+ petal:content="language/label"
+ >English</option>
+ <option
+ value="fr"
+ title="fr"
+ petal:attributes="value language/id;
+ title language/id;"
+ petal:condition="false: language/selected;
+ true: language/label;"
+ petal:content="language/label"
+ >French</option>
+ </div>
+ </select>
+ <br />
+ </p>
+
+ <p
+ class="field"
+ >
+ <label
+ for="status"
+ 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="status"
+ >Status</label>
+ <em
+ lang="en"
+ xml:lang="en"
+ dir="ltr"
+ class="help"
+ i18n:attributes="lang two-letter-language-code;
+ xml:lang two-letter-language-code;
+ dir text-direction;"
+ i18n:translate="finder-status-help"
+ >
+ Only match documents that have the selected status.
+ </em>
+ <select
+ name="status"
+ id="status"
+ >
+ <option
+ value=""
+ selected="selected"
+ title="Match all"
+ i18n:attributes="title match-all;"
+ petal:condition="false: self/cgi/param --status"
+ >Any</option>
+ <option
+ value=""
+ title="Match all"
+ i18n:attributes="title match-all;"
+ petal:condition="true: 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>
+ </select>
+ <br />
+ </p>
+
+ <p
+ class="field"
+ >
+ <label
+ for="narrow"
+ 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="narrow"
+ >Narrow</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="finder-narrow-help"
+ >
+ Restrict the search to a specific section of the site (to use this fuction you need to
+ use the finder page in the part of the site you want to narrow your search to).
+ </em>
+ <select
+ name="narrow"
+ id="narrow"
+ >
+ <div
+ petal:omit-tag="string:1"
+ petal:repeat="ancestor self/ancestors"
+ >
+ <option
+ value="/foo/"
+ selected="selected"
+ title="Foo"
+ petal:condition="true: self/cgi/param_eq --narrow ancestor/path"
+ petal:attributes="value ancestor/path;
+ title ancestor/title;"
+ petal:content="ancestor/path"
+ >/foo/</option>
+ <option
+ value="/foo/"
+ title="Bar"
+ petal:condition="false: self/cgi/param_eq --narrow ancestor/path"
+ petal:attributes="value ancestor/path;
+ title ancestor/title;"
+ petal:content="ancestor/path"
+ >/foo/bar/</option>
+ </div>
+ </select>
+ <br />
+ </p>
+
+ <p
+ class="field"
+ >
+ <label
+ for="per_page"
+ 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="results-per-page"
+ >Results Per Page</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="finder-results-per-page-help"
+ >
+ Select the number of matches per page.
+ </em>
+ <select
+ name="per_page"
+ id="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>
+ <br />
+ </p>
+
+ <p>
+ <input
+ lang="en"
+ xml:lang="en"
+ dir="ltr"
+ type="submit"
+ value="Find Documents"
+ class="input-submit"
+ title="Find documents matching the selected criteria."
+ i18n:attributes="lang two-letter-language-code;
+ xml:lang two-letter-language-code;
+ dir text-direction;
+ value find-documents;
+ title find-documents-matching-the-selected-criteria;"
+ />
+ </p>
+
</fieldset>
</form>
+
<table border="1" cellpadding="2">
<tr>
<td><strong>ID</strong></td>
More information about the MKDoc-commit
mailing list