[MKDoc-commit] Title encoding bug fixes

Wed Apr 20 16:34:32 BST 2005

Log Message:
-----------
Title encoding bug fixes

Modified Files:
--------------
    mkd/resources/templates/admin/content:
        en.html
    mkd/resources/templates/editor/html:
        en.html
    mkd/resources/templates/macros/document/head:
        en.html
    mkd/resources/templates/photo:
        en.html

-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/admin/content/en.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lresources/templates/admin/content/en.html -Lresources/templates/admin/content/en.html -u -r1.10 -r1.11

--- resources/templates/admin/content/en.html
+++ resources/templates/admin/content/en.html
@@ -109,30 +109,38 @@
                         title    self/parent/title"
       petal:condition="true: self/parent"
     />
+
+<!--? tinyMCE http://tinymce.moxiecode.com/ ?-->
+<script 
+  language="javascript" 
+  type="text/javascript" 
+  src="/.jscripts/tiny_mce/tiny_mce.js"
+  petal:condition="true: self/components --html"
+></script>
+<!--? the language for the editor interface can be set here, using this:
+
+  language : "${self/lang}"
+
+However if the document lang is en-gb this will not match en...
+
+?-->
+<script 
+  language="javascript" 
+  type="text/javascript"
+  petal:condition="true: self/components --html"
+>
+   tinyMCE.init({
+      mode : "specific_textareas",
+      language : "${self/lang}"
+   });
+</script>
+<!--? /tinyMCE ?-->
+
+
   </head>
 
-  <body
-    onload="init();"
-  >
-
-    <!-- This loads the WYSIWYG editor for the HTML Component -->
-    <script 
-      type="text/javascript" 
-      src="/.resources/xeditor.js"
-    ></script>
-    <script 
-      type="text/javascript" 
-      petal:condition="true: self; 
-                       true: self/components --html"
-    >
-      // call this at body.onload:
-      function init() {
-        use_lang ('${self/language}');
-        <?for name="element self/components --html"?>
-        make_wysiwyg ('${element/block_name}');
-        <?end?>
-      }
-    </script>
+  <body>
+
 
 
     <!--? Admin Fragment ?-->
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/editor/html/en.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -Lresources/templates/editor/html/en.html -Lresources/templates/editor/html/en.html -u -r1.9 -r1.10
--- resources/templates/editor/html/en.html
+++ resources/templates/editor/html/en.html
@@ -165,7 +165,7 @@
         rows="12"
         cols="45"
         title="Enter HTML code here."
-        style="width: 85%"
+        mce_editable="true"
         petal:attributes="name self/block_name; 
                           id   self/block_name"
         petal:content="self/data" 
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/macros/document/head/en.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lresources/templates/macros/document/head/en.html -Lresources/templates/macros/document/head/en.html -u -r1.14 -r1.15
--- resources/templates/macros/document/head/en.html
+++ resources/templates/macros/document/head/en.html
@@ -24,7 +24,7 @@
   i18n:domain="mkdoc"
 >
   <title 
-      petal:content="structure string:${self/parent_alternate_title}${self/title}"
+      petal:content="structure string:${self/parent_alternate_title}; string:${self/title}"
   >
     Root Document : Foo : Bar : Baz
   </title>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/resources/templates/photo/en.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lresources/templates/photo/en.html -Lresources/templates/photo/en.html -u -r1.12 -r1.13
--- resources/templates/photo/en.html
+++ resources/templates/photo/en.html
@@ -29,7 +29,7 @@
     profile="http://dublincore.org/documents/dcq-html/"
   >
     <title
-      petal:content="string:${self/parent_alternate_title}${self/component/title}"
+      petal:content="structure string:${self/parent_alternate_title}; string:${self/component/title}"
     >
       Root Document : Parent Document : Photo Title
     </title>
