[MKDoc-commit] Various half completed updates to the formating of the events listings.

chris at mkdoc.demon.co.uk chris at mkdoc.demon.co.uk
Wed Mar 30 11:56:14 BST 2005


Log Message:
-----------
Various half completed updates to the formating of the events listings.

Tags:
----
mkdoc-1-6

Modified Files:
--------------
    mkd/templates/component/headlines/anon:
        en.html

Added Files:
-----------
    mkd/templates/component/headlines/anon/documents:
        en.html
    mkd/templates/component/headlines/anon/events:
        en.html

-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/component/headlines/anon/Attic/en.html,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -Ltemplates/component/headlines/anon/en.html -Ltemplates/component/headlines/anon/en.html -u -r1.1.2.2 -r1.1.2.3
--- templates/component/headlines/anon/en.html
+++ templates/component/headlines/anon/en.html
@@ -11,113 +11,21 @@
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   petal:condition="false: self/is_user_logged_in"
 >
-  <h2 
-    xml:lang="en"
-    lang="en"
-    dir="ltr"
-    petal:condition="true: self/title"
-    petal:attributes="xml:lang lang; lang lang; dir dir;"
-    petal:content="self/title"
-  >Headlines Title</h2>
 
-  <dl>
-
-    <!--? Generate upcoming events style headlines -->
+    <!--? Upcoming events style headlines -->
     <div 
       petal:condition="true: self/mode_is_upcoming"
-      petal:repeat="row self/default_headlines" 
       petal:omit-tag=""
     >
-      <dt 
-        class="event"
-        petal:define="headline row/document; timerange row/timerange;"
-      >
-        <a
-            href="#"
-            hreflang="en"
-            lang="en"
-            xml:lang="en"
-            dir="ltr"
-            petal:attributes="href headline/uri; 
-                              hreflang headline/lang; 
-                              lang headline/lang; 
-                              xml:lang headline/lang; 
-                              dir headline/direction;"
-            petal:content="headline/title"
-          >Title of the document</a>
-      </dt>
-      <dd
-        class="event"
-      > 
-        <span
-          lang="en"
-          xml:lang="en"
-          dir="ltr"
-          petal:attributes="lang headline/lang; 
-                            xml:lang headline/lang; 
-                            dir headline/direction;"
-          petal:content="timerange/title"
-        >
-          A description of the event.
-        </span>
-      </dd>
-      <dd
-        class="event"
-      >
-        <span
-          metal:use-macro="/macros/timerange/#simple"
-          class="mkdoc-date"
-        >
-          10:11am to 5:10pm Monday December 18 2005
-        </span>
-      </dd>
+    <?include file="./events/"?>
     </div>
 
-
-    <!--? Generate newest documents style headlines -->
+    <!--? Newest documents style headlines -->
     <div 
       petal:condition="true: self/mode_is_newest"
-      petal:repeat="headline self/default_headlines" 
       petal:omit-tag=""
     >
-      <dt
-        class="document"
-      >
-        <a
-            href="#"
-            hreflang="en"
-            lang="en"
-            xml:lang="en"
-            dir="ltr"
-            petal:attributes="href headline/uri; 
-                              hreflang headline/lang; 
-                              lang headline/lang; 
-                              xml:lang headline/lang; 
-                              dir headline/direction;"
-            petal:content="headline/title"
-          >Title of the document</a>
-      </dt>
-      <dd
-        class="document"
-      > 
-        <span
-          lang="en"
-          xml:lang="en"
-          dir="ltr"
-          petal:attributes="lang headline/lang; 
-                            xml:lang headline/lang; 
-                            dir headline/direction;"
-          petal:content="headline/description"
-        >
-          A description of the document.
-        </span>
-          <br />
-          <small petal:content="headline/date_created"> 
-            01-03-2005 
-          </small>
-      </dd>
+    <?include file="./documents/"?>
     </div>
 
-  </dl>
-
 </div>
