Merge pull request #75 from plone/fix_sitesetup_link

Update Site Setup link in all control panels
2015-11-25 01:39:33 +01:00 · 2015-11-25 01:39:33 +01:00 · a2439609c6
commit a2439609c6
parent c7282543a1 3f07781675
3 changed files with 7 additions and 6 deletions
--- a/CHANGES.rst
+++ b/CHANGES.rst
@ -10,6 +10,9 @@ New:

 Fixes:

+- Update Site Setup link in all control panels (fixes https://github.com/plone/Products.CMFPlone/issues/1255)
+  [davilima6]
+
 - Move translations to plone.app.locales
  https://github.com/plone/plone.app.discussion/issues/66
  [gforcada]
--- 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>
--- 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()