[kupu-checkins] r43482 - in kupu/trunk/kupu: doc plone plone/kupu_plone_layer

[duncan at codespeak.net]

Author: duncan
Date: Fri May 18 15:47:41 2007
New Revision: 43482

Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/body.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
Log:
Plone ticket 5420: "Edit with kupu" broken for fields on custom fieldset
https://dev.plone.org/plone/ticket/5420

Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Fri May 18 15:47:41 2007
@@ -20,6 +20,8 @@
     <br> tags are left unchanged (so those people who insist on using
     the to generate whitespace still can).
 
+  - Plone tickets: 5420
+
 - 1.4 Beta 6
 
   - Removed the getToolByName deprecation workround since

Modified: kupu/trunk/kupu/plone/body.kupu
==============================================================================
--- kupu/trunk/kupu/plone/body.kupu	(original)
+++ kupu/trunk/kupu/plone/body.kupu	Fri May 18 15:47:41 2007
@@ -69,7 +69,8 @@
         tal:attributes="style python:test(floated, 'float:left;;', '');"
       ><span class="discreet"><a class="forcekupu" href="#"
         i18n:translate="suppress-kupu"
-        tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName};"
+        tal:define="fs fieldset|nothing;fs python:test(fs,'&amp;fieldset=%s'%fs,None);"
+        tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName}${fs};"
         title="reload current page without kupu">
          Edit without visual editor
       </a></span>
@@ -86,7 +87,8 @@
         <span class="discreet"><a class="forcekupu" href="#"
            i18n:translate="force-kupu"
            tal:condition="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=context.REQUEST, context=context, fieldName=fieldName)"
-           tal:attributes="href string:${request/URL0}?kupu.convert=${fieldName};"
+           tal:define="fs fieldset|nothing;fs python:test(fs,'&amp;fieldset=%s'%fs,None);"
+           tal:attributes="href string:${request/URL0}?kupu.convert=${fieldName}${fs};"
            title="reload current page using kupu to edit this field">
            Edit with visual editor
         </a></span>

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	Fri May 18 15:47:41 2007
@@ -21,7 +21,7 @@
     <!--$Id: wire.kupu 25247 2006-04-03 11:23:02Z fschulze $-->
     <!--$Id: head.kupu 34332 2006-11-07 14:50:40Z duncan $-->
     <!--$Id: xmlconfig.kupu 35367 2006-12-06 09:06:21Z duncan $-->
-    <!--$Id: body.kupu 42388 2007-04-28 10:29:22Z limi $-->
+    <!--$Id: body.kupu 43479 2007-05-18 13:02:42Z duncan $-->
     <!--$Id: toolbar.kupu 35491 2006-12-08 15:41:49Z duncan $-->
     <!--$Id save.kupu (not yet in svn) $-->
     <!--$Id: drawers.kupu 35477 2006-12-08 13:20:38Z duncan $-->
@@ -447,7 +447,7 @@
     </textarea>
     </div>
   
-    <div class="kupuoverride" tal:condition="python:exists('kupu_content') and len(kupu_content)==0" tal:define="floated widget/allow_file_upload | python:1;" tal:attributes="style python:test(floated, 'float:left;;', '');"><span class="discreet"><a class="forcekupu" href="#" i18n:translate="suppress-kupu" tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName};" title="reload current page without kupu">
+    <div class="kupuoverride" tal:condition="python:exists('kupu_content') and len(kupu_content)==0" tal:define="floated widget/allow_file_upload | python:1;" tal:attributes="style python:test(floated, 'float:left;;', '');"><span class="discreet"><a class="forcekupu" href="#" i18n:translate="suppress-kupu" tal:define="fs fieldset|nothing;fs python:test(fs,'&amp;fieldset=%s'%fs,None);" tal:attributes="href string:${request/URL0}?kupu.suppress=${fieldName}${fs};" title="reload current page without kupu">
          Edit without visual editor
       </a></span>
     </div>
@@ -471,7 +471,7 @@
   
     <tal:archetypes tal:condition="fieldName|nothing">
       <div class="kupuoverride" tal:condition="python:path('widget/allow_format_edit|python:True') and not path('kupu_convert_message_generated|nothing')" tal:define="floated widget/allow_file_upload | python:1;" tal:attributes="style python:test(floated, 'float:left;;', '');">
-        <span class="discreet"><a class="forcekupu" href="#" i18n:translate="force-kupu" tal:condition="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=context.REQUEST, context=context, fieldName=fieldName)" tal:attributes="href string:${request/URL0}?kupu.convert=${fieldName};" title="reload current page using kupu to edit this field">
+        <span class="discreet"><a class="forcekupu" href="#" i18n:translate="force-kupu" tal:condition="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=context.REQUEST, context=context, fieldName=fieldName)" tal:define="fs fieldset|nothing;fs python:test(fs,'&amp;fieldset=%s'%fs,None);" tal:attributes="href string:${request/URL0}?kupu.convert=${fieldName}${fs};" title="reload current page using kupu to edit this field">
            Edit with visual editor
         </a></span>
       </div>