Merge bcc6075 into b05514c

zopefoundation · Jul 14, 2020 · e569e28 · e569e28
2 parents b05514c + bcc6075
commit e569e28
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/src/App/dtml/davLockManager.dtml b/src/App/dtml/davLockManager.dtml
@@ -11,21 +11,20 @@
     provided path.
   </p>
 
-  <form action="&dtml-URL0;" name="finderform">
-    <p class="form-help">Search path:
-      <input type="text" size="14" name="frompath"
-             value="&dtml.missing-frompath;" 
-             class="form-element" />
-      <input class="btn btn-primary" type="submit" value="Go"/>
-    </p>
+  <form action="&dtml-URL0;" name="finderform" class="form-inline">
+    <label for="frompath" class="form-label mr-3">Search path</label>
+        <input type="text" name="frompath" id="frompath" 
+              value="&dtml.missing-frompath;" 
+              class="form-control mr-3" />
+        <input class="btn btn-primary" type="submit" value="Go" />
   </form>
 
   <form action="manage_unlockObjects" name="objectItems" method="post">
     <input type="hidden" name="frompath" value="&dtml.missing-frompath;" />
 
     <dtml-if lockedobjs>
 
-      <table class="table table-striped table-hover table-sm objectItems">
+      <table class="table table-striped table-hover table-sm objectItems my-5">
 
         <thead class="thead-light">
           <th scope="col" class="zmi-object-check text-right">
@@ -73,9 +72,9 @@
       </div>
     <dtml-else>
       <dtml-if frompath>
-        <p class="form-help">
+        <div class="alert alert-info my-5">
           Found no locked items under path <em>&dtml-frompath;</em>.
-        </p>
+        </div>
       </dtml-if>
     </dtml-if>
   </form>

diff --git a/src/zmi/styles/resources/zmi_base.css b/src/zmi/styles/resources/zmi_base.css
@@ -105,10 +105,10 @@ a:hover {
 .zmi-controls > * {
 	margin-bottom:.6rem;
 }
-
 .zmi .zmi-controls .btn.btn-primary,
 .zmi a.btn.btn-primary,
-.zmi input.btn.btn-primary {
+.zmi input.btn.btn-primary,
+.zmi .btn-primary:not(:disabled):not(.disabled):active {
   background-color:white !important;
   color:#6c757d;
   border-color:#6c757d;

diff --git a/src/zmi/styles/resources/zmi_base.js b/src/zmi/styles/resources/zmi_base.js
@@ -104,8 +104,13 @@ function fix_modern_modal_gui() {
 	// Aggregate multiple Help-Paragraphs
 	if ( $('#zmi-modal .modal-body p.form-help').length > 1) {
 		var help_text = $('#zmi-modal .modal-body p.form-help').text();
+		var help_text_html = '<p class="form-help">' + help_text +'</p>';
 		$('#zmi-modal .modal-body p.form-help').remove();
-		$('#zmi-modal .modal-body').prepend('<p class="form-help">' + help_text +'</p>');
+		if ( 0 === $('.modal-body main').length ) {
+			$('#zmi-modal .modal-body').prepend(help_text_html);
+		} else {
+			$('#zmi-modal .modal-body main').prepend(help_text_html);
+		}
 	}
 	$('#zmi-modal .modal-body p.form-help').before('<i title="Help" class="zmi-help-icon fas fa-question-circle" onclick="$(\'#zmi-modal .form-help\').toggle();$(this).toggleClass(\'active\')"></i>');
 	$('#zmi-modal .modal-body p.form-help').hide();