From 4e088e46e30f2ddfd4a71d751fdafb7cf3e2dfde Mon Sep 17 00:00:00 2001
From: Johannes Raggam <thetetet@gmail.com>
Date: Fri, 11 Mar 2016 13:55:15 +0100
Subject: [PATCH 1/2] Use ``getSite()`` instead of portal url Change base URLs
 from portal URL to what getSite returns, but don't change the theming
 controlpanel context binding. This allows for more flexibility when
 configuring it to be allowed on a sub site with a local registry.

---
 CHANGES.rst                                   |  4 ++-
 src/plone/app/theming/browser/controlpanel.pt | 13 +++++----
 src/plone/app/theming/browser/controlpanel.py | 28 +++++++++----------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 4a849cb0..d2600af7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,7 +10,9 @@ Incompatibilities:
 
 New:
 
-- *add item here*
+- Change base URLs from portal URL to what getSite returns, but don't change the theming controlpanel context binding.
+  This allows for more flexibility when configuring it to be allowed on a sub site with a local registry.
+  [thet]
 
 Fixes:
 
diff --git a/src/plone/app/theming/browser/controlpanel.pt b/src/plone/app/theming/browser/controlpanel.pt
index f1e7b6a9..7f1c45fe 100644
--- a/src/plone/app/theming/browser/controlpanel.pt
+++ b/src/plone/app/theming/browser/controlpanel.pt
@@ -12,7 +12,8 @@
           view nocall:view | nocall: plone_view;
           portal_url portal_state/portal_url;
           ajax_load python:False;
-          dummy python: request.set('disable_toolbar', True);"
+          dummy python: request.set('disable_toolbar', True);
+          site_url view/site_url"
       tal:attributes="lang lang;">
 
     <metal:cache tal:replace="structure provider:plone.httpheaders" />
@@ -72,9 +73,9 @@
                 i18n:translate="heading_theme_settings">Theme settings</h1>
 
             <a id="setup-link" class="link-parent"
-                tal:attributes="href string:${context/portal_url}/@@overview-controlpanel"
-                i18n:translate="label_up_to_plone_setup">
-                    Up to Site Setup
+                tal:attributes="href string:$site_url/@@overview-controlpanel"
+                i18n:translate="">
+              Site Setup
             </a>
           </header>
 
@@ -100,12 +101,12 @@
                 data-pat-plone-modal="width: 80%"
                 i18n:translate="">Upload Zip file</a>
 
-            <a tal:attributes="href string:${context/portal_url}/test_rendering#top"
+            <a tal:attributes="href string:$site_url/test_rendering#top"
                 class="plone-btn plone-btn-large plone-btn-primary"
                 target="_blank"
                 i18n:translate="">Test Styles</a>
 
-            <a tal:attributes="href string:${context/portal_url}/@@theming-controlpanel-help"
+            <a tal:attributes="href string:$site_url/@@theming-controlpanel-help"
                 class="plone-btn plone-btn-large plone-btn-primary pat-plone-modal"
                 data-pat-plone-modal="
                     width: 85%;
diff --git a/src/plone/app/theming/browser/controlpanel.py b/src/plone/app/theming/browser/controlpanel.py
index 46cd766a..4bf8798e 100644
--- a/src/plone/app/theming/browser/controlpanel.py
+++ b/src/plone/app/theming/browser/controlpanel.py
@@ -24,6 +24,7 @@
 from plone.resource.utils import queryResourceDirectory
 from zope.component import getMultiAdapter
 from zope.component import getUtility
+from zope.component.hooks import getSite
 from zope.publisher.browser import BrowserView
 from zope.schema.interfaces import IVocabularyFactory
 import logging
@@ -40,6 +41,13 @@ def authorize(context, request):
 
 class ThemingControlpanel(BrowserView):
 
+    @property
+    def site_url(self):
+        """Return the absolute URL to the current site, which is likely not
+        necessarily the portal root.
+        """
+        return getSite().absolute_url()
+
     def __call__(self):
         self.pskin = getToolByName(self.context, 'portal_skins')
 
@@ -102,10 +110,7 @@ def update(self):
 
         if 'form.button.Cancel' in form:
             IStatusMessage(self.request).add(_(u"Changes cancelled"))
-
-            portalUrl = getToolByName(self.context, 'portal_url')()
-            self.redirect("{0:s}/@@overview-controlpanel".format(portalUrl))
-
+            self.redirect("{0}/@@overview-controlpanel".format(self.site_url))
             return False
 
         if 'form.button.Enable' in form:
@@ -310,10 +315,9 @@ def update(self):
                     self.theme_settings.enabled = True
 
             if not self.errors:
-                portalUrl = getToolByName(self.context, 'portal_url')()
                 self.redirect(
                     "{0}/++theme++{1}/@@theming-controlpanel-mapper".format(
-                        portalUrl,
+                        self.site_url,
                         themeData.__name__
                     )
                 )
@@ -366,10 +370,9 @@ def update(self):
                     applyTheme(themeData)
                     self.theme_settings.enabled = True
 
-                portalUrl = getToolByName(self.context, 'portal_url')()
                 self.redirect(
                     "{0}/++theme++{1}/@@theming-controlpanel-mapper".format(
-                        portalUrl,
+                        self.site_url,
                         name
                     )
                 )
@@ -414,9 +417,7 @@ def themeList(self):
         themes = []
         zodbNames = [t.__name__ for t in self.zodbThemes]
 
-        portalUrl = getToolByName(self.context, 'portal_url')()
-
-        complete = [];
+        complete = []
         active_theme = None
 
         for theme in self.availableThemes:
@@ -448,7 +449,7 @@ def themeList(self):
                 'description': theme.description,
                 'override': override,
                 'editable': theme.__name__ in zodbNames,
-                'preview': "{0}/{1}".format(portalUrl, previewUrl),
+                'preview': "{0}/{1}".format(self.site_url, previewUrl),
                 'selected': theme.__name__ == self.selectedTheme,
             }
             if theme.__name__ == self.selectedTheme:
@@ -465,10 +466,9 @@ def themeList(self):
         return themes
 
     def redirectToFieldset(self, fieldset):
-        portalUrl = getToolByName(self.context, 'portal_url')()
         self.redirect(
             "{0}/{1}#fieldsetlegend-{2}".format(
-                portalUrl,
+                self.site_url,
                 self.__name__,
                 fieldset
             )

From 2d36d66858e96b41d481d128344b57bb6652e344 Mon Sep 17 00:00:00 2001
From: Johannes Raggam <thetetet@gmail.com>
Date: Fri, 11 Mar 2016 14:10:16 +0100
Subject: [PATCH 2/2] typo

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index d2600af7..9b9f97d5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,7 +10,7 @@ Incompatibilities:
 
 New:
 
-- Change base URLs from portal URL to what getSite returns, but don't change the theming controlpanel context binding.
+- For the theming controlpanel, change base URLs from portal URL to what getSite returns, but don't change the controlpanels context binding.
   This allows for more flexibility when configuring it to be allowed on a sub site with a local registry.
   [thet]