Merge bab9819 into cfb1321

zopefoundation · Jun 21, 2019 · f1c1b63 · f1c1b63
2 parents cfb1321 + bab9819
commit f1c1b63
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 36 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -13,6 +13,9 @@ https://github.com/zopefoundation/Zope/blob/4.0a6/CHANGES.rst
 
 - Update to current releases of the dependencies.
 
+- Fix broken ZMI when using non-root deployments.
+  (`#647 <https://github.com/zopefoundation/Zope/issues/647>`_)
+
 
 4.1 (2019-06-19)
 ----------------

diff --git a/src/App/dtml/copyright.dtml b/src/App/dtml/copyright.dtml
@@ -6,16 +6,16 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
 
   <title>Zope Public License (ZPL) Version 2.1</title>
-  <link rel="stylesheet" type="text/css" href="/++resource++zmi/bootstrap-4.1.1/bootstrap.min.css" />
-  <link rel="stylesheet" type="text/css" href="/++resource++zmi/zmi_base.css" />
+  <link rel="stylesheet" type="text/css" href="&dtml-BASEPATH1;/++resource++zmi/bootstrap-4.1.1/bootstrap.min.css" />
+  <link rel="stylesheet" type="text/css" href="&dtml-BASEPATH1;/++resource++zmi/zmi_base.css" />
 
-  <link rel="shortcut icon" type="image/x-icon" href="/++resource++zmi/logo/favicon/favicon.ico" />
-  <link rel="apple-touch-icon" sizes="180x180" href="/++resource++zmi/logo/favicon/apple-touch-icon.png" />
-  <link rel="icon" type="image/png" sizes="32x32" href="/++resource++zmi/logo/favicon/favicon-32x32.png" />
-  <link rel="icon" type="image/png" sizes="16x16" href="/++resource++zmi/logo/favicon/favicon-16x16.png" />
-  <link rel="manifest" href="/++resource++zmi/logo/favicon/site.webmanifest" />
-  <link rel="mask-icon" href="/++resource++zmi/logo/favicon/safari-pinned-tab.svg" color="#5bbad5" />
-  <meta name="msapplication-config" content="/++resource++zmi/logo/favicon/browserconfig.xml"/>
+  <link rel="shortcut icon" type="image/x-icon" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/favicon.ico" />
+  <link rel="apple-touch-icon" sizes="180x180" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/apple-touch-icon.png" />
+  <link rel="icon" type="image/png" sizes="32x32" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/favicon-32x32.png" />
+  <link rel="icon" type="image/png" sizes="16x16" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/favicon-16x16.png" />
+  <link rel="manifest" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/site.webmanifest" />
+  <link rel="mask-icon" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/safari-pinned-tab.svg" color="#5bbad5" />
+  <meta name="msapplication-config" content="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/browserconfig.xml"/>
   <meta name="msapplication-TileColor" content="#2d89ef" />
   <meta name="theme-color" content="#ffffff" />
 </head>
@@ -31,19 +31,19 @@
     <h3>This software is Copyright &copy;
     <a href="http://www.zope.org/en/latest/foundation.html" target="_top">
       Zope Foundation</a> and Contributors. All rights reserved.</h3>
-    
+
     <p>
       This license has been certified as open source. It has also
       been designated as GPL compatible by the Free Software
       Foundation (FSF).
     </p>
-    
+
     <p>
       Redistribution and use in source and binary forms, with or
       without modification, are permitted provided that the
       following conditions are met:
     </p>
-    
+
     <ol>
       <li>
         Redistributions in source code must retain the
@@ -75,7 +75,7 @@
         the files and the date of any change.
       </li>
     </ol>
-    
+
     <h3>Disclaimer</h3>
     <p>
       <strong>

diff --git a/src/App/dtml/manage.dtml b/src/App/dtml/manage.dtml
@@ -2,13 +2,13 @@
 <head>
 	<title>Zope on &dtml-BASE0;</title>
 
-	<link rel="shortcut icon" type="image/x-icon" href="/++resource++zmi/logo/favicon/favicon.ico" />
-	<link rel="apple-touch-icon" sizes="180x180" href="/++resource++zmi/logo/favicon/apple-touch-icon.png" />
-	<link rel="icon" type="image/png" sizes="32x32" href="/++resource++zmi/logo/favicon/favicon-32x32.png" />
-	<link rel="icon" type="image/png" sizes="16x16" href="/++resource++zmi/logo/favicon/favicon-16x16.png" />
-	<link rel="manifest" href="/++resource++zmi/logo/favicon/site.webmanifest" />
-	<link rel="mask-icon" href="/++resource++zmi/logo/favicon/safari-pinned-tab.svg" color="#5bbad5" />
-	<meta name="msapplication-config" content="/++resource++zmi/logo/favicon/browserconfig.xml"/>
+	<link rel="shortcut icon" type="image/x-icon" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/favicon.ico" />
+	<link rel="apple-touch-icon" sizes="180x180" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/apple-touch-icon.png" />
+	<link rel="icon" type="image/png" sizes="32x32" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/favicon-32x32.png" />
+	<link rel="icon" type="image/png" sizes="16x16" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/favicon-16x16.png" />
+	<link rel="manifest" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/site.webmanifest" />
+	<link rel="mask-icon" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/safari-pinned-tab.svg" color="#5bbad5" />
+	<meta name="msapplication-config" content="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/browserconfig.xml"/>
 	<meta name="msapplication-TileColor" content="#2d89ef" />
 	<meta name="theme-color" content="#ffffff" />
 