--- /dev/null
+++ templates/component/headlines/anon/documents/en.html
@@ -0,0 +1,71 @@
+<!--?
+
+
+This template is used for rendering the headlines component in documents
+for anon users. 
+
+?-->
+<div
+  class="headlines"
+  xmlns:petal="http://purl.org/petal/1.0/"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  petal:condition="false: self/is_user_logged_in;
+                   true: self/mode_is_newest"
+>
+  <h2 
+    xml:lang="en"
+    lang="en"
+    dir="ltr"
+    petal:condition="true: self/title"
+    petal:attributes="xml:lang lang; lang lang; dir dir;"
+    petal:content="self/title"
+  >Headlines Title</h2>
+
+  <dl>
+
+    <!--? Generate newest documents style headlines -->
+    <div 
+      petal:repeat="headline self/default_headlines" 
+      petal:omit-tag=""
+    >
+      <dt
+        class="document"
+      >
+        <a
+            href="#"
+            hreflang="en"
+            lang="en"
+            xml:lang="en"
+            dir="ltr"
+            petal:attributes="href headline/uri; 
+                              hreflang headline/lang; 
+                              lang headline/lang; 
+                              xml:lang headline/lang; 
+                              dir headline/direction;"
+            petal:content="headline/title"
+          >Title of the document</a>
+      </dt>
+      <dd
+        class="document"
+      > 
+        <span
+          lang="en"
+          xml:lang="en"
+          dir="ltr"
+          petal:attributes="lang headline/lang; 
+                            xml:lang headline/lang; 
+                            dir headline/direction;"
+          petal:content="headline/description"
+        >
+          A description of the document.
+        </span>
+          <br />
+          <small petal:content="headline/date_created"> 
+            01-03-2005 
+          </small>
+      </dd>
+    </div>
+
+  </dl>
+
+</div>
--- /dev/null
+++ templates/component/headlines/anon/events/en.html
@@ -0,0 +1,90 @@
+<!--?
+
+
+This template is used for rendering the headlines component in documents
+for anon users in events mode. 
+
+?-->
+<div
+  class="headlines"
+  xmlns:petal="http://purl.org/petal/1.0/"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  petal:condition="false: self/is_user_logged_in;
+                   true: self/mode_is_upcoming"
+>
+  <h2 
+    petal:condition="true: self/title"
+    petal:content="self/title"
+  >Headlines Title</h2>
+
+  <dl>
+
+    <!--? Generate upcoming events style headlines -->
+    <div 
+      petal:repeat="row self/default_headlines" 
+      petal:omit-tag=""
+    >
+      <dt 
+        class="event"
+        petal:define="headline row/document; 
+                      timerange row/timerange;"
+      >
+        <a
+            href="#"
+            hreflang="en"
+            lang="en"
+            xml:lang="en"
+            dir="ltr"
+            petal:attributes="href headline/uri; 
+                              hreflang headline/lang; 
+                              lang headline/lang; 
+                              xml:lang headline/lang; 
+                              title headline/description"
+            petal:content="headline/title"
+          >Title of the document</a>
+         <bdo
+           dir="ltr"
+           petal:attributes="self/direction"
+         >:</bdo>
+         <span
+            lang="en"
+            xml:lang="en"
+            dir="ltr"
+            petal:attributes="href headline/uri; 
+                              lang headline/lang; 
+                              xml:lang headline/lang" 
+            petal:content="timerange/title"
+          >Title of the event</span>
+      </dt>
+<!--? Document description
+      <dd
+        class="event"
+      > 
+        <span
+          lang="en"
+          xml:lang="en"
+          dir="ltr"
+          petal:attributes="lang headline/lang; 
+                            xml:lang headline/lang; 
+                            dir headline/direction;"
+          petal:content="headline/description"
+        >
+          Description of the document.
+        </span>
+      </dd>
+?-->
+      <dd
+        class="event"
+      >
+        <span
+          metal:use-macro="/macros/timerange/#simple"
+          class="mkdoc-date"
+        >
+          10:11am to 5:10pm Monday December 18 2005
+        </span>
+      </dd>
+    </div>
+
+  </dl>
+
+</div>


More information about the MKDoc-commit mailing list