[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kupu-checkins
Subject:    [kupu-checkins] r14903 - in kupu/trunk/kupu/plone: .
From:       duncan () codespeak ! net
Date:       2005-07-22 9:56:11
Message-ID: 20050722095611.13E4727B90 () code1 ! codespeak ! net
[Download RAW message or body]

Author: duncan
Date: Fri Jul 22 11:56:09 2005
New Revision: 14903

Modified:
   kupu/trunk/kupu/plone/body.kupu
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuplone.css.dtml
   kupu/trunk/kupu/plone/wire.kupu
   kupu/trunk/kupu/plone/wysiwyg_support.kupu
Log:
Moved 'force kupu' link to below textarea instead of above.
Added a 'suppress kupu' link, but only when the field is entirely empty.
Float both left if there is a file upload box so they appear on the same line.

Turned both links into 'features' so that their position or indeed presence may be \
more easily controlled.


Modified: kupu/trunk/kupu/plone/body.kupu
==============================================================================
--- kupu/trunk/kupu/plone/body.kupu	(original)
+++ kupu/trunk/kupu/plone/body.kupu	Fri Jul 22 11:56:09 2005
@@ -4,6 +4,7 @@
     xmlns="http://www.w3.org/1999/xhtml"
     xmlns:kupu="http://kupu.oscom.org/namespaces/dist"
     xmlns:tal="http://xml.zope.org/namespaces/tal"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
     >
   <kupu:id>$Id$</kupu:id>
   <kupu:part name="editorframe"><script type="text/javascript">var focuscount = \
0;</script> @@ -59,4 +60,35 @@
     </textarea>
   </kupu:part>
 
+  <kupu:part name="suppress-kupu">
+    <div class="kupuoverride"
+        tal:condition="python:len(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">
+         edit without using Kupu
+      </a></span>
+    </div>
+  </kupu:part>
+
+  <kupu:part name="force-kupu">
+    <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)"
 +           tal:attributes="href string:${request/URL0}?kupu.convert=${fieldName};"
+           title="reload current page using kupu to edit this field">
+           edit with Kupu
+        </a></span>
+      </div>
+    </tal:archetypes>
+  </kupu:part>
 </kupu:feature>

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	Fri Jul 22 11:56:09 \
2005 @@ -203,6 +203,9 @@
   background-color: &dtml-contentViewBackgroundColor;;
 }
 
+div.kupuoverride {
+    margin-left: 0.75em;
+}
 .forcekupu {
     background: transparent url(kupuimages/kupu_icon.gif) 5px 2px no-repeat;
     padding: 6px 6px 1px 30px;

Modified: kupu/trunk/kupu/plone/wire.kupu
==============================================================================
--- kupu/trunk/kupu/plone/wire.kupu	(original)
+++ kupu/trunk/kupu/plone/wire.kupu	Fri Jul 22 11:56:09 2005
@@ -22,6 +22,7 @@
     <!-- insert styles even if kupu is disabled -->
     <kupu:insert-part feature="head" part="styles" />
     <kupu:insert-part feature="wysiwyg_support" part="textarea" />
+    <kupu:insert-part feature="body" part="force-kupu" />
   </kupu:fill-slot>
 
   <kupu:fill-slot name="fulleditor">
@@ -40,6 +41,7 @@
     <kupu:insert-part feature="toolboxes" part="toolboxes" />
     <kupu:insert-part feature="colorchooser" part="colorchooser" />
     <kupu:insert-part feature="body" part="editorframe" />
+    <kupu:insert-part feature="body" part="suppress-kupu" />
   </kupu:fill-slot>
 
 </kupu:wire>

Modified: kupu/trunk/kupu/plone/wysiwyg_support.kupu
==============================================================================
--- kupu/trunk/kupu/plone/wysiwyg_support.kupu	(original)
+++ kupu/trunk/kupu/plone/wysiwyg_support.kupu	Fri Jul 22 11:56:09 2005
@@ -39,17 +39,6 @@
   </kupu:part>
 
   <kupu:part name="textarea">
-    <tal:archetypes tal:condition="fieldName|nothing">
-      <div 
-        tal:condition="python:path('widget/allow_format_edit|python:True') and not \
                path('kupu_convert_message_generated|nothing')">
-        <a class="forcekupu" href="#"
-           tal:condition="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=context.REQUEST)"
                
-           tal:attributes="href string:${request/URL0}?kupu.convert=${fieldName};"
-           title="reload current page using kupu to edit this field">
-           edit with Kupu
-        </a>
-      </div>
-    </tal:archetypes>
     <textarea
         cols="80"
         rows="25"


[prev in list] [next in list] [prev in thread] [next in thread]