diff --git a/src/App/dtml/manage_page_header.dtml b/src/App/dtml/manage_page_header.dtml
@@ -11,19 +11,19 @@
 
 <title><dtml-if title_or_id><dtml-var title_or_id><dtml-else>Zope</dtml-if></title>
 <dtml-in css_urls>
-	<link rel="stylesheet" type="text/css" href="&dtml-sequence-item;" />
+	<link rel="stylesheet" type="text/css" href="&dtml-BASEPATH1;&dtml-sequence-item;" />
 </dtml-in>
 <dtml-in js_urls>
-	<script src="&dtml-sequence-item;"></script>
+	<script src="&dtml-BASEPATH1;&dtml-sequence-item;"></script>
 </dtml-in>
 
-<link rel="shortcut icon" type="image/x-icon" href="/++resource++zmi/logo/favicon/favicon.ico" />
-<link rel="apple-touch-icon" sizes="180x180" href="/++resource++zmi/logo/favicon/apple-touch-icon.png" />
-<link rel="icon" type="image/png" sizes="32x32" href="/++resource++zmi/logo/favicon/favicon-32x32.png" />
-<link rel="icon" type="image/png" sizes="16x16" href="/++resource++zmi/logo/favicon/favicon-16x16.png" />
-<link rel="manifest" href="/++resource++zmi/logo/favicon/site.webmanifest" />
-<link rel="mask-icon" href="/++resource++zmi/logo/favicon/safari-pinned-tab.svg" color="#5bbad5" />
-<meta name="msapplication-config" content="/++resource++zmi/logo/favicon/browserconfig.xml"/>
+<link rel="shortcut icon" type="image/x-icon" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/favicon.ico" />
+<link rel="apple-touch-icon" sizes="180x180" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/apple-touch-icon.png" />
+<link rel="icon" type="image/png" sizes="32x32" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/favicon-32x32.png" />
+<link rel="icon" type="image/png" sizes="16x16" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/favicon-16x16.png" />
+<link rel="manifest" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/site.webmanifest" />
+<link rel="mask-icon" href="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/safari-pinned-tab.svg" color="#5bbad5" />
+<meta name="msapplication-config" content="&dtml-BASEPATH1;/++resource++zmi/logo/favicon/browserconfig.xml"/>
 <meta name="msapplication-TileColor" content="#2d89ef" />
 <meta name="theme-color" content="#ffffff" />
 

diff --git a/src/App/dtml/menu.dtml b/src/App/dtml/menu.dtml
@@ -2,19 +2,19 @@
 
 <main>
 <div class="dropdown" id="menu_buttons">
-	<a href="#" class="dropdown-toggle" 
-		data-toggle="dropdown" 
-		id="dropdownMenu1" 
+	<a href="#" class="dropdown-toggle"
+		data-toggle="dropdown"
+		id="dropdownMenu1"
 		title="Menu-Options"
-		aria-haspopup="true" 
+		aria-haspopup="true"
 		aria-expanded="true"
 		><i class="fa fa-cog"></i>
 	</a>
 	<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
 		<li><a id="menu_refresh" href="manage_menu">Refresh</a></li>
 		<li><a id="menu_save" href="manage_menu?save_layout=1">Save layout</a></li>
 
-		<li><a id="menu_cp" title="Control Panel" 
+		<li><a id="menu_cp" title="Control Panel"
 			href="/Control_Panel/manage_main" target="manage_main">Control Panel</a></li>
 		<dtml-try>
 			<dtml-in "Control_Panel.Database.getDatabaseNames(quote=True)">
@@ -24,7 +24,7 @@
 		<dtml-except AttributeError>
 		<dtml-except NameError>
 		</dtml-try>
-		<li><a id="menu_undo" 
+		<li><a id="menu_undo"
 			href="/Control_Panel/Database/main/manage_UndoForm" target="manage_main">Undo</a></li>
 
 		<li><a id="menu_logout" href="manage_zmi_logout">Logout</a></li>
@@ -62,7 +62,7 @@
 
 </main>
 
-<script src="/++resource++zmi/zmi.localstorage.api.js"></script>
+<script src="&dtml-BASEPATH1;/++resource++zmi/zmi.localstorage.api.js"></script>
 <script>
 	function menu_resize(init) {
 		var key = "ZMI.manage_menu.width";