From hannosch at codespeak.net  Fri Nov 13 20:18:58 2009
From: hannosch at codespeak.net (hannosch at codespeak.net)
Date: Fri, 13 Nov 2009 20:18:58 +0100 (CET)
Subject: [kupu-checkins] r69271 - in kupu/trunk/kupu: doc plone plone/tests
	plone/tests/input plone/tests/output
Message-ID: <20091113191858.E1F6F168026@codespeak.net>

Author: hannosch
Date: Fri Nov 13 20:18:58 2009
New Revision: 69271

Added:
   kupu/trunk/kupu/plone/tests/input/imagemap.in   (contents, props changed)
   kupu/trunk/kupu/plone/tests/output/imagemap.out   (contents, props changed)
Modified:
   kupu/trunk/kupu/doc/CHANGES.txt
   kupu/trunk/kupu/plone/config.py
   kupu/trunk/kupu/plone/tests/kuputestcase.py
   kupu/trunk/kupu/plone/tests/test_html2captioned.py
Log:
Kupu didn't not transform resolveuid to friendly url in area tags (Plone ticket 9402).


Modified: kupu/trunk/kupu/doc/CHANGES.txt
==============================================================================
--- kupu/trunk/kupu/doc/CHANGES.txt	(original)
+++ kupu/trunk/kupu/doc/CHANGES.txt	Fri Nov 13 20:18:58 2009
@@ -4,6 +4,9 @@
 
 - 1.4.16
 
+  - Kupu didn't not transform resolveuid to friendly url in area tags
+    (Plone ticket 9402).
+
   - Updated getWysiwygmacros to respect Plone 4's default_editor property.
 
   - Remove Kupu from the available editors list on uninstall.

Modified: kupu/trunk/kupu/plone/config.py
==============================================================================
--- kupu/trunk/kupu/plone/config.py	(original)
+++ kupu/trunk/kupu/plone/config.py	Fri Nov 13 20:18:58 2009
@@ -18,5 +18,5 @@
 #    url: the url containing the uid (stops after the uid: any
 #    trailing part such as '/image_thumb' is not included.
 #    uid: the uid itself.
-UID_PATTERN = re.compile('(?P<tag><(?:a|img|object|param)\\s[^>]*(?:src|href|data|value)\s*=\s*")(?P<url>[^"]*resolveuid/(?P<uid>[^/"#? ]*))', re.DOTALL | re.IGNORECASE)
+UID_PATTERN = re.compile('(?P<tag><(?:a|area|img|object|param)\\s[^>]*(?:src|href|data|value)\s*=\s*")(?P<url>[^"]*resolveuid/(?P<uid>[^/"#? ]*))', re.DOTALL | re.IGNORECASE)
 

Added: kupu/trunk/kupu/plone/tests/input/imagemap.in
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/tests/input/imagemap.in	Fri Nov 13 20:18:58 2009
@@ -0,0 +1,8 @@
+<div>Ensure links in image map area tags are transformed</div>
+<p>
+<img class="image-left" alt="image map" src="resolveuid/104ede98d4c7c8eaeaa3b984f7395979" usemap="#the_map"  />
+<map id="the_map" name="the_map">
+<area alt="alpha" shape="rect" coords="1,2,3,4" href="resolveuid/828cfdd7e4ee51e223d0ae0672412633" />
+<area alt="beta" shape="rect" coords="1,2,3,4" href="resolveuid/f0249e0f3f2ff915d707e9d64a3e3621" />
+</map>
+</p>
\ No newline at end of file

Modified: kupu/trunk/kupu/plone/tests/kuputestcase.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/kuputestcase.py	(original)
+++ kupu/trunk/kupu/plone/tests/kuputestcase.py	Fri Nov 13 20:18:58 2009
@@ -97,8 +97,16 @@
         self.loginPortalOwner()
         f = self.create('folder', 'Folder')
 
-        for id in ('alpha', 'beta'):
-            self.create(id, 'Document', f, subject=['aspidistra'])
+        self.create('alpha', 'Document', f, subject=['aspidistra'])
+        alpha = f.alpha
+        # The dcoument needs a fixed uid for the transform tests.
+        alpha._setUID('828cfdd7e4ee51e223d0ae0672412633')
+        
+        self.create('beta', 'Document', f, subject=['aspidistra'])
+        beta = f.beta
+        # The dcoument needs a fixed uid for the transform tests.
+        beta._setUID('f0249e0f3f2ff915d707e9d64a3e3621')
+        
         self.create('gamma', 'Image', f)
         gamma = f.gamma
         gamma.setImage(open(join(PREFIX,'image.jpg'),'rb').read())

