Merge 984aace into c149e92

CHANGES.rst

@@ -3,7 +3,7 @@ Change Log
 
 2.6.3 (unreleased)
 ------------------
-
+- Changed adding object gui to modal window
 
 2.6.2 (2021-03-12)
 -------------------

src/Products/PluggableAuthService/PluggableAuthService.py

@@ -940,9 +940,17 @@ def all_meta_types(self):
         """ What objects can be put in here?
         """
         import Products
+        meta_types = Products.meta_types
         allowed_types = tuple(MultiPlugins) + (RAMCacheManager.meta_type,)
 
-        return [x for x in Products.meta_types if x['name'] in allowed_types]
+        meta_types = [x for x in meta_types if x['name'] in allowed_types]
+        dlg_type = 'zmi_show_add_dialog' 
+
+        for mt in meta_types:
+            want_modal = getattr(mt.get('instance', None), dlg_type, True)
+            mt[dlg_type] = 'modal' if want_modal else ''
+
+        return meta_types
 
     @security.private
     def manage_beforeDelete(self, item, container):

src/Products/PluggableAuthService/plugins/www/caAdd.zpt

@@ -2,59 +2,42 @@
 
 <main class="container-fluid">
 
-<h2 tal:define="form_title string:Add Cookie Auth Helper"
-    tal:replace="structure here/manage_form_title">Form Title</h2>
-
-<p class="form-help">
-Cookie Auth Helpers manage the details of Cookie Authentication for
-Pluggable Auth Service functionality.
-</p>
-
-<form action="addCookieAuthHelper" method="post"
- enctype="multipart/form-data">
-<table class="table table-sm">
-  <tr>
-    <td>
-    <div class="form-label">
-    Id
-    </div>
-    </td>
-    <td>
-    <input type="text" name="id" size="40" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-    <div class="form-optional">
-    Title
-    </div>
-    </td>
-    <td>
-    <input type="text" name="title" size="40" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-    <div class="form-optional">
-    Cookie Name
-    </div>
-    </td>
-    <td>
-    <input type="text" name="cookie_name" size="40" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-    </td>
-    <td>
-    <div class="form-element">
-    <input class="form-element" type="submit" name="submit"
-     value=" Add " />
-    </div>
-    </td>
-  </tr>
-</table>
-</form>
+  <h2 tal:define="form_title string:Add Cookie Auth Helper"
+      tal:replace="structure here/manage_form_title">Form Title</h2>
+
+    <p class="form-help">
+      Cookie Auth Helpers manage the details of Cookie Authentication for
+      Pluggable Auth Service functionality.
+    </p>
+
+    <form action="addCookieAuthHelper" method="post" enctype="multipart/form-data">
+
+      <div class="form-group row">
+        <label for="id" class="form-label col-sm-3 col-md-2">Id</label>
+        <div class="col-sm-9 col-md-10">
+          <input id="id" name="id" class="form-control" type="text" />
+        </div>
+      </div>
+
+      <div class="form-group row form-optional">
+        <label for="title" class="form-label col-sm-3 col-md-2">Title</label>
+        <div class="col-sm-9 col-md-10">
+          <input id="title" name="title" class="form-control" type="text" />
+        </div>
+      </div>
+
+      <div class="form-group row form-optional">
+        <label for="cookie_name" class="form-label col-sm-3 col-md-2">Cookie Name</label>
+        <div class="col-sm-9 col-md-10">
+          <input id="cookie_name" name="cookie_name" class="form-control" type="text" />
+        </div>
+      </div>
+
+      <div class="zmi-controls">
+        <input class="btn btn-primary" type="submit" name="submit" value="Add" />
+      </div>
+
+  </form>
 
 </main>
 

src/Products/PluggableAuthService/plugins/www/cpcAdd.zpt

@@ -2,50 +2,35 @@
 
 <main class="container-fluid">
 
-<h2 tal:define="form_title string:Add a Challenge Protocol Chooser Plugin"
-    tal:replace="structure here/manage_form_title">Form Title</h2>
-
-
-<p class="form-help">
-Challenge Protocol Chooser Plugins select the protocol to be used for
-challenge based on the incoming request.
-</p>
-
-<form action="addChallengeProtocolChooserPlugin" method="post"
- enctype="multipart/form-data">
-<table class="table table-sm">
-  <tr>
-    <td>
-    <div class="form-label">
-    Id
+  <h2 tal:define="form_title string:Add a Challenge Protocol Chooser Plugin"
+      tal:replace="structure here/manage_form_title">Form Title</h2>
+
+  <p class="form-help">
+    Challenge Protocol Chooser Plugins select the protocol to be used for
+    challenge based on the incoming request.
+  </p>
+
+  <form action="addChallengeProtocolChooserPlugin" method="post" enctype="multipart/form-data">
+
+    <div class="form-group row">
+      <label for="id" class="form-label col-sm-3 col-md-2">Id</label>
+      <div class="col-sm-9 col-md-10">
+        <input id="id" name="id" class="form-control" type="text" />
+      </div>
     </div>
