web/include/network/components/system_groups/sgdc_header.pxi | 4 ++-- web/modules/sniglets/Sniglets/HTML.pm | 10 +++++----- web/modules/sniglets/Sniglets/ServerGroup.pm | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 5b399de3a90df546cb60bca75992f6ed6edb9a95 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 16:39:30 2013 +0100
bootstrap tuning: reuse OK icon
diff --git a/web/modules/sniglets/Sniglets/ServerGroup.pm b/web/modules/sniglets/Sniglets/ServerGroup.pm index 243b7c4..54f318f 100644 --- a/web/modules/sniglets/Sniglets/ServerGroup.pm +++ b/web/modules/sniglets/Sniglets/ServerGroup.pm @@ -64,7 +64,7 @@ sub system_group_status_interface {
if (not ($counts->{SECURITY_ERRATA} or $counts->{BUG_ERRATA} or $counts->{ENHANCEMENT_ERRATA})) {
- $subst->{icon} = '<img src="/img/icon_up2date.gif" alt="up to date" />'; + $subst->{icon} = '<i class="fa fa-check-circle fa-1-5x text-success"></i>'; $subst->{status_str} = 'No applicable errata'; $subst->{status_class} = 'system-status-up-to-date'; }
commit 6df0b0629e43404a591036659ef204c693847a24 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 16:17:49 2013 +0100
bootstrap tuning: replace old help img with new icon in pxt pages
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm index dfc8299..7d662a0 100644 --- a/web/modules/sniglets/Sniglets/HTML.pm +++ b/web/modules/sniglets/Sniglets/HTML.pm @@ -166,7 +166,7 @@ sub rhn_help { return render_help_link(-user => $pxt->user, -guide => $guide, -href => $href, - -block => qq(<img src="/img/rhn-icon-help.gif" alt="Help Icon" />), + -block => qq(<span class="fa-stack"><i class="fa fa-circle fa-stack-1x"></i><i class="fa fa-question fa-stack-1x fa-inverse"></i></span>), -satellite => $params{satellite}); }
commit b2fa9fa5aef7c3054cfacaa0539edbca46a2199c Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 16:07:10 2013 +0100
bootstrap tuning: replace old image with icons in system group pxt pages
diff --git a/web/include/network/components/system_groups/sgdc_header.pxi b/web/include/network/components/system_groups/sgdc_header.pxi index 0eb103c..3265f40 100644 --- a/web/include/network/components/system_groups/sgdc_header.pxi +++ b/web/include/network/components/system_groups/sgdc_header.pxi @@ -7,12 +7,12 @@ <pxt-formvar>
<rhn-toolbar base="h1" - img="/img/rhn-icon-system_group.gif" + icon="fa spacewalk-icon-system-groups" alt="system group" help-url="s1-sm-systems.jsp#s2-sm-system-group-list" misc-url="/network/systems/ssm/work_with_group.pxt?sgid={formvar:sgid}&pxt_trap=rhn:work_with_group_cb" misc-alt="work with group" - misc-img="/img/work_with_group.gif" + misc-icon="fa spacewalk-icon-system-groups" misc-text="work with group" deletion-type="group" deletion-url="delete_confirm.pxt?sgid={formvar:sgid}"
commit 670edab2a3c7ae7138b4d40f876848b0ccdb1b55 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 16:04:11 2013 +0100
bootstrap tuning: set header size according to $base
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm index 72a543d..dfc8299 100644 --- a/web/modules/sniglets/Sniglets/HTML.pm +++ b/web/modules/sniglets/Sniglets/HTML.pm @@ -127,7 +127,7 @@ sub toolbar {
my $toolbar = join(" | ", @toolbar);
- return qq{<div class="spacewalk-toolbar-$base"><div class="spacewalk-toolbar">$toolbar</div>$img $icon $params{__block__}$help</div>}; + return qq{<div class="spacewalk-toolbar-$base"><div class="spacewalk-toolbar">$toolbar</div><$base>$img $icon $params{__block__}$help</$base></div>}; }
sub creation_link {
commit 279f75f57cdd9d6a44c03eae2183fdc5d50e2eaa Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 16:00:30 2013 +0100
bootstrap tuning: by icon we really mean icon not image
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm index b8f96b6..72a543d 100644 --- a/web/modules/sniglets/Sniglets/HTML.pm +++ b/web/modules/sniglets/Sniglets/HTML.pm @@ -112,7 +112,7 @@ sub toolbar { text => $params{'misc-text'})); } elsif (defined $params{'misc-icon'} and $acl->eval_acl($pxt, $params{'misc-acl'} || '')) { push @toolbar, misc_link($pxt, (url => $params{'misc-url'}, - img => $params{'misc-icon'}, + icon => $params{'misc-icon'}, text => $params{'misc-text'})); }
commit 4a0093a3b8c7ee7e3844c06b030e4c49e80adbd1 Author: Michael Mraka michael.mraka@redhat.com Date: Mon Dec 2 15:39:29 2013 +0100
bootstrap tuning: proper add/delete icons in pxt pages
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm index 331338d..b8f96b6 100644 --- a/web/modules/sniglets/Sniglets/HTML.pm +++ b/web/modules/sniglets/Sniglets/HTML.pm @@ -134,14 +134,14 @@ sub creation_link { my $pxt = shift; my %params = @_;
- return qq{<a href="$params{url}"><i class="icon-plus"></i>create new $params{type}</a>}; + return qq{<a href="$params{url}"><i class="fa fa-plus"></i>create new $params{type}</a>}; }
sub deletion_link { my $pxt = shift; my %params = @_;
- return qq{<a href="$params{url}"><i class="icon-trash"></i>delete $params{type}</a>}; + return qq{<a href="$params{url}"><i class="fa fa-trash-o"></i>delete $params{type}</a>}; }
sub misc_link {
spacewalk-commits@lists.fedorahosted.org
-
Michael Mraka