Revert titleless entry change, fix gap between draggable items, fix n…

…on draggable cards having drag handle
janfaracik · Dec 24, 2021 · a2615d8 · a2615d8
1 parent 49d0f0c
commit a2615d8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/core/src/main/resources/lib/form/entry.jelly b/core/src/main/resources/lib/form/entry.jelly
@@ -96,20 +96,18 @@ THE SOFTWARE.
         </j:if>
       </j:when>
       <j:otherwise>
-        <div class="help-sibling">
+        <div class="setting-main help-sibling">
+          <d:invokeBody />
           <f:helpLink url="${attrs.help}" featureName="${title}"/>
         </div>
+        <!-- used to display the form validation error -->
+        <div class="validation-error-area tr"><div colspan="2"></div><div></div><div></div></div>
+        <f:helpArea />
         <j:if test="${!empty(attrs.description)}">
           <f:description>
             <j:out value="${escapeEntryTitleAndDescription ? h.escape(attrs.description) : attrs.description}"/>
           </f:description>
         </j:if>
-        <div class="setting-main">
-          <d:invokeBody />
-        </div>
-        <!-- used to display the form validation error -->
-        <div class="validation-error-area tr"><div colspan="2"></div><div></div><div></div></div>
-        <f:helpArea />
       </j:otherwise>
     </j:choose>
   </div>

diff --git a/core/src/main/resources/lib/form/repeatable.jelly b/core/src/main/resources/lib/form/repeatable.jelly
@@ -133,7 +133,7 @@ THE SOFTWARE.
     <!-- The first DIV is the master copy. -->
     <div class="repeated-chunk to-be-removed" name="${name}">
       <div class="repeated-chunk__header">
-        <div class="${readOnlyMode ? '' : 'dd-handle'}"/>
+        <j:if test="${!empty(header)}"><div class="${readOnlyMode ? '' : 'dd-handle'}"/></j:if>
         ${header}
       </div>
       <j:scope>

diff --git a/war/src/main/less/modules/draggable-card.less b/war/src/main/less/modules/draggable-card.less
@@ -5,6 +5,7 @@
   border: 2px dashed var(--input-border);
   padding: 1rem;
   border-radius: 10px;
+  margin-bottom: 1rem;
 }
 
 .repeated-chunk .show-if-last { visibility: hidden; }
@@ -193,4 +194,4 @@ div.to-be-removed { display: none; }
       }
     }
   }
-}
+}