Update Site Setup link in all control panels (fixes plone/Products.CM…

…FPlone#1255)
plone · Nov 23, 2015 · 469adb2 · 469adb2
1 parent c728254
commit 469adb2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,6 +14,9 @@ Fixes:
   https://github.com/plone/plone.app.discussion/issues/66
   [gforcada]
 
+- Update Site Setup link in all control panels (fixes https://github.com/plone/Products.CMFPlone/issues/1255)
+  [davilima6]
+
 
 2.4.8 (2015-09-20)
 ------------------

diff --git a/plone/app/discussion/browser/controlpanel.pt b/plone/app/discussion/browser/controlpanel.pt
@@ -5,13 +5,11 @@
       lang="en"
       metal:use-macro="here/prefs_main_template/macros/master"
       i18n:domain="plone">
-
 <body>
 <article id="content"
      tal:attributes="class view/settings"
      metal:fill-slot="prefs_configlet_content">
 
-
     <div class="portalMessage warning"
         tal:condition="view/mailhost_warning">
         <strong i18n:translate="">
@@ -74,9 +72,8 @@
       Portal status message
     </div>
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/plone_control_panel"
+    <a id="setup-link" class="link-parent"
+       tal:attributes="href string:$portal_url/@@overview-controlpanel"
        i18n:translate="">
         Site Setup
     </a>
@@ -92,6 +89,7 @@
   <script type="text/javascript"
           tal:attributes="src string:${context/portal_url}/++resource++plone.app.discussion.javascripts/controlpanel.js">
   </script>
+
 </article>
 </body>
 </html>
diff --git a/plone/app/discussion/tests/functional_test_comments.txt b/plone/app/discussion/tests/functional_test_comments.txt
@@ -262,7 +262,7 @@ Log in as admin
 
 Use the Plone control panel to enable comment editing.
 
-    >>> browser.open(portal_url + '/plone_control_panel')
+    >>> browser.open(portal_url + '/@@overview-controlpanel')
     >>> browser.getLink('Discussion').click()
     >>> browser.getControl('Enable editing of comments').selected = True
     >>> browser.getControl(name='form.buttons.save').click()