Merge pull request #26 from plone/fix_sitesetup_link

Update Site Setup link in all control panels
plone · Nov 25, 2015 · 056e4f5 · 056e4f5
2 parents 861515b + e594d26
commit 056e4f5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -10,7 +10,8 @@ New:
 
 Fixes:
 
-- *add item here*
+- Update Site Setup link in all control panels (fixes https://github.com/plone/Products.CMFPlone/issues/1255)
+  [davilima6]
 
 
 2.2.8 (2015-10-28)

diff --git a/Products/ATContentTypes/skins/ATContentTypes/atct_manageTopicIndex.cpt b/Products/ATContentTypes/skins/ATContentTypes/atct_manageTopicIndex.cpt
@@ -48,9 +48,8 @@
         </div>
 
         <div id="content-core">
-            <a href=""
-               class="link-parent"
-               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="label_up_to_plone_setup">
                 Up to Site Setup
             </a>

diff --git a/Products/ATContentTypes/skins/ATContentTypes/atct_manageTopicMetadata.cpt b/Products/ATContentTypes/skins/ATContentTypes/atct_manageTopicMetadata.cpt
@@ -27,7 +27,6 @@
                  i18n:translate="label_collection_metadata">Collection Metadata</a>
             </li>
         </ul>
-
         <div class="contentActions">&nbsp;</div>
     </div>
 
@@ -46,9 +45,8 @@
         </div>
 
         <div id="content-core">
-            <a href=""
-               class="link-parent"
-               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="label_up_to_plone_setup">
                 Up to Site Setup
             </a>
@@ -102,8 +100,7 @@
                     <tbody>
                     <tal:indexes tal:repeat="index metadata">
                         <tal:object tal:define="indexObj python:atct_tool.getMetadata(index);
-                                                oddrow repeat/index/odd;">
-
+                                                oddrow repeat/index/odd">
                         <tr class="" tal:attributes="class python:test(oddrow, 'even', 'odd')">
                             <td class="listingCheckbox">
                                 <input type="hidden"
@@ -136,9 +133,7 @@
                                        tal:attributes="name string:metadata.description:records;"
                                        tal:content="indexObj/description"></textarea>
                             </td>
-
                         </tr>
-
                         </tal:object>
                     </tal:indexes>
                     </tbody>