-    </td>
-    <td>
-    <input type="text" name="id" size="40" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-    <div class="form-optional">
-    Title
+
+    <div class="form-group row form-optional">
+      <label for="title" class="form-label col-sm-3 col-md-2">Title</label>
+      <div class="col-sm-9 col-md-10">
+        <input id="title" name="title" class="form-control" type="text" />
+      </div>
     </div>
-    </td>
-    <td>
-    <input type="text" name="title" size="40" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-    </td>
-    <td>
-    <div class="form-element">
-    <input class="form-element" type="submit" name="submit"
-     value=" Add " />
+
+    <div class="zmi-controls">
+      <input class="btn btn-primary" type="submit" name="submit" value="Add" />
     </div>
-    </td>
-  </tr>
-</table>
-</form>
+
+  </form>
 
 </main>
 

src/Products/PluggableAuthService/plugins/www/daAdd.zpt

@@ -2,49 +2,35 @@
 
 <main class="container-fluid">
 
-<h2 tal:define="form_title string:Add Domain Auth Helper"
-    tal:replace="structure here/manage_form_title">Form Title</h2>
-
-<p class="form-help">
-Domain Auth Helpers manage the details of Domain-based Authentication for
-Pluggable Auth Service functionality.
-</p>
-
-<form action="manage_addDomainAuthHelper" method="post"
- enctype="multipart/form-data">
-<table class="table table-sm">
-  <tr>
-    <td>
-    <div class="form-label">
-    Id
+  <h2 tal:define="form_title string:Add Domain Auth Helper"
+      tal:replace="structure here/manage_form_title">Form Title</h2>
+
+  <p class="form-help">
+    Domain Auth Helpers manage the details of Domain-based Authentication for
+    Pluggable Auth Service functionality.
+  </p>
+
+  <form action="manage_addDomainAuthHelper" method="post" enctype="multipart/form-data">
+
+    <div class="form-group row">
+      <label for="id" class="form-label col-sm-3 col-md-2">Id</label>
+      <div class="col-sm-9 col-md-10">
+        <input id="id" name="id" class="form-control" type="text" />
+      </div>
     </div>
-    </td>
-    <td>
-    <input type="text" name="id" size="40" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-    <div class="form-optional">
-    Title
+
+    <div class="form-group row form-optional">
+      <label for="title" class="form-label col-sm-3 col-md-2">Title</label>
+      <div class="col-sm-9 col-md-10">
+        <input id="title" name="title" class="form-control" type="text" />
+      </div>
     </div>
-    </td>
-    <td>
-    <input type="text" name="title" size="40" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-    </td>
-    <td>
-    <div class="form-element">
-    <input class="form-element" type="submit" name="submit"
-     value=" Add " />
+
+    <div class="zmi-controls">
+      <input class="btn btn-primary" type="submit" name="submit" value="Add" />
     </div>
-    </td>
-  </tr>
-</table>
-</form>
+
+  </form>
 
 </main>
 

src/Products/PluggableAuthService/plugins/www/dgpAdd.zpt

@@ -2,50 +2,36 @@
 
 <main class="container-fluid">
 
-<h2 tal:define="form_title string:Add a Dynamic Groups Plugin"
-    tal:replace="structure here/manage_form_title">Form Title</h2>
-
-
-<p class="form-help">
-Dynamic Groups Plugins define groups using business rules, expressed via
-TALES expressions.
-</p>
-
-<form action="addDynamicGroupsPlugin" method="post"
- enctype="multipart/form-data">
-<table class="table table-sm">
-  <tr>
-    <td>
-    <div class="form-label">
-    Id
+  <h2 tal:define="form_title string:Add a Dynamic Groups Plugin"
+      tal:replace="structure here/manage_form_title">Form Title</h2>
+
+
+  <p class="form-help">
+    Dynamic Groups Plugins define groups using business rules, expressed via
+    TALES expressions.
+  </p>
+
+  <form action="addDynamicGroupsPlugin" method="post" enctype="multipart/form-data">
+
+    <div class="form-group row">
+      <label for="id" class="form-label col-sm-3 col-md-2">Id</label>
+      <div class="col-sm-9 col-md-10">
+        <input id="id" name="id" class="form-control" type="text" />
+      </div>
     </div>
-    </td>
-    <td>
-    <input type="text" name="id" size="40" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-    <div class="form-optional">
-    Title
+
+    <div class="form-group row form-optional">
+      <label for="title" class="form-label col-sm-3 col-md-2">Title</label>
+      <div class="col-sm-9 col-md-10">
+        <input id="title" name="title" class="form-control" type="text" />
+      </div>
     </div>
-    </td>
-    <td>
-    <input type="text" name="title" size="40" />
-    </td>
-  </tr>
-  <tr>
-    <td>
-    </td>
-    <td>
-    <div class="form-element">
-    <input class="form-element" type="submit" name="submit"
-     value=" Add " />
+
+    <div class="zmi-controls">
+      <input class="btn btn-primary" type="submit" name="submit" value="Add" />
     </div>
-    </td>
-  </tr>
-</table>
-</form>
+
+  </form>
 
 </main>