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

List:       kupu-checkins
Subject:    [kupu-checkins] r30521 - in kupu/trunk/kupu: common
From:       duncan () codespeak ! net
Date:       2006-07-25 12:50:20
Message-ID: 20060725125020.88F6E100A0 () code0 ! codespeak ! net
[Download RAW message or body]

Author: duncan
Date: Tue Jul 25 14:50:18 2006
New Revision: 30521

Modified:
   kupu/trunk/kupu/common/kupucontentfilters.js
   kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
   kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js
Log:
Slightly different approach to links containing 'portal_factory'.
alt attribute is no always present in an img tag, even when empty.

Modified: kupu/trunk/kupu/common/kupucontentfilters.js
==============================================================================
--- kupu/trunk/kupu/common/kupucontentfilters.js	(original)
+++ kupu/trunk/kupu/common/kupucontentfilters.js	Tue Jul 25 14:50:18 2006
@@ -513,6 +513,10 @@
                 }
             }
         }
+        this.alt = function(name, htmlnode, xhtmlnode) {
+            var val = htmlnode.getAttribute(name);
+            if (val || xhtmlnode.tagName=='img') xhtmlnode.setAttribute(name, val);
+        }
         this.rowspan = this.colspan = function(name, htmlnode, xhtmlnode) {
             var val = htmlnode.getAttribute(name);
             if (val && val != '1') xhtmlnode.setAttribute(name, val);

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/emptypage.pt	Tue Jul 25 14:50:18 2006
@@ -12,8 +12,8 @@
     <link rel="stylesheet" type="text/css" href="#" tal:attributes="href \
string:${here/portal_url}/ploneCustom.css" />  </tal:plone20>
     <base href="emptypage"
-        tal:define="folderish here/isPrincipiaFolderish; hereid here/getId|nothing;
-          tail python:test(folderish or hereid=='portal_factory', '/', '');"
+        tal:define="folderish here/isPrincipiaFolderish;
+          tail python:test(folderish, '/', '');"
         tal:attributes="href string:${request/URL1}${tail}" />
   </head>
   <body class="kupu documentContent">

Modified: kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/kupuploneeditor.js	Tue Jul 25 14:50:18 \
2006 @@ -45,7 +45,7 @@
                    urlparts[common]==hrefparts[common])
                 common++;
             var last = urlparts[common];
-            if (common+1 == urlparts.length && last=='emptypage') {
+            if (common+1 == urlparts.length && \
(last=='emptypage'||last=='portal_factory')) {  urlparts[common] = '';
             }
             // The base and the url have 'common' parts in common.


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

Configure | About | News | Add a list | Sponsored by KoreLogic