Repository: Products.CMFPlone
Branch: refs/heads/master
Date: 2014-11-06T10:31:29+01:00
Author: Martin Opstad Reistadbakk (martior) <martin@blaastolen.com>
Commit: https://github.com/plone/Products.CMFPlone/commit/ffe10937bdbcdc8c74bf31cb2656c89de4566bad

Use prefs_main_template for resource registry control panel and add link back to Site Setup

Files changed:
M Products/CMFPlone/controlpanel/browser/resourceregistry.pt

diff --git a/Products/CMFPlone/controlpanel/browser/resourceregistry.pt b/Products/CMFPlone/controlpanel/browser/resourceregistry.pt
index 34492d4..a42dabd 100644
--- a/Products/CMFPlone/controlpanel/browser/resourceregistry.pt
+++ b/Products/CMFPlone/controlpanel/browser/resourceregistry.pt
@@ -3,7 +3,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       lang="en"
-      metal:use-macro="context/main_template/macros/master"
+      metal:use-macro="context/prefs_main_template/macros/master"
       i18n:domain="plone">
 
 
@@ -17,8 +17,15 @@
   </metal:block>
 <body>
 
-<metal:content-core fill-slot="content-core">
-    <metal:content-core define-macro="content-core">
+<metal:content-core fill-slot="prefs_configlet_main">
+    <metal:content-core define-macro="prefs_configlet_main">
+      <a href=""
+         id="setup-link"
+         tal:attributes="href string:$portal_url/plone_control_panel"
+         i18n:translate="">
+          Site Setup
+      </a>
+    
       <span tal:replace="structure context/@@authenticator/authenticator"/>
       <div class="pat-resourceregistry" tal:attributes="data-pat-resourceregistry view/config" />
     </metal:content-core>


Repository: Products.CMFPlone
Branch: refs/heads/master
Date: 2014-12-14T11:57:37+01:00
Author: Timo Stollenwerk (tisto) <tisto@plone.org>
Commit: https://github.com/plone/Products.CMFPlone/commit/ab5d056c8343235b93e421cb6a9fec2b6ff802ca

Merge pull request #294 from martior/master

Use prefs_main_template for resource registry control panel...

Files changed:
M Products/CMFPlone/controlpanel/browser/resourceregistry.pt

diff --git a/Products/CMFPlone/controlpanel/browser/resourceregistry.pt b/Products/CMFPlone/controlpanel/browser/resourceregistry.pt
index 34492d4..a42dabd 100644
--- a/Products/CMFPlone/controlpanel/browser/resourceregistry.pt
+++ b/Products/CMFPlone/controlpanel/browser/resourceregistry.pt
@@ -3,7 +3,7 @@
       xmlns:metal="http://xml.zope.org/namespaces/metal"
       xmlns:i18n="http://xml.zope.org/namespaces/i18n"
       lang="en"
-      metal:use-macro="context/main_template/macros/master"
+      metal:use-macro="context/prefs_main_template/macros/master"
       i18n:domain="plone">
 
 
@@ -17,8 +17,15 @@
   </metal:block>
 <body>
 
-<metal:content-core fill-slot="content-core">
-    <metal:content-core define-macro="content-core">
+<metal:content-core fill-slot="prefs_configlet_main">
+    <metal:content-core define-macro="prefs_configlet_main">
+      <a href=""
+         id="setup-link"
+         tal:attributes="href string:$portal_url/plone_control_panel"
+         i18n:translate="">
+          Site Setup
+      </a>
+    
       <span tal:replace="structure context/@@authenticator/authenticator"/>
       <div class="pat-resourceregistry" tal:attributes="data-pat-resourceregistry view/config" />
     </metal:content-core>