[kupu-checkins] r39185 - in kupu/trunk/kupu/plone: . kupu_plone_layer profiles/default

[duncan at codespeak.net]

Author: duncan
Date: Sun Feb 18 20:45:42 2007
New Revision: 39185

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js
   kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
Log:
Remove spurious br tags

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html	Sun Feb 18 20:45:42 2007
@@ -125,7 +125,9 @@
     <span class="kupu-tb-buttongroup" style="float: right" id="kupu-zoom" tal:condition="filter/zoom">
       <button type="button" class="kupu-zoom" id="kupu-zoom-button" i18n:attributes="title" title="Zoom: Access key (Alt or Ctrl) + X" accesskey="x">&#160;</button>
     </span>
-  
+
+    <button type="button" class="kupu-save" name="azax-save"
+	   value="Save">&#160;</button>
     <span class="kupu-tb-buttongroup" id="kupu-bg-basicmarkup" tal:condition="filter/bg-basicmarkup">
       <button type="button" class="kupu-bold" id="kupu-bold-button" title="Bold: Access key (Alt or Ctrl) + B" tal:condition="filter/bold-button" i18n:attributes="title" accesskey="b">&#160;</button>
       <button type="button" class="kupu-italic" id="kupu-italic-button" title="Italic: Access key (Alt or Ctrl) + I" tal:condition="filter/italic-button" i18n:attributes="title" accesskey="i">&#160;</button>

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml	Sun Feb 18 20:45:42 2007
@@ -181,7 +181,7 @@
 button.kupu-logo {background-image: url("&dtml-portal_url;/kupuimages/kupu_icon.gif");}
 .kupu-outdent {background-image: url("&dtml-portal_url;/plonekupuimages/outdent.gif");}
 .kupu-redo {background-image: url("&dtml-portal_url;/plonekupuimages/redo.gif");}
-.kupu-save {background-image: url("&dtml-portal_url;/plonekupuimages/save.png");}
+.kupu-save {background-image: url("&dtml-portal_url;/kupuimages/save.png");}
 .kupu-save-and-exit {background-image: url("&dtml-portal_url;/kupuimages/exit.gif");}
 .kupu-space {background-image: url("&dtml-portal_url;/plonekupuimages/space.gif");}
 .kupu-source {background-image: url("&dtml-portal_url;/plonekupuimages/view-source.gif");}

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js	Sun Feb 18 20:45:42 2007
@@ -76,8 +76,8 @@
     // Remove empty links
     contents = contents.replace(/<a\s+href="[^"]*"\s*>\s*<\/a>/g, '');
     // Fixup empty paras.
-    contents = contents.replace(/<p[^>]*>\s*<\/p>(<br \/>)*/g, '<p$1><br /></p>').strip();
-    return contents;
+    contents = contents.replace(/<p[^>]*>\s*<\/p>(<br \/>)*/g, '<p$1>&#160;</p>').strip();
+    return contents;	
 };
 
 KupuEditor.prototype.saveDataToField = function(form, field) {

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py	Sun Feb 18 20:45:42 2007
@@ -21,7 +21,7 @@
     )
 
 EXCLUDED_HTML = [
-  {'tags': ('center','tt','big','small','s','strike','basefont','font',),
+  {'tags': ('center','tt','big','small','basefont','font',),
    'attributes':(),
    'keep': 1 },
   

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Sun Feb 18 20:45:42 2007
@@ -75,7 +75,7 @@
 
 # Tidy up html by exlcluding lots of things.
 _excluded_html = [
-  (('center', 'tt', 'big', 'small', 's', 'strike', 'basefont', 'font'), ()),
+  (('center', 'tt', 'big', 'small', 'basefont', 'font'), ()),
   ((), ('dir','lang','valign','halign','border','frame','rules','cellspacing','cellpadding','bgcolor')),
   (('table','th','td'),('width','height')),
 ]

Modified: kupu/trunk/kupu/plone/profiles/default/kupu.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/kupu.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/kupu.xml	Sun Feb 18 20:45:42 2007
@@ -17,7 +17,7 @@
     <style>Even row|tr|even</style>
     <style>Heading cell|th|</style>
     <filter attributes=""
-            tags="center tt big small s strike basefont font"/>
+            tags="center tt big small basefont font"/>
     <filter attributes="dir lang valign halign border frame rules cellspacing cellpadding bgcolor"
             tags=""/>
     <filter attributes="width height" tags="table th td"/>