[kupu-checkins] r35480 - kupu/trunk/kupu/plone

[duncan at codespeak.net]

Author: duncan
Date: Fri Dec  8 14:46:22 2006
New Revision: 35480

Modified:
   kupu/trunk/kupu/plone/helpers.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/zmi_toolbar.pt
Log:
Added buttons to the toolbar tab.

Modified: kupu/trunk/kupu/plone/helpers.py
==============================================================================
--- kupu/trunk/kupu/plone/helpers.py	(original)
+++ kupu/trunk/kupu/plone/helpers.py	Fri Dec  8 14:46:22 2006
@@ -9,43 +9,43 @@
 ##############################################################################
 # Helper classes
 FILTERS = [
-    ('bg-basicmarkup', 'Bold/Italic group', True),
-    ('bold-button', 'Bold button', True),
-    ('italic-button', 'Italic button', True),
-    ('bg-subsuper', 'Subscript/Superscript group', True),
-    ('subscript-button', 'Subscript button', True),
-    ('superscript-button', 'Superscript button', True),
-    ('bg-justify', 'Justify group', True),
-    ('justifyleft-button', 'Justify left button', True),
-    ('justifycenter-button', 'Justify center button', True),
-    ('justifyright-button', 'Justify right button', True),
-    ('bg-list', 'List group', True),
-    ('list-ol-addbutton', 'Add ordered list button', True),
-    ('list-ul-addbutton', 'Add unordered list button', True),
-    ('definitionlist', 'Definition list', True),
-    ('bg-indent', 'Indent group', True),
-    ('outdent-button', 'Outdent button', True),
-    ('indent-button', 'Indent button', True),
-    ('bg-drawers', 'Drawers group', True),
-    ('imagelibdrawer-button', 'Image drawer button', True),
-    ('linklibdrawer-button', 'Link drawer button', True),
-    ('linkdrawer-button', 'External link drawer button', True),
-    ('anchors-button', 'Anchor drawer button', True),
-    ('tabledrawer-button', 'Table drawer button', True),
-    ('bg-remove', 'Remove group', True),
-    ('removeimage-button', 'Remove image button', True),
-    ('removelink-button', 'Remove link button', True),
-    ('bg-undo', 'Undo group', True),
-    ('undo-button', 'Undo button', True),
-    ('redo-button', 'Redo button', True),
-    ('spellchecker', 'Spellchecker', False),
-    ('source', 'Source', True),
-    ('styles', 'Styles pulldown', True),
-    ('ulstyles', 'Unordered list style pulldown', True),
-    ('olstyles', 'Ordered list style pulldown', True),
-    ('zoom', 'Zoom button', True),
+    ('bg-basicmarkup', 'Bold/Italic group', True, None),
+    ('bold-button', 'Bold button', True, 'kupu-bold'),
+    ('italic-button', 'Italic button', True, 'kupu-italic'),
+    ('bg-subsuper', 'Subscript/Superscript group', True, None),
+    ('subscript-button', 'Subscript button', True, 'kupu-subscript'),
+    ('superscript-button', 'Superscript button', True, 'kupu-superscript'),
+    ('bg-justify', 'Justify group', True, None),
+    ('justifyleft-button', 'Justify left button', True, 'kupu-justifyleft'),
+    ('justifycenter-button', 'Justify center button', True, 'kupu-justifycenter'),
+    ('justifyright-button', 'Justify right button', True, 'kupu-justifyright'),
+    ('bg-list', 'List group', True, None),
+    ('list-ol-addbutton', 'Add ordered list button', True, 'kupu-insertorderedlist'),
+    ('list-ul-addbutton', 'Add unordered list button', True, 'kupu-insertunorderedlist'),
+    ('definitionlist', 'Definition list', True, 'kupu-insertdefinitionlist'),
+    ('bg-indent', 'Indent group', True, None),
+    ('outdent-button', 'Outdent button', True, 'kupu-outdent'),
+    ('indent-button', 'Indent button', True, 'kupu-indent'),
+    ('bg-drawers', 'Drawers group', True, None),
+    ('imagelibdrawer-button', 'Image drawer button', True, 'kupu-image'),
+    ('linklibdrawer-button', 'Link drawer button', True, 'kupu-inthyperlink'),
+    ('linkdrawer-button', 'External link drawer button', True, 'kupu-exthyperlink'),
+    ('anchors-button', 'Anchor drawer button', True, 'kupu-anchors'),
+    ('tabledrawer-button', 'Table drawer button', True, 'kupu-table'),
+    ('bg-remove', 'Remove group', True, None),
+    ('removeimage-button', 'Remove image button', True, 'kupu-removeimage'),
+    ('removelink-button', 'Remove link button', True, 'kupu-removelink'),
+    ('bg-undo', 'Undo group', True, None),
+    ('undo-button', 'Undo button', True, 'kupu-undo'),
+    ('redo-button', 'Redo button', True, 'kupu-redo'),
+    ('spellchecker', 'Spellchecker', False, ''),
+    ('source', 'Source', True, 'kupu-source'),
+    ('styles', 'Styles pulldown', True, None),
+    ('ulstyles', 'Unordered list style pulldown', True, None),
+    ('olstyles', 'Ordered list style pulldown', True, None),
+    ('zoom', 'Zoom button', True, 'kupu-zoom'),
 ]
-FILTERDICT = dict([(k,v) for (k,title,v) in FILTERS])
+FILTERDICT = dict([(k,v) for (k,title,v,cl) in FILTERS])
 
 class ButtonFilter:
     """Helper class to control visibility of buttons.

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Fri Dec  8 14:46:22 2006
@@ -192,13 +192,13 @@
         filters = helpers.FILTERS
         config = self._getToolbarFilterOptions()
         res = []
-        for (id, title, default) in filters:
+        for (id, title, default, klass) in filters:
             cfg = config.get(id, {})
             visible = cfg.get('visible', default)
             expr = cfg.get('override', None)
             if expr is not None:
                 expr = expr.text
-            res.append(dict(id=id, title=title, visible=visible, override=expr))
+            res.append(dict(id=id, title=title, visible=visible, override=expr, classname=klass))
         return res
 
     security.declareProtected(permissions.ManageLibraries, "set_toolbar_filters")

Modified: kupu/trunk/kupu/plone/zmi_toolbar.pt
==============================================================================
--- kupu/trunk/kupu/plone/zmi_toolbar.pt	(original)
+++ kupu/trunk/kupu/plone/zmi_toolbar.pt	Fri Dec  8 14:46:22 2006
@@ -34,6 +34,7 @@
 
           <table class="listing nosort">
             <thead>
+              <th></th>
               <th>Id</th>
               <th>Title</th>
               <th>Visible<br/>
@@ -43,9 +44,13 @@
               </th>
               <th>Expression</th>
             </thead>
-            <tbody>
+            <tbody class="kupu-tb-buttons">
               <tr tal:repeat="opt context/getFilterOptions">
-                <td><span tal:content="opt/id" />
+                <td><button tal:condition="opt/classname"
+                  tal:attributes="class opt/classname">&#160;</button>
+                </td>
+                <td>
+                  <span tal:content="opt/id" />
                   <input type="hidden" name="filters.id:records" tal:attributes="value opt/id" />
                 </td>
                 <td tal:content="opt/title">