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

[duncan at codespeak.net]

Author: duncan
Date: Wed Jan 30 11:18:06 2008
New Revision: 51120

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/sample-kupu-customisation-policy.py
   kupu/trunk/kupu/plone/plonelibrarytool.py
   kupu/trunk/kupu/plone/profiles/default/kupu.xml
Log:
Plone ticket 7713 Kupu browser "Home" link goes to Plone root and not content root.
Added suggested patch (but with fallback to portal_url for backwards compatability.


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 Jan 30 11:18:06 2008
@@ -88,9 +88,9 @@
 LIBRARIES = (
     dict(id="root",
          title="string:Home",
-         uri="string:${portal_url}",
-         src="string:${portal_url}/kupucollection.xml",
-         icon="string:${portal_url}/misc_/CMFPlone/plone_icon"),
+         uri="string:${globals_view/navigationRootUrl|portal_url}",
+         src="string:${globals_view/navigationRootUrl|portal_url}/kupucollection.xml",
+         icon="string:${globals_view/navigationRootUrl|portal_url}/misc_/CMFPlone/plone_icon"),
     dict(id="current",
          title="string:Current folder",
          uri="string:${folder_url}",

Modified: kupu/trunk/kupu/plone/plonelibrarytool.py
==============================================================================
--- kupu/trunk/kupu/plone/plonelibrarytool.py	(original)
+++ kupu/trunk/kupu/plone/plonelibrarytool.py	Wed Jan 30 11:18:06 2008
@@ -52,9 +52,9 @@
 _default_libraries = (
     dict(id="root",
          title="string:Home",
-         uri="string:${portal_url}",
-         src="string:${portal_url}/kupucollection.xml",
-         icon="string:${portal_url}/misc_/CMFPlone/plone_icon"),
+         uri="string:${globals_view/navigationRootUrl|portal_url}",
+         src="string:${globals_view/navigationRootUrl|portal_url}/kupucollection.xml",
+         icon="string:${globals_view/navigationRootUrl|portal_url}/misc_/CMFPlone/plone_icon"),
     dict(id="current",
          title="string:Current folder",
          uri="string:${folder_url}",

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 Jan 30 11:18:06 2008
@@ -28,9 +28,9 @@
     <filterstyle>list-style-type</filterstyle>
     <filterstyle>float</filterstyle>
   </config>
-  <library src="string:${portal_url}/kupucollection.xml"
-           uri="string:${portal_url}" id="root"
-           icon="string:${portal_url}/misc_/CMFPlone/plone_icon"
+  <library src="string:${globals_view/navigationRootUrl|portal_url}/kupucollection.xml"
+           uri="string:${globals_view/navigationRootUrl|portal_url}" id="root"
+           icon="string:${globals_view/navigationRootUrl|portal_url}/misc_/CMFPlone/plone_icon"
            title="string:Home">
   </library>
   <library src="string:${folder_url}/kupucollection.xml"