java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java | 2 +- java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java | 2 +- web/include/network/components/legends/errata-list-legend.pxi | 6 +++--- web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 7 ++++--- web/modules/sniglets/Sniglets/ListView/PackageList.pm | 10 +++++----- web/modules/sniglets/Sniglets/ListView/Style.pm | 2 +- web/modules/sniglets/Sniglets/ServerGroup.pm | 4 ++-- 7 files changed, 17 insertions(+), 16 deletions(-)
New commits: commit 8ea182a4bedeedf6694088e8f3ee9ce4f9660eba Author: Michael Mraka michael.mraka@redhat.com Date: Tue Dec 3 16:00:21 2013 +0100
bootstrap tuning: fixed icons in package errata list
e.g. /network/systems/groups/errata_list.pxt?sgid=7
diff --git a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm index 2ba6c9c..0adce0e 100644 --- a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm +++ b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm @@ -170,10 +170,11 @@ sub row_callback { my $row = shift; my $pxt = shift;
+ my %adv_icon = ('Bug Fix Advisory' => '<i class="fa fa-bug fa-1-5x"></i>', + 'Product Enhancement Advisory' => '<i class="fa fa-1-5x spacewalk-icon-enhancement"></i>', + 'Security Advisory' => '<i class="fa fa-shield fa-1-5x"></i>'); if (exists $row->{ADVISORY_TYPE}) { - $row->{ADVISORY_ICON} = PXT::HTML->img(-src => '/img/wrh-' . lc ((split /[\s]/, $row->{ADVISORY_TYPE})[0]) . '.gif', - -alt => $row->{ADVISORY_TYPE}, - -title => $row->{ADVISORY_TYPE}); + $row->{ADVISORY_ICON} = $adv_icon{$row->{ADVISORY_TYPE}}; }
if (exists $row->{ADVISORY_LAST_UPDATED}) { diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm index 9387d06..2f83964 100644 --- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm +++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm @@ -1382,9 +1382,9 @@ sub package_install_remote_command_cb { return 1; }
-my %adv_icon = ('Bug Fix Advisory' => '/img/wrh-bug.gif', - 'Product Enhancement Advisory' => '/img/wrh-product.gif', - 'Security Advisory' => '/img/wrh-security.gif'); +my %adv_icon = ('Bug Fix Advisory' => '<i class="fa fa-bug fa-1-5x"></i>', + 'Product Enhancement Advisory' => '<i class="fa fa-1-5x spacewalk-icon-enhancement"></i>', + 'Security Advisory' => '<i class="fa fa-shield fa-1-5x"></i>');
sub system_upgradable_package_provider { my $self = shift; @@ -1458,7 +1458,7 @@ sub system_upgradable_package_provider { foreach my $adv (@{$row->{ERRATA_ADVISORY}}) { my $adv_id = shift @{$row->{ERRATA_ID}}; my $adv_type = shift @adv_types; - push @errata, sprintf('<img src="%s" alt="%s" /> <a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_type, $adv_id, $adv); + push @errata, sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_id, $adv); }
$row->{RELATED_ERRATA} = join("<br />\n", @errata); @@ -1480,7 +1480,7 @@ sub obsoleting_packages_provider { my $adv_type = $row->{ADVISORY_TYPE}; my $adv_id = $row->{ERRATA_ID};
- $row->{RELATED_ERRATA} = defined $adv_id ? sprintf('<img src="%s" alt="%s" /> <a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_type, $adv_id, $adv) : ''; + $row->{RELATED_ERRATA} = defined $adv_id ? sprintf('%s<a href="/rhn/errata/details/Details.do?eid=%s">%s</a>', $adv_icon{$adv_type}, $adv_id, $adv) : ''; }
return (%ret);
commit bbca39a2f45bd36df0a2ba4a4f493d230ce52100 Author: Michael Mraka michael.mraka@redhat.com Date: Tue Dec 3 15:35:03 2013 +0100
bootstrap tuning: updates / security updates icons for pxt
e.g. /network/systems/groups/details.pxt?sgid=7
diff --git a/web/modules/sniglets/Sniglets/ServerGroup.pm b/web/modules/sniglets/Sniglets/ServerGroup.pm index 54f318f..a59b55b 100644 --- a/web/modules/sniglets/Sniglets/ServerGroup.pm +++ b/web/modules/sniglets/Sniglets/ServerGroup.pm @@ -70,14 +70,14 @@ sub system_group_status_interface { } elsif ($counts->{SECURITY_ERRATA}) {
- $subst->{icon} = '<img src="/img/icon_crit_update.gif" alt="critical updates available" />'; + $subst->{icon} = '<i class="fa fa-exclamation-circle fa-1-5x text-danger"></i>'; $subst->{status_str} = $counts->{SECURITY_ERRATA} . ' critical updates available'; $subst->{message} = "(<a href="/network/systems/groups/errata_list.pxt?sgid=" . $sgid . "">more info</a>)";; $subst->{status_class} = 'system-status-critical-updates'; } else {
- $subst->{icon} = '<img src="/img/icon_reg_update.gif" alt="updates available" />'; + $subst->{icon} = '<i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i>'; $subst->{status_str} = ' updates available'; $subst->{message} = "(<a href="/network/systems/groups/errata_list.pxt?sgid=" . $sgid . "">more info</a>)"; $subst->{status_class} = 'system-status-updates';
commit fb8d77fa49ac14bf2b4e756188dce9384305cc82 Author: Michael Mraka michael.mraka@redhat.com Date: Tue Dec 3 15:28:41 2013 +0100
bootstrap tuning: style pxt table lists
diff --git a/web/modules/sniglets/Sniglets/ListView/Style.pm b/web/modules/sniglets/Sniglets/ListView/Style.pm index 580d408..2ab8fab 100644 --- a/web/modules/sniglets/Sniglets/ListView/Style.pm +++ b/web/modules/sniglets/Sniglets/ListView/Style.pm @@ -45,7 +45,7 @@ sub header { my $self = shift;
my $ret =<<EOQ; -<table width="100%" cellspacing="0" cellpadding="0" class="list" align="center"> +<table class="table table-striped"> <!-- Begin Header Row --> <thead> <tr>
commit 6f22cd46ae6f5c097694213e5bdced6c275d19a8 Author: Michael Mraka michael.mraka@redhat.com Date: Tue Dec 3 15:03:24 2013 +0100
bootstrap tuning: fixed errata legend in pxt pages
e.g. /network/systems/groups/errata_list.pxt?sgid=7
diff --git a/web/include/network/components/legends/errata-list-legend.pxi b/web/include/network/components/legends/errata-list-legend.pxi index 1de119e..de36a24 100644 --- a/web/include/network/components/legends/errata-list-legend.pxi +++ b/web/include/network/components/legends/errata-list-legend.pxi @@ -3,8 +3,8 @@ <div class="sideleg"> <h2>Errata Legend</h2> <ul> - <li><img src="/img/wrh-security.gif" alt="" />Security</li> - <li><img src="/img/wrh-bug.gif" alt="" />Bug Fix</li> - <li><img src="/img/wrh-product.gif" alt="" />Enhancement</li> + <li><i class="fa fa-shield fa-1-5x"></i>Security</li> + <li><i class="fa fa-bug fa-1-5x"></i>Bug Fix</li> + <li><i class="fa fa-1-5x spacewalk-icon-enhancement"></i>Enhancement</li> </ul> </div>
commit 4bd1d1dc0abbc135c58e68364b6672053205a287 Author: Michael Mraka michael.mraka@redhat.com Date: Tue Dec 3 14:31:19 2013 +0100
bootstrap tuning: "_new" is not HTML5 valid target
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java index f9f7dfe..bd51bc4 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/ToolbarTag.java @@ -549,7 +549,7 @@ public class ToolbarTag extends TagSupport {
HtmlTag tag = new HtmlTag("a"); tag.setAttribute("href", getHelpUrl()); - tag.setAttribute("target", "_new"); + tag.setAttribute("target", "_blank");
HtmlTag stack = new HtmlTag("span"); stack.setAttribute("class", "fa-stack"); diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java index 5405901..4b72367 100644 --- a/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java +++ b/java/code/src/com/redhat/rhn/frontend/taglibs/test/ToolbarTagBasicTest.java @@ -32,7 +32,7 @@ public class ToolbarTagBasicTest extends BaseTestToolbarTag { "<h1>" + "<img src="/img/rhn-icon-preferences.gif" alt="Home Icon" />" + "<a href="/help/provisioning/" + - "s1-sm-your-rhn.html#S2-SM-YOUR-RHN-PREFS" target="_new">" + + "s1-sm-your-rhn.html#S2-SM-YOUR-RHN-PREFS" target="_blank">" + "<span class="fa-stack">" + "<i class="fa fa-circle fa-stack-1x"></i>" + "<i class="fa fa-question fa-stack-1x fa-inverse"></i>" +
spacewalk-commits@lists.fedorahosted.org