[MKDoc-commit] Audiences categories added
chris at mkdoc.demon.co.uk
chris at mkdoc.demon.co.uk
Thu Feb 3 11:23:00 GMT 2005
Log Message:
-----------
Audiences categories added
Tags:
----
mkdoc-1-6
Modified Files:
--------------
mkd/skin:
admin.css
mkd/templates/admin/properties:
en.html
mkd/templates/admin/properties/audiences:
en.html
mkd/templates/admin/new:
en.html
-------------- next part --------------
Index: admin.css
===================================================================
RCS file: /var/spool/cvs/mkd/skin/Attic/admin.css,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -Lskin/admin.css -Lskin/admin.css -u -r1.1.2.13 -r1.1.2.14
--- skin/admin.css
+++ skin/admin.css
@@ -81,11 +81,15 @@
margin-top: 1em;
margin-bottom: 1em;
padding: 0.6em;
- border: 0;
+ border: 0em;
clear: both;
}
+div.admin-content fieldset fieldset {
+ border: 1px solid #000;
+}
div.admin-content legend {
font-size: larger;
+ clear: both;
}
div.admin-content p {
margin: 0.4em;
@@ -123,10 +127,12 @@
color: #000;
background: #C99;
}
+/*
.optional-metadata {
color: #000;
background: #F9C;
}
+*/
.properties {
color: #000;
background: #FC9;
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/admin/properties/Attic/en.html,v
retrieving revision 1.7.2.24
retrieving revision 1.7.2.25
diff -Ltemplates/admin/properties/en.html -Ltemplates/admin/properties/en.html -u -r1.7.2.24 -r1.7.2.25
--- templates/admin/properties/en.html
+++ templates/admin/properties/en.html
@@ -98,7 +98,7 @@
align="left"
petal:attributes="align align"
>
- All fields in this section of the form and mandatory
+ All fields in this section of the form are mandatory
</p>
<p
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/admin/properties/audiences/Attic/en.html,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Ltemplates/admin/properties/audiences/en.html -Ltemplates/admin/properties/audiences/en.html -u -r1.1.2.1 -r1.1.2.2
--- templates/admin/properties/audiences/en.html
+++ templates/admin/properties/audiences/en.html
@@ -21,9 +21,9 @@
align="left"
petal:attributes="align align"
>
- The audience metadata in this section of the form is optional.
+ You may optionally select all the audiences that will be interested in this document.
</p>
-
+<!--?
<p
lang="en"
xml:lang="en"
@@ -31,11 +31,6 @@
align="left"
petal:attributes="align align"
>
- <em
- class="help"
- >
- Select all the audiences that will be interested in this document.
- </em>
<span
class="input-checkbox"
petal:repeat="audience self/audiences"
@@ -62,5 +57,69 @@
>Cats</label>
</span>
</p>
-
- </fieldset>
+?-->
+ <div
+ petal:repeat="category self/audience_categories"
+ petal:omit-tag=""
+ >
+
+ <p
+ petal:repeat="audience self/audiences_by_category --$category"
+ petal:condition="false: category"
+ >
+ <input
+ type="checkbox"
+ name="audience"
+ id="audience-cats"
+ value="12"
+ class="input-checkbox"
+ title="Add $audience/label to this documents audience."
+ petal:attributes="id string:audience-$audience/id;
+ value audience/id;
+ checked audience/checked;"
+ />
+ <label
+ for="audience-cats"
+ lang="en"
+ xml:lang="en"
+ dir="ltr"
+ petal:attributes="for string:audience-$audience/id"
+ petal:inner="audience/short_label"
+ >Cats</label>
+ </p>
+
+ <fieldset
+ petal:condition="true: category"
+ >
+ <legend
+ petal:content="category"
+ >
+ Category
+ </legend>
+ <p
+ petal:repeat="audience self/audiences_by_category --$category"
+ >
+ <input
+ type="checkbox"
+ name="audience"
+ id="audience-cats"
+ value="12"
+ class="input-checkbox"
+ title="Add $audience/label to this documents audience."
+ petal:attributes="id string:audience-$audience/id;
+ value audience/id;
+ checked audience/checked;"
+ />
+ <label
+ for="audience-cats"
+ lang="en"
+ xml:lang="en"
+ dir="ltr"
+ petal:attributes="for string:audience-$audience/id"
+ petal:inner="audience/short_label"
+ >Cats</label>
+ </p>
+ </fieldset>
+ </div>
+
+</fieldset>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/admin/new/Attic/en.html,v
retrieving revision 1.10.2.15
retrieving revision 1.10.2.16
diff -Ltemplates/admin/new/en.html -Ltemplates/admin/new/en.html -u -r1.10.2.15 -r1.10.2.16
--- templates/admin/new/en.html
+++ templates/admin/new/en.html
@@ -238,68 +238,9 @@
</select>
</p>
</fieldset>
-
- <fieldset
- class="audience"
- >
- <legend
- lang="en"
- xml:lang="en"
- dir="ltr"
- align="left"
- petal:attributes="align align"
- >Audience Metadata</legend>
-
- <p
- lang="en"
- xml:lang="en"
- dir="ltr"
- align="left"
- petal:attributes="align align"
- >
- The audience metadata in this section of the form is optional.
- </p>
-
- <p
- lang="en"
- xml:lang="en"
- dir="ltr"
- align="left"
- petal:attributes="align align"
- >
- <em
- class="help"
- >
- Select all the audiences that will be interested in this document.
- </em>
- <span
- class="input-checkbox"
- petal:repeat="audience self/audiences"
- >
- <br />
- <input
- type="checkbox"
- name="audience"
- id="audience-cats"
- value="12"
- class="input-checkbox"
- title="Add $audience/label to this documents audience."
- petal:attributes="id string:audience-$audience/id;
- value audience/id;
- checked audience/checked"
- />
- <label
- for="audience-cats"
- lang="en"
- xml:lang="en"
- dir="ltr"
- petal:attributes="for string:audience-$audience/id"
- petal:inner="audience/label"
- >Cats</label>
- </span>
- </p>
-
- </fieldset>
+
+ <!--? The audiences are in a seperate file ?-->
+ <?include file="/admin/properties/audiences/"?>
<fieldset
class="optional-metadata"
More information about the MKDoc-commit
mailing list