branding/css/spacewalk-theme.less | 18 ++++--------- java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java | 8 ++--- java/spacewalk-java.spec | 6 +++- rel-eng/packages/spacewalk-java | 2 - 4 files changed, 16 insertions(+), 18 deletions(-)
New commits: commit a4be2dfdb420970efa53c558700ec4193bac5ff5 Author: Michael Mraka michael.mraka@redhat.com Date: Fri Jan 31 16:13:43 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.139-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index a2f9e79..56353e5 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -28,7 +28,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 2.1.138 +Version: 2.1.139 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -801,6 +801,10 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Fri Jan 31 2014 Michael Mraka michael.mraka@redhat.com 2.1.139-1 +- add special class to help links +- use consistent set of icons for system status + * Fri Jan 31 2014 Michael Mraka michael.mraka@redhat.com 2.1.138-1 - reuse IconTag for help links, item search and pagination icons - re-style kickstart creation wizard, 1st form diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index f87e58b..5f302c9 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.138-1 java/ +2.1.139-1 java/
commit 8dcd62bef32745e7f7386a6dee93c442b054ec28 Author: Michael Mraka michael.mraka@redhat.com Date: Fri Jan 31 15:46:35 2014 +0100
add special class to help links
so we can easily hide them in spacewalk
diff --git a/branding/css/spacewalk-theme.less b/branding/css/spacewalk-theme.less index b7434cf..ac0b595 100644 --- a/branding/css/spacewalk-theme.less +++ b/branding/css/spacewalk-theme.less @@ -424,17 +424,8 @@ aside .nav > li > a { }
/* question symbol for help pop up*/ -h1 .fa-stack .fa-question { - font-size: .6em; -} -h1 .fa-stack { - width: 1em; - height: 1em; - line-height: .7em; -} -.fa-stack .fa-circle { - font-size: .7em; - color: @spacewalk-blue; +.spacewalk-help-link { + vertical-align: top; }
// Panels: reseting default margins and paddings in H tags @@ -719,7 +710,10 @@ ul.nav.nav-tabs:last-child { text-decoration: underline; }
-.fa-question-circle { +/* help links are hidden in spacewalk + * remove this if your product support local help pages + */ +.spacewalk-help-link { display: none; }
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java index daa6224..a997d44 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java @@ -75,7 +75,7 @@ public class IconTag extends TagSupport { icons.put("header-file", "fa fa-file-text-o"); icons.put("header-folder", "fa fa-folder-open-o"); icons.put("header-globe", "fa fa-globe"); - icons.put("header-help", "fa fa-question-circle"); + icons.put("header-help", "fa fa-question-circle spacewalk-help-link"); icons.put("header-info", "fa fa-info-circle"); icons.put("header-kickstart", "fa fa-rocket"); icons.put("header-list", "fa fa-list");
commit 3c15b918e17790ac0c9e1cb71f7f8079f8f0088c Author: Michael Mraka michael.mraka@redhat.com Date: Fri Jan 31 15:24:37 2014 +0100
use consistent set of icons for system status
similar to original set look & feel
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java index c73b4d8..daa6224 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/IconTag.java @@ -139,12 +139,12 @@ public class IconTag extends TagSupport { icons.put("sort-up", "fa fa-arrow-circle-up"); icons.put("system-crit", "fa fa-exclamation-circle fa-1-5x text-danger"); icons.put("system-kickstarting", "fa fa-rocket fa-1-5x"); - icons.put("system-locked", "fa fa-1-5x spacewalk-icon-locked-system"); + icons.put("system-locked", "fa fa-lock fa-1-5x"); icons.put("system-ok", "fa fa-check-circle fa-1-5x text-success"); icons.put("system-physical", "fa fa-desktop fa-1-5x"); icons.put("system-reboot", "fa fa-refresh"); - icons.put("system-unentitled", "fa fa-1-5x spacewalk-icon-unentitled"); - icons.put("system-unknown", "fa fa-1-5x spacewalk-icon-unknown-system"); + icons.put("system-unentitled", "fa fa-times-circle fa-1-5x"); + icons.put("system-unknown", "fa fa-question-circle fa-1-5x"); 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");
spacewalk-commits@lists.fedorahosted.org