Add description to checkbox "Enable property inheritance" (#30)

wcm-io · Apr 10, 2024 · 643ce3b · 643ce3b
1 parent 4413b4a
commit 643ce3b
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 10 deletions.
diff --git a/bundle/src/main/resources/angularjs-partials/configTable.html b/bundle/src/main/resources/angularjs-partials/configTable.html
@@ -3,20 +3,23 @@
        ng-cloak>
   <thead>
     <tr class="coral-Table-row">
-      <th class="coral-Table-headerCell"  style="width: 15%;">
+      <th class="coral-Table-headerCell" style="width: 15%;">
         <h3 bo-text="config.collectionItemName"></h3>
       </th>
       <th class="coral-Table-headerCell">
         <p class="caconfig-if-is-preview">
           <span class="caconfig-edit-config caconfig-link coral-Link" bo-text="i18n('config.edit')" tabindex="0"></span>
         </p>
-        <label class="coral-Checkbox caconfig-if-not-preview caconfig-if-config-not-inherited caconfig-if-config-not-overridden">
-          <input class="coral-Checkbox-input" type="checkbox"
-                 ng-model="configPropertyInherit.value"
-                 ng-change="configTable.handleConfigPropertyInheritChange(index)" />
-          <span class="coral-Checkbox-checkmark"></span>
-          <span class="coral-Checkbox-description" bo-text="i18n('config.inheritance.property')"></span>
-        </label>
+        <div class="caconfig-if-not-preview caconfig-if-config-not-inherited caconfig-if-config-not-overridden">
+          <label class="coral-Checkbox">
+            <input class="coral-Checkbox-input" type="checkbox"
+                   ng-model="configPropertyInherit.value"
+                   ng-change="configTable.handleConfigPropertyInheritChange(index)" />
+            <span class="coral-Checkbox-checkmark"></span>
+            <span class="coral-Checkbox-description" bo-text="i18n('config.inheritance.property')"></span>
+          </label>
+          <caconfig-help-inline-popup content="i18n('config.inheritance.propertyDescription')"></caconfig-help-inline-popup>
+        </div>
         <p class="caconfig-if-not-preview caconfig-if-config-inherited">
           <span class="caconfig-if-is-collection" bo-text="i18n('config.inheritance.collectionItem')"></span>
           <span class="caconfig-if-not-collection" bo-text="i18n('config.inheritance.config')"></span>

diff --git a/bundle/src/main/resources/i18n/de.json b/bundle/src/main/resources/i18n/de.json
@@ -45,7 +45,8 @@
         "collection": "Listen-Vererbung aktivieren",
         "collectionItem": "Diese Konfiguration wird über Listen-Vererbung vererbt.",
         "config": "Diese Konfiguration wird vererbt.",
-        "property": "Eigenschafts-Vererbung aktivieren"
+        "property": "Eigenschafts-Vererbung aktivieren",
+        "propertyDescription": "Wenn aktiviert, werden Eigenschaften, die hier nicht explizit gesetzt sind, von Konfigurationen aus höheren Ebenen des Vererbungsbaums übernommen."
       },
 
       "tooltip": {

diff --git a/bundle/src/main/resources/i18n/en.json b/bundle/src/main/resources/i18n/en.json
@@ -45,7 +45,8 @@
         "collection": "Enable collection inheritance",
         "collectionItem": "This configuration is inherited via collection inheritance.",
         "config": "This configuration is inherited.",
-        "property": "Enable property inheritance"
+        "property": "Enable property inheritance",
+        "propertyDescription": "If enabled, properties that are not set here explicitly are inherited from configurations further up in the inheritance tree."
       },
 
       "tooltip": {

diff --git a/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/css/editor.css b/bundle/src/main/webapp/app-root/clientlibs/io.wcm.caconfig.editor/css/editor.css
@@ -233,5 +233,13 @@ span.caconfig-tagbrowser {
 .caconfig-help-inline-popup button {
   padding: 0;
   min-height: 0;
+}
+.coral-Table-headerCell .caconfig-help-inline-popup {
+  text-transform: none;
+  font-size: 14px;
+  font-weight: normal;
+  letter-spacing: 0;
+}
+.coral-Table-headerCell .caconfig-help-inline-popup button {
   margin-top: 8px;
 }
diff --git a/changes.xml b/changes.xml
@@ -24,6 +24,9 @@
   <body>
 
     <release version="1.15.10" date="not released">
+      <action type="add" dev="sseifert" issue="30">
+        Add info button to explain behavior of "Enable Property Inheritance" checkbox.
+      </action>
       <action type="update" dev="sseifert">
         Switch to AEM 6.5.17 as minimum version.
       </action>