Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Site Setup link in all control panels #18

Merged
merged 1 commit into from
Nov 25, 2015
Merged

Update Site Setup link in all control panels #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGES.rst
View file
Open in desktop
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.2.7 (2015-09-09)
Expand Down
4 changes: 2 additions & 2 deletions plone/app/caching/browser/controlpanel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
_isuri = re.compile(
r"[a-zA-z0-9+.-]+:" # scheme
r"\S*$" # non space (should be pickier)
).match
).match


class BaseView(object):
Expand Down Expand Up @@ -156,7 +156,7 @@ def update(self):
self.processSave()
elif 'form.button.Cancel' in self.request.form:
self.request.response.redirect(
"%s/plone_control_panel" % self.context.absolute_url())
"%s/@@overview-controlpanel" % self.context.absolute_url())

def processSave(self):

Expand Down
5 changes: 2 additions & 3 deletions plone/app/caching/browser/import.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@
<h1 class="documentFirstHeading"
i18n:translate="heading_caching_import">Import caching profiles</h1>

<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>
Expand Down
7 changes: 3 additions & 4 deletions plone/app/caching/browser/purge.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@
<h1 class="documentFirstHeading"
i18n:translate="heading_caching_purging">Purge caching proxy</h1>

<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>
Expand All @@ -74,7 +73,7 @@
<form name="purge" tal:attributes="action string:${request/URL}" method="post"
class="enableUnloadProtection"
tal:define="errors view/errors">

<div tal:define="error errors/urls | nothing"
tal:attributes="class python:'field error' if error else 'field'">

Expand Down
7 changes: 3 additions & 4 deletions plone/app/caching/browser/ramcache.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@
<h1 class="documentFirstHeading"
i18n:translate="heading_ramcache_stats">RAM cache statistics</h1>

<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>
Expand All @@ -61,7 +60,7 @@
<form name="purge" tal:attributes="action string:${request/URL}" method="post"
class="enableUnloadProtection"
tal:define="errors view/errors">

<table tal:define="stats view/ramCache/getStatistics"
class="listing nosort" summary="RAM cache statistics"
i18n:attributes="summary heading_ramcache_stats;">
Expand Down