java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf | 10 +++++----- java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf | 6 +++--- java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 727fa659a44aeb7366f3006dcf413acf0ab7dfbe Author: Tomas Kasparek tkasparek@redhat.com Date: Wed Dec 11 16:40:27 2013 +0100
use new icon aliases in more places
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf index a4342f7..e16cd2d 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system-header.jspf @@ -11,25 +11,25 @@ <c:when test="${!inSSM}"> <c:set var="actionLink" value="/rhn/systems/details/AddToSSM.do?sid=${system.id}"/> <c:set var="actionMessage" value="toolbar.ssm.add"/> - <c:set var="actionIcon" value="fa-plus-circle"/> + <c:set var="actionIcon" value="item-ssm-add"/> </c:when> <c:otherwise> <c:set var="actionLink" value="/rhn/systems/details/RemoveFromSSM.do?sid=${system.id}"/> <c:set var="actionMessage" value="toolbar.ssm.remove"/> - <c:set var="actionIcon" value="fa-times-circle-o"/> + <c:set var="actionIcon" value="item-ssm-del"/> </c:otherwise> </c:choose> </rhn:require>
<c:choose> <c:when test="${system.virtualGuest}"> - <c:set var="systemIcon" value="spacewalk-icon-virtual-guest"/> + <c:set var="systemIcon" value="header-system-virt-guest"/> </c:when> <c:when test="${system.virtualHost}"> - <c:set var="systemIcon" value="spacewalk-icon-virtual-host"/> + <c:set var="systemIcon" value="header-system-virt-host"/> </c:when> <c:otherwise> - <c:set var="systemIcon" value="fa-desktop"/> + <c:set var="systemIcon" value="header-system-physical"/> </c:otherwise> </c:choose>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf index ba1d606..534fdea 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/system_list_fragment.jspf @@ -1,13 +1,13 @@ <c:out value="<a href="/rhn/systems/details/Overview.do?sid=${current.id}">" escapeXml="false" /> <c:choose> <c:when test="${current.virtualGuest && empty nosystemicons}"> - <i class="fa spacewalk-icon-virtual-guest" title="<bean:message key='systemlist.jsp.virtguest'/>"></i> + <rhn:icon type="system-virt-guest" title="<bean:message key='systemlist.jsp.virtguest'/>" /> </c:when> <c:when test="${current.virtualHost && empty nosystemicons}"> - <i class="fa spacewalk-icon-virtual-host" title="<bean:message key='systemlist.jsp.virthost'/>"></i> + <rhn:icon type="system-virtual-host" title="<bean:message key='systemlist.jsp.virthost'/>" /> </c:when> <c:otherwise> - <i class="fa fa-desktop" title="<bean:message key='systemlist.jsp.nonvirt'/>"></i> + <rhn:icon type="system-physical" title="<bean:message key='systemlist.jsp.nonvirt'/>" /> </c:otherwise> </c:choose> <c:choose> diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf index 9f9c59d..363aabd 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/user/user-header.jspf @@ -6,12 +6,12 @@ <c:if test="${not targetuser.disabled}"> <c:set var="url" value="/rhn/users/DisableUser.do?uid=${param.uid}" /> <c:set var="text" value="userdetails.jsp.disable" /> - <c:set var="icon" value="fa-minus-circle" /> + <c:set var="icon" value="item-ssm-del" /> </c:if> <c:if test="${targetuser.disabled}"> <c:set var="url" value="/rhn/users/EnableUser.do?uid=${param.uid}" /> <c:set var="text" value="userdetails.jsp.enable" /> - <c:set var="icon" value="fa-plus-circle" /> + <c:set var="icon" value="item-ssm-add" /> </c:if>
<rhn:toolbar base="h1" icon="header-user"
spacewalk-commits@lists.fedorahosted.org