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

duncan at codespeak.net duncan at codespeak.net
Wed Aug 15 12:47:28 CEST 2007 

Author: duncan
Date: Wed Aug 15 12:47:27 2007
New Revision: 45669

Modified:
   kupu/trunk/kupu/default/drawers.kupu
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/helpers.py
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
   kupu/trunk/kupu/plone/wire.kupu
   kupu/trunk/kupu/version.txt
Log:
  Limi asked for some last minute changes for Plone 3:

  - Embed doesn't work out of the box in Plone 3, so shouldn't be shown
    by default (it will only lead to a lot of user frustration).

  - The anchor/table of contents generation is done differently in Plone
    3, so should be off by default (turning on buttons is easy in Kupu
    now).

  - Insert image/link should default to current folder instead of
    Recent, since the Upload button isn't visible if not (which is the
    most common use case)

  - Place the delete link/image button after the pulldown (so it doesn't
    push around the toolbar elements)

Modified: kupu/trunk/kupu/default/drawers.kupu
==============================================================================
--- kupu/trunk/kupu/default/drawers.kupu	(original)
+++ kupu/trunk/kupu/default/drawers.kupu	Wed Aug 15 12:47:27 2007
@@ -5,6 +5,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
     xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    xmlns:tal="http://xml.zope.org/namespaces/tal"
     i18n:domain="kupu"
     >
   <kupu:id>$Id$</kupu:id>
@@ -57,7 +58,8 @@
          <ul class="kupu-tabs">
             <li class="kupu-linkdrawer-addlink selected"><a href="#"
             i18n:translate="tab_link">Link to url</a></li>
-            <li class="kupu-linkdrawer-embed"><a href="#"
+            <li class="kupu-linkdrawer-embed"
+                tal:condition="filter/embed-tab|nothing"><a href="#"
             i18n:translate="tab_embed">Embed external object</a></li>
          </ul>
          <table class="kupu-tabbed">
@@ -289,9 +291,11 @@
          <ul class="kupu-tabs">
             <li class="kupu-ins-bm selected"><a href="#"
             i18n:translate="tab_link_anchor">Link to anchor</a></li>
-            <li class="kupu-anchor"><a href="#"
+            <li class="kupu-anchor"
+                tal:condition="filter/manage-anchors-tab"><a href="#"
             i18n:translate="tab_manage_anchors">Manage Anchors</a></li>
-            <li class="kupu-toc"><a href="#" i18n:translate="tab_toc">Table of contents</a></li>
+            <li class="kupu-toc"
+                tal:condition="filter/toc-tab|nothing"><a href="#" i18n:translate="tab_toc">Table of contents</a></li>
          </ul>
         <table class="kupu-tabbed">
           <tr>

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Wed Aug 15 12:47:27 2007
@@ -2,6 +2,24 @@
 Kupu changes
 ============
 
+- 1.4.1
+
+  Limi asked for some last minute changes for Plone 3:
+
+  - Embed doesn't work out of the box in Plone 3, so shouldn't be shown
+    by default (it will only lead to a lot of user frustration).
+
+  - The anchor/table of contents generation is done differently in Plone
+    3, so should be off by default (turning on buttons is easy in Kupu
+    now).
+
+  - Insert image/link should default to current folder instead of
+    Recent, since the Upload button isn't visible if not (which is the
+    most common use case)
+
+  - Place the delete link/image button after the pulldown (so it doesn't
+    push around the toolbar elements)
+
 - 1.4
 
   - The icons in the toolbar for Plone now use CSS sprites. This means that

Modified: kupu/trunk/kupu/plone/helpers.py
==============================================================================
--- kupu/trunk/kupu/plone/helpers.py	(original)
+++ kupu/trunk/kupu/plone/helpers.py	Wed Aug 15 12:47:27 2007
@@ -35,7 +35,10 @@
     ('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'),
+    ('embed-tab', 'Embed tab in External link drawer', False, None),
     ('anchors-button', 'Anchor drawer button', True, 'kupu-anchors'),
+    ('manage-anchors-tab', 'Manage Anchors tab in anchor drawer', True, None),
+    ('toc-tab', 'Table of Contents in anchor drawer', False, None),
     ('tabledrawer-button', 'Table drawer button', True, 'kupu-table'),
     ('bg-remove', 'Remove group', True, None),
     ('removeimage-button', 'Remove image button', True, 'kupu-removeimage'),

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	Wed Aug 15 12:47:27 2007
@@ -22,7 +22,7 @@
     <!--$Id: head.kupu 44831 2007-07-07 19:01:27Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
     <!--$Id: body.kupu 45298 2007-07-24 10:38:54Z duncan $-->
-    <!--$Id: toolbar.kupu 45493 2007-08-05 06:38:47Z limi $-->
+    <!--$Id: toolbar.kupu 45621 2007-08-13 12:26:50Z duncan $-->
     <!--$Id save.kupu (not yet in svn) $-->
     <!--$Id: drawers.kupu 44538 2007-06-26 10:46:28Z duncan $-->
     <!--$Id: beforeunload.kupu 14546 2005-07-12 14:35:55Z duncan $-->
@@ -176,11 +176,6 @@
       <button type="button" class="kupu-table" tal:condition="filter/tabledrawer-button" id="kupu-tabledrawer-button" title="Insert table" i18n:attributes="title title_insert_table;">&#160;</button>
     </span>
   
