Added classes to creation types

uyuni-project · Oct 15, 2024 · e4b1330 · e4b1330
1 parent 73ce1c7
commit e4b1330
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -19595,7 +19595,7 @@ the &lt;a href="/rhn/kickstart/ActivationKeysList.do?ksid={0}"&gt;Activation Key
           <context context-type="sourcefile">/rhn/kickstart/ViewTrees.do</context>
         </context-group>
         </trans-unit>
-        <trans-unit id="kickstart.kickstartable_distro_create_new.jsp">
+        <trans-unit id="toolbar.create.distro">
           <source>Create Distribution</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/kickstart/ViewTrees.do</context>

diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java
@@ -18,6 +18,8 @@
 import com.redhat.rhn.frontend.html.HtmlTag;
 import com.redhat.rhn.manager.acl.AclManager;
 
+import org.apache.commons.lang3.StringUtils;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspWriter;
@@ -505,11 +507,11 @@ public int doStartTag() throws JspException {
             buf.append(baseTag.renderOpenTag());
             buf.append(toolbarDivTag.renderOpenTag());
 
-            buf.append(renderCreationLink());
             buf.append(renderCloneLink());
             buf.append(renderUploadLink());
             buf.append(renderDeletionLink());
             buf.append(renderMiscLink());
+            buf.append(renderCreationLink());
             buf.append(toolbarDivTag.renderCloseTag());
 
 
@@ -593,8 +595,7 @@ private String renderCreationLink() {
                 assertNotEmpty(getCreationUrl())) {
 
             String create = "toolbar.create." + getCreationType();
-            String className = "btn btn-primary";
-            return renderActionLink(getCreationUrl(), create, className,
+            return renderActionLink(getCreationUrl(), create, "btn btn-primary",
                                     create, "item-add", null, false);
         }
         return "";
@@ -605,8 +606,7 @@ private String renderCloneLink() {
                 assertNotEmpty(getCloneUrl())) {
 
             String clone = "toolbar.clone." + getCloneType();
-            String className = "btn btn-default";
-            return renderActionLink(getCloneUrl(), clone, className,
+            return renderActionLink(getCloneUrl(), clone, "btn btn-default",
                                     clone, "item-clone", null, false);
         }
         return "";
@@ -617,8 +617,7 @@ private String renderDeletionLink() {
                 assertNotEmpty(getDeletionUrl())) {
 
             String del = "toolbar.delete." + getDeletionType();
-            String className = "btn btn-danger";
-            return renderActionLink(getDeletionUrl(), del, className, del, "item-del", null, false);
+            return renderActionLink(getDeletionUrl(), del, "btn btn-danger", del, "item-del", null, false);
         }
         return "";
     }
@@ -628,8 +627,7 @@ private String renderUploadLink() {
                 assertNotEmpty(getUploadUrl())) {
 
             String del = "toolbar.upload." + getUploadType();
-            String className = "btn btn-default";
-            return renderActionLink(getUploadUrl(), del, className, del, "item-upload", null, false);
+            return renderActionLink(getUploadUrl(), del, "btn btn-default", del, "item-upload", null, false);
         }
         return "";
     }
@@ -646,8 +644,7 @@ private String renderMiscLink() {
             return "";
         }
 
-        String className = "btn btn-default";
-        return renderActionLink(getMiscUrl(), getMiscText(), className,
+        return renderActionLink(getMiscUrl(), getMiscText(), "btn btn-default",
                                  getMiscAlt(), getMiscIcon(), getMiscImg(), isMiscSpaOff());
     }
 
@@ -662,11 +659,15 @@ private String renderActionLink(String url, String text, String className,
 
         HtmlTag a = new HtmlTag("a");
         a.setAttribute("href", url);
-        a.setAttribute("class", className);
+
         if (isSpaOff) {
             a.setAttribute("data-senna-off", "true");
         }
 
+        if (StringUtils.isNotBlank(className)) {
+            a.setAttribute("class", className);
+        }
+
         if (assertNotEmpty(imgName)) {
             alt = LocalizationService.getInstance().getMessage(alt);
             HtmlTag imgTag = new HtmlTag("img");

diff --git a/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp b/java/code/webapp/WEB-INF/pages/kickstart/kstrees.jsp
@@ -8,8 +8,8 @@
 <body>
 
 <rhn:toolbar base="h1" miscIcon="item-add"
-    miscText="kickstart.kickstartable_distro_create_new.jsp"
-    miscUrl="TreeCreate.do"
+    creationType="distro"
+    creationUrl="TreeCreate.do"
     icon="header-kickstart"
     iconAlt="kickstarts.alt.img"
     helpUrl="/docs/${rhn:getDocsLocale(pageContext)}/reference/systems/autoinst-distributions.html">

diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/migrate.jsp
@@ -40,7 +40,7 @@
       </html:select>
     </div>
     <div class="form-group">
-      <button class="btn btn-primary" type="submit" name="dispatch" value="${rhn:localize('ssm.migrate.systems.confirmbutton')}">
+      <button class="btn btn-default" type="submit" name="dispatch" value="${rhn:localize('ssm.migrate.systems.confirmbutton')}">
           ${rhn:localize('ssm.migrate.systems.confirmbutton')}
       </button>
     </div>