Toolbar logo and position

plone · Jul 16, 2015 · 52e78b4 · 52e78b4
1 parent 3adfa44
commit 52e78b4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/plone/app/layout/viewlets/toolbar.pt b/plone/app/layout/viewlets/toolbar.pt
@@ -1,15 +1,15 @@
 <section id="edit-bar" role="toolbar"
          tal:define="portal_state view/portal_state;
-                     toolbar_class python:request.cookies.get('plone-toolbar', 'plone-toolbar-left pat-toolbar');
-                     portal_url portal_state/portal_url;
+                     toolbar_class view/get_toolbar_position;
                      personal_bar python: view.get_personal_bar()"
          tal:condition="not: portal_state/anonymous"
          i18n:domain="plone">
   <div id="edit-zone" role="toolbar" tal:attributes="class toolbar_class">
     <div class="plone-toolbar-container">
       <a class="plone-toolbar-logo">
-        <img alt="Plone Toolbar" tal:attributes="src string:${portal_url}/++plone++static/plone-toolbarlogo.svg" />
+        <img alt="Plone Toolbar" tal:attributes="src view/get_toolbar_logo" />
       </a>
+      <a class="plone-toolbar-switcher" tal:condition="view/show_switcher"><span>Left-Top switcher</span></a>
       <nav role="navigation">
         <ul class="plone-toolbar-main">
           <div tal:replace="structure view/base_render">

diff --git a/plone/app/layout/viewlets/toolbar.py b/plone/app/layout/viewlets/toolbar.py
@@ -3,6 +3,9 @@
 from zope.component import getMultiAdapter
 from plone.memoize.instance import memoize
 from plone.app.layout.viewlets.common import PersonalBarViewlet
+from zope.component import getUtility
+from plone.registry.interfaces import IRegistry
+from Products.CMFPlone.interfaces.controlpanel import ISiteSchema
 
 
 class ToolbarViewletManager(OrderedViewletManager):
@@ -22,4 +25,23 @@ def portal_state(self):
     def get_personal_bar(self):
         viewlet = PersonalBarViewlet(self.context, self.request, self.__parent__, self)
         viewlet.update()
-        return viewlet
+        return viewlet
+
+    def get_toolbar_logo(self):
+        registry = getUtility(IRegistry)
+        settings = registry.forInterface(ISiteSchema, prefix='plone')
+        portal_url = self.portal_state.portal_url()
+        return portal_url + settings.toolbar_logo
+
+    def get_toolbar_position(self):
+        registry = getUtility(IRegistry)
+        settings = registry.forInterface(ISiteSchema, prefix='plone')
+        if settings.toolbar_position == 'side':
+            return 'plone-toolbar-left pat-toolbar'
+        else:
+            return 'portal-toolbar-top pat-toolbar'
+
+    def show_switcher(self):
+        return False
+
+