Update ACE editor 1.4.4 to 1.5.0 (#1166)

* Update ACE editor Ref: #1161 * - guard ZMI resources with permission, create a public resource for logos * - jazz up auto-generated default root page * jazz up auto-generated default root page (2) --------- Co-authored-by: Jens Vagelpohl <jens@plyp.com>
zopefoundation · Oct 11, 2023 · ce5288a · ce5288a
1 parent dcff181
commit ce5288a
Show file tree

Hide file tree

Showing 24 changed files with 87 additions and 21 deletions.
diff --git a/src/OFS/Application.py b/src/OFS/Application.py
@@ -351,7 +351,8 @@ def install_root_view(self):
         if 'index_html' not in app:
             from Products.PageTemplates.ZopePageTemplate import \
                 ZopePageTemplate
-            root_pt = ZopePageTemplate('index_html')
+            root_pt = ZopePageTemplate('index_html',
+                                       text=DEFAULT_ROOT_TEMPLATE)
             root_pt.pt_setTitle('Auto-generated default page')
             app._setObject('index_html', root_pt)
             self.commit('Added default view for root object')
@@ -513,3 +514,37 @@ def pgetattr(product, name, default=install_products, __init__=0):
         return default
 
     raise AttributeError(name)
+
+
+DEFAULT_ROOT_TEMPLATE = """\
+<!DOCTYPE html>
+<html>
+    <head>
+        <title tal:content="template/title">The title</title>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+        <link rel="shortcut icon" type="image/x-icon" href="/++resource++logo/favicon/favicon.svg" />
+        <link rel="stylesheet" type="text/css" href="/++resource++logo/default.css" />
+    </head>
+    <body>
+        <a href="https://www.zope.dev" target="_blank">
+            <img src="/++resource++logo/Zope.svg" id="logo" alt="Zope logo" />
+        </a>
+        <h1>
+            <span tal:condition="template/title" tal:replace="context/title_or_id">
+                content title or id
+            </span>:
+            <span tal:condition="template/title" tal:replace="template/title">
+                optional template title
+            </span>
+        </h1>
+        <p>
+            This is Page Template <em tal:content="template/id">template id</em>.
+        </p>
+        <p>
+            For documentation, please visit
+            <a href="https://zope.readthedocs.io">https://zope.readthedocs.io</a>.
+        </p>
+    </body>
+</html>
+"""
diff --git a/src/zmi/styles/configure.zcml b/src/zmi/styles/configure.zcml
@@ -6,7 +6,13 @@
 
     <browser:resourceDirectory
         name="zmi"
-        directory="resources" />
+        directory="resources"
+        permission="zope2.ViewManagementScreens" />
+
+    <browser:resourceDirectory
+        name="logo"
+        directory="resources/logo"
+        permission="zope.Public" />
 
     <subscriber
         provides="App.interfaces.ICSSPaths"

diff --git a/src/zmi/styles/resources/ace.ajax.org/ace.js b/src/zmi/styles/resources/ace.ajax.org/ace.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/ext-searchbox.js b/src/zmi/styles/resources/ace.ajax.org/ext-searchbox.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-css.js b/src/zmi/styles/resources/ace.ajax.org/mode-css.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-html.js b/src/zmi/styles/resources/ace.ajax.org/mode-html.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-javascript.js b/src/zmi/styles/resources/ace.ajax.org/mode-javascript.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-json.js b/src/zmi/styles/resources/ace.ajax.org/mode-json.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-less.js b/src/zmi/styles/resources/ace.ajax.org/mode-less.js
diff --git a/src/zmi/styles/resources/ace.ajax.org/mode-markdown.js b/src/zmi/styles/resources/ace.ajax.org/mode-markdown.js