Menu
▾
▴
[Sageplugins-commit] webapp/WebContent/m menu.jsp,1.8,1.9
|
From: jreichen <jre...@us...> - 2011-06-08 20:33:37
|
Update of /cvsroot/sageplugins/webapp/WebContent/m
In directory vz-cvs-3.sog:/tmp/cvs-serv23908/WebContent/m
Modified Files:
menu.jsp
Log Message:
- Default menu item images
- Remove useragentheaders.jspf
Index: menu.jsp
===================================================================
RCS file: /cvsroot/sageplugins/webapp/WebContent/m/menu.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** menu.jsp 13 May 2011 02:05:35 -0000 1.8
--- menu.jsp 8 Jun 2011 20:33:35 -0000 1.9
***************
*** 15,19 ****
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <%@ include file="/WEB-INF/jspf/m/useragentheaders.jspf"%>
<%@ include file="/WEB-INF/jspf/m/cacheheaders.jspf"%>
<%@ include file="/WEB-INF/jspf/m/contextpath.jspf"%>
--- 15,18 ----
***************
*** 61,64 ****
--- 60,66 ----
Object menuName = menu.get("title");
boolean menuVisible = menu.optBoolean("visible", true);
+ Object defaultItemImage = menu.opt("defaultItemImage");
+
+ request.setAttribute("defaultItemImage", JSONObject.NULL.equals(defaultItemImage) ? null : defaultItemImage);
if (!menuVisible)
***************
*** 89,93 ****
<c:set var="contextName" value="<%= sagex.webserver.UiContextProperties.getProperty(pageContext.getAttribute("context").toString(), "name") %>"/>
<tr>
! <td class="menuimage"><div><img src="images/OSDPlayMobile.png"/></div></td>
<td class="menuitem">
<div><a href="webremote.jsp?context=${context}">${contextName}</a></div>
--- 91,95 ----
<c:set var="contextName" value="<%= sagex.webserver.UiContextProperties.getProperty(pageContext.getAttribute("context").toString(), "name") %>"/>
<tr>
! <td class="menuimage"><div><c:if test="${!empty defaultItemImage}"><img src="${defaultItemImage}"/></c:if></div></td>
<td class="menuitem">
<div><a href="webremote.jsp?context=${context}">${contextName}</a></div>
***************
*** 98,102 ****
<tr>
<c:set var="clientName" value= "<%= sagex.webserver.UiContextProperties.getProperty(pageContext.getAttribute("client").toString(), "name") %>"/>
! <td class="menuimage"><div><img src="images/OSDPlayMobile.png"/></div></td>
<td class="menuitem">
<div><a href="webremote.jsp?context=${client}">${clientName}</a></div>
--- 100,104 ----
<tr>
<c:set var="clientName" value= "<%= sagex.webserver.UiContextProperties.getProperty(pageContext.getAttribute("client").toString(), "name") %>"/>
! <td class="menuimage"><div><c:if test="${!empty defaultItemImage}"><img src="${defaultItemImage}"/></c:if></div></td>
<td class="menuitem">
<div><a href="webremote.jsp?context=${client}">${clientName}</a></div>
***************
*** 133,140 ****
menuItemLink = "usermenu_new.jsp?menu=" + menuItemLink;
}*/
!
request.setAttribute("menuItemName", menuItemName);
request.setAttribute("menuItemLink", JSONObject.NULL.equals(menuItemLink) ? null : menuItemLink);
! request.setAttribute("menuItemImage", JSONObject.NULL.equals(menuItemImage) ? null : menuItemImage);
%>
<tr>
--- 135,142 ----
menuItemLink = "usermenu_new.jsp?menu=" + menuItemLink;
}*/
!
request.setAttribute("menuItemName", menuItemName);
request.setAttribute("menuItemLink", JSONObject.NULL.equals(menuItemLink) ? null : menuItemLink);
! request.setAttribute("menuItemImage", JSONObject.NULL.equals(menuItemImage) ? defaultItemImage : menuItemImage);
%>
<tr>
|
