Update of /cvsroot/sageplugins/webapp/WebContent/m
In directory vz-cvs-3.sog:/tmp/cvs-serv21944/WebContent/m
Modified Files:
menu.jsp
Log Message:
Support for hidden menu items
Mobile remote icons
Index: menu.jsp
===================================================================
RCS file: /cvsroot/sageplugins/webapp/WebContent/m/menu.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** menu.jsp 6 Mar 2011 01:10:29 -0000 1.7
--- menu.jsp 13 May 2011 02:05:35 -0000 1.8
***************
*** 15,18 ****
--- 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"%>
***************
*** 59,62 ****
--- 60,70 ----
JSONObject menu = menus.getJSONObject(i);
Object menuName = menu.get("title");
+ boolean menuVisible = menu.optBoolean("visible", true);
+
+ if (!menuVisible)
+ {
+ continue;
+ }
+
%>
<div class="menu section"><%= menuName.toString() %></div>
***************
*** 81,85 ****
<c:set var="contextName" value="<%= sagex.webserver.UiContextProperties.getProperty(pageContext.getAttribute("context").toString(), "name") %>"/>
<tr>
! <td class="menuimage"><div></div></td>
<td class="menuitem">
<div><a href="webremote.jsp?context=${context}">${contextName}</a></div>
--- 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>
***************
*** 90,94 ****
<tr>
<c:set var="clientName" value= "<%= sagex.webserver.UiContextProperties.getProperty(pageContext.getAttribute("client").toString(), "name") %>"/>
! <td class="menuimage"><div></div></td>
<td class="menuitem">
<div><a href="webremote.jsp?context=${client}">${clientName}</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>
***************
*** 114,135 ****
Object menuItemLink = menuItem.opt("link");
Object menuItemImage = menuItem.opt("image");
! // sub menu item array
! /*JSONArray menuItems = menuItem.optJSONArray("items");
! if (!JSONObject.NULL.equals(menuItems))
{
! menuItemLink = URLEncoder.encode(menuItemName.toString(), "UTF-8");
! 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>
! <td class="menuimage"><div><c:if test="${!empty menuItemImage}"><img src="${menuItemImage}"/></c:if></div></td>
! <td class="menuitem"><div><c:if test="${!empty menuItemLink}"><a href="${menuItemLink}"></c:if>${menuItemName}<c:if test="${!empty menuItemLink}"></a></c:if></div></td>
! </tr>
! <%
}
%>
--- 122,147 ----
Object menuItemLink = menuItem.opt("link");
Object menuItemImage = menuItem.opt("image");
+ boolean menuItemVisible = menuItem.optBoolean("visible", true);
! if (menuItemVisible)
{
! // sub menu item array
! /*JSONArray menuItems = menuItem.optJSONArray("items");
! if (!JSONObject.NULL.equals(menuItems))
! {
! menuItemLink = URLEncoder.encode(menuItemName.toString(), "UTF-8");
! 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>
! <td class="menuimage"><div><c:if test="${!empty menuItemImage}"><img src="${menuItemImage}"/></c:if></div></td>
! <td class="menuitem"><div><c:if test="${!empty menuItemLink}"><a href="${menuItemLink}"></c:if>${menuItemName}<c:if test="${!empty menuItemLink}"></a></c:if></div></td>
! </tr>
! <%
! }
}
%>
|
