- Move the notification to the last position, and make it appear even
when other notifications are shown.
- Missing icon
- Capitalize the text of the title to be consistent with other pages
From f20edd99cf6b4862e77378d9018161f12417aef7 Mon Sep 17 00:00:00 2001
From: Duncan Mac-Vicar P dmacvi...@suse.de
Date: Tue, 24 Apr 2012 16:18:00 +0200
Subject: [PATCH 1/3] Put the reboot notification at the end. Make it not
mutually exclusive with other notifications.
---
.../webapp/WEB-INF/pages/systems/sdc/overview.jsp | 16
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
index d69645b..94eba0d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp
@@ -8,8 +8,10 @@
body
%@ include file=/WEB-INF/pages/common/fragments/systems/system-header.jspf %
h2bean:message key=sdc.details.overview.systemstatus//h2
+
div class=systeminfo
div class=systeminfo-full
+
c:choose
c:when test=${unentitled}
@@ -22,10 +24,6 @@
bean:message key=sdc.details.overview.inactive2 arg0=/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list/
/c:if
/c:when
-c:when test=${rebootRequired}
- img src=/img/restart.png/bean:message key=sdc.details.overview.requires_reboot/
- bean:message key=sdc.details.overview.schedulereboot arg0=/network/systems/details/reboot_confirm.pxt?sid=${system.id}/
-/c:when
c:when test=${hasUpdates}
c:choose
c:when test=${criticalErrataCount 0}
@@ -54,6 +52,16 @@
/c:otherwise
/c:choose
/div
+
+ c:if test=${rebootRequired}
+div class=systeminfo
+ div class=systeminfo-full
+img src=/img/restart.png/bean:message key=sdc.details.overview.requires_reboot/
+bean:message key=sdc.details.overview.schedulereboot arg0=/network/systems/details/reboot_confirm.pxt?sid=${system.id}/
+ /div
+/div
+ /c:if
+
div class=systeminfo-clear /
/div
c:if test=${probeListEmpty != 'true'}
--
1.7.7
From c3d2235f90001c953d32db9074a941d43fe78963 Mon Sep 17 00:00:00 2001
From: Duncan Mac-Vicar P dmacvi...@suse.de
Date: Fri, 20 Apr 2012 13:39:16 +0200
Subject: [PATCH 2/3] Missing icon for the systems that need reboot list
---
branding/img/restart.png | Bin 0 - 912 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 branding/img/restart.png
diff --git a/branding/img/restart.png b/branding/img/restart.png
new file mode 100644
index ..3fd71d6e5929ba0c40db1960e36e9acba9d7e525
GIT binary patch
literal 912
zcmV;B18@9^P)h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV4b3#c}2nYxW
zdbNSPbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$TB1uF+R5*=o
zQcY}BWfVR4d+(L`tut*0Td1}Qh7zWsqBD(u(U?Xz#9ycyhMzUf$+0o2OA7c3=wo;
zqTmCgF-#?xGyymK1R;{t!mDx7(2~^B#sNkvoWowDaEkzU!j%l38$)o7}}cCnx7z
zVrKYAWwOsS=-Lqw-t?qu)r6QQ!notg696vQmg~r9t3cLe1UW(yG7H)Ku^~yeO+g
z(bg0Jm{BNJFfw+(d}sQhCl9uE%R)8S2n|p?*PPznUTt5*BiPR+1l3~ipPS`iO?Jk
zARN#U4H*a;0yD)$9M29{3dMY4K?WE{g^G!Zl7)jelV^{i|AG#D_%tfB+t_MTc
zeJs7#lH0O;okMFqzQr$gkPrsJC8h7YDw+Nu`!(E)KfE(t5U!_KF)uRXGsl%@
z#;0eK6ZhtiUhin`+P8I6C=mc9EA6Ed~Oh1OP~!d1ufk}o{_gOutKfI-_b^R{JP
z`QzJUK*V?A?9r67D}NVS1(vsTcqQ01GUys_Cgne`6%@RcHIkZU9qtY3sTsc5Zto
z2^LHMWS9G(o-t)@yh1Uq9cxfG6X$C)H~ghbOC7?WrZ-yyL00QOs`0x)UuAAQg
z;LGL0Gpf^PVr@oj}%1`wDT7wv!4sq=s3q*OhWftpMhqGg=O68@F-$%x80Ep=T
zKm-sG?*3PXAs8nI|0Dok)RR-0Y?z4d_HJBzCOQm0-yn?3IGs91OOe05LUN@@#X%v
zsjVe)?3Fz~-%4e6*s6^5?o^0Noh2ra)My_p{u2^JcwBLDVQ7jykI}v|io-kJ
z2z}6(e7UtbaxJ}Uz%_L7jZ`u|_ho4jX~0c7z6Sk*NR2p{0r3+~lR$EA{P2of=
zi0-usdagYlDwbXRJ6nR|coYd5ICpup;z@M`0G1y~F-_#=PTxGaE%~6Z@JavoH|CEI
z+$;^LcltM%9%NL@3OchjeEiCkKZJAL;J5G-fbF(raxE|ezUjbwpTH4kW$4B
mU7I1oP}Px#Y|H%H5BGmARd#9Wz5C^MNUMnLSTZGTBDT!
literal 0
HcmV?d1
--
1.7.7
From 2022e7821091986983e959adbf0457372d6a19e4 Mon Sep 17 00:00:00 2001
From: Duncan Mac-Vicar P dmacvi...@suse.de
Date: Tue, 24 Apr 2012 15:43:30 +0200
Subject: [PATCH 3/3] Capitalize title to be consistent
---
.../frontend/strings/jsp/StringResource_en_US.xml |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index e82b561..72e9d24 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -5062,7 +5062,7 @@ value for this entitlement, excluding the default organization's consumption./s
/trans-unit
trans-unit id=requiringrebootlist.jsp.header
-sourceSystems requiring reboot/source
+sourceSystems Requiring Reboot/source
