update/ simplify back buttons

castlecms · Nov 13, 2023 · 5b45969 · 5b45969
1 parent bee2e62
commit 5b45969
Show file tree

Hide file tree

Showing 14 changed files with 69 additions and 75 deletions.
diff --git a/castle/cms/browser/controlpanel/templates/announcements.pt b/castle/cms/browser/controlpanel/templates/announcements.pt
@@ -14,10 +14,8 @@
   <metal:main metal:fill-slot="prefs_configlet_main">
 
     <a
-      href=""
+      href="${context/portal_url}/@@overview-controlpanel"
       id="setup-link"
-      tal:attributes="href string:$portal_url/plone_control_panel"
-      i18n:translate=""
     >
       Site Setup
     </a>

diff --git a/castle/cms/browser/controlpanel/templates/archives-manage.pt b/castle/cms/browser/controlpanel/templates/archives-manage.pt
@@ -11,12 +11,13 @@
 
 <metal:main metal:fill-slot="prefs_configlet_main" i18n:domain="plone">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/@@overview-controlpanel"
-       i18n:translate="">
-       Site Setup
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
+      Site Setup
     </a>
+
     <h1 class="documentFirstHeading"
         i18n:translate="">Archive Management</h1>
 

diff --git a/castle/cms/browser/controlpanel/templates/archives-review.pt b/castle/cms/browser/controlpanel/templates/archives-review.pt
@@ -18,12 +18,13 @@
 
 <metal:main metal:fill-slot="prefs_configlet_main" i18n:domain="plone">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/@@overview-controlpanel"
-       i18n:translate="">
-       Site Setup
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
+      Site Setup
     </a>
+
     <h1 class="documentFirstHeading"
         i18n:translate="">Archive Management</h1>
 

diff --git a/castle/cms/browser/controlpanel/templates/audit.pt b/castle/cms/browser/controlpanel/templates/audit.pt
@@ -12,15 +12,14 @@
             tal:define="connected view/can_connect_to_index;
                         site_path python: '/'.join(context.getPhysicalPath())">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/plone_control_panel"
-       i18n:translate=""
-       tal:condition="not: view/user">
-        Site Setup
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+      tal:condition="not: view/user">
+    >
+      Site Setup
     </a>
 
-
     <h1 class="documentFirstHeading" tal:content="view/label">View Title</h1>
 
     <div metal:use-macro="context/global_statusmessage/macros/portal_message">

diff --git a/castle/cms/browser/controlpanel/templates/celery.pt b/castle/cms/browser/controlpanel/templates/celery.pt
@@ -11,12 +11,13 @@
 
 <metal:main metal:fill-slot="prefs_configlet_main" i18n:domain="plone">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/@@overview-controlpanel"
-       i18n:translate="">
-       Site Setup
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
+      Site Setup
     </a>
+
     <h1 class="documentFirstHeading"
         i18n:translate="">Celery Tasks</h1>
 

diff --git a/castle/cms/browser/controlpanel/templates/crawler.pt b/castle/cms/browser/controlpanel/templates/crawler.pt
@@ -10,14 +10,13 @@
 
 <div metal:fill-slot="prefs_configlet_main">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/plone_control_panel"
-       i18n:translate="">
-        Site Setup
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
+      Site Setup
     </a>
 
-
     <h1 class="documentFirstHeading" tal:content="view/label">View Title</h1>
 
     <div metal:use-macro="context/global_statusmessage/macros/portal_message">

diff --git a/castle/cms/browser/controlpanel/templates/links.pt b/castle/cms/browser/controlpanel/templates/links.pt
@@ -47,14 +47,13 @@
 
 <metal:main metal:fill-slot="prefs_configlet_main">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/plone_control_panel"
-       i18n:translate="">
-        Site Setup
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
+      Site Setup
     </a>
 
-
     <h1 class="documentFirstHeading" tal:content="view/label">View Title</h1>
 
     <div metal:use-macro="context/global_statusmessage/macros/portal_message">

diff --git a/castle/cms/browser/controlpanel/templates/sessions.pt b/castle/cms/browser/controlpanel/templates/sessions.pt
@@ -10,14 +10,13 @@
 
 <metal:main metal:fill-slot="prefs_configlet_main">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/plone_control_panel"
-       i18n:translate="">
-        Site Setup
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
+      Site Setup
     </a>
 
-
     <h1 class="documentFirstHeading" tal:content="view/label">View Title</h1>
 
     <div metal:use-macro="context/global_statusmessage/macros/portal_message">

diff --git a/castle/cms/browser/controlpanel/templates/social.pt b/castle/cms/browser/controlpanel/templates/social.pt
@@ -10,14 +10,13 @@
 
 <div metal:fill-slot="prefs_configlet_main">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/plone_control_panel"
-       i18n:translate="">
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
         Site Setup
     </a>
 
-
     <h1 class="documentFirstHeading" tal:content="view/label">View Title</h1>
 
     <div metal:use-macro="context/global_statusmessage/macros/portal_message">

diff --git a/castle/cms/browser/controlpanel/templates/status.pt b/castle/cms/browser/controlpanel/templates/status.pt
@@ -9,15 +9,13 @@
 <body>
 <metal:main metal:fill-slot="prefs_configlet_main">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/plone_control_panel"
-       i18n:translate="">
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
         Site Setup
     </a>
 
-
-
     <h1 class="documentFirstHeading">CastleCMS Status</h1>
         <p class="discreet">
             Displays the status of components and subprocesses used by CastleCMS

diff --git a/castle/cms/browser/controlpanel/templates/subscribers.pt b/castle/cms/browser/controlpanel/templates/subscribers.pt
@@ -9,12 +9,13 @@
 <body>
 <metal:main metal:fill-slot="prefs_configlet_main">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/plone_control_panel"
-       i18n:translate="">
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
         Site Setup
     </a>
+
     <div tal:content="python: view.get_page(1)">
     </div>
 

diff --git a/castle/cms/browser/controlpanel/templates/survey.pt b/castle/cms/browser/controlpanel/templates/survey.pt
@@ -9,12 +9,12 @@
 <body>
 
 <div metal:fill-slot="prefs_configlet_main">
-  <a href=""
-     id="setup-link"
-     tal:attributes="href string:$portal_url/plone_control_panel"
-     i18n:translate="">
-      Site Setup
-  </a> &rsaquo;
+  <a
+    href="${context/portal_url}/@@overview-controlpanel"
+    id="setup-link"
+  >
+    Site Setup
+  </a>
 
   <h1 class="documentFirstHeading" tal:content="view/label">View Title</h1>
 

diff --git a/castle/cms/browser/controlpanel/templates/tags.pt b/castle/cms/browser/controlpanel/templates/tags.pt
@@ -9,14 +9,13 @@
 <body>
 <metal:main metal:fill-slot="prefs_configlet_main">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/plone_control_panel"
-       i18n:translate="">
-        Site Setup
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
+      Site Setup
     </a>
 
-
     <h1 class="documentFirstHeading" tal:content="view/label">View Title</h1>
 
     <div metal:use-macro="context/global_statusmessage/macros/portal_message">

diff --git a/castle/cms/browser/controlpanel/templates/usergroups_usersoverview.pt b/castle/cms/browser/controlpanel/templates/usergroups_usersoverview.pt
@@ -20,11 +20,11 @@
 
   <article id="content">
 
-    <a href=""
-       id="setup-link"
-       tal:attributes="href string:$portal_url/@@overview-controlpanel"
-       i18n:translate="">
-        Site Setup
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
+      Site Setup
     </a>
 
     <h1 class="documentFirstHeading"