[MKDoc-commit] [1.6] Switch component list from auto-generated to templated

[bruno at mkdoc.demon.co.uk]

Log Message:
-----------
[1.6] Switch component list from auto-generated to templated

Tags:
----
mkdoc-1-6

Modified Files:
--------------
    mkd/flo:
        Editor.pm
    mkd/templates/editor/box:
        en.html

-------------- next part --------------
Index: Editor.pm
===================================================================
RCS file: /var/spool/cvs/mkd/flo/Editor.pm,v
retrieving revision 1.12.2.40
retrieving revision 1.12.2.41
diff -Lflo/Editor.pm -Lflo/Editor.pm -u -r1.12.2.40 -r1.12.2.41
--- flo/Editor.pm
+++ flo/Editor.pm
@@ -684,7 +684,7 @@
     foreach (sort keys %{$pam})
     {
 	my $type = $pam->{$_};
-	push @add, { label => $type, name => BLOCK . "_" . $next_id . "_" . $type };
+	push @add, { label => $type, name => BLOCK . "_" . $next_id . "_" . $type, type => {$type => 1}};
     }
     
     # build the add component box
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/editor/box/Attic/en.html,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Ltemplates/editor/box/en.html -Ltemplates/editor/box/en.html -u -r1.1.2.4 -r1.1.2.5
--- templates/editor/box/en.html
+++ templates/editor/box/en.html
@@ -65,15 +65,137 @@
         can't think of how else to do this...
       ?-->
       <span
-        petal:omit-tag="string:1"
+        petal:omit-tag=""
         petal:repeat="option option_list"
       >
         <option
           value="foo"
+          petal:condition="option/type/text"
           petal:attributes="value option/name"
-          petal:content="option/label"
-        >Foo Component</option>
+        >Simple Text</option>
       </span>
+
+      <span
+        petal:omit-tag=""
+        petal:repeat="option option_list"
+      >
+        <option
+          value="foo"
+          petal:condition="option/type/link"
+          petal:attributes="value option/name"
+        >Link</option>
+      </span>
+
+      <span
+        petal:omit-tag=""
+        petal:repeat="option option_list"
+      >
+        <option
+          value="foo"
+          petal:condition="option/type/image"
+          petal:attributes="value option/name"
+        >Embedded Image</option>
+      </span>
+
+      <span
+        petal:omit-tag=""
+        petal:repeat="option option_list"
+      >
+        <option
+          value="foo"
+          petal:condition="option/type/file"
+          petal:attributes="value option/name"
+        >File Attachment</option>
+      </span>
+
+      <span
+        petal:omit-tag=""
+        petal:repeat="option option_list"
+      >
+        <option
+          value="foo"
+          petal:condition="option/type/timerange"
+          petal:attributes="value option/name"
+        >Time Range</option>
+      </span>
+
+      <span
+        petal:omit-tag=""
+        petal:repeat="option option_list"
+      >
+        <option
+          value="foo"
+          petal:condition="option/type/photo"
+          petal:attributes="value option/name"
+        >Album Photo</option>
+      </span>
+
+      <span
+        petal:omit-tag=""
+        petal:repeat="option option_list"
+      >
+        <option
+          value="foo"
+          petal:condition="option/type/headlines"
+          petal:attributes="value option/name"
+        >News/Events Listing</option>
+      </span>
+
+      <span
+        petal:omit-tag=""
+        petal:repeat="option option_list"
+      >
+        <option
+          value="foo"
+          petal:condition="option/type/rss"
+          petal:attributes="value option/name"
+        >External RSS Headlines</option>
+      </span>
+
+      <span
+        petal:omit-tag=""
+        petal:repeat="option option_list"
+      >
+        <option
+          value="foo"
+          petal:condition="option/type/price"
+          petal:attributes="value option/name"
+        >Price</option>
+      </span>
+
+      <span
+        petal:omit-tag=""
+        petal:repeat="option option_list"
+      >
+        <option
+          value="foo"
+          petal:condition="option/type/html"
+          petal:attributes="value option/name"
+        >HTML</option>
+      </span>
+
+      <span
+        petal:omit-tag=""
+        petal:repeat="option option_list"
+      >
+        <option
+          value="foo"
+          petal:condition="option/type/poll"
+          petal:attributes="value option/name"
+        >User Poll</option>
+      </span>
+
+      <span
+        petal:omit-tag=""
+        petal:repeat="option option_list"
+      >
+        <option
+          value="foo"
+          petal:condition="option/type/discussion"
+          petal:attributes="value option/name"
+        >User Discussion</option>
+      </span>
+
     </select>
 
     <input