WIP: Button storybook

java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml

@@ -290,8 +290,8 @@
           <context context-type="sourcefile">/rhn/users/Addresses</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="Fill in this address" xml:space="preserve">
-        <source>Fill in this address</source>
+      <trans-unit id="Add address" xml:space="preserve">
+        <source>Add address</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/users/Addresses</context>
         </context-group>
@@ -526,8 +526,8 @@
           <context context-type="sourcefile">Navigation Menu</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="Edit this address" xml:space="preserve">
-        <source>Edit this address</source>
+      <trans-unit id="Edit" xml:space="preserve">
+        <source>Edit</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/users/Addresses</context>
         </context-group>
@@ -2170,7 +2170,7 @@ and try again.
         </context-group>
       </trans-unit>
       <trans-unit id="toolbar.delete.snippets" xml:space="preserve">
-        <source>delete snippet</source>
+        <source>Delete Snippet</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/kickstart/cobbler/CobblerSnippetEdit</context>
         </context-group>

java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml

@@ -1868,7 +1868,7 @@ button below, and &lt;b&gt;will be unable to log back in&lt;/b&gt;.</source>
         </context-group>
       </trans-unit>
       <trans-unit id="userdetails.jsp.noemailaddress" xml:space="preserve">
-        <source>No email address</source>
+        <source>Add Email Address</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/users/UserDetails</context>
         </context-group>
@@ -6345,13 +6345,13 @@ organization. You may grant or remove the organization administrator role in the
         </context-group>
         </trans-unit>
         <trans-unit id="systems.groups.jsp.remove">