Added: kupu/trunk/kupu/plone/tests/output/imagemap.out
==============================================================================
--- (empty file)
+++ kupu/trunk/kupu/plone/tests/output/imagemap.out	Fri Nov 13 20:18:58 2009
@@ -0,0 +1,8 @@
+<div>Ensure links in image map area tags are transformed</div>
+<p>
+ <img class="image-left" alt="image map" src="/plone/folder/gamma" usemap="#the_map"  />
+ <map id="the_map" name="the_map">
+  <area alt="alpha" shape="rect" coords="1,2,3,4" href="/plone/folder/alpha" />
+  <area alt="beta" shape="rect" coords="1,2,3,4" href="/plone/folder/beta" />
+ </map>
+</p>
\ No newline at end of file

Modified: kupu/trunk/kupu/plone/tests/test_html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/tests/test_html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/tests/test_html2captioned.py	Fri Nov 13 20:18:58 2009
@@ -32,6 +32,7 @@
 ('Products.kupu.plone.html2captioned', "linked.in", "linked.out", normalize_html, 0),
 ('Products.kupu.plone.html2captioned', "umlauts.in", "umlauts.out", normalize_html, 0),
 ('Products.kupu.plone.html2captioned', "umlauts2.in", "umlauts2.out", normalize_html, 0),
+('Products.kupu.plone.html2captioned', "imagemap.in", "imagemap.out", normalize_html, 0),
     )
 
 class TransformTest(KupuTestCase):

From davisagli at codespeak.net  Tue Nov 17 05:57:51 2009
From: davisagli at codespeak.net (davisagli at codespeak.net)
Date: Tue, 17 Nov 2009 05:57:51 +0100 (CET)
Subject: [kupu-checkins] r69328 - kupu/trunk/kupu/plone/profiles/default
Message-ID: <20091117045751.8C6C5168045@codespeak.net>

Author: davisagli
Date: Tue Nov 17 05:57:49 2009
New Revision: 69328

Modified:
   kupu/trunk/kupu/plone/profiles/default/cssregistry.xml
Log:
don't explicitly place before ploneCustom.css ... this happens automatically anyway, and specifying it breaks if ploneCustom.css is not in the registry (such as during initial creation of the site before the theme products are installed)

Modified: kupu/trunk/kupu/plone/profiles/default/cssregistry.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/cssregistry.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/cssregistry.xml	Tue Nov 17 05:57:49 2009
@@ -3,16 +3,13 @@
  <stylesheet title="" cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupustyles.css" media="" rel="stylesheet" rendering="link"
-    insert-before="ploneCustom.css" />
+    id="kupustyles.css" media="" rel="stylesheet" rendering="link" />
  <stylesheet title="" cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupuplone.css" media="" rel="stylesheet" rendering="link"
-    insert-before="ploneCustom.css" />
+    id="kupuplone.css" media="" rel="stylesheet" rendering="link" />
  <stylesheet title="" cacheable="True" compression="safe" cookable="True"
     enabled="True"
     expression="python:portal.kupu_library_tool.isKupuEnabled(REQUEST=request)"
-    id="kupudrawerstyles.css" media="" rel="stylesheet" rendering="link"
-    insert-before="ploneCustom.css" />
+    id="kupudrawerstyles.css" media="" rel="stylesheet" rendering="link" />
 </object>

From duncan at codespeak.net  Thu Nov 19 16:15:08 2009
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 19 Nov 2009 16:15:08 +0100 (CET)
Subject: [kupu-checkins] r69449 - in kupu/trunk/kupu: .
	plone/kupu_plone_layer plone/profiles/default
Message-ID: <20091119151508.68AD9168024@codespeak.net>

Author: duncan
Date: Thu Nov 19 16:15:06 2009
New Revision: 69449

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/kupu_wysiwyg_support.html
   kupu/trunk/kupu/plone/profiles/default/metadata.xml
   kupu/trunk/kupu/version.txt