-    <span class="kupu-tb-buttongroup" id="kupu-bg-remove" tal:condition="filter/bg-remove">
-      <button type="button" class="kupu-removeimage invisible" tal:condition="filter/removeimage-button" id="kupu-removeimage-button" title="Remove image" i18n:attributes="title title_removeimage;">&#160;</button>
-      <button type="button" class="kupu-removelink invisible" tal:condition="filter/removelink-button" id="kupu-removelink-button" title="Remove link" i18n:attributes="title title_removelink;">&#160;</button>
-    </span>
-  
     <span class="kupu-tb-buttongroup" id="kupu-bg-undo" tal:condition="filter/bg-undo">
       <button type="button" class="kupu-undo" tal:condition="filter/undo-button" id="kupu-undo-button" title="Undo: Access key (Alt or Ctrl) + Z" i18n:attributes="title title_undo;" accesskey="z">&#160;</button>
       <button type="button" class="kupu-redo" tal:condition="filter/redo-button" id="kupu-redo-button" title="Redo: Access key (Alt or Ctrl) + Y" i18n:attributes="title title_redo;" accesskey="y">&#160;</button>
@@ -201,6 +196,11 @@
       </tal:block>
     </select>
   
+    <span class="kupu-tb-buttongroup" id="kupu-bg-remove" tal:condition="filter/bg-remove">
+      <button type="button" class="kupu-removeimage invisible" tal:condition="filter/removeimage-button" id="kupu-removeimage-button" title="Remove image" i18n:attributes="title title_removeimage;">&#160;</button>
+      <button type="button" class="kupu-removelink invisible" tal:condition="filter/removelink-button" id="kupu-removelink-button" title="Remove link" i18n:attributes="title title_removelink;">&#160;</button>
+    </span>
+  
     </span>
   
     <select id="kupu-ulstyles" class="kupu-ulstyles" tal:condition="filter/ulstyles">
@@ -229,7 +229,7 @@
       <div id="kupu-linkdrawer-addlink" class="kupu-panels kupu-linkdrawer-addlink">
          <ul class="kupu-tabs">
             <li class="kupu-linkdrawer-addlink selected"><a href="#" i18n:translate="tab_link">Link to url</a></li>
-            <li class="kupu-linkdrawer-embed"><a href="#" i18n:translate="tab_embed">Embed external object</a></li>
+            <li class="kupu-linkdrawer-embed" tal:condition="filter/embed-tab|nothing"><a href="#" i18n:translate="tab_embed">Embed external object</a></li>
          </ul>
          <table class="kupu-tabbed">
             <tbody class="kupu-addlink">
@@ -401,8 +401,8 @@
       <div class="kupu-panels kupu-ins-bm">
          <ul class="kupu-tabs">
             <li class="kupu-ins-bm selected"><a href="#" i18n:translate="tab_link_anchor">Link to anchor</a></li>
-            <li class="kupu-anchor"><a href="#" i18n:translate="tab_manage_anchors">Manage Anchors</a></li>
-            <li class="kupu-toc"><a href="#" i18n:translate="tab_toc">Table of contents</a></li>
+            <li class="kupu-anchor" tal:condition="filter/manage-anchors-tab"><a href="#" i18n:translate="tab_manage_anchors">Manage Anchors</a></li>
+            <li class="kupu-toc" tal:condition="filter/toc-tab|nothing"><a href="#" i18n:translate="tab_toc">Table of contents</a></li>
          </ul>
         <table class="kupu-tabbed">
           <tr>

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	Wed Aug 15 12:47:27 2007
@@ -107,7 +107,7 @@
          src="string:${portal_url}/kupurecentitems.xml",
          icon="string:${portal_url}/kupuimages/kupusearch_icon.gif")
     )
-DEFAULT_LIBRARY = 'myitems'
+DEFAULT_LIBRARY = 'current'
 
 INSTALL_BEFOREUNLOAD = False
 LINKBYUID = False

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	Wed Aug 15 12:47:27 2007
@@ -47,7 +47,7 @@
            icon="string:${portal_url}/kupuimages/kupusearch_icon.gif"
            title="string:Recent items">
   </library>
-  <defaultlibrary>myitems</defaultlibrary>
+  <defaultlibrary>current</defaultlibrary>
   <resource id="collection" mode="whitelist">
     <type>Plone Site</type>
     <type>Large Plone Folder</type>

Modified: kupu/trunk/kupu/plone/wire.kupu
==============================================================================
--- kupu/trunk/kupu/plone/wire.kupu	(original)
+++ kupu/trunk/kupu/plone/wire.kupu	Wed Aug 15 12:47:27 2007
@@ -56,11 +56,11 @@
     <kupu:insert-part feature="toolbar" part="buttongroup-definitionlist" />
     <kupu:insert-part feature="toolbar" part="buttongroup-indent" />
     <kupu:insert-part feature="drawers" part="buttons" />
-    <kupu:insert-part feature="toolbar" part="buttongroup-remove" />
     <kupu:insert-part feature="toolbar" part="buttongroup-undo" />
     <kupu:insert-part feature="spellchecker" part="buttons" />
     <kupu:insert-part feature="sourceedit" part="buttons" />
     <kupu:insert-part feature="toolbar" part="select-styles" />
+    <kupu:insert-part feature="toolbar" part="buttongroup-remove" />
   </kupu:fill-slot>
 
 

Modified: kupu/trunk/kupu/version.txt
==============================================================================
--- kupu/trunk/kupu/version.txt	(original)
+++ kupu/trunk/kupu/version.txt	Wed Aug 15 12:47:27 2007
@@ -1 +1 @@
-kupu 1.4
+kupu 1.4.1

More information about the kupu-checkins mailing list