From aa6fd37c9774914fc632aa860bc7ad2bce721e46 Mon Sep 17 00:00:00 2001 From: Brian Duncan Date: Mon, 13 Nov 2023 15:20:04 -0600 Subject: [PATCH 1/6] j3cbot templates to add/ move button --- ...one.controlpanel.browser.quickinstaller.pt | 342 +++++++ ...cts.CMFPlone.controlpanel.browser.types.pt | 287 ++++++ ...wordManager.browser.prefs_keywords_view.pt | 15 +- ...asticsearch.browser.controlpanel_layout.pt | 98 ++ .../plone.app.caching.browser.controlpanel.pt | 915 ++++++++++++++++++ .../plone.app.caching.browser.import.pt | 168 ++++ .../plone.app.caching.browser.purge.pt | 190 ++++ .../plone.app.caching.browser.ramcache.pt | 128 +++ ...entrules.browser.templates.controlpanel.pt | 199 ++++ .../plone.app.theming.browser.controlpanel.pt | 792 +++++++++++++++ 10 files changed, 3126 insertions(+), 8 deletions(-) create mode 100644 castle/cms/jbot_overrides/Products.CMFPlone.controlpanel.browser.quickinstaller.pt create mode 100644 castle/cms/jbot_overrides/Products.CMFPlone.controlpanel.browser.types.pt create mode 100644 castle/cms/jbot_overrides/collective.elasticsearch.browser.controlpanel_layout.pt create mode 100644 castle/cms/jbot_overrides/plone.app.caching.browser.controlpanel.pt create mode 100644 castle/cms/jbot_overrides/plone.app.caching.browser.import.pt create mode 100644 castle/cms/jbot_overrides/plone.app.caching.browser.purge.pt create mode 100644 castle/cms/jbot_overrides/plone.app.caching.browser.ramcache.pt create mode 100644 castle/cms/jbot_overrides/plone.app.contentrules.browser.templates.controlpanel.pt create mode 100644 castle/cms/jbot_overrides/plone.app.theming.browser.controlpanel.pt diff --git a/castle/cms/jbot_overrides/Products.CMFPlone.controlpanel.browser.quickinstaller.pt b/castle/cms/jbot_overrides/Products.CMFPlone.controlpanel.browser.quickinstaller.pt new file mode 100644 index 000000000..011fb0bf6 --- /dev/null +++ b/castle/cms/jbot_overrides/Products.CMFPlone.controlpanel.browser.quickinstaller.pt @@ -0,0 +1,342 @@ + + + + + + + + + Site Setup + + +

Add-ons

+ +
+ This is the Add-on configuration section, you can activate and deactivate + add-ons in the lists below. +
+ +
+ +

+ To make new add-ons show up here, add them to your buildout + configuration, run buildout, and restart the server process. + For detailed instructions see + + + Installing a third party add-on + + . +

+ +
+
Upgrades
+
+
+ No upgrades in this corner + You are up to date. High fives. +
+
+
+
    + +
  • +
    + + +
    +

    + + Add-on Name + +

    +

    + add-on description + – (plugin.app.name 1.0) +

    +
      +
    • + + This addon has been upgraded. + + + Old version was version. + + + + Old profile version was version. + + + New profile version is version. + + + +
      + Warning + There is no upgrade procedure defined for this + addon. Please consult the addon documentation + for upgrade information, or contact the addon + author. +
      +
      • +
    +
    • +     +
  • +
    + + + + +
    The question is, do you feel lucky, punk?
    + +     +
    +
    • +
+
+
+ +
+
Available add-ons
+
+
    +
  • + +
    + + +
    + +

    + + Add-on Name + +

    +

    + add-on description + – (plugin.app.name 1.0) +

    +     +
    • +
+
+
+ +
+
Activated add-ons
+
+
    +
  • + +
    + + +
    +

    + + Add-on Name + +

    +

    + add-on description + – (plugin.app.name 1.0) +

    +     +
    • +
+
+
+ +
+
Broken add-ons
+
+
    +
  • +

    + + Add-on Name + +

    +

    + Error Type + - Error Reason +

    +
    • +
+
+
+ +
+ + + + + diff --git a/castle/cms/jbot_overrides/Products.CMFPlone.controlpanel.browser.types.pt b/castle/cms/jbot_overrides/Products.CMFPlone.controlpanel.browser.types.pt new file mode 100644 index 000000000..56f056208 --- /dev/null +++ b/castle/cms/jbot_overrides/Products.CMFPlone.controlpanel.browser.types.pt @@ -0,0 +1,287 @@ + + + + + + + + + Site Setup + + +

