java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp | 4
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp | 62
+++++-----
2 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit 00a2e74a2a686a44f1c1935475bfa9206ba56fa0
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Tue Dec 3 14:35:03 2013 +0100
Inconsistent tab vs. space
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
index ecca1fa..7f8c33a 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
@@ -6,57 +6,57 @@
<c:when test="${requestScope.showPendingActions == 'true'}">
<form method="post" name="rhn_list"
action="/YourRhn.do">
<rhn:list pageList="${requestScope.scheduledActionList}"
- noDataText="${requestScope.scheduledActionEmpty}"
- formatMessage="false">
- <rhn:listdisplay title="yourrhn.jsp.scheduledactions"
- set="${requestScope.set}"
- paging="false"
- description="yourrhn.jsp.actions.description"
- type="list">
+ noDataText="${requestScope.scheduledActionEmpty}"
+ formatMessage="false">
+ <rhn:listdisplay title="yourrhn.jsp.scheduledactions"
+ set="${requestScope.set}"
+ paging="false"
+ description="yourrhn.jsp.actions.description"
+ type="list">
<rhn:column header="schedulesync.jsp.action">
- <c:choose>
- <c:when test="${current.actionStatusId == 0 || current.actionStatusId ==
1}">
- <i class="fa fa-clock-o" title="<bean:message
key='yourrhn.jsp.actions.pending'/>"></i>
- </c:when>
- <c:when test="${current.actionStatusId == 2}">
- <i class="fa fa-check-circle-o text-success"
title="<bean:message
key='yourrhn.jsp.actions.completed'/>"></i>
- </c:when>
- <c:when test="${current.actionStatusId == 3}">
- <i class="fa fa-times-circle-o text-danger"
title="<bean:message
key='yourrhn.jsp.actions.failed'/>"></i>
- </c:when>
- <c:otherwise>
- <i class="spacewalk-icon-unknown-system" title="<bean:message
key='yourrhn.jsp.actions.unknown'/>"></i>
- </c:otherwise>
- </c:choose>
+ <c:choose>
+ <c:when test="${current.actionStatusId == 0 || current.actionStatusId
== 1}">
+ <i class="fa fa-clock-o" title="<bean:message
key='yourrhn.jsp.actions.pending'/>"></i>
+ </c:when>
+ <c:when test="${current.actionStatusId == 2}">
+ <i class="fa fa-check-circle-o text-success"
title="<bean:message
key='yourrhn.jsp.actions.completed'/>"></i>
+ </c:when>
+ <c:when test="${current.actionStatusId == 3}">
+ <i class="fa fa-times-circle-o text-danger"
title="<bean:message
key='yourrhn.jsp.actions.failed'/>"></i>
+ </c:when>
+ <c:otherwise>
+ <i class="spacewalk-icon-unknown-system"
title="<bean:message
key='yourrhn.jsp.actions.unknown'/>"></i>
+ </c:otherwise>
+ </c:choose>
<a
href="/rhn/schedule/ActionDetails.do?aid=${current.id}"><c:out
value="${current.actionName}" /></a>
</rhn:column>
<rhn:column header="yourrhn.jsp.user"
- style="text-align: center;">
+ style="text-align: center;">
<c:choose>
- <c:when test="${current.userName != ''}">
+ <c:when test="${current.userName != ''}">
<i class="fa fa-user" title="<bean:message
key='yourrhn.jsp.user.alt'/>"></i>
- ${current.userName}
+ ${current.userName}
</c:when>
<c:otherwise>
- <bean:message key="none.message"/>
+ <bean:message key="none.message"/>
</c:otherwise>
- </c:choose>
+ </c:choose>
</rhn:column>
<rhn:column header="yourrhn.jsp.age"
- style="text-align: center;">
- ${current.ageString}
+ style="text-align: center;">
+ ${current.ageString}
</rhn:column>
</rhn:listdisplay>
<span class="full-width-note-right">
- <a href="/rhn/schedule/PendingActions.do">
- <bean:message key="yourrhn.jsp.allactions" />
- </a>
+ <a href="/rhn/schedule/PendingActions.do">
+ <bean:message key="yourrhn.jsp.allactions" />
+ </a>
</span>
</rhn:list>
</form>
commit fe8ada220de98e6a87b8e1e881a1912c50aecccd
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Tue Dec 3 14:23:19 2013 +0100
bootstrap-tuning - inconsistent schedule icons on YourRhn.do vs. legend
diff --git a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
index f065739..b2ef929 100644
--- a/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
+++ b/java/code/webapp/WEB-INF/includes/legends/yourrhn-legend.jsp
@@ -15,8 +15,8 @@
<li><i class="fa fa-rocket
fa-1-5x"></i><bean:message key="system-legend.jsp.kickstarting"
/></li>
</rhn:require>
<li><i class="fa fa-clock-o fa-1-5x"></i><bean:message
key="system-legend.jsp.pending" /></li>
- <li><i class="fa fa-times-circle-o
fa-1-5x"></i><bean:message
key="yourrhn-legend.jsp.failedactions" /></li>
- <li><i class="fa fa-check-circle-o
fa-1-5x"></i><bean:message
key="yourrhn-legend.jsp.completedactions" /></li>
+ <li><i class="fa fa-times-circle-o fa-1-5x
text-danger"></i><bean:message
key="yourrhn-legend.jsp.failedactions" /></li>
+ <li><i class="fa fa-check-circle-o fa-1-5x
text-success"></i><bean:message
key="yourrhn-legend.jsp.completedactions" /></li>
<rhn:require acl="show_monitoring();"
mixins="com.redhat.rhn.common.security.acl.MonitoringAclHandler">
<li><i class="fa fa-1-5x
spacewalk-icon-monitoring-status"></i><bean:message
key="system-legend.jsp.monitoring" /></li>
</rhn:require>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
index 911beba..ecca1fa 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/scheduledActions.jsp
@@ -20,10 +20,10 @@
<i class="fa fa-clock-o" title="<bean:message
key='yourrhn.jsp.actions.pending'/>"></i>
</c:when>
<c:when test="${current.actionStatusId == 2}">
- <i class="fa fa-check text-success" title="<bean:message
key='yourrhn.jsp.actions.completed'/>"></i>
+ <i class="fa fa-check-circle-o text-success"
title="<bean:message
key='yourrhn.jsp.actions.completed'/>"></i>
</c:when>
<c:when test="${current.actionStatusId == 3}">
- <i class="fa fa-times-circle text-danger"
title="<bean:message
key='yourrhn.jsp.actions.failed'/>"></i>
+ <i class="fa fa-times-circle-o text-danger"
title="<bean:message
key='yourrhn.jsp.actions.failed'/>"></i>
</c:when>
<c:otherwise>
<i class="spacewalk-icon-unknown-system" title="<bean:message
key='yourrhn.jsp.actions.unknown'/>"></i>
Show replies by date