java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java | 30
+++++++---
web/modules/sniglets/Sniglets/ListView/SystemList.pm | 10 +++
web/modules/sniglets/Sniglets/Servers.pm | 29
++++++---
3 files changed, 50 insertions(+), 19 deletions(-)
New commits:
commit f789e57e1fe8d41e2c63bd8342de3573568168cb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Feb 25 11:56:23 2011 +0100
680375 - we do not want the locked status (icon) to hide the the other statuses, we
add separate padlock icon.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
index 8f0bddf..4f97e8e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemListHelper.java
@@ -80,15 +80,6 @@ public class SystemListHelper {
img.setAttribute("alt", message);
img.setAttribute("title", message);
}
- else if (next.getLocked().intValue() == 1) {
- //status = "locked";
- url.setAttribute("href",
- "/rhn/help/reference/en-US/s1-sm-systems.jsp");
- message = ls.getMessage("systemlist.jsp.locked");
- img.setAttribute("src", "/img/icon_locked.gif");
- img.setAttribute("alt", message);
- img.setAttribute("title", message);
- }
else if (SystemManager.isKickstarting(user,
new Long(next.getId().longValue()))) {
//status = "kickstarting";
@@ -166,6 +157,27 @@ public class SystemListHelper {
else {
statusDisplay = img.render();
}
+
+ if (next.getLocked().intValue() == 1) {
+ HtmlTag locked_url = new HtmlTag("a");
+ HtmlTag locked_img = new HtmlTag("img");
+
+ //status = "locked";
+ locked_url.setAttribute("href",
+ "/rhn/help/reference/en-US/s1-sm-systems.jsp");
+ message = ls.getMessage("systemlist.jsp.locked");
+ locked_img.setAttribute("src", "/img/icon_locked.gif");
+ locked_img.setAttribute("alt", message);
+ locked_img.setAttribute("title", message);
+ if (makeLinks) {
+ locked_url.addBody(locked_img);
+ statusDisplay = statusDisplay + locked_url.render();
+ }
+ else {
+ statusDisplay = statusDisplay + locked_img.render();
+ }
+ }
+
next.setStatusDisplay(statusDisplay);
}
diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm
b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
index d827fc1..6c216c1 100644
--- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
@@ -678,6 +678,16 @@ sub row_callback {
-border => 0);
$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);
+
+ $row->{ADVISORY_ICON} .= PXT::HTML->link($locked_data->{link},
$locked_image);
+ }
}
$row->{MONITORING_ICON} = '';
diff --git a/web/modules/sniglets/Sniglets/Servers.pm
b/web/modules/sniglets/Sniglets/Servers.pm
index baaf388..84153a0 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -399,6 +399,25 @@ sub server_name {
return PXT::Utils->escapeHTML($server->name);
}
+sub system_locked_info {
+ my $user = shift;
+ my $data = shift;
+
+ my $ret = {};
+ if ($data->{LOCKED}) {
+ $ret->{image} = '/img/icon_locked.gif';
+ $ret->{image_medium} = '/img/icon_locked.gif';
+ $ret->{status_str} = 'System locked';
+ $ret->{status_class} = 'system-status-locked';
+ $ret->{message} = 'more info';
+ $ret->{link} = Sniglets::HTML::render_help_link(-user => $user,
+ -href =>
's1-sm-systems.html#S3-SM-SYSTEM-DETAILS');
+
+ }
+ return $ret;
+}
+
+
# not a sniglet
sub system_status_info {
my $user = shift;
@@ -433,16 +452,6 @@ sub system_status_info {
$ret->{link} = Sniglets::HTML::render_help_link(-user => $user,
-href => 's1-sm-systems.html#S3-SM-SYSTEM-LIST-INACT');
}
- elsif ($data->{LOCKED}) {
- $ret->{image} = '/img/icon_locked.gif';
- $ret->{image_medium} = '/img/icon_locked.gif';
- $ret->{status_str} = 'System locked';
- $ret->{status_class} = 'system-status-locked';
- $ret->{message} = 'more info';
- $ret->{link} = Sniglets::HTML::render_help_link(-user => $user,
- -href => 's1-sm-systems.html#S3-SM-SYSTEM-DETAILS');
-
- }
elsif ($data->{KICKSTART_SESSION_ID}) {
$ret->{image} = '/img/icon_kickstart_session.gif';
$ret->{image_medium} = '/img/icon_kickstart_session.gif';