Skip to content

Commit

Permalink
Update Site Setup link in all control panels (fixes plone/Products.CM…
Browse files Browse the repository at this point in the history
  • Loading branch information
davilima6 committed Nov 22, 2015
1 parent d806a87 commit b42e96e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 15 deletions.
3 changes: 2 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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]


1.3.6 (2015-10-27)
Expand Down
2 changes: 1 addition & 1 deletion plone/app/registry/browser/controlpanel.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class MyForm(RegistryEditForm):
Then register MyFormView as a browser view.
"""

control_panel_view = "plone_control_panel"
control_panel_view = "@@overview-controlpanel"
schema_prefix = None

def getContent(self):
Expand Down
8 changes: 2 additions & 6 deletions plone/app/registry/browser/controlpanel_layout.pt
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
i18n:domain="plone">

<body>

<div metal:fill-slot="prefs_configlet_main">

<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>
Expand All @@ -23,8 +21,6 @@
Portal status message
</div>



<div id="content-core">
<div id="layout-contents">
<span tal:replace="structure view/contents" />
Expand Down
13 changes: 6 additions & 7 deletions plone/app/registry/browser/records.pt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
i18n:domain="plone">

<metal:block fill-slot="top_slot">
<tal:defines tal:define="dummy python:request.set('disable_border',1);
disable_column_one python:request.set('disable_plone.leftcolumn',1);
disable_column_two python:request.set('disable_plone.rightcolumn',0);"/>
<tal:defines tal:define="dummy python:request.set('disable_border', 1);
disable_column_one python:request.set('disable_plone.leftcolumn', 1);
disable_column_two python:request.set('disable_plone.rightcolumn', 0);"/>
<link rel="stylesheet" type="text/css"
tal:attributes="href string:${context/portal_url}/++resource++plone.app.registry/style.css" />
</metal:block>
Expand All @@ -18,9 +18,8 @@
<div id="content" metal:fill-slot="prefs_configlet_content"
tal:define="records view/records">

<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>
Expand Down Expand Up @@ -71,7 +70,7 @@
</div>
</div>
</form>

</th>
</tr>
<tr>
Expand Down

0 comments on commit b42e96e

Please sign in to comment.