branding/templates/footer.pxt | 11 +- web/include/network/components/legends/event-status.pxi | 6 - web/include/network/components/legends/event-type.pxi | 8 +- web/modules/sniglets/Sniglets/ListView/ActionList.pm | 61 +++++++--------- 4 files changed, 40 insertions(+), 46 deletions(-)
New commits: commit f068416b4dc182c0b8cd6a22b3597edfb7376937 Author: Michael Mraka michael.mraka@redhat.com Date: Wed Dec 4 13:38:05 2013 +0100
bootstrap tuning: fixed pxt page footer
diff --git a/branding/templates/footer.pxt b/branding/templates/footer.pxt index 7ee1502..413e695 100644 --- a/branding/templates/footer.pxt +++ b/branding/templates/footer.pxt @@ -3,12 +3,11 @@ <pxt-passthrough> <pxt-use class="Sniglets::Users" /> <div> -</div> -<div> - Copyright © 2002‒12 Red Hat, Inc. All rights reserved. <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> : <a href="http://www.redhat.com/legal/legal_statement.html" accesskey="8">Legal statement</a> : <a href="http://www.redhat.com/">redhat.com</a> -<div style="color: black"> - Spacewalk release <a href="/rhn/help/dispatcher/release_notes"><pxt-config var="version" /></a> -</div> + Copyright © 2002‒13 Red Hat, Inc. All rights reserved. + <a href="https://www.redhat.com/legal/privacy_statement.html">Privacy statement</a> + : <a href="http://www.redhat.com/legal/legal_statement.html">Legal statement</a> + : <a href="http://www.redhat.com/">redhat.com</a> + <div>Spacewalk release <a href="/rhn/help/dispatcher/release_notes"><pxt-config var="version" /></a></div> </div> <div> <img src="/img/logo_vendor.png" />
commit cff9a22f3e09cd0ad063f8b07bb72cd47be7c08b Author: Michael Mraka michael.mraka@redhat.com Date: Wed Dec 4 12:10:48 2013 +0100
bootstrap tuning: fixed icons in event pxt pages
e.g. /network/systems/details/history/pending.pxt?sid=1000010049 /network/systems/details/history/history.pxt?sid=1000010049
diff --git a/web/modules/sniglets/Sniglets/ListView/ActionList.pm b/web/modules/sniglets/Sniglets/ListView/ActionList.pm index c5bc9aa..bee505f 100644 --- a/web/modules/sniglets/Sniglets/ListView/ActionList.pm +++ b/web/modules/sniglets/Sniglets/ListView/ActionList.pm @@ -21,7 +21,6 @@ use Sniglets::ListView::List; use RHN::Action; use RHN::DataSource::Action;
-use PXT::HTML; use Data::Dumper;
our @ISA = qw/Sniglets::ListView::List/; @@ -71,28 +70,28 @@ sub _register_modes { }
-my %history_type_icons = ('packages.refresh_list' => 'rhn-listicon-package.gif', - 'packages.delta' => 'rhn-listicon-package.gif', - 'packages.update' => 'rhn-listicon-package.gif', - 'packages.remove' => 'rhn-listicon-package.gif', - 'packages.runTransaction' => 'rhn-listicon-package.gif', - 'up2date_config.get' => 'rhn-listicon-preferences.gif', - 'up2date_config.update' => 'rhn-listicon-preferences.gif', - 'rollback.config' => 'rhn-listicon-preferences.gif', - 'rollback.listTransactions' => 'rhn-listicon-package.gif', # bad icon for this - 'errata.update' => 'rhn-listicon-errata.gif', - 'hardware.refresh_list' => 'rhn-listicon-system.gif', # bad icon for this - 'reboot.reboot' => 'rhn-listicon-system.gif', # bad icon for this - 'configfiles.upload' => 'rhn-listicon-system.gif', - 'configfiles.deploy' => 'rhn-listicon-system.gif', - 'configfiles.verify' => 'rhn-listicon-system.gif', - 'configfiles.diff' => 'rhn-listicon-system.gif', +my %history_type_icons = ('packages.refresh_list' => 'spacewalk-icon-packages', + 'packages.delta' => 'spacewalk-icon-packages', + 'packages.update' => 'spacewalk-icon-packages', + 'packages.remove' => 'spacewalk-icon-packages', + 'packages.runTransaction' => 'spacewalk-icon-packages', + 'up2date_config.get' => 'fa-cog', + 'up2date_config.update' => 'fa-cog', + 'rollback.config' => 'fa-cog', + 'rollback.listTransactions' => 'spacewalk-icon-packages', # bad icon for this + 'errata.update' => 'spacewalk-icon-patches', + 'hardware.refresh_list' => 'fa-desktop', # bad icon for this + 'reboot.reboot' => 'fa-desktop', # bad icon for this + 'configfiles.upload' => 'fa-desktop', + 'configfiles.deploy' => 'fa-desktop', + 'configfiles.verify' => 'fa-desktop', + 'configfiles.diff' => 'fa-desktop', );
-my %history_status_icons = ('Completed' => 'rhn-listicon-ok.gif', - 'Failed' => 'rhn-listicon-error.gif', - 'Picked Up' => 'rhn-listicon-activity.gif', - ); +my %history_status_icons = ('Completed' => 'fa-check-circle-o fa-1-5x text-success', + 'Failed' => 'fa-times-circle-o fa-1-5x text-danger', + 'Picked Up' => 'fa-exchange fa-1-5x text-info', + );
sub system_history_provider { my $self = shift; @@ -118,28 +117,24 @@ sub system_history_provider { if (defined $event->{HISTORY_TYPE}) {
if ($history_type_icons{$event->{HISTORY_TYPE}}) { - $event->{HISTORY_TYPE} = PXT::HTML->img(-src => '/img/' . $history_type_icons{$event->{HISTORY_TYPE}}, - -alt => $event->{HISTORY_TYPE_NAME}, - -title => $event->{HISTORY_TYPE_NAME}); + $event->{HISTORY_TYPE} = sprintf(qq{<i class="fa %s" title="%s"></i>}, + $history_type_icons{$event->{HISTORY_TYPE}}, + $event->{HISTORY_TYPE_NAME}); } else { PXT::Debug->log(2,"no icon for scheduled action type?! type: " . $event->{HISTORY_TYPE}); - $event->{HISTORY_TYPE} = PXT::HTML->img(-src => '/img/rhn-listicon-system.gif', - -alt => 'System Event', - -title => 'System Event'); + $event->{HISTORY_TYPE} = qq{<i class="fa fa-desktop" title="System Event"></i>}; } } else { - $event->{HISTORY_TYPE} = PXT::HTML->img(-src => '/img/rhn-listicon-system.gif', - -alt => 'System Event', - -title => 'System Event'); + $event->{HISTORY_TYPE} = qq{<i class="fa fa-desktop" title="System Event"></i>}; }
if (defined $event->{HISTORY_STATUS}) {
- $event->{HISTORY_STATUS} = PXT::HTML->img(-src => '/img/' . $history_status_icons{$event->{HISTORY_STATUS}}, - -alt => $event->{HISTORY_STATUS}, - -title => $event->{HISTORY_STATUS}); + $event->{HISTORY_STATUS} = sprintf(qq{<i class="fa %s" title="%s"></i>}, + $history_status_icons{$event->{HISTORY_STATUS}}, + $event->{HISTORY_STATUS}); } else { $event->{HISTORY_STATUS} = '<span class="no-details">(n/a)</span>';
commit 88f83e2f85e746d1429eb46b45816d8396f80215 Author: Michael Mraka michael.mraka@redhat.com Date: Wed Dec 4 11:53:28 2013 +0100
bootstrap tuning: fixed icons in events
diff --git a/web/include/network/components/legends/event-status.pxi b/web/include/network/components/legends/event-status.pxi index d652f0d..1b98ff5 100644 --- a/web/include/network/components/legends/event-status.pxi +++ b/web/include/network/components/legends/event-status.pxi @@ -3,8 +3,8 @@ <div class="sideleg"> <h2>Event Status Legend</h2> <ul> - <li><img src="/img/rhn-listicon-ok.gif" alt="" />Complete</li> - <li><img src="/img/rhn-listicon-error.gif" alt="" />Failure</li> - <li><img src="/img/rhn-listicon-activity.gif" alt="" />Activity Occuring</li> + <li><i class="fa fa-check-circle-o fa-1-5x text-success"></i>Complete</li> + <li><i class="fa fa-times-circle-o fa-1-5x text-danger"></i>Failure</li> + <li><i class="fa fa-exchange fa-1-5x text-info"></i>Activity Occuring</li> </ul> </div> diff --git a/web/include/network/components/legends/event-type.pxi b/web/include/network/components/legends/event-type.pxi index 0cec63b..df25bf4 100644 --- a/web/include/network/components/legends/event-type.pxi +++ b/web/include/network/components/legends/event-type.pxi @@ -3,9 +3,9 @@ <div class="sideleg"> <h2>Event Type Legend</h2> <ul> - <li><img src="/img/rhn-listicon-package.gif" alt="" />Package Event</li> - <li><img src="/img/rhn-listicon-errata.gif" alt="" />Errata Event</li> - <li><img src="/img/rhn-listicon-preferences.gif" alt="" />Preferences Event</li> - <li><img src="/img/rhn-listicon-system.gif" alt="" />System Event</li> + <li><i class="fa spacewalk-icon-packages"></i>Package Event</li> + <li><i class="fa spacewalk-icon-patches"></i>Errata Event</li> + <li><i class="fa fa-cog"></i>Preferences Event</li> + <li><i class="fa fa-desktop"></i>System Event</li> </ul> </div>
spacewalk-commits@lists.fedorahosted.org