diff --git a/CHANGES.rst b/CHANGES.rst index 4bc40ca282..edac84affb 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -30,7 +30,8 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst Fixes `#1077 `_. - Fix authentication error viewing ZMI with a user defined outside of zope root. - Fixes `#1195 `_. + Fixes `#1195 `_ and + `#1203 `_. - Work around ``Products.CMFCore`` and ``Products.CMFPlone`` design bug (registering non callable constructors). diff --git a/src/App/dtml/copyright.dtml b/src/App/dtml/copyright.dtml index 7b1d544f08..6843c58d45 100644 --- a/src/App/dtml/copyright.dtml +++ b/src/App/dtml/copyright.dtml @@ -6,16 +6,16 @@ Zope Public License (ZPL) Version 2.1 - + - - - - - - - + + + + + + + diff --git a/src/App/dtml/manage.dtml b/src/App/dtml/manage.dtml index 89800b76bc..1d6f237f2c 100644 --- a/src/App/dtml/manage.dtml +++ b/src/App/dtml/manage.dtml @@ -2,13 +2,13 @@ Zope on &dtml-BASE0; - - - - - - - + + + + + + + diff --git a/src/App/dtml/manage_page_header.dtml b/src/App/dtml/manage_page_header.dtml index e8b8659e10..a70451a9c3 100644 --- a/src/App/dtml/manage_page_header.dtml +++ b/src/App/dtml/manage_page_header.dtml @@ -10,27 +10,25 @@ <dtml-if title_or_id><dtml-var title_or_id><dtml-else>Zope</dtml-if> - - + - + - - - - - - - + + + + + + + - " class="zmi zmi- zmi-"> diff --git a/src/App/dtml/menu.dtml b/src/App/dtml/menu.dtml index a23800fd28..548c1c5185 100644 --- a/src/App/dtml/menu.dtml +++ b/src/App/dtml/menu.dtml @@ -64,7 +64,6 @@ -