ZMI

zopefoundation · May 17, 2018 · 1b4006e · icemac · Jun 20, 2018 · 1b4006e
1 parent a84a580
commit 1b4006e
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 9 deletions.
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Zope</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.pydevproject b/.pydevproject
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+    <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+    <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python interpreter</pydev_property>
+    <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+        <path>/${PROJECT_DIR_NAME}</path>
+    </pydev_pathproperty>
+</pydev_project>
diff --git a/requirements-full.txt b/requirements-full.txt
@@ -93,5 +93,5 @@ zope.viewlet==4.1.0
 -e git+https://github.com/zopefoundation/zmi.styles@master#egg=zmi.styles
 -e git+https://github.com/zopefoundation/AccessControl@zmi-bootstrap#egg=AccessControl
 -e git+https://github.com/zopefoundation/Products.BTreeFolder2@zmi-bootstrap#egg=Products.BTreeFolder2
--e git+https://github.com/zopefoundation/Products.ZCatalog@zmi-bootstrap#egg=Products.ZCatalog
+#-e git+https://github.com/zopefoundation/Products.ZCatalog@zmi-bootstrap#egg=Products.ZCatalog
 -e git+https://github.com/zopefoundation/Products.PythonScripts@zmi-bootstrap#egg=Products.PythonScripts
diff --git a/src/App/dtml/manage_page_footer.dtml b/src/App/dtml/manage_page_footer.dtml
@@ -1,3 +1,2 @@
-  </div>
 </body>
 </html>
diff --git a/src/App/dtml/manage_page_header.dtml b/src/App/dtml/manage_page_header.dtml
@@ -16,4 +16,3 @@
 </head>
 <!-- REFACT what is a better way to get the last part of the current URL? -->
 <body class="zmi zmi-<dtml-var "meta_type.replace(' ', '-')"> zmi-<dtml-var "URL0[_.len(URL1)+1:]">">
-  <div class="container-fluid">
diff --git a/src/OFS/dtml/access.dtml b/src/OFS/dtml/access.dtml
@@ -5,7 +5,7 @@
   </dtml-if>
 </dtml-with>
 
-<main class="<dtml-var "meta_type.replace(' ', '-')"> <dtml-var "URL0[_.len(URL1)+1:]">">
+<main class="container-fluid <dtml-var "meta_type.replace(' ', '-')"> <dtml-var "URL0[_.len(URL1)+1:]">">
     <p class="form-help">
         The listing below shows the current security settings for this item.
         Permissions are rows and roles are columns. Checkboxes are used to
@@ -97,19 +97,19 @@
             <div class="form-group">
                 <label for="username" class="nowrap">User defined roles</label>
                 <div class="form-inline">
-                    <input type="text" class="form-control col-sm-6 col-md-3 mr-2" id="role" name="role" placeholder="Define a new user role ..." />
-                    <input type="submit" class="btn btn-primary" name="submit" value="Add Role" /> 
+                    <input type="text" class="form-control col-sm-6 col-md-3 mr-2 mb-2" id="role" name="role" placeholder="Define a new user role ..." />
+                    <input type="submit" class="btn btn-primary mb-2" name="submit" value="Add Role" /> 
                 </div>
             </div>
             <dtml-if userdefined_roles>
                 <div class="form-group">
                     <div class="form-inline">
-                        <select name="roles:list" class="form-control col-sm-6 col-md-3 mr-2">
+                        <select name="roles:list" class="form-control col-sm-6 col-md-3 mr-2  mb-2">
                           <dtml-in userdefined_roles>
                             <option value="&dtml-sequence-item;">&dtml-sequence-item;</option>
                           </dtml-in userdefined_roles>
                         </select>
-                        <input type="submit" class="btn btn-primary" name="submit" value="Delete Role" /> 
+                        <input type="submit" class="btn btn-primary  mb-2" name="submit" value="Delete Role" /> 
                     </div>
                 </div>
             </dtml-if>

diff --git a/src/OFS/zpt/main.zpt b/src/OFS/zpt/main.zpt
@@ -2,7 +2,7 @@
 <tal:tabs replace="structure here/manage_tabs" />
 
 <!-- Add object widget -->
-<form class="form-inline float-right mb-2"
+<form  class="form-inline float-right mb-2 addItemSelect"
       method="get"
       tal:condition="here/filtered_meta_types"
       tal:attributes="action string:${request/URL1}/" >