Fix #25918 Styles in template dropdown when creating new pages (#25922)

dotCMS · Aug 28, 2023 · cd64f02 · cd64f02
1 parent 7d4f4a8
commit cd64f02
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/core-web/libs/dotcms-scss/jsp/scss/dijit/_menu.scss b/core-web/libs/dotcms-scss/jsp/scss/dijit/_menu.scss
@@ -2,6 +2,19 @@
     padding: 0;
     border: 0 none;
 
+    // Template selector in create page form
+    &#templateSel_popup {
+        .dijitMenuItem {
+            height: auto;
+            padding: $spacing-1 $spacing-2;
+            gap: $spacing-0;
+
+            small {
+                color: $color-palette-gray-700;
+            }
+        }
+    }
+
     .dijitMenuItem {
         display: flex;
         padding: 0 $spacing-2;
@@ -47,6 +60,12 @@
     }
 }
 
+// http://localhost:8080/dotAdmin/#/c/maintenance
+// Specific to the maintenance page to prevent double scrollbars
+.dijitComboBoxMenuPopup#widget_cache_list_dropdown {
+    max-height: 17.5rem !important;
+}
+
 .dijitComboBoxMenuPopup {
     background: $white;
     color: $black;
@@ -55,7 +74,6 @@
     box-shadow: $md-shadow-6;
     padding: $spacing-1;
     margin-top: $spacing-1;
-    max-height: 17.5rem !important;
 
     .dijitMenuItem {
         display: flex;

diff --git a/dotCMS/src/main/java/com/dotmarketing/portlets/templates/ajax/TemplateAjax.java b/dotCMS/src/main/java/com/dotmarketing/portlets/templates/ajax/TemplateAjax.java
@@ -162,7 +162,7 @@ private Map<String, Object> buildTemplateMap(Template template) throws DotDataEx
 			templateMap.put("hostName", parentHost.getHostname());
 			templateMap.put("hostId", parentHost.getIdentifier());
 			templateMap.put("fullTitle",   templateMap.get("title") + " (" + parentHost.getHostname() + ")" );
-			templateMap.put("htmlTitle",  "<div><div style='float:left'>" + templateMap.get("title") + "</div><div style='float:right'>" + parentHost.getHostname() + "</div></div>" );
+			templateMap.put("htmlTitle",  "<div>" + templateMap.get("title") + "</div><small>" + parentHost.getHostname() + "</div></small>" );
 		} else {
 			templateMap.put("fullTitle", templateMap.get("title"));
 			templateMap.put("htmlTitle", templateMap.get("title"));

diff --git a/dotCMS/src/main/webapp/html/css/dijit-dotcms/dotcms.css b/dotCMS/src/main/webapp/html/css/dijit-dotcms/dotcms.css
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/cmsmaintenance/view_cms_maintenance.jsp b/dotCMS/src/main/webapp/html/portlet/ext/cmsmaintenance/view_cms_maintenance.jsp
@@ -1341,7 +1341,7 @@ dd.leftdl {
                 <tr>
                     <td>&nbsp;</td>
                     <td align="right" style="white-space: nowrap;">
-                        <select name="cName" dojoType="dijit.form.ComboBox" autocomplete="true" value="<%= LanguageUtil.get(pageContext,"Flush-All-Caches") %>">
+                        <select id="cache_list" name="cName" dojoType="dijit.form.ComboBox" autocomplete="true" value="<%= LanguageUtil.get(pageContext,"Flush-All-Caches") %>">
                             <option selected="selected" value="all"><%= LanguageUtil.get(pageContext,"Flush-All-Caches") %></option>
                             <% Object[] caches = (Object[])CacheLocator.getCacheIndexes();
                             String[] indexValue = new String[caches.length];