[MKDoc-commit] More i18n and table update etc
chris at mkdoc.demon.co.uk
chris at mkdoc.demon.co.uk
Thu Nov 18 17:20:46 GMT 2004
Log Message:
-----------
More i18n and table update etc
Modified Files:
--------------
mkd/resources/templates/admin/audience_delete:
en.html
mkd/resources/templates/admin/audience_insert:
en.html
mkd/resources/templates/admin/audience_list:
en.html
mkd/resources/templates/admin/audience_modify:
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
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_insert:
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/new/en.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lresources/templates/admin/new/en.html -Lresources/templates/admin/new/en.html -u -r1.12 -r1.13
--- resources/templates/admin/new/en.html
+++ resources/templates/admin/new/en.html
@@ -14,7 +14,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/audience_delete/en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lresources/templates/admin/audience_delete/en.html -Lresources/templates/admin/audience_delete/en.html -u -r1.7 -r1.8
--- resources/templates/admin/audience_delete/en.html
+++ resources/templates/admin/audience_delete/en.html
@@ -12,7 +12,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
@@ -71,15 +71,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;"
@@ -123,26 +123,20 @@
>
<!--? 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 href="../../document/default/en.html" name="admin-menu-document" id="admin-menu-document" hreflang="en"><span
+ lang="en" xml:lang="en" dir="ltr">Document</span></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>
+ <a href="../user_list/en.html" name="admin-menu-users" title="List, edit, add and delete users"
+ id="admin-menu-users"><span lang="en" xml:lang="en" dir="ltr">Users</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#"
- title="Edit the Content of of this document.">Content</a>
+ <a href="../user_insert/en.html" name="admin-menu-add-user" title="Add a new user" id="admin-menu-add-user"><span
+ lang="en" xml:lang="en" dir="ltr">Add User</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#" title="Find documents.">Finder</a>
+ <a href="../audience_list/en.html" name="admin-menu-audiences" title="List, edit, add and delete audiences"
+ id="admin-menu-audiences"><span lang="en" xml:lang="en" dir="ltr">Audiences</span></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>
+ <a href="../audience_insert/en.html" name="admin-menu-add-audience" title="Add an audience"
+ id="admin-menu-add-audience">Add Audience</a>
</form>
<!--? / Mockup content ?-->
</div>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/audience_insert/en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lresources/templates/admin/audience_insert/en.html -Lresources/templates/admin/audience_insert/en.html -u -r1.6 -r1.7
--- resources/templates/admin/audience_insert/en.html
+++ resources/templates/admin/audience_insert/en.html
@@ -12,7 +12,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
@@ -74,15 +74,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;"
@@ -127,26 +127,20 @@
>
<!--? 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 href="../../document/default/en.html" name="admin-menu-document" id="admin-menu-document" hreflang="en"><span
+ lang="en" xml:lang="en" dir="ltr">Document</span></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>
+ <a href="../user_list/en.html" name="admin-menu-users" title="List, edit, add and delete users"
+ id="admin-menu-users"><span lang="en" xml:lang="en" dir="ltr">Users</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#"
- title="Edit the Content of of this document.">Content</a>
+ <a href="../user_insert/en.html" name="admin-menu-add-user" title="Add a new user" id="admin-menu-add-user"><span
+ lang="en" xml:lang="en" dir="ltr">Add User</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#" title="Find documents.">Finder</a>
+ <a href="../audience_list/en.html" name="admin-menu-audiences" title="List, edit, add and delete audiences"
+ id="admin-menu-audiences"><span lang="en" xml:lang="en" dir="ltr">Audiences</span></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>
+ <a href="../audience_insert/en.html" name="admin-menu-add-audience" title="Add an audience"
+ id="admin-menu-add-audience">Add Audience</a>
</form>
<!--? / Mockup content ?-->
</div>
@@ -220,7 +214,7 @@
<fieldset
class="audience"
- >
+ >
<legend>
<a
lang="en"
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/audience_list/en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lresources/templates/admin/audience_list/en.html -Lresources/templates/admin/audience_list/en.html -u -r1.7 -r1.8
--- resources/templates/admin/audience_list/en.html
+++ resources/templates/admin/audience_list/en.html
@@ -12,7 +12,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
@@ -95,15 +95,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;"
@@ -147,26 +147,20 @@
>
<!--? 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 href="../../document/default/en.html" name="admin-menu-document" id="admin-menu-document" hreflang="en"><span
+ lang="en" xml:lang="en" dir="ltr">Document</span></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>
+ <a href="../user_list/en.html" name="admin-menu-users" title="List, edit, add and delete users"
+ id="admin-menu-users"><span lang="en" xml:lang="en" dir="ltr">Users</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#"
- title="Edit the Content of of this document.">Content</a>
+ <a href="../user_insert/en.html" name="admin-menu-add-user" title="Add a new user" id="admin-menu-add-user"><span
+ lang="en" xml:lang="en" dir="ltr">Add User</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#" title="Find documents.">Finder</a>
+ <a href="../audience_list/en.html" name="admin-menu-audiences" title="List, edit, add and delete audiences"
+ id="admin-menu-audiences"><span lang="en" xml:lang="en" dir="ltr">Audiences</span></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>
+ <a href="../audience_insert/en.html" name="admin-menu-add-audience" title="Add an audience"
+ id="admin-menu-add-audience">Add Audience</a>
</form>
<!--? / Mockup content ?-->
</div>
@@ -262,20 +256,6 @@
lang="en"
xml:lang="en"
dir="ltr"
- title="Audience Identifier"
- id="audience-id"
- i18n:attributes="lang two-letter-language-code;
- xml:lang two-letter-language-code;
- dir text-direction;
- title audience-identifier;"
- i18n:translate="id"
- >
- ID
- </th>
- <th
- lang="en"
- xml:lang="en"
- dir="ltr"
title="Audience Name"
id="audience-name"
i18n:attributes="lang two-letter-language-code;
@@ -318,66 +298,131 @@
</tr>
</thead>
<tbody>
- <tr
+ <div
+ petal:omit-tag=""
petal:repeat="audience self/audiences"
>
- <td
- headers="audience-id"
- petal:content="audience/id"
+ <!--? The odd row comes before the even row ?-->
+ <tr
+ class="odd"
+ petal:condition="true: repeat/odd"
>
- 1
- </td>
- <td
- headers="audience-name"
- petal:content="audience/name"
+ <td
+ headers="audience-name"
+ class="odd"
+ petal:content="audience/name"
+ >
+ hackers
+ </td>
+ <td
+ headers="audience-title"
+ class="odd"
+ petal:content="audience/label"
+ >
+ Programmers
+ </td>
+ <td
+ headers="audience-actions"
+ class="odd"
+ >
+ <a
+ href="#"
+ lang="en"
+ xml:lang="en"
+ dir="ltr"
+ i18n:attributes="lang two-letter-language-code;
+ xml:lang two-letter-language-code;
+ dir text-direction;"
+ petal:attributes="href string:${audience_mod/uri}?id=${audience/id};"
+ i18n:translate="edit-audience"
+ >Edit
+ <strong
+ i18n:name="audience-name"
+ petal:content="audience/name"
+ >name</strong></a>
+ </td>
+ <td
+ headers="audience-actions"
+ class="odd"
+ >
+ <a
+ href="#"
+ lang="en"
+ xml:lang="en"
+ dir="ltr"
+ i18n:attributes="lang two-letter-language-code;
+ xml:lang two-letter-language-code;
+ dir text-direction;"
+ petal:attributes="href string:${audience_del/uri}?id=${audience/id};"
+ i18n:translate="delete-audience"
+ >Delete
+ <strong
+ i18n:name="audience-name"
+ petal:content="audience/name"
+ >name</strong></a>
+ </td>
+ </tr>
+ <!--? The even row comes after the odd row ?-->
+ <tr
+ class="even"
+ petal:condition="true: repeat/even"
>
- hackers
- </td>
- <td
- headers="audience-title"
- petal:content="audience/label"
- >
- Programmers
- </td>
- <td
- headers="audience-actions"
- >
- <a
- href="#"
- lang="en"
- xml:lang="en"
- dir="ltr"
- i18n:attributes="lang two-letter-language-code;
- xml:lang two-letter-language-code;
- dir text-direction;"
- petal:attributes="href string:${audience_mod/uri}?id=${audience/id};"
- i18n:translate="edit-audience"
- >Edit
- <strong
- i18n:name="audience-name"
- petal:content="audience/name"
- >name</strong></a>
- </td>
- <td
- headers="audience-actions"
- >
- <a
- href="#"
- lang="en"
- xml:lang="en"
- dir="ltr"
- i18n:attributes="lang two-letter-language-code;
- xml:lang two-letter-language-code;
- dir text-direction;"
- petal:attributes="href string:${audience_del/uri}?id=${audience/id};"
- i18n:translate="delete-audience"
- >Delete
- <strong
- i18n:name="audience-name"
- petal:content="audience/name"
- >name</strong></a>
- </td>
- </tr>
+ <td
+ headers="audience-name"
+ class="even"
+ petal:content="audience/name"
+ >
+ hackers
+ </td>
+ <td
+ headers="audience-title"
+ class="even"
+ petal:content="audience/label"
+ >
+ Programmers
+ </td>
+ <td
+ headers="audience-actions"
+ class="even"
+ >
+ <a
+ href="#"
+ lang="en"
+ xml:lang="en"
+ dir="ltr"
+ i18n:attributes="lang two-letter-language-code;
+ xml:lang two-letter-language-code;
+ dir text-direction;"
+ petal:attributes="href string:${audience_mod/uri}?id=${audience/id};"
+ i18n:translate="edit-audience"
+ >Edit
+ <strong
+ i18n:name="audience-name"
+ petal:content="audience/name"
+ >name</strong></a>
+ </td>
+ <td
+ headers="audience-actions"
+ class="even"
+ >
+ <a
+ href="#"
+ lang="en"
+ xml:lang="en"
+ dir="ltr"
+ i18n:attributes="lang two-letter-language-code;
+ xml:lang two-letter-language-code;
+ dir text-direction;"
+ petal:attributes="href string:${audience_del/uri}?id=${audience/id};"
+ i18n:translate="delete-audience"
+ >Delete
+ <strong
+ i18n:name="audience-name"
+ petal:content="audience/name"
+ >name</strong></a>
+ </td>
+ </tr>
+ </div>
</tbody>
</table>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/audience_modify/en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lresources/templates/admin/audience_modify/en.html -Lresources/templates/admin/audience_modify/en.html -u -r1.5 -r1.6
--- resources/templates/admin/audience_modify/en.html
+++ resources/templates/admin/audience_modify/en.html
@@ -12,7 +12,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
@@ -74,15 +74,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;"
@@ -126,26 +126,20 @@
>
<!--? 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 href="../../document/default/en.html" name="admin-menu-document" id="admin-menu-document" hreflang="en"><span
+ lang="en" xml:lang="en" dir="ltr">Document</span></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>
+ <a href="../user_list/en.html" name="admin-menu-users" title="List, edit, add and delete users"
+ id="admin-menu-users"><span lang="en" xml:lang="en" dir="ltr">Users</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#"
- title="Edit the Content of of this document.">Content</a>
+ <a href="../user_insert/en.html" name="admin-menu-add-user" title="Add a new user" id="admin-menu-add-user"><span
+ lang="en" xml:lang="en" dir="ltr">Add User</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#" title="Find documents.">Finder</a>
+ <a href="../audience_list/en.html" name="admin-menu-audiences" title="List, edit, add and delete audiences"
+ id="admin-menu-audiences"><span lang="en" xml:lang="en" dir="ltr">Audiences</span></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>
+ <a href="../audience_insert/en.html" name="admin-menu-add-audience" title="Add an audience"
+ id="admin-menu-add-audience">Add Audience</a>
</form>
<!--? / Mockup content ?-->
</div>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/component_copy/en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lresources/templates/admin/component_copy/en.html -Lresources/templates/admin/component_copy/en.html -u -r1.6 -r1.7
--- resources/templates/admin/component_copy/en.html
+++ resources/templates/admin/component_copy/en.html
@@ -13,7 +13,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/properties/en.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -Lresources/templates/admin/properties/en.html -Lresources/templates/admin/properties/en.html -u -r1.11 -r1.12
--- resources/templates/admin/properties/en.html
+++ resources/templates/admin/properties/en.html
@@ -16,7 +16,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/component_move/en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lresources/templates/admin/component_move/en.html -Lresources/templates/admin/component_move/en.html -u -r1.6 -r1.7
--- resources/templates/admin/component_move/en.html
+++ resources/templates/admin/component_move/en.html
@@ -13,7 +13,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/sort/en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lresources/templates/admin/sort/en.html -Lresources/templates/admin/sort/en.html -u -r1.8 -r1.9
--- resources/templates/admin/sort/en.html
+++ resources/templates/admin/sort/en.html
@@ -11,7 +11,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk> and others
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/content/en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lresources/templates/admin/content/en.html -Lresources/templates/admin/content/en.html -u -r1.7 -r1.8
--- resources/templates/admin/content/en.html
+++ resources/templates/admin/content/en.html
@@ -13,7 +13,8 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/user_delete/en.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lresources/templates/admin/user_delete/en.html -Lresources/templates/admin/user_delete/en.html -u -r1.5 -r1.6
--- resources/templates/admin/user_delete/en.html
+++ resources/templates/admin/user_delete/en.html
@@ -12,7 +12,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk> and others
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
@@ -73,15 +73,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;"
@@ -125,26 +125,20 @@
>
<!--? 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 href="../../document/default/en.html" name="admin-menu-document" id="admin-menu-document" hreflang="en"><span
+ lang="en" xml:lang="en" dir="ltr">Document</span></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>
+ <a href="../user_list/en.html" name="admin-menu-users" title="List, edit, add and delete users"
+ id="admin-menu-users"><span lang="en" xml:lang="en" dir="ltr">Users</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#"
- title="Edit the Content of of this document.">Content</a>
+ <a href="../user_insert/en.html" name="admin-menu-add-user" title="Add a new user" id="admin-menu-add-user"><span
+ lang="en" xml:lang="en" dir="ltr">Add User</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#" title="Find documents.">Finder</a>
+ <a href="../audience_list/en.html" name="admin-menu-audiences" title="List, edit, add and delete audiences"
+ id="admin-menu-audiences"><span lang="en" xml:lang="en" dir="ltr">Audiences</span></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>
+ <a href="../audience_insert/en.html" name="admin-menu-add-audience" title="Add an audience"
+ id="admin-menu-add-audience">Add Audience</a>
</form>
<!--? / Mockup content ?-->
</div>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/copy/en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lresources/templates/admin/copy/en.html -Lresources/templates/admin/copy/en.html -u -r1.9 -r1.10
--- resources/templates/admin/copy/en.html
+++ resources/templates/admin/copy/en.html
@@ -12,7 +12,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/user_insert/en.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -Lresources/templates/admin/user_insert/en.html -Lresources/templates/admin/user_insert/en.html -u -r1.7 -r1.8
--- resources/templates/admin/user_insert/en.html
+++ resources/templates/admin/user_insert/en.html
@@ -12,7 +12,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk> and others
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
@@ -92,15 +92,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;"
@@ -144,26 +144,20 @@
>
<!--? 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 href="../../document/default/en.html" name="admin-menu-document" id="admin-menu-document" hreflang="en"><span
+ lang="en" xml:lang="en" dir="ltr">Document</span></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>
+ <a href="../user_list/en.html" name="admin-menu-users" title="List, edit, add and delete users"
+ id="admin-menu-users"><span lang="en" xml:lang="en" dir="ltr">Users</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#"
- title="Edit the Content of of this document.">Content</a>
+ <a href="../user_insert/en.html" name="admin-menu-add-user" title="Add a new user" id="admin-menu-add-user"><span
+ lang="en" xml:lang="en" dir="ltr">Add User</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#" title="Find documents.">Finder</a>
+ <a href="../audience_list/en.html" name="admin-menu-audiences" title="List, edit, add and delete audiences"
+ id="admin-menu-audiences"><span lang="en" xml:lang="en" dir="ltr">Audiences</span></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>
+ <a href="../audience_insert/en.html" name="admin-menu-add-audience" title="Add an audience"
+ id="admin-menu-add-audience">Add Audience</a>
</form>
<!--? / Mockup content ?-->
</div>
@@ -213,7 +207,7 @@
>
User added successfully, you may add another or return to the list of
<a
- href="#"
+ href="../user_list/en.html"
lang="en"
xml:lang="en"
dir="ltr"
@@ -578,16 +572,23 @@
name="base_documents"
>
<option
- value=""
+ value="0"
title="None"
i18n:attributes="title none"
></option>
<option
+ value="1"
+ title="Foo"
petal:repeat="document self/documents"
petal:attributes="selected self/is_selected $document;
value document/id;
title document/title;"
petal:content="document/path"
+ >/foo/</option>
+ <option
+ petal-omit-tag=""
+ value="2"
+ title="Bar"
>/foo/bar/</option>
</select>
<br />
@@ -596,7 +597,6 @@
</fieldset>
<p>
-
<input
lang="en"
xml:lang="en"
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/delete/en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lresources/templates/admin/delete/en.html -Lresources/templates/admin/delete/en.html -u -r1.9 -r1.10
--- resources/templates/admin/delete/en.html
+++ resources/templates/admin/delete/en.html
@@ -12,7 +12,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/user_list/en.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lresources/templates/admin/user_list/en.html -Lresources/templates/admin/user_list/en.html -u -r1.6 -r1.7
--- resources/templates/admin/user_list/en.html
+++ resources/templates/admin/user_list/en.html
@@ -12,7 +12,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk> and others
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
@@ -103,7 +103,7 @@
</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;"
@@ -147,26 +147,20 @@
>
<!--? 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/default/en.html">Document</a>
+ <a href="../../document/default/en.html" name="admin-menu-document" id="admin-menu-document" hreflang="en"><span
+ lang="en" xml:lang="en" dir="ltr">Document</span></a>
<bdo dir="ltr">|</bdo>
- <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>
+ <a href="../user_list/en.html" name="admin-menu-users" title="List, edit, add and delete users"
+ id="admin-menu-users"><span lang="en" xml:lang="en" dir="ltr">Users</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="../content/en.html"
- title="Edit the Content of of this document.">Content</a>
+ <a href="../user_insert/en.html" name="admin-menu-add-user" title="Add a new user" id="admin-menu-add-user"><span
+ lang="en" xml:lang="en" dir="ltr">Add User</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="../finder/en.html" title="Find documents.">Finder</a>
+ <a href="../audience_list/en.html" name="admin-menu-audiences" title="List, edit, add and delete audiences"
+ id="admin-menu-audiences"><span lang="en" xml:lang="en" dir="ltr">Audiences</span></a>
<bdo dir="ltr">|</bdo>
- <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="../move/en.html" title="Move this document.">Move</a>
- <bdo dir="ltr">|</bdo>
- <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="../new/en.html" title="Create a new child document.">New</a>
- <bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="../delete/en.html" title="Delete this document.">Delete</a>
+ <a href="../audience_insert/en.html" name="admin-menu-add-audience" title="Add an audience"
+ id="admin-menu-add-audience">Add Audience</a>
</form>
<!--? / Mockup content ?-->
</div>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/finder/en.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lresources/templates/admin/finder/en.html -Lresources/templates/admin/finder/en.html -u -r1.8 -r1.9
--- resources/templates/admin/finder/en.html
+++ resources/templates/admin/finder/en.html
@@ -12,7 +12,7 @@
$Id$
- Authors: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and others
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/move/en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lresources/templates/admin/move/en.html -Lresources/templates/admin/move/en.html -u -r1.10 -r1.11
--- resources/templates/admin/move/en.html
+++ resources/templates/admin/move/en.html
@@ -12,7 +12,7 @@
$Id$
- Author: Chris Croome <chris at webarchitects.co.uk>
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/user_modify/en.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lresources/templates/admin/user_modify/en.html -Lresources/templates/admin/user_modify/en.html -u -r1.4 -r1.5
--- resources/templates/admin/user_modify/en.html
+++ resources/templates/admin/user_modify/en.html
@@ -12,7 +12,7 @@
$Id$
- Authors: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and others
+ Author: Jean-Michel Hiver, Chris Croome <chris at webarchitects.co.uk> and other
Copyright: (c) 2004, MKDoc Holdings Ltd.
This file is part of MKDoc.
@@ -59,6 +59,7 @@
petal:attributes="lang self/lang;
xml:lang self/lang;
dir self/direction;"
+ petal:define="user_list plugin: flo::plugin::Admin::UserList;"
xmlns:petal="http://purl.org/petal/1.0/"
xmlns:i18n="http://xml.zope.org/namespaces/i18n"
xmlns:metal="http://xml.zope.org/namespaces/metal"
@@ -92,15 +93,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;"
@@ -144,26 +145,20 @@
>
<!--? 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 href="../../document/default/en.html" name="admin-menu-document" id="admin-menu-document" hreflang="en"><span
+ lang="en" xml:lang="en" dir="ltr">Document</span></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>
+ <a href="../user_list/en.html" name="admin-menu-users" title="List, edit, add and delete users"
+ id="admin-menu-users"><span lang="en" xml:lang="en" dir="ltr">Users</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#"
- title="Edit the Content of of this document.">Content</a>
+ <a href="../user_insert/en.html" name="admin-menu-add-user" title="Add a new user" id="admin-menu-add-user"><span
+ lang="en" xml:lang="en" dir="ltr">Add User</span></a>
<bdo dir="ltr">|</bdo>
- <a lang="en" xml:lang="en" dir="ltr" href="#" title="Find documents.">Finder</a>
+ <a href="../audience_list/en.html" name="admin-menu-audiences" title="List, edit, add and delete audiences"
+ id="admin-menu-audiences"><span lang="en" xml:lang="en" dir="ltr">Audiences</span></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>
+ <a href="../audience_insert/en.html" name="admin-menu-add-audience" title="Add an audience"
+ id="admin-menu-add-audience">Add Audience</a>
</form>
<!--? / Mockup content ?-->
</div>
@@ -231,6 +226,10 @@
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-the-user-details"
>
Edit the user details in the following form and then modify the user.
</p>
@@ -240,140 +239,225 @@
method="post"
accept-charset="UTF-8"
enctype="application/x-www-form-urlencoded"
- petal:attributes="action uri"
+ petal:attributes="action self/uri"
>
- <input
- type="hidden"
- name="id"
- petal:attributes="value self/user_edit/id"
- />
-
- <fieldset
+ <input
+ type="hidden"
+ name="id"
+ petal:attributes="value self/user_edit/id"
+ />
+
+ <fieldset
class="user-details"
>
-
- <legend
- lang="en"
- xml:lang="en"
- dir="ltr"
- >
- User Details
- </legend>
+ <legend>
+ <a
+ lang="en"
+ xml:lang="en"
+ dir="ltr"
+ id="user-details"
+ name="user-details"
+ i18n:attributes="lang two-letter-language-code;
+ xml:lang two-letter-language-code;
+ dir text-direction;"
+ i18n:translate="user-details"
+ >User Details</a></legend>
<p
- lang="en"
- xml:lang="en"
- dir="ltr"
+ class="field"
>
+ <label
+ for="login"
+ 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="username"
+ >Username</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="edit-user-username-help"
>
You can't edit the username. If you want a different username you will need to create a new user.
</em>
- <label
- for="login"
- >Username</label>
+ <input
+ type="text"
+ readonly="readonly"
+ value="lisa"
+ id="login"
+ name="login"
+ size="10"
+ title="The username cannot be changed."
+ petal:attributes="value self/cgi/param --login"
+ i18n:attributes="title the-username-cannot-be-changed"
+ />
<br />
- <span
- petal:content="self/cgi/param --login"
- >username</span>
</p>
- <p
- lang="en"
- xml:lang="en"
- dir="ltr"
+ <p
+ class="field"
>
+ <label
+ for="first_name"
+ 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="first-name"
+ >First Name</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="add-user-first-name-help"
>
The first, or given or christian name of the user.
</em>
- <label
- for="first_name"
- >First Name</label>
- <br />
<input
type="text"
value=""
id="first_name"
name="first_name"
size="20"
+ title="Enter the users first name."
petal:attributes="value self/cgi/param --first_name"
+ i18n:attributes="title enter-first-name"
/>
+ <br />
</p>
<p
- lang="en"
- xml:lang="en"
- dir="ltr"
+ class="field"
>
+ <label
+ for="family_name"
+ 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="family-name"
+ >Family Name</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="add-user-family-name-help"
>
The family or second or surname of the user.
</em>
- <label
- for="family_name"
- >Family Name</label>
- <br />
<input
type="text"
value=""
id="family_name"
name="family_name"
size="20"
+ title="Enter the users family name."
petal:attributes="value self/cgi/param --family_name"
+ i18n:attributes="title enter-family-name"
/>
+ <br />
</p>
<p
- lang="en"
- xml:lang="en"
- dir="ltr"
+ class="field"
>
+ <label
+ for="email"
+ 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="email"
+ >Email</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="add-user-email-help"
>
The email address of the user, please double check that this is correct.
</em>
- <label
- for="email"
- >Email</label>
- <br />
<input
type="text"
value=""
id="email"
name="email"
- size="40"
+ size="30"
+ title="Enter the users email address."
petal:attributes="value self/cgi/param --email"
+ i18n:attributes="title enter-email-address"
/>
+ <br />
</p>
<p
- lang="en"
- xml:lang="en"
- dir="ltr"
+ class="field"
>
+ <label
+ for="password"
+ 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="password"
+ >Password</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="add-user-password-help"
>
The password for the user, this shouldn't contain any spaces and it is case sensitive.
</em>
- <label
- for="password"
- >Password</label>
- <br />
<input
type="password"
value=""
id="password"
name="password"
- size="15"
+ size="10"
+ title="Enter the password here."
petal:attributes="value self/cgi/param --password"
+ i18n:attributes="title enter-password"
/>
+ <br />
</p>
</fieldset>
@@ -381,63 +465,48 @@
class="user-permissions"
>
- <legend
- lang="en"
- xml:lang="en"
- dir="ltr"
- >
- User Permissions
+ <legend>
+ <a
+ lang="en"
+ xml:lang="en"
+ dir="ltr"
+ id="user-permissions"
+ name="user-permissions"
+ i18n:attributes="lang two-letter-language-code;
+ xml:lang two-letter-language-code;
+ dir text-direction;"
+ i18n:translate="user-permissions"
+ >User Permissions</a>
</legend>
<p
- lang="en"
- xml:lang="en"
- dir="ltr"
+ class="field"
>
- <em
- class="help"
- >
- The base document(s) are the document(s) that this user is allowed to edit.
- If this user has no selected based document then they will not be allowed to edit any
- documents on this site. If one of more documents are selected then the user will be able
- edit those documents <strong>and</strong> any child documents that these documents might
- have. This means that if you want to allow someone to edit all documents you only need to
- set / as their base document. To select multiple items or select no items you might need to
- use the <kbd>Ctrl</kbd> key.
- </em>
<label
- for="base_documents"
- >Base Document(s)</label>
- <br />
- <select
- multiple="multiple"
- size="12"
- id="base_documents"
- name="base_documents"
- >
- <option
- petal:repeat="document self/documents"
- petal:attributes="selected self/is_selected $document; value document/id"
- petal:content="document/path"
- >/foo/bar/</option>
- </select>
- </p>
-
- <p
- lang="en"
- xml:lang="en"
- dir="ltr"
- >
+ for="disabled"
+ for="title"
+ 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="account-status"
+ >Account 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="add-user-account-status-help"
>
Accounts can be enabled, which means that they can be used, or disabled which means that
they can't be used.
</em>
- <label
- for="disabled"
- >Account Status</label>
- <br />
<select
id="disabled"
name="disabled"
@@ -459,20 +528,85 @@
petal:condition="false: self/cgi/param --disabled"
>Disabled</option>
</select>
+ <br />
</p>
+ <p
+ class="widefield"
+ >
+ <label
+ for="base_documents"
+ for="title"
+ 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="base-documents"
+ >Base Document(s)</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="add-user-base-document-help"
+ >
+ The base document(s) are the document(s) that this user is allowed to edit.
+ If this user has no selected based document then they will not be allowed to edit any
+ documents on this site. If one of more documents are selected then the user will be able
+ edit those documents <strong>and</strong> any child documents that these documents might
+ have. This means that if you want to allow someone to edit all documents you only need to
+ set / as their base document.
+ </em>
+ <select
+ multiple="multiple"
+ size="12"
+ id="base_documents"
+ name="base_documents"
+ >
+ <option
+ value="0"
+ title="None"
+ i18n:attributes="title none"
+ ></option>
+ <option
+ value="1"
+ title="Foo"
+ petal:repeat="document self/documents"
+ petal:attributes="selected self/is_selected $document;
+ value document/id;
+ title document/title;"
+ petal:content="document/path"
+ >/foo/</option>
+ <option
+ petal-omit-tag=""
+ value="2"
+ title="Bar"
+ >/foo/bar/</option>
+ </select>
+ </p>
+
</fieldset>
- <p
- lang="en"
- xml:lang="en"
- dir="ltr"
- >
+ <p>
<input
+ lang="en"
+ xml:lang="en"
+ dir="ltr"
type="submit"
value="Modify User"
class="input-submit"
title="Amend the user using values in this form."
+ i18n:attributes="lang two-letter-language-code;
+ xml:lang two-letter-language-code;
+ dir text-direction;
+ value create-user;
+ title modify-user;"
/>
</p>
More information about the MKDoc-commit
mailing list