-          <source>Leave Selected Groups</source>
+          <source>Leave Groups</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/groups/* pages</context>
         </context-group>
         </trans-unit>
         <trans-unit id="systems.groups.jsp.add">
-          <source>Join Selected Groups</source>
+          <source>Join Groups</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/groups/* pages</context>
         </context-group>
@@ -6489,7 +6489,7 @@ organization. You may grant or remove the organization administrator role in the
         </context-group>
         </trans-unit>
         <trans-unit id="systemgroup.details.editproperties">
-          <source>Edit These Properties</source>
+          <source>Edit System Group Properties</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/groups/* pages</context>
         </context-group>
@@ -7261,7 +7261,7 @@ organization. You may grant or remove the organization administrator role in the
         </context-group>
       </trans-unit>
       <trans-unit id="installpkgs.jsp.installpackages" xml:space="preserve">
-        <source>Install Selected Packages</source>
+        <source>Install Packages</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/packages/InstallPackages</context>
         </context-group>
@@ -12287,7 +12287,7 @@ the &lt;strong&gt;@@ENTERPRISE_LINUX_NAME@@ System Administration Guide.&lt;/str
         </context-group>
         </trans-unit>
         <trans-unit id="activation-key.groups.jsp.add">
-          <source>Join Selected Groups</source>
+          <source>Join Groups</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/activationkeys/groups/* pages</context>
         </context-group>
@@ -12711,13 +12711,13 @@ the &lt;strong&gt;@@ENTERPRISE_LINUX_NAME@@ System Administration Guide.&lt;/str
         </context-group>
         </trans-unit>
         <trans-unit id="system.audit.listscap.jsp.removebut">
-          <source>Remove Selected Scans</source>
+          <source>Remove</source>
         <context-group name="ctx">
           <context context-type="sourcefile">View of SCAP scans for given system</context>
         </context-group>
         </trans-unit>
         <trans-unit id="system.audit.listscap.jsp.diffbut">
-          <source>Compare Selected Scans</source>
+          <source>Compare</source>
         <context-group name="ctx">
           <context context-type="sourcefile">View of SCAP scans for given system</context>
         </context-group>
@@ -13499,7 +13499,7 @@ the &lt;strong&gt;@@ENTERPRISE_LINUX_NAME@@ System Administration Guide.&lt;/str
         </context-group>
         </trans-unit>
         <trans-unit id="system.event.pending.headerPending">
-          <source>You may cancel events for this system by selecting them and clicking the &lt;strong&gt;Cancel Selected Events&lt;/strong&gt; button.</source>
+          <source>You may cancel events for this system by selecting them and clicking the &lt;strong&gt;Cancel Events&lt;/strong&gt; button.</source>
         <context-group name="ctx">
           <context context-type="sourcefile">System Events Pages</context>
         </context-group>
@@ -13517,7 +13517,7 @@ the &lt;strong&gt;@@ENTERPRISE_LINUX_NAME@@ System Administration Guide.&lt;/str
         </context-group>
         </trans-unit>
         <trans-unit id="system.event.pending.cancel">
-          <source>Cancel Selected Events</source>
+          <source>Cancel Events</source>
         <context-group name="ctx">
           <context context-type="sourcefile">System Events Pages</context>
         </context-group>
@@ -14761,7 +14761,7 @@ a file or files, or copy the latest version into a set of local overrides or int
         </context-group>
       </trans-unit>
       <trans-unit id="channelfiles.jsp.removeselected" xml:space="preserve">
-        <source>Remove Selected Files</source>
+        <source>Remove Files</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/configuration/ChannelFiles.do</context>
         </context-group>
@@ -15674,7 +15674,7 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
         </context-group>
       </trans-unit>
       <trans-unit id="toolbar.delete.configfile" xml:space="preserve">
-        <source>Delete This File Revision</source>
+        <source>Delete</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/configuration/file/FileDetails.do</context>
         </context-group>
@@ -15686,7 +15686,7 @@ centrally-managed configuration channel, {2}; below is a list of systems you may
         </context-group>
       </trans-unit>
       <trans-unit id="toolbar.delete.deletefile" xml:space="preserve">
-        <source>Delete This File</source>
+        <source>Delete</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/configuration/file/FileDetails.do</context>
         </context-group>
@@ -18765,14 +18765,14 @@ any of these revisions.  Are you sure you want to do this?</source>
         <trans-unit id="ssm.package.remove.select.summary">
           <source>Packages listed below may be removed from one or more systems.
 
-             Select one or more and click the &lt;b&gt;Remove Selected Packages&lt;/b&gt; button to schedule package removal.
+             Select one or more and click the &lt;b&gt;Remove Packages&lt;/b&gt; button to schedule package removal.
           </source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/ssm/PackageRemove.do</context>
         </context-group>
         </trans-unit>
         <trans-unit id="ssm.package.remove.select.confirm">
-          <source>Remove Selected Packages</source>
+          <source>Remove Packages</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/ssm/PackageRemove.do</context>
         </context-group>
@@ -18830,7 +18830,7 @@ any of these revisions.  Are you sure you want to do this?</source>
         </context-group>
         </trans-unit>
         <trans-unit id="ssm.package.upgrade.select.confirm">
-          <source>Upgrade Selected Packages</source>
+          <source>Upgrade Packages</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/ssm/PackageUpgrade.do</context>
         </context-group>
@@ -18882,14 +18882,14 @@ any of these revisions.  Are you sure you want to do this?</source>
         <trans-unit id="ssm.package.verify.select.summary">
           <source>Packages listed below may be verified on one or more systems.
 
-            Select one or more and click the &lt;b&gt;Verify Selected Packages&lt;/b&gt; button to schedule package verification.
+            Select one or more and click the &lt;b&gt;Verify Packages&lt;/b&gt; button to schedule package verification.
          </source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/ssm/PackageVerify.do</context>
         </context-group>
         </trans-unit>
         <trans-unit id="ssm.package.verify.select.confirm">
-          <source>Verify Selected Packages</source>
+          <source>Verify Packages</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/ssm/PackageVerify.do</context>
         </context-group>
@@ -20787,7 +20787,13 @@ The Tree Path, Base Channel, and Installer Generation should always match. This
         </context-group>
       </trans-unit>
       <trans-unit id="sdc.details.overview.subscribedchannels" xml:space="preserve">
-        <source>Subscribed Channels (&lt;a href="{0}"&gt;Alter Channel Subscriptions&lt;/a&gt;)</source>
+        <source>Subscribed Channels</source>
+        <context-group name="ctx">
+          <context context-type="sourcefile">/systems/details/Overview.do</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="sdc.details.overview.subscribedchannels.edit" xml:space="preserve">
+        <source>Edit Subscribed Channels</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/systems/details/Overview.do</context>
         </context-group>
@@ -20861,7 +20867,13 @@ The Tree Path, Base Channel, and Installer Generation should always match. This
         </context-group>
       </trans-unit>
       <trans-unit id="sdc.details.overview.sysproperties" xml:space="preserve">
-        <source>System Properties (&lt;a href="{0}"&gt;Edit These Properties&lt;/a&gt;)</source>
+        <source>System Properties</source>
+        <context-group name="ctx">
+          <context context-type="sourcefile">/systems/details/Overview.do</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="sdc.details.overview.sysproperties.edit" xml:space="preserve">
+        <source>Edit System Properties</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/systems/details/Overview.do</context>
         </context-group>
@@ -23813,13 +23825,13 @@ given channel.</source>
         </context-group>
       </trans-unit>
       <trans-unit id="toolbar.create.schedule" xml:space="preserve">
-        <source>create schedule</source>
+        <source>Create schedule</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
         </context-group>
       </trans-unit>
       <trans-unit id="toolbar.delete.schedule" xml:space="preserve">
-        <source>delete schedule</source>
+        <source>Delete Schedule</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/admin/ScheduleDetail.do</context>
         </context-group>
@@ -23951,7 +23963,7 @@ given channel.</source>
         </context-group>
       </trans-unit>
       <trans-unit id="toolbar.delete.software.channel" xml:space="preserve">
-        <source>Delete software channel</source>
+        <source>Delete Channel</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/channels/manage/Edit.do</context>
         </context-group>
@@ -23975,7 +23987,7 @@ given channel.</source>
         </context-group>
       </trans-unit>
       <trans-unit id="toolbar.delete.channel" xml:space="preserve">
-        <source>Delete software channel</source>
+        <source>Delete Channel</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/channels/manage/errata//Add.do</context>
         </context-group>
@@ -24422,13 +24434,13 @@ given channel.</source>
         <source>Add new slave</source>
       </trans-unit>
       <trans-unit id="iss.slave.remove" xml:space="preserve">
-        <source>Remove selected slaves</source>
+        <source>Remove slaves</source>
       </trans-unit>
       <trans-unit id="toolbar.create.master" xml:space="preserve">
         <source>Add new master</source>
       </trans-unit>
       <trans-unit id="iss.master.remove" xml:space="preserve">
-        <source>Remove selected masters</source>
+        <source>Remove masters</source>
       </trans-unit>
       <trans-unit id="toolbar.delete.slave" xml:space="preserve">
         <source>Delete slave</source>

java/code/src/com/redhat/rhn/frontend/taglibs/AddressTag.java

@@ -41,7 +41,7 @@
  *
  *                 Phone: 650-555-1212
  *                 Fax: 650-555-1212
- *                 Edit This Address (this is a link)
+ *                 Edit (this is a link)
  * </pre>
  *
  */
