web/html/network/systems/system_list | 5 +
web/include/network/components/legends/system-list-legend.pxi | 18 +++---
web/modules/pxt/PXT/HTML.pm | 18 ++++++
web/modules/sniglets/Sniglets/ListView/SystemList.pm | 18 ++----
web/modules/sniglets/Sniglets/Servers.pm | 27 +++-------
5 files changed, 45 insertions(+), 41 deletions(-)
New commits:
commit 31928ce93c928792e60f03203854de2c248d3aad
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 4 16:50:05 2013 +0100
bootstrap tuning: icons in subscribed system list
/network/systems/system_list/in_channel_family.pxt?cfam_id=1000
/network/systems/system_list/regular_in_channel_family.pxt?cfam_id=1000
diff --git a/web/html/network/systems/system_list b/web/html/network/systems/system_list
index 218ba0a..d473a9f 100644
--- a/web/html/network/systems/system_list
+++ b/web/html/network/systems/system_list
@@ -13,8 +13,9 @@
<pxt-formvar>
<rhn-pathinfo-list-mode type="system">
- <h1><img src="/img/rhn-icon-system.gif" alt="system" /> {pinfo_list_name} <rhn-help href="s1-sm-systems.jsp#s2-sm-system-list" /></h1>
-
+ <div class="spacewalk-toolbar-h1"><div class="spacewalk-toolbar"></div>
+ <h1><i class="fa fa-desktop"></i> {pinfo_list_name} <rhn-help href="s1-sm-systems.jsp#s2-sm-system-list" /></h1>
+ </div>
<rhn-listview class="Sniglets::ListView::SystemList" mode="{pinfo_list_mode}" alphabar_column="name">
<formvars>
<var name="view_mode" />
diff --git a/web/modules/pxt/PXT/HTML.pm b/web/modules/pxt/PXT/HTML.pm
index 6e2a05d..19b72c0 100644
--- a/web/modules/pxt/PXT/HTML.pm
+++ b/web/modules/pxt/PXT/HTML.pm
@@ -508,4 +508,22 @@ sub img {
return qq{<img $inner_str />};
}
+sub icon {
+ my $class = shift;
+ my %params = @_;
+
+ if (not exists $params{-class}) {
+ die "classless icon";
+ }
+
+ my @inner;
+ for my $attr (qw/class title/) {
+ next unless exists $params{"-$attr"};
+ push @inner, sprintf(qq{$attr="$params{-$attr}"});
+ }
+
+ my $inner_str = join(" ", @inner);
+ return qq{<i $inner_str></i>};
+}
+
1;
diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
index 020ea66..13a382c 100644
--- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
@@ -567,19 +567,15 @@ sub row_callback {
my $icon_data = Sniglets::Servers::system_status_info($pxt->user, $row);
- my $image = PXT::HTML->img(-src => $icon_data->{image},
- -alt => $icon_data->{status_str},
- -title => $icon_data->{status_str},
- -border => 0);
+ my $image = PXT::HTML->icon(-class => $icon_data->{icon},
+ -title => $icon_data->{status_str});
$row->{ADVISORY_ICON} = PXT::HTML->link($icon_data->{link}, $image);
my $locked_data = Sniglets::Servers::system_locked_info($pxt->user, $row);
if ($locked_data->{link}) {
- my $locked_image = PXT::HTML->img(-src => $locked_data->{image},
- -alt => $locked_data->{status_str},
- -title => $locked_data->{status_str},
- -border => 0);
+ my $locked_image = PXT::HTML->icon(-class => $locked_data->{icon},
+ -title => $locked_data->{status_str});
$row->{ADVISORY_ICON} .= PXT::HTML->link($locked_data->{link}, $locked_image);
}
@@ -590,10 +586,8 @@ sub row_callback {
if (defined $row->{MONITORING_STATUS}) {
my $icon_data = Sniglets::Servers::system_monitoring_info($pxt->user, $row);
- my $image = PXT::HTML->img(-src => $icon_data->{image},
- -alt => $icon_data->{status_str},
- -title => $icon_data->{status_str},
- -border => 0);
+ my $image = PXT::HTML->icon(-class => $icon_data->{icon},
+ -title => $icon_data->{status_str});
$row->{MONITORING_ICON} = PXT::HTML->link($icon_data->{system_link}, $image);
}
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 11bc1a4..8b4d249 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -191,8 +191,7 @@ sub system_locked_info {
my $ret = {};
if ($data->{LOCKED}) {
- $ret->{image} = '/img/icon_locked.gif';
- $ret->{image_medium} = '/img/icon_locked.gif';
+ $ret->{icon} = 'fa fa-1-5x spacewalk-icon-locked-system';
$ret->{status_str} = 'System locked';
$ret->{status_class} = 'system-status-locked';
$ret->{message} = 'more info';
@@ -219,8 +218,7 @@ sub system_status_info {
$ret->{$_} = '' foreach (qw/image status_str status_class message link/);
if (not $data->{IS_ENTITLED}) {
- $ret->{image} = '/img/icon_unentitled.gif';
- $ret->{image_medium} = '/img/icon_unentitled.gif';
+ $ret->{icon} = 'fa fa-1-5x spacewalk-icon-Unentitled';
$ret->{status_str} = 'System not entitled';
$ret->{status_class} = 'system-status-unentitled';
@@ -230,8 +228,7 @@ sub system_status_info {
}
}
elsif ($data->{LAST_CHECKIN_DAYS_AGO} > PXT::Config->get('system_checkin_threshold')) {
- $ret->{image} = '/img/icon_checkin.gif';
- $ret->{image_medium} = '/img/icon_checkin.gif';
+ $ret->{icon} = 'spacewalk-icon-unknown-system';
$ret->{status_str} = 'System not checking in with R H N';
$ret->{status_class} = 'system-status-awol';
$ret->{message} = 'more info';
@@ -239,46 +236,40 @@ sub system_status_info {
-href => 's1-sm-systems.html#S3-SM-SYSTEM-LIST-INACT');
}
elsif ($data->{KICKSTART_SESSION_ID}) {
- $ret->{image} = '/img/icon_kickstart_session.gif';
- $ret->{image_medium} = '/img/icon_kickstart_session.gif';
+ $ret->{icon} = 'fa fa-rocket fa-1-5x';
$ret->{status_str} = 'Kickstart in progress';
$ret->{status_class} = 'system-status-kickstart';
$ret->{message} = 'view progress';
$ret->{link} = "/rhn/systems/details/kickstart/SessionStatus.do?sid=${sid}";
}
elsif (not ($errata_count or $data->{OUTDATED_PACKAGES}) and not $package_actions_count) {
- $ret->{image} = '/img/icon_up2date.gif';
- $ret->{image_medium} = '/img/icon_up2date.gif';
+ $ret->{icon} = 'fa fa-check-circle fa-1-5x text-success';
$ret->{status_str} = 'System is up to date';
$ret->{status_class} = 'system-status-up-to-date';
}
elsif ($errata_count and not RHN::Server->unscheduled_errata($sid, $user->id)) {
- $ret->{image} = '/img/icon_pending.gif';
- $ret->{image_medium} = '/img/icon_pending.gif';
+ $ret->{icon} = 'fa fa-clock-o fa-1-5x';
$ret->{status_str} = 'All updates scheduled';
$ret->{status_class} = 'system-status-updates-scheduled';
$ret->{message} = 'view actions';
$ret->{link} = "/network/systems/details/history/pending.pxt?sid=${sid}";
}
elsif ($actions_count) {
- $ret->{image} = '/img/icon_pending.gif';
- $ret->{image_medium} = '/img/icon_pending.gif';
+ $ret->{icon} = 'fa fa-clock-o fa-1-5x';
$ret->{status_class} = 'system-status-updates-scheduled';
$ret->{status_str} = 'Actions scheduled';
$ret->{message} = 'view actions';
$ret->{link} = "/network/systems/details/history/pending.pxt?sid=${sid}";
}
elsif ($data->{SECURITY_ERRATA}) {
- $ret->{image} = '/img/icon_crit_update.gif';
- $ret->{image_medium} = '/img/icon_crit_update.gif';
+ $ret->{icon} = 'fa fa-exclamation-circle fa-1-5x text-danger';
$ret->{status_str} = 'Critical updates available';
$ret->{status_class} = 'system-status-critical-updates';
$ret->{message} = 'update now';
$ret->{link} = "/rhn/systems/details/ErrataConfirm.do?all=true&sid=${sid}";
}
elsif ($data->{OUTDATED_PACKAGES}) {
- $ret->{image} = '/img/icon_reg_update.gif';
- $ret->{image_medium} = '/img/icon_reg_update.gif';
+ $ret->{icon} = 'fa fa-exclamation-triangle fa-1-5x text-warning';
$ret->{status_str} = 'Updates available';
$ret->{status_class} = 'system-status-updates';
$ret->{message} = "more info";
commit 9bbabcf7f653f53d8db1521b941accf2d57a084e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 4 14:22:53 2013 +0100
bootstrap tuning: icons in system ledend for pxt pages
diff --git a/web/include/network/components/legends/system-list-legend.pxi b/web/include/network/components/legends/system-list-legend.pxi
index 66acbcd..2c59157 100644
--- a/web/include/network/components/legends/system-list-legend.pxi
+++ b/web/include/network/components/legends/system-list-legend.pxi
@@ -7,20 +7,20 @@
<div class="sideleg">
<h4>System Legend</h4>
<ul>
- <li><img src="/img/icon_up2date.gif" alt="" />OK</li>
- <li><img src="/img/icon_crit_update.gif" alt="" />Critical</li>
- <li><img src="/img/icon_reg_update.gif" alt="" />Warning</li>
- <li><i class="spacewalk-icon-unknown-system" />Unknown</li>
+ <li><i class="fa fa-check-circle fa-1-5x text-success"></i>OK</li>
+ <li><i class="fa fa-exclamation-circle fa-1-5x text-danger"></i>Critical</li>
+ <li><i class="fa fa-exclamation-triangle fa-1-5x text-warning"></i></i>Warning</li>
+ <li><i class="spacewalk-icon-unknown-system"></i>Unknown</li>
<rhn-require acl="org_entitlement(sw_mgr_enterprise)">
- <li><img src="/img/icon_locked.gif" alt="" />Locked</li>
+ <li><i class="fa fa-1-5x spacewalk-icon-locked-system"></i></i>Locked</li>
</rhn-require>
<rhn-require acl="org_entitlement(rhn_provisioning)">
- <li><img src="/img/icon_kickstart_session.gif" alt="" />Kickstarting</li>
+ <li><i class="fa fa-rocket fa-1-5x"></i>Kickstarting</li>
</rhn-require>
- <li><img src="/img/icon_pending.gif" alt="" />Pending Actions</li>
- <li><img src="/img/icon_unentitled.gif" alt="" />Unentitled</li>
+ <li><i class="fa fa-clock-o fa-1-5x"></i>Pending Actions</li>
+ <li><i class="fa fa-1-5x spacewalk-icon-Unentitled"></i>Unentitled</li>
<rhn-require acl="org_entitlement(rhn_monitor)">
- <li><img src="/img/icon_subicon_monitoring.gif" alt="" />Monitoring Status</li>
+ <li><i class="fa fa-1-5x spacewalk-icon-monitoring-status"></i>Monitoring Status</li>
</rhn-require>
</ul>
</div>
