Issue #2251: Corrected html structure of customer date(time) dynamic …

…fields to fit in with new rendering. Also adjusted js and css label code accordingly.
RotherOSS · Sep 18, 2023 · 4d4f8dc · 4d4f8dc
1 parent 3d477ff
commit 4d4f8dc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/Kernel/Output/HTML/Templates/Standard/DynamicField/Customer/BaseDateTime.tt b/Kernel/Output/HTML/Templates/Standard/DynamicField/Customer/BaseDateTime.tt
@@ -14,6 +14,7 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 # --
 
+<div class="DynamicFieldDate">
 [% Data.DateSelectionHTML %]
 [% IF Data.Mandatory %]
 <div id="[% Data.DivIDMandatory %]" class="TooltipErrorMessage">
@@ -29,3 +30,4 @@
     </p>
 </div>
 [% END %]
+</div>
diff --git a/Kernel/Output/HTML/Templates/Standard/DynamicField/Customer/Date.tt b/Kernel/Output/HTML/Templates/Standard/DynamicField/Customer/Date.tt
@@ -14,6 +14,7 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 # --
 
+<div class="DynamicFieldDate">
 [% Data.DateSelectionHTML %]
 [% IF Data.Mandatory %]
 <div id="[% Data.DivIDMandatory %]" class="TooltipErrorMessage">
@@ -29,3 +30,4 @@
     </p>
 </div>
 [% END %]
+</div>
diff --git a/var/httpd/htdocs/js/Core.UI.Datepicker.js b/var/httpd/htdocs/js/Core.UI.Datepicker.js
@@ -170,7 +170,7 @@ Core.UI.Datepicker = (function (TargetNS) {
                 Container.wrapInner("<div class='oooDate'></div>");
                 Container.addClass('oooDateContainer');
 
-                var Label = $('label', Container.parent());
+                var Label = $('label', Container.parent().parent());
                 var Checkbox = $('.oooDate > input[type=checkbox]', Container);
                 var Icon = $("<i class='oooAltCheck ooofo'></i>").on('click', function() {
                     Checkbox.click();

diff --git a/var/httpd/htdocs/skins/Customer/default/css/Core.InputFields.css b/var/httpd/htdocs/skins/Customer/default/css/Core.InputFields.css
@@ -390,10 +390,10 @@ label.oooFocus.LabelError {
 }*/
 
 /* Checkboxes & Date */
-.FieldCell > div.Field.oooDateContainer,
-.FieldCell > div.Field.oooCheckboxContainer,
-.Row > div.Field.oooDateContainer,
-.Row > div.Field.oooCheckboxContainer {
+.FieldCell > div.Field > div.oooDateContainer,
+.FieldCell > div.Field > div.oooCheckboxContainer,
+.Row > div.Field > div.oooDateContainer,
+.Row > div.Field > div.oooCheckboxContainer {
     height: 38px;
     padding-top: 16px;
     padding-left: 16px;