Merge pull request #574 from castlecms/bd/master-fix-back-to-site-setup

Bd/master fix back to site setup
castlecms · Nov 13, 2023 · abd7a0d · abd7a0d
2 parents b6ef93f + 43de4cd
commit abd7a0d
Show file tree

Hide file tree

Showing 31 changed files with 3,286 additions and 105 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -10,6 +10,7 @@ Changelog
 - Fix data-tiles that don't exist from rendering and spamming output
   (for dexterity type definitions in control panel in /@@dexterity-types/<DexterityTypeHere>)
 - Allow resuming importjson script
+- fix missing/ inconsistently localed back to site setup button in controlpanels
 
 3.0.0b126 (2023-08-01)
 ----------------------

diff --git a/castle/cms/browser/controlpanel/documentviewer.py b/castle/cms/browser/controlpanel/documentviewer.py
@@ -0,0 +1,12 @@
+from collective.documentviewer.browser.controlpanel import GlobalSettingsForm
+from plone.app.z3cform.layout import wrap_form
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
+
+
+class CastleDocumentViewerSettingsForm(GlobalSettingsForm):
+    template = ViewPageTemplateFile('templates/documentviewer.pt')
+    label = None
+    description=None
+
+
+GlobalSettingsFormView = wrap_form(CastleDocumentViewerSettingsForm)
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/documentviewer.pt b/castle/cms/browser/controlpanel/templates/documentviewer.pt
@@ -0,0 +1,28 @@
+<html
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  i18n:domain="plone.z3cform"
+  metal:use-macro="context/@@standard_macros/page"
+>
+
+<body metal:fill-slot="body">
+  <div metal:use-macro="context/global_statusmessage/macros/portal_message">
+    Portal status message
+  </div>
+
+  <a
+    href="${context/portal_url}/@@overview-controlpanel"
+    id="setup-link"
+  >
+    Site Setup
+  </a>
+
+  <h1 class="documentFirstHeading">Global Document Viewer Settings</h1>
+
+  <metal:block use-macro="context/@@ploneform-macros/titlelessform" />
+
+</body>
+
+</html>
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"

diff --git a/castle/cms/browser/templates/redirects-controlpanel.pt b/castle/cms/browser/templates/redirects-controlpanel.pt
@@ -29,6 +29,13 @@
         </dd>
       </dl>
 
+    <a
+      href="${context/portal_url}/@@overview-controlpanel"
+      id="setup-link"
+    >
+      Site Setup
+    </a>
+
       <h1 i18n:translate="heading_add_aliases">Manage aliases</h1>
 
       <form tal:attributes="action view/view_url" method="post">

diff --git a/castle/cms/browser/templates/types-listing.pt b/castle/cms/browser/templates/types-listing.pt
@@ -15,10 +15,19 @@
     </span>
   </div>
 
+  <a
+    href="${context/portal_url}/@@overview-controlpanel"
+    id="setup-link"
+  >
+    Site Setup
+  </a>
+
+  <h1 class="documentFirstHeading">Dexterity Content Types</h1>
+
   <p class="crud-description documentDescription"
-      tal:condition="view/description"
-      tal:content="structure view/description">
-  </p>
+    tal:condition="view/description"
+    tal:content="structure view/description"
+  ></p>
 
   <a class="pat-plone-modal"
       href="${context/absolute_url}/@@add-clone-type">

diff --git a/castle/cms/browser/types.py b/castle/cms/browser/types.py
@@ -21,5 +21,6 @@ class TypesListing(types.TypesListing):
 
 # Create a form wrapper so the form gets layout.
 TypesListingPage = layout.wrap_form(
-    TypesListing, __wrapper_class=types.TypesEditFormWrapper,
-    label=_(u'Dexterity Content Types'))
+    TypesListing,
+    __wrapper_class=types.TypesEditFormWrapper,
+)