Log:
Preparing for 1.4.16

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	Thu Nov 19 16:15:06 2009
@@ -21,8 +21,8 @@
     <!--$Id: include.kupu 39202 2007-02-19 12:06:45Z duncan $-->
     <!--$Id: wire.kupu 45669 2007-08-15 10:47:27Z duncan $-->
     <!--$Id: head.kupu 44831 2007-07-07 19:01:27Z duncan $-->
-    <!--$Id: xmlconfig.kupu 65893 2009-06-23 19:32:14Z ldr $-->
-    <!--$Id: body.kupu 52814 2008-03-21 16:37:00Z duncan $-->
+    <!--$Id: xmlconfig.kupu 66540 2009-07-23 14:37:24Z dannyb $-->
+    <!--$Id: body.kupu 66130 2009-07-06 17:19:28Z duncan $-->
     <!--$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 $-->
@@ -34,10 +34,9 @@
     <div xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:tal="http://xml.zope.org/namespaces/tal" metal:define-macro="wysiwygEditorBox" id="kupu-editor" tal:define="name fieldName|inputname;                 editorid string:kupu-editor-${name}" tal:attributes="id editorid">
      <tal:usekupu define="fname fieldName|inputname|nothing;                   usekupu python:here.contentUsesKupu(fname);">
       <div tal:condition="usekupu">
-
+        
     <div id="kupu-editor-config-escaped" style="display: none;" tal:attributes="id string:kupu-editor-${fname}-config-escaped" tal:define="field field|nothing;      kupu_base_override kupu_base_override|nothing;      config python:context.kupu_xmlconfig(field=field, kupu_base_override=kupu_base_override);      pss modules/Products/PythonScripts/standard" tal:content="python:pss.url_quote(config)"/>
     <div id="kupu-editor-config" tal:attributes="id string:kupu-editor-${fname}-config" style="display: none;"> </div>
-        
   
     <div class="kupu-fulleditor">
       

Modified: kupu/trunk/kupu/plone/profiles/default/metadata.xml
==============================================================================
--- kupu/trunk/kupu/plone/profiles/default/metadata.xml	(original)
+++ kupu/trunk/kupu/plone/profiles/default/metadata.xml	Thu Nov 19 16:15:06 2009
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>1.4.15</version>
+  <version>1.4.16</version>
 </metadata>

Modified: kupu/trunk/kupu/version.txt
==============================================================================
--- kupu/trunk/kupu/version.txt	(original)
+++ kupu/trunk/kupu/version.txt	Thu Nov 19 16:15:06 2009
@@ -1 +1,2 @@
-kupu 1.4.15
+kupu 1.4.16
+

From duncan at codespeak.net  Thu Nov 19 16:19:06 2009
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 19 Nov 2009 16:19:06 +0100 (CET)
Subject: [kupu-checkins] r69450 - kupu/tag/kupu-1.4.16
Message-ID: <20091119151906.59EC8168026@codespeak.net>

Author: duncan
Date: Thu Nov 19 16:19:05 2009
New Revision: 69450

Added:
   kupu/tag/kupu-1.4.16/   (props changed)
      - copied from r69449, kupu/trunk/kupu/
Log:
Branch for new release

From duncan at codespeak.net  Thu Nov 19 16:23:51 2009
From: duncan at codespeak.net (duncan at codespeak.net)
Date: Thu, 19 Nov 2009 16:23:51 +0100 (CET)
Subject: [kupu-checkins] r69451 - kupu/tag/Products.kupu-1.4.16
Message-ID: <20091119152351.8120F168073@codespeak.net>

Author: duncan
Date: Thu Nov 19 16:23:50 2009
New Revision: 69451

Added:
   kupu/tag/Products.kupu-1.4.16/
      - copied from r69450, kupu/trunk/Products.kupu/
Log:
Branch for new egg release

From kupu-checkins at codespeak.net  Thu Nov 26 06:23:08 2009
From: kupu-checkins at codespeak.net (VIAGRA Store (c tm))
Date: Thu, 26 Nov 2009 06:23:08 +0100 (CET)
Subject: [kupu-checkins] Personal 75% OFF to kupu-checkins@codespeak.net.
	Pfizer.
Message-ID: <20091126052308.CA07C1683BB@codespeak.net>

An HTML attachment was scrubbed...
URL: http://codespeak.net/pipermail/kupu-checkins/attachments/20091126/1349ec9f/attachment.htm