@@ -213,7 +213,7 @@ public int doStartTag() throws JspException {
                       .append("&amp;uid=")
                       .append(user.getId())
                       .append("\">")
-                      .append(ls.getMessage("Edit this address"))
+                      .append(ls.getMessage("Edit"))
                       .append("</a>");
             }
             else {
@@ -229,7 +229,7 @@ public int doStartTag() throws JspException {
                       .append("&amp;uid=")
                       .append(user.getId())
                       .append("\">")
-                      .append(ls.getMessage("Fill in this address"))
+                      .append(ls.getMessage("Add address"))
                       .append("</a>");
             }
 

java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java

@@ -168,6 +168,7 @@ public class IconTag extends TagSupport {
         icons.put("system-virt-guest", "fa fa-1-5x spacewalk-icon-virtual-guest");
         icons.put("system-virt-host", "fa fa-1-5x spacewalk-icon-virtual-host");
         icons.put("system-warn", "fa fa-exclamation-triangle fa-1-5x text-warning");
+        icons.put("item-close", "fa fa-times");
     }
 
     /**

java/code/src/com/redhat/rhn/frontend/taglibs/ListDisplayTag.java

@@ -465,12 +465,12 @@ private void renderSetButtons(Writer out) throws IOException {
                                                     "update_list_key_id").render());
                 buf.append(" ");
                 buf.append(addButtonTo(buf,
-                                       RequestContext.DISPATCH, SELECT_ALL_KEY).render());
+                                        RequestContext.DISPATCH, SELECT_ALL_KEY).render());
 
                 if (numItemsChecked > 0) {
                     buf.append(" ");
                     buf.append(addButtonTo(buf, RequestContext.DISPATCH, UNSELECT_ALL_KEY)
-                        .render());
+                    .render());
                 }
                 buf.append("</span>");
             }
@@ -594,7 +594,7 @@ private void renderActionButtons(JspWriter out) throws IOException {
             return;
         }
 
-        out.println("<div class=\"col-sm-12 text-right\">");
+        out.println("<div class=\"action-button-wrapper\">");
         if (getButton2() != null && AclManager.hasAcl(getButton2Acl(),
                 (HttpServletRequest) pageContext.getRequest(), getMixins())) {
 
@@ -772,13 +772,6 @@ public int doStartTag() throws JspException {
                 doSort(sortedColumn);
             }
 
-            out.print("<div class=\"spacewalk-list ");
-            out.println(type + "\"");
-            if (tableId != null) {
-                out.print(" id=\"" + tableId + "\"");
-            }
-            out.println(">");
-
             /*
              * If pageList contains an index and pageList.size() (what we are
              * displaying on the page) is less than pageList.getTotalSize() (the
@@ -787,6 +780,7 @@ public int doStartTag() throws JspException {
              * the entries on a single page and is similar to how the perl code
              * behaves.
              */
+
             StringWriter alphaBarContent = new StringWriter();
             StringWriter paginationContent = new StringWriter();
 
@@ -817,6 +811,18 @@ public int doStartTag() throws JspException {
                 out.print(paginationContent.getBuffer().toString());
                 out.println("</div>");
             }
+            if (isPaging()) {
+                out.print("<div class=\"spacewalk-section-toolbar\">\n");
+                renderActionButtons(out);
+                out.println("</div>");
+            }
+
+            out.print("<div class=\"spacewalk-list ");
+            out.println(type + "\"");
+            if (tableId != null) {
+                out.print(" id=\"" + tableId + "\"");
+            }
+            out.println(">");
 
             out.print("<div class=\"panel panel-default\">");
 
@@ -943,11 +949,6 @@ else if (type.equals("list")) {
                 out.println("</span>");
             }
             out.println("</div>");
-            if (isPaging()) {
-                out.print("<div class=\"row-0\">\n");
-                renderActionButtons(out);
-                out.println("</div>");
-            }
             out.println("</div>");
 
             // close list

java/code/src/com/redhat/rhn/frontend/taglibs/test/AddressTagTest.java

@@ -104,14 +104,14 @@ private String getPopulatedReturnValue(HttpServletRequest req, Long uid) {
                 "Fax: 650-555-1212<br />" +
                 "</address>" +
                 "<a class=\"btn btn-default\" href=\"/EditAddress.do?type=M&amp;uid=" +
-                uid + "\">" + "Edit this address</a>";
+                uid + "\">" + "Edit</a>";
     }
 
     private String getEmptyReturnValue(HttpServletRequest req, Long uid) {
         return "<strong>Mailing Address</strong>" +
                 "<div class=\"alert alert-info\">Address not filled in</div>" +
                 "<a class=\"btn btn-default\" href=\"/EditAddress.do?type=M&amp;uid=" +
-                uid + "\">Fill in this address</a>";
+                uid + "\">Add address</a>";
     }
 
 }