Content Settings

+ +
+ Workflow, visibility and versioning settings for your content types. +
+ +
+
+ + + + +
+ + + + + +

+ Type description +

+ +
+ + +
+ + + +
+ + + + +
+ + + +
+ + + + + + + +
+ +
+ + +
+ + +
+ + Manage portlets assigned to this content type + +
+ + + + +
+ + Community Workflow +
+ +
    + +
  • Workflow description
    • +     +
+ +
+ + + + +
+ + +
    + +
  • Workflow description
    • +     +
+ +
+ + + +
+ When changing workflows, you have to select a state equivalent in the + new workflow. +
+ + + + + + + + + + + + + + + + +
Old StateNew State
+ + Published + + +
+
+ + + +
+ Info + + Changing the workflow of a type will take a while, and may slow down + the site significantly while the content is updated to the new setting. + +
+ +
+ + +
+ +
+ +
+
+ + + + diff --git a/castle/cms/jbot_overrides/Products.PloneKeywordManager.browser.prefs_keywords_view.pt b/castle/cms/jbot_overrides/Products.PloneKeywordManager.browser.prefs_keywords_view.pt index 5c8baabb2..d4c06502a 100644 --- a/castle/cms/jbot_overrides/Products.PloneKeywordManager.browser.prefs_keywords_view.pt +++ b/castle/cms/jbot_overrides/Products.PloneKeywordManager.browser.prefs_keywords_view.pt @@ -21,15 +21,14 @@ show_filters python: len(catalogSubjects) > many_kws; url_quote python:modules['Products.PythonScripts.standard'].url_quote"> -

Keyword Manager

+ + Site Setup + - - Up to Plone Setup - +

Keyword Manager

diff --git a/castle/cms/jbot_overrides/collective.elasticsearch.browser.controlpanel_layout.pt b/castle/cms/jbot_overrides/collective.elasticsearch.browser.controlpanel_layout.pt new file mode 100644 index 000000000..c91a0a8b9 --- /dev/null +++ b/castle/cms/jbot_overrides/collective.elasticsearch.browser.controlpanel_layout.pt @@ -0,0 +1,98 @@ + + + + + +
+ + + + + Site Setup + + +

View Title

+ +
+ Portal status message +
+ +
+
+ Warning +
+
+ Could not connect to specified elastic search server. +
+
+ +
+ +
+ + +
+
+
+ + + | +
+ + + Could take a very long time. Use carefully. + +
+ +
+ + + + + + + + +
+ Server status +
+ +
+
+ + +
+ + diff --git a/castle/cms/jbot_overrides/plone.app.caching.browser.controlpanel.pt b/castle/cms/jbot_overrides/plone.app.caching.browser.controlpanel.pt new file mode 100644 index 000000000..9976d42d5 --- /dev/null +++ b/castle/cms/jbot_overrides/plone.app.caching.browser.controlpanel.pt @@ -0,0 +1,915 @@ + + + + + +
+ + + + + Site Setup + + +
+ +
+ +
+ + Info + + + First time here? We recommend that you get started by + importing a preconfigured set of caching rules. + +
+ +
+ Portal status message +
+ + +
+ +

Caching settings

+ + +

+ Control how pages, images, style sheets and other resources are + cached. +

+ + +
+ + + +
+ Global settings + +
+ + + + +
+ If this option is disabled, no caching will take place. +
+ +
+ +
+ + +
+ Caching proxies + +
+ High-performance sites will often place a caching reverse + proxy such as Varnish or Squid in front of Zope. The caching + operations configured elsewhere on this screen can often take + advantage of such a proxy by instructing it to cache certain + content in a certain way, whilst passing requests for other + content through to Plone always. Plone can also send so-called + PURGE requests to a caching proxy when content + changes, reducing the risk of a stale response from a cached + copy. +
+ +
+ + + + +
+ Enable this option if you have configured a caching proxy + in front of Plone, and the proxy supports HTTP + PURGE requests. +
+ +
+ +
+ + +
+ Enter the domain name of each caching proxy, one per + line. For example, if you have Varnish running on the + local machine on port 1234, you could enter + http://localhost:1234. The domain name must + be reachable by the Zope process, but does not need to + be reachable from users' local machines. +
+ +
+ + + +
+ +
+ + +
+ If you have enabled purging, Plone can automatically purge + the views of content items when they are modified or + removed. Select the types to automatically purge below. + Note: although a content items's view + can be purged easily, it is not always possible to purge + every page where that item may appear. Items that appear + in dynamic listings (such as Collection portlets), + the navigation tree and other navigational aids may appear + out of date if you have cached the pages where those + items would appear. +
+ +
+ + + +
+ +
+ + + + +
+ Enable this if you are using virtual hosting with Zope's + VirtualHostMonster and you perform URL rewriting (to + incorporate the special virtual hosting tokens such as + VirtualHostBase and + VirtualHostRoot in the URL) before + the request is passed to the caching proxy, e.g. in an + Apache web server that receives requests and passes them + on to a Varnish caching proxy. Disable this option if you + are not using virtual hosting, or if the caching proxy is + in front of whatever performs the rewrite (or is itself + performing the rewrites), disable this option. +
+ +
+ +
+ + +
+

+ If you have enabled Virtual host rewriting takes place + front of the caching proxy above, and your site is + reachable via multiple domains (e.g. + http://example.com:80 vs. + http://www.example.com:80), enter all available + domains here, one per line. This will ensure that purge + requests are sent for all domains where applicable. Note + that it is more efficient to configure the front-most web + server to simply redirect all requests to a single domain, + so that Zope only "sees" a single domain. +

+

+ It is safe to leave this list blank if you are not using + a caching proxy, if you are not using virtual hosting, + if virtual host rewriting takes place behind the caching + proxy, or if you only have a single virtually hosted + domain name. +

+
+ +
+ + + +
+ +
+ + +
+ In-memory cache + +
+ Plone maintains a cache of certain pages and + fragments of pages in memory to speed up + rendering. Certain caching operations, when + mapped, can be used to place entire pages into the + RAM cache. Using the RAM cache may allow you to + gain some speed (and reduce CPU usage), at the + cost of using more memory. Note that the default + RAM cache is shared among threads in the same + Zope instance, but is not shared between Zope + instances. Thus, if you are running a + multi-instance ZEO setup, you may find it more + efficient to segment your users using a front-end + load balancer so that they always reach the same + back-end instance. As an alternative, you can + integrate a shared cache such as + memcached. See the documentation for + details. +
+ +
+ + + + (Required) + +
+ Use this to control how many items can be + placed in the cache. The more items you allow, + the higher the potential memory consumption. +
+ +
+ + + +
+ +
+ + + + (Required) + +
+ Enter the maximum time, in seconds, that an item + may remain in the cache before being purged. +
+ + +
+ + + +
+ +
+ + + + (Required) + +
+ Enter the time, in seconds, before attempts + to clean up the cache. A lower value may reduce + memory consumption by purging items frequently, + but can also slow down the system by tying up + the cache with maintenance tasks for too long. +
+ +
+ + + +
+ +
+ + +
+ Caching operations + +
+

+ Caching can be controlled by mapping rulesets to + caching operations. +

+

+ A ruleset is a name given to a resource + published by Plone, such as a view. Rulesets are declared by + the developers who write those views. You can think of them as + a way to give hints about how something should be cached, + without actually implementing the caching operations. +

+

+ The exact caching operations to use are mapped to + rulesets in the table below. Caching operations will often + set response headers to tell the users's web browser and/or + a caching proxy how to cache content. They may also intercept + a response to return a cached copy or instruct the browser to use + its own cached copy, if it is considered to be current. +

+
+ + +
+ Use the table below to map rulesets to caching + operations. +
+ + + + + + + + + + + + + + +
RulesetOperation
+
+

+

+ +
+ + +
+

+ Legacy page templates defined in the portal_skins + tool in the ZMI, or created or customised through the web cannot be + associated with rulesets in the usual way. There are two options: +

+
    +
  • If the template is the default type of a content type + it is possible to associate the type class or an interface it + provides with a ruleset.
    • +
  • You can also associate a specific page template (by name) or + content type with a ruleset using the options below.
    • +
+

+ Note: By default, folder-like content types are + associated with the ruleset plone.content.folderView, + and item-like content types are associated with the ruleset + plone.content.itemView. Any settings entered below or + set via an explicit cache ruleset (in a ZCML file) will override these + defaults. +

+

+ Note: You can only use each template name or + content type once! +

+
+ + + + + + + + + + + + + + + + + + +
RulesetContent typesTemplates
+
+

+

+
+
+
+
+
+ +
+ 		+
+ +
+
+ +
+ + +
+ Detailed settings + +
+

+ Many caching operations accept parameters to influence their + behaviour. For example, an operation which returns a page + cached in RAM may accept a parameter specifying the timeout + period before pages are re-calculated. Most operations, + however, will have "sensible defaults", so that they work + acceptably even when no parameters have been set. Note also + that not all operations support parameters. +

+

+ Parameters can be set at two levels. By default, parameters + apply to all uses of particular operation. Thus, if you have + assigned an operation to more than one ruleset, the + same parameters will be used. However, you can also + override the parameters for a particular ruleset. +

+

+ Use the table below to access parameters for a particular + operation or ruleset. Warning: If you have + made changes elsewhere in this form, you should save them + before configuring any operation parameters. Otherwise, you + will lose your changes. +

+
+ + +
+ Use the table below to create, clear and edit operation + parameters. If you clear the ruleset-specific parameters for + a given operation, it will fall back on the global operation + parameters. +
+ + + + + + + + + + + + + + +
RulesetOperation
+
+

+

+ + Not mapped + + + +
+
+ No parameters +
+
+ View/edit + global parameters +
+
+ + View/edit/clear + Create + + per-ruleset parameters +
+ + +
+ +
+ +
+ + + +
+ + + +
+
+
+ + + diff --git a/castle/cms/jbot_overrides/plone.app.caching.browser.import.pt b/castle/cms/jbot_overrides/plone.app.caching.browser.import.pt new file mode 100644 index 000000000..cf47477d8 --- /dev/null +++ b/castle/cms/jbot_overrides/plone.app.caching.browser.import.pt @@ -0,0 +1,168 @@ + + + + + +
+ + + Site Setup + + +
+ +
+ +
+ Portal status message +
+ +
+ +

Import caching profiles

+ + +

+ Choose a profile below to import cache settings. Additional + profiles may be installed by third party products. + Warning: This may overwrite existing + settings. +

+ +
+ +
+ +
+ +
+ + + +
+
+ +
+ + + + +
+ This allows rollback to a previous state via the + portal_setup tool. +
+
+ +
+ +
+ + + + +
+
+ + + + diff --git a/castle/cms/jbot_overrides/plone.app.caching.browser.purge.pt b/castle/cms/jbot_overrides/plone.app.caching.browser.purge.pt new file mode 100644 index 000000000..b97a26f2d --- /dev/null +++ b/castle/cms/jbot_overrides/plone.app.caching.browser.purge.pt @@ -0,0 +1,190 @@ + + + + + +
+ + + Site Setup + + +
+ +
+ +
+ Portal status message +
+ +
+ +

Purge caching proxy

+ +

+ If you have enabled a caching proxy, it may end up caching + objects which are no longer current. Plone will attempt + to automatically purge objects when they change, but if + you are seeing stale objects in your cache, you can purge + them manually below. +

+ +
+ Status + + The following items were purged: + +
    +
  • +
+
+ +
+ +
+ + + +
+ Enter URLs to purge, one per line, below. You can + either enter a full URL including a domain, or a path + relative to the site root, starting with a /. +
+ +
+ + + +
+ +
+ + + + +
+ Select this option to wait while the purge completes. + This allows you to see the results of the purges. + Purging asynchronously will return immediately, but + you will need to check your caching proxy's log files + to see if the purge actually succeeded. +
+
+ +
+ +
+ + + + +
+ +
+ + + diff --git a/castle/cms/jbot_overrides/plone.app.caching.browser.ramcache.pt b/castle/cms/jbot_overrides/plone.app.caching.browser.ramcache.pt new file mode 100644 index 000000000..b55db8431 --- /dev/null +++ b/castle/cms/jbot_overrides/plone.app.caching.browser.ramcache.pt @@ -0,0 +1,128 @@ + + + + + +
+ + Site Setup + + +
+ +
+ +
+ Portal status message +
+ +
+ +

RAM cache statistics

+ + +

+ The table below shows statistics for the default RAM + cache. You can use the Purge button to manually + clear the cache if you suspect there are stale items there. +

+ +
+ + + + + + + + + + + + + + + + + + +
KeyHitsMissesSize (bytes)Entries
     
+ +
+ +
+ + + +
+
+ +
+ + + diff --git a/castle/cms/jbot_overrides/plone.app.contentrules.browser.templates.controlpanel.pt b/castle/cms/jbot_overrides/plone.app.contentrules.browser.templates.controlpanel.pt new file mode 100644 index 000000000..b8fda09e8 --- /dev/null +++ b/castle/cms/jbot_overrides/plone.app.contentrules.browser.templates.controlpanel.pt @@ -0,0 +1,199 @@ + + + + + +
+ + + + + + Site Setup + + +

Content Rules

+ +

+ Use the form below to define, change or remove content rules. Rules + will automatically perform actions on content when certain triggers + take place. After defining rules, you may want to go to a folder + to assign them, using the "rules" item in the actions menu. +

+ + + +
+
+ +
+ + + +
+ Whether or not content rules should be disabled globally. If this is selected, + no rules will be executed anywhere in the portal. +
+
+ + + +
+ +
+ Content rules + +
+ + Filter: + + + + + + + + + + + +
+
+
+ + + + + + + + + + + + + + + + + + + +
content ruleeventenabled 
+
+
+ Rule Title +
+
+ Rule Description. +
+
+ 		+ trigger + + enabled + unassigned + +
+ + + + + + +
+
+ Add content rule +
+
+ + diff --git a/castle/cms/jbot_overrides/plone.app.theming.browser.controlpanel.pt b/castle/cms/jbot_overrides/plone.app.theming.browser.controlpanel.pt new file mode 100644 index 000000000..69c5dd8c5 --- /dev/null +++ b/castle/cms/jbot_overrides/plone.app.theming.browser.controlpanel.pt @@ -0,0 +1,792 @@ + + + + + + + + + + +
+ + + + + Various slots where you can insert elements in the header from a template. + + +
+ + + + + + + +
+ + + + +
+ +
+ +
+ +
+
+ + Site Setup + +

Theme settings

+ +
+ +
+ +
+ +
+

Themes

+ +

+ Use the buttons to create or upload a new Diazo theme, + or select an existing theme from a the list below. +

+ +
+ New theme + + Upload Zip file + + Test Styles + + Help +
+ +
+ +
+ +
+ + + Title + (this theme overrides a filesystem theme) + (active) + + +
+ + + + + +
+ +
+ +
+ + + + + + +
+ + Copy + +
+

Create copy of

+ +

+ Please enter the details of your new theme +

+ +
+ +
+ + +
+ Enter a short, descriptive title for your theme +
+ +
+ + +
+ +
+ +
+ You may also provide a longer description for your theme. +
+ +
+ + + +
+ + + +
+ Select this option to enable the newly created theme + immediately. +
+
+ +
+ + +
+ + + + +
+ +
+ +
+ +
+ + +
+ + Delete + +
+

+ Are you sure you want to delete +

+ +

+ This operation cannot be undone. Note that filesystem themes + cannot be deleted from within Plone. +

+ +
+ + +
+ + +
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+

Advanced settings

+ +
+ +
+
+ Theme details + +

+ Use the fields below to configure the Diazo theme + manually. Usually, these settings are applied by + enabling a theme from the Themes + tab. +

+ +
+ + + + +
+ If enabled the currently configured Diazo theme (if any) + will be applied. +
+ +
+ +
+ + +
+ Enter a path or URL for the theme rules file. +
+ +
+ + + +
+ +
+ + +
+ If your theme uses relative paths for images, stylesheets + or other resources, you can enter a prefix here to make + sure these resources will work regardless of which page + Plone is rendering. +
+ +
+ + + +
+ +
+ + +
+ You can specify a Doctype string which will be set on + the output, for example "<!DOCTYPE html>". If left + blank the default XHTML 1.0 transistional Doctype or + that set in the Diazo theme is used. +
+ +
+ + + +
+ +
+ + + + +
+ Allow rules and themes to be read from remote servers. +
+ +
+ +
+ + +
+ If there are hostnames that you do not want to be + themed, you can list them here, one per line. This is + useful during theme development, so that you can + compare the themed and unthemed sites. In some cases, + you may also want to provided an unthemed host alias + for content administrators to be able to use 'plain' + Plone. +
+ +
+ + + +
+ +
+ + +
+ You can define parameters that will be passed + to the compiled theme here. In your rules file, you can + refer to a parameter by $name. Parameters + are defined using TALES expressions, which should + evaluate to a string, a number, a boolean or None. + Available variables are context, + request, portal, + portal_state, and + context_state. Define one variable + per line, in the format name = expression. +
+ +
+ + +
+ +
+
+ Theme base + +

+ The settings below control the presentation of the + content produced by Plone before a Diazo theme + is applied. Note that these settings will have an effect + even if no Diazo theme is currently enabled. +

+ +
+ + + +
+ The theme base defines a collection of templates and other + resources that makes up the raw content to which a theme is + applied. Most Diazo themes will assume the default theme base, + so only change this if you know what you are doing. +
+ + + +
+ +
+ + + + +
+ If enabled all external links will be marked with link type specific icons. +
+ +
+ +
+ + + + +
+ If enabled all external links in the content region open in a new window. +
+ +
+ +
+
+ + +
+ + + +
+ + + + + +
+ +
+ +
+ + +
+

New theme

+ +

+ Please enter the details of your new theme +

+ +
+ +
+ + +
+ Enter a short, descriptive title for your theme +
+ +
+ + +
+ +
+ +
+ You may also provide a longer description for your theme. +
+ +
+ + + +
+ + + +
+ Select this option to enable the newly created theme + immediately. +
+
+ +
+ + +
+ + + + +
+ + +
+
+

Upload theme

+ +

+ You can import a Zip file containing an existing theme. + This should contain a single top level directory, which will be used as + the theme identifier. If no Diazo rules.xml or + manifest.cfg file is found in this directory, a + default rules.xml file will be created. +

+ +
+ +
+ +
+ Select a file to upload. +
+ +
+ + + +
+ +
+ + + +
+ Select this option to enable the newly uploaded theme + immediately. +
+
+ +
+ + + +
+ Select this option to replace any existing theme that + may have been uploaded previously. +
+
+ +
+ + + +
+ + + + + +
+
+ + +
+
+
+
+ + From 3dcac71396859d3588dd9c590f3b12e9c2418183 Mon Sep 17 00:00:00 2001 From: Brian Duncan Date: Mon, 13 Nov 2023 15:25:53 -0600 Subject: [PATCH 2/6] override documentviewer template --- .../browser/controlpanel/documentviewer.py | 12 +++++ .../controlpanel/templates/documentviewer.pt | 28 ++++++++++++ castle/cms/overrides.zcml | 45 ++++++++++++------- 3 files changed, 68 insertions(+), 17 deletions(-) create mode 100644 castle/cms/browser/controlpanel/documentviewer.py create mode 100644 castle/cms/browser/controlpanel/templates/documentviewer.pt diff --git a/castle/cms/browser/controlpanel/documentviewer.py b/castle/cms/browser/controlpanel/documentviewer.py new file mode 100644 index 000000000..f772c0e35 --- /dev/null +++ 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/documentviewer.pt b/castle/cms/browser/controlpanel/templates/documentviewer.pt new file mode 100644 index 000000000..efe2ae9e8 --- /dev/null +++ b/castle/cms/browser/controlpanel/templates/documentviewer.pt @@ -0,0 +1,28 @@ + + + +
+ Portal status message +
+ + + Site Setup + + +

Global Document Viewer Settings

+ + + + + + diff --git a/castle/cms/overrides.zcml b/castle/cms/overrides.zcml index a0631cff2..d1efaa3f7 100644 --- a/castle/cms/overrides.zcml +++ b/castle/cms/overrides.zcml @@ -1,20 +1,31 @@ + xmlns="http://namespaces.zope.org/zope" + xmlns:five="http://namespaces.zope.org/five" + xmlns:i18n="http://namespaces.zope.org/i18n" + xmlns:plone="http://namespaces.plone.org/plone" + xmlns:genericsetup="http://namespaces.zope.org/genericsetup" + xmlns:monkey="http://namespaces.plone.org/monkey" + xmlns:browser="http://namespaces.zope.org/browser" + xmlns:z3c="http://namespaces.zope.org/z3c" + xmlns:cmf="http://namespaces.zope.org/cmf" + xmlns:zcml="http://namespaces.zope.org/zcml" + i18n_domain="castle.cms" +> - + - + + + + + From 2639462e7838161b342bea46651d789572139458 Mon Sep 17 00:00:00 2001 From: Brian Duncan Date: Mon, 13 Nov 2023 15:36:24 -0600 Subject: [PATCH 3/6] add dexterity types back button --- castle/cms/browser/templates/types-listing.pt | 15 ++++++++++++--- castle/cms/browser/types.py | 5 +++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/castle/cms/browser/templates/types-listing.pt b/castle/cms/browser/templates/types-listing.pt index 1604e3517..afd8b6cbd 100644 --- a/castle/cms/browser/templates/types-listing.pt +++ b/castle/cms/browser/templates/types-listing.pt @@ -15,10 +15,19 @@
+ + Site Setup + + +

Dexterity Content Types

+

-

+ tal:condition="view/description" + tal:content="structure view/description" + >

diff --git a/castle/cms/browser/types.py b/castle/cms/browser/types.py index 598efa356..034050015 100644 --- 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, +) From bee2e62bcede6f68d8aff3ce44f5d3282defd0b7 Mon Sep 17 00:00:00 2001 From: Brian Duncan Date: Mon, 13 Nov 2023 15:40:14 -0600 Subject: [PATCH 4/6] add missing back button --- castle/cms/browser/templates/redirects-controlpanel.pt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/castle/cms/browser/templates/redirects-controlpanel.pt b/castle/cms/browser/templates/redirects-controlpanel.pt index e9f62fc35..bce6f6aec 100644 --- a/castle/cms/browser/templates/redirects-controlpanel.pt +++ b/castle/cms/browser/templates/redirects-controlpanel.pt @@ -29,6 +29,13 @@ + + Site Setup + +

Manage aliases

From 5b4596921793eadb70b820e62be923e26a2cf644 Mon Sep 17 00:00:00 2001 From: Brian Duncan Date: Mon, 13 Nov 2023 15:51:51 -0600 Subject: [PATCH 5/6] update/ simplify back buttons --- .../browser/controlpanel/templates/announcements.pt | 4 +--- .../controlpanel/templates/archives-manage.pt | 11 ++++++----- .../controlpanel/templates/archives-review.pt | 11 ++++++----- castle/cms/browser/controlpanel/templates/audit.pt | 13 ++++++------- castle/cms/browser/controlpanel/templates/celery.pt | 11 ++++++----- .../cms/browser/controlpanel/templates/crawler.pt | 11 +++++------ castle/cms/browser/controlpanel/templates/links.pt | 11 +++++------ .../cms/browser/controlpanel/templates/sessions.pt | 11 +++++------ castle/cms/browser/controlpanel/templates/social.pt | 9 ++++----- castle/cms/browser/controlpanel/templates/status.pt | 10 ++++------ .../browser/controlpanel/templates/subscribers.pt | 9 +++++---- castle/cms/browser/controlpanel/templates/survey.pt | 12 ++++++------ castle/cms/browser/controlpanel/templates/tags.pt | 11 +++++------ .../templates/usergroups_usersoverview.pt | 10 +++++----- 14 files changed, 69 insertions(+), 75 deletions(-) diff --git a/castle/cms/browser/controlpanel/templates/announcements.pt b/castle/cms/browser/controlpanel/templates/announcements.pt index 16defcc7d..62d4aba35 100644 --- a/castle/cms/browser/controlpanel/templates/announcements.pt +++ b/castle/cms/browser/controlpanel/templates/announcements.pt @@ -14,10 +14,8 @@ Site Setup diff --git a/castle/cms/browser/controlpanel/templates/archives-manage.pt b/castle/cms/browser/controlpanel/templates/archives-manage.pt index eb40ee0f7..a2887a0b7 100644 --- a/castle/cms/browser/controlpanel/templates/archives-manage.pt +++ b/castle/cms/browser/controlpanel/templates/archives-manage.pt @@ -11,12 +11,13 @@ - - Site Setup + + Site Setup +

Archive Management

diff --git a/castle/cms/browser/controlpanel/templates/archives-review.pt b/castle/cms/browser/controlpanel/templates/archives-review.pt index 680eba2e2..3d10c6aef 100644 --- a/castle/cms/browser/controlpanel/templates/archives-review.pt +++ b/castle/cms/browser/controlpanel/templates/archives-review.pt @@ -18,12 +18,13 @@ - - Site Setup + + Site Setup +

Archive Management

diff --git a/castle/cms/browser/controlpanel/templates/audit.pt b/castle/cms/browser/controlpanel/templates/audit.pt index 9981cc711..6ad9b4c00 100644 --- 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())"> - - Site Setup + + > + Site Setup -

View Title

diff --git a/castle/cms/browser/controlpanel/templates/celery.pt b/castle/cms/browser/controlpanel/templates/celery.pt index 4f17c442a..17842c7ec 100644 --- a/castle/cms/browser/controlpanel/templates/celery.pt +++ b/castle/cms/browser/controlpanel/templates/celery.pt @@ -11,12 +11,13 @@ - - Site Setup + + Site Setup +

Celery Tasks

diff --git a/castle/cms/browser/controlpanel/templates/crawler.pt b/castle/cms/browser/controlpanel/templates/crawler.pt index e1a560d8c..8332e38b6 100644 --- a/castle/cms/browser/controlpanel/templates/crawler.pt +++ b/castle/cms/browser/controlpanel/templates/crawler.pt @@ -10,14 +10,13 @@
- - Site Setup + + Site Setup -

View Title

diff --git a/castle/cms/browser/controlpanel/templates/links.pt b/castle/cms/browser/controlpanel/templates/links.pt index ac321a66a..5df2c0cf7 100644 --- a/castle/cms/browser/controlpanel/templates/links.pt +++ b/castle/cms/browser/controlpanel/templates/links.pt @@ -47,14 +47,13 @@ - - Site Setup + + Site Setup -

View Title

diff --git a/castle/cms/browser/controlpanel/templates/sessions.pt b/castle/cms/browser/controlpanel/templates/sessions.pt index f501fd4cb..f6d7b8e80 100644 --- a/castle/cms/browser/controlpanel/templates/sessions.pt +++ b/castle/cms/browser/controlpanel/templates/sessions.pt @@ -10,14 +10,13 @@ - - Site Setup + + Site Setup -

View Title

diff --git a/castle/cms/browser/controlpanel/templates/social.pt b/castle/cms/browser/controlpanel/templates/social.pt index 8563f4ebe..71980d4d5 100644 --- a/castle/cms/browser/controlpanel/templates/social.pt +++ b/castle/cms/browser/controlpanel/templates/social.pt @@ -10,14 +10,13 @@
- + Site Setup -

View Title

diff --git a/castle/cms/browser/controlpanel/templates/status.pt b/castle/cms/browser/controlpanel/templates/status.pt index d1101af6b..5b765ada5 100644 --- a/castle/cms/browser/controlpanel/templates/status.pt +++ b/castle/cms/browser/controlpanel/templates/status.pt @@ -9,15 +9,13 @@ - + Site Setup - -

CastleCMS Status

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 index ba2fa3569..c373b158a 100644 --- a/castle/cms/browser/controlpanel/templates/subscribers.pt +++ b/castle/cms/browser/controlpanel/templates/subscribers.pt @@ -9,12 +9,13 @@ - + Site Setup +

diff --git a/castle/cms/browser/controlpanel/templates/survey.pt b/castle/cms/browser/controlpanel/templates/survey.pt index c0ac45b99..76be2dc84 100644 --- a/castle/cms/browser/controlpanel/templates/survey.pt +++ b/castle/cms/browser/controlpanel/templates/survey.pt @@ -9,12 +9,12 @@
- - Site Setup - › + + Site Setup +

View Title

diff --git a/castle/cms/browser/controlpanel/templates/tags.pt b/castle/cms/browser/controlpanel/templates/tags.pt index cb0fa9a81..2e53b37db 100644 --- a/castle/cms/browser/controlpanel/templates/tags.pt +++ b/castle/cms/browser/controlpanel/templates/tags.pt @@ -9,14 +9,13 @@ - - Site Setup + + Site Setup -

View Title

diff --git a/castle/cms/browser/controlpanel/templates/usergroups_usersoverview.pt b/castle/cms/browser/controlpanel/templates/usergroups_usersoverview.pt index 9ed180fa1..a447b8618 100644 --- a/castle/cms/browser/controlpanel/templates/usergroups_usersoverview.pt +++ b/castle/cms/browser/controlpanel/templates/usergroups_usersoverview.pt @@ -20,11 +20,11 @@
- - Site Setup + + Site Setup

Date: Mon, 13 Nov 2023 15:54:43 -0600 Subject: [PATCH 6/6] update CHANGES --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index df7dfbd9a..8803f5672 100644 --- 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/) - Allow resuming importjson script +- fix missing/ inconsistently localed back to site setup button in controlpanels 3.0.0b126 (2023-08-01) ----------------------