[MKDoc-commit] [1.6] Inconsistencies with audience names and titles
sorted out and code
chris at mkdoc.demon.co.uk
chris at mkdoc.demon.co.uk
Wed Dec 7 11:46:20 GMT 2005
Log Message:
-----------
[1.6] Inconsistencies with audience names and titles sorted out and code
omitted which was supposed to display and name and title of an audience
after it had created (it didn't work).
Tags:
----
mkdoc-1-6
Modified Files:
--------------
mkd/templates/error:
en.html
mkd/templates/admin/audience_delete:
en.html
mkd/templates/admin/audience_insert:
en.html
mkd/templates/admin/audience_list:
en.html
mkd/templates/admin/audience_modify:
en.html
-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/admin/audience_delete/Attic/en.html,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -Ltemplates/admin/audience_delete/en.html -Ltemplates/admin/audience_delete/en.html -u -r1.1.2.14 -r1.1.2.15
--- templates/admin/audience_delete/en.html
+++ templates/admin/audience_delete/en.html
@@ -70,11 +70,11 @@
align="left"
>
Please confirm that you want to delete the audience with
- the identifier
+ the name
<em
petal:content=""
>$self/audience/name</em>
- and the label
+ and the title
<strong
petal:content=""
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/admin/audience_insert/Attic/en.html,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -Ltemplates/admin/audience_insert/en.html -Ltemplates/admin/audience_insert/en.html -u -r1.1.2.14 -r1.1.2.15
--- templates/admin/audience_insert/en.html
+++ templates/admin/audience_insert/en.html
@@ -68,13 +68,7 @@
petal:attributes="align align"
petal:condition="self/ok"
>
- The
- <em
- petal:content="self/cgi/param --name"
- >ID</em> audience has been created with the label
- <strong
- petal:content="self/cgi/param --label"
- >Label</strong>, you may add another if you wish or you can
+ An audience has been created, you may add another if you wish or you can
<a
href="#"
title="List, edit, add and delete audiences."
@@ -121,7 +115,7 @@
<em
class="help"
>
- The Identifier is only used for internal purposes, it should be short, unique and it
+ The name is only used for internal purposes, it should be short, unique and it
can't contain spaces or punctuation apart from dashes. Any uppercase letters
will be converted to lowercase ones.
</em>
@@ -130,7 +124,7 @@
lang="en"
xml:lang="en"
dir="ltr"
- >Identifier</label>
+ >Name</label>
<br />
<input
type="text"
@@ -150,7 +144,7 @@
<em
class="help"
>
- The label for the audience field is the name that will be visible when users and editors
+ The title for the audience field is the name that will be visible when users and editors
select audiences.
</em>
<label
@@ -158,7 +152,7 @@
lang="en"
xml:lang="en"
dir="ltr"
- >Label</label>
+ >Title</label>
<br />
<input
type="text"
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/error/Attic/en.html,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -Ltemplates/error/en.html -Ltemplates/error/en.html -u -r1.1.2.24 -r1.1.2.25
--- templates/error/en.html
+++ templates/error/en.html
@@ -94,24 +94,24 @@
<!--? Audience related errors -->
<li petal:condition="error/is --audience/name/empty">
- The audience 'identifier' field cannot be left blank.
+ The audience name field cannot be left blank.
</li>
<li petal:condition="error/is --audience/name/too_long">
- The audience 'identifier' field is too long.
+ The audience name field is too long.
</li>
<li petal:condition="error/is --audience/name/exists">
- The audience 'identifier' field already exists in the database.
+ The audience name field already exists in the database.
Please choose another one.
</li>
<li petal:condition="error/is --audience/label/empty">
- The audience 'label' field cannot be left blank.
+ The audience title field cannot be left blank.
</li>
<li petal:condition="error/is --audience/label/too_long">
- The audience 'label' field is too long.
+ The audience title field is too long.
</li>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/admin/audience_list/Attic/en.html,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -Ltemplates/admin/audience_list/en.html -Ltemplates/admin/audience_list/en.html -u -r1.1.2.14 -r1.1.2.15
--- templates/admin/audience_list/en.html
+++ templates/admin/audience_list/en.html
@@ -86,14 +86,14 @@
</caption>
<thead>
<tr>
- <th
+ <!--? th
lang="en"
xml:lang="en"
dir="ltr"
title="Audience Identifier"
>
ID
- </th>
+ </th -->
<th
lang="en"
xml:lang="en"
@@ -106,9 +106,9 @@
lang="en"
xml:lang="en"
dir="ltr"
- title="Audience Label"
+ title="Audience Title"
>
- Label
+ Title
</th>
<th
lang="en"
@@ -125,11 +125,11 @@
<tr
petal:repeat="audience self/audiences"
>
- <td
+ <!--? td
petal:content="audience/id"
>
1
- </td>
+ </td -->
<td
petal:content="audience/name"
>
@@ -143,7 +143,7 @@
<td>
<a
href="#"
- title="Edit Label"
+ title="Edit Title"
petal:attributes="href string:${audience_mod/uri}?id=${audience/id}; title string:Edit ${audience/label}"
petal:content="string:Edit ${audience/id}"
>Edit</a>
@@ -151,7 +151,7 @@
<td>
<a
href="#"
- title="Delete Label"
+ title="Delete Title"
petal:attributes="href string:${audience_del/uri}?id=${audience/id}; title string:Delete ${audience/label}"
petal:content="string:Delete ${audience/id}"
>Delete</a>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/admin/audience_modify/Attic/en.html,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -Ltemplates/admin/audience_modify/en.html -Ltemplates/admin/audience_modify/en.html -u -r1.1.2.16 -r1.1.2.17
--- templates/admin/audience_modify/en.html
+++ templates/admin/audience_modify/en.html
@@ -69,10 +69,10 @@
The
<em
petal:content="self/audience/name"
- >ID</em> audience now has the label
+ >ID</em> audience now has the title
<strong
petal:content="self/audience/label"
- >Label</strong>, if you wish to
+ >Label</strong>, if you wish to
modify another audience you can select it from
<a
href="#"
@@ -88,7 +88,7 @@
align="left"
petal:attributes="align align"
>
- You can use the following form to amend the label of the audience.
+ You can use the following form to amend the title of the audience.
</p>
@@ -129,18 +129,18 @@
<em
class="help"
>
- The audience identifier cannot be edited.
+ The audience name cannot be edited.
</em>
<label
for="name"
lang="en"
xml:lang="en"
dir="ltr"
- >Audience Identifier</label>
+ >Name</label>
<br />
<strong
petal:content="self/audience/name"
- >ID</strong>
+ >Name</strong>
</p>
<p
@@ -153,7 +153,7 @@
<em
class="help"
>
- The label for the audience field is the name that will be visible when users and editors
+ The title for the audience field is the name that will be visible when users and editors
select audiences.
</em>
<label
@@ -161,7 +161,7 @@
lang="en"
xml:lang="en"
dir="ltr"
- >Audience Label</label>
+ >Title</label>
<br />
<input
type="text"
More information about the MKDoc-commit
mailing list