Menu
▾
▴
[Sageplugins-commit] webapp/WebContent/m home.jsp,1.5,1.6
|
From: PiX64 <pi...@us...> - 2011-01-26 02:16:03
|
Update of /cvsroot/sageplugins/webapp/WebContent/m In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3979/WebContent/m Modified Files: home.jsp Log Message: Modified home page to include direct links in the form of buttons to the webremote. Index: home.jsp =================================================================== RCS file: /cvsroot/sageplugins/webapp/WebContent/m/home.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** home.jsp 23 Jan 2011 17:58:00 -0000 1.5 --- home.jsp 26 Jan 2011 02:15:55 -0000 1.6 *************** *** 10,15 **** <%@ taglib prefix="sagemf" tagdir="/WEB-INF/tags/sage/api/mediafile" %> <%@ taglib prefix="sagemp" tagdir="/WEB-INF/tags/sage/api/mediaplayer" %> - <%@ taglib prefix="sagemsg" tagdir="/WEB-INF/tags/sage/api/systemmessage" %> - <%@ taglib prefix="sagemsgfn" tagdir="/WEB-INF/tags/sage/functions/systemmessage" %> <%@ taglib prefix="sageutil" tagdir="/WEB-INF/tags/sage/api/utility" %> <%@ taglib prefix="sagedatefn" tagdir="/WEB-INF/tags/sage/functions/date" %> --- 10,13 ---- *************** *** 35,39 **** -- Now Playing --%> ! <div class="section">Now Playing</div> <div class="sectionbody"> <sageglbl:GetUIContextNames var="contexts"/> --- 33,37 ---- -- Now Playing --%> ! <div class="section gloss">Now Playing</div> <div class="sectionbody"> <sageglbl:GetUIContextNames var="contexts"/> *************** *** 47,51 **** <div class="divider"> <a href="extenderdetails.jsp?context=${context}"> ! <%= sagex.webserver.UiContextProperties.getProperty(pageContext.getAttribute("context").toString(), "name") %> </a> </div> --- 45,49 ---- <div class="divider"> <a href="extenderdetails.jsp?context=${context}"> ! <%= sagex.webserver.UIContextTranslator.doTranslate(pageContext.getAttribute("context").toString()) %> </a> </div> *************** *** 63,66 **** --- 61,65 ---- <input type="hidden" name="command" value="Stop"/> <button type="submit" value="Stop Playback">Stop Playback</button> + <button type="button" onClick="location.href='webremote.jsp?context=${context}'">Web Remote</button> </form> </div> *************** *** 78,82 **** <div class="divider"> <a href="extenderdetails.jsp?context=${client}" style="color: #042360;"> ! <%= sagex.webserver.UiContextProperties.getProperty(pageContext.getAttribute("client").toString(), "name") %> </a> </div> --- 77,81 ---- <div class="divider"> <a href="extenderdetails.jsp?context=${client}" style="color: #042360;"> ! <%= sagex.webserver.UIContextTranslator.doTranslate(pageContext.getAttribute("client").toString()) %> </a> </div> *************** *** 94,97 **** --- 93,97 ---- <input type="hidden" name="command" value="Stop"/> <button type="submit" value="Stop Playback">Stop Playback</button> + <button type="button" onClick="location.href='webremote.jsp?context=${context}'">Web Remote</button> </form> </div> *************** *** 113,117 **** -- Currently Recording --%> ! <div class="section">Currently Recording</div> <div class="sectionbody"> <sagecd:GetActiveCaptureDevices var="capturedevices"/> --- 113,117 ---- -- Currently Recording --%> ! <div class="section gloss">Currently Recording</div> <div class="sectionbody"> <sagecd:GetActiveCaptureDevices var="capturedevices"/> *************** *** 140,144 **** -- Next Upcoming Recordings --%> ! <div class="section">Next Upcoming Recordings</div> <div class="sectionbody"> <sageglbl:GetScheduledRecordings var="scheduledRecordings"/> --- 140,144 ---- -- Next Upcoming Recordings --%> ! <div class="section gloss">Next Upcoming Recordings</div> <div class="sectionbody"> <sageglbl:GetScheduledRecordings var="scheduledRecordings"/> *************** *** 186,242 **** </div> <%-- - -- System Messages - --%> - <div class="section">System Messages</div> - <div class="sectionbody"> - <sagemsgfn:SupportsSystemMessages var="supportsSystemMessages"/> - - <c:if test="${not supportsSystemMessages}"> - System messages require SageTV 6.5.17 or later. - </c:if> - - <c:if test="${supportsSystemMessages}"> - <sagemsg:GetSystemAlertLevel var="alertLevel"/> - <c:if test="${empty alertLevel}"><c:set var="alertLevel">0</c:set></c:if> - <sagemsg:GetSystemMessages var="systemMessages"/> - <sageutil:Size var="systemMessageCount" data="${systemMessages}"/> - <c:choose> - <c:when test="${alertLevel == 0}"> - <c:set var="alertLevelDesc">Status</c:set> - </c:when> - <c:when test="${alertLevel == 1}"> - <c:set var="alertLevelDesc">Information</c:set> - </c:when> - <c:when test="${alertLevel == 2}"> - <c:set var="alertLevelDesc">Warning</c:set> - </c:when> - <c:when test="${alertLevel == 3}"> - <c:set var="alertLevelDesc">Error</c:set> - </c:when> - </c:choose> - - <div class="divider">Alert Level</div> - <c:if test="${alertLevel == 0}"> - <div class="dividerbody">No new system messages have been generated since the alert level was last reset.</div> - </c:if> - <c:if test="${alertLevel > 0}"> - <div class="dividerbody"> - The system is currently at alert level ${alertLevel} - ${alertLevelDesc} - <img style="border: 0px none; width: 20px; height: 20px;" src="${cp}/images/MarkerSysAlert${alertLevel}.png" alt="Message Level ${alertLevel}" title="Message Level ${alertLevel}"/> - </div> - </c:if> - <div class="divider">System Messages</div> - <c:if test="${systemMessageCount == 1}"> - <div class="dividerbody">There is <a href="systemmessages.jsp">${systemMessageCount} system message</a></div> - </c:if> - <c:if test="${systemMessageCount != 1}"> - <div class="dividerbody">There are <a href="systemmessages.jsp">${systemMessageCount} system messages</a></div> - </c:if> - </c:if> - </div> - <%-- -- Conflicts --%> ! <div class="section">Conflicts</div> <div class="sectionbody"> <%@ include file="/WEB-INF/jspf/m/conflictstats.jspf" %> --- 186,192 ---- </div> <%-- -- Conflicts --%> ! <div class="section gloss">Conflicts</div> <div class="sectionbody"> <%@ include file="/WEB-INF/jspf/m/conflictstats.jspf" %> *************** *** 247,251 **** --%> <c:if test="${!empty connectedClients and !supportsClientApiUi}"> ! <div class="section">Connected Clients</div> <div class="sectionbody"> <c:forEach var="client" items="${connectedClients}"> --- 197,201 ---- --%> <c:if test="${!empty connectedClients and !supportsClientApiUi}"> ! <div class="section gloss">Connected Clients</div> <div class="sectionbody"> <c:forEach var="client" items="${connectedClients}"> *************** *** 257,261 **** -- Video Disk Space --%> ! <div class="section">Video Disk Space</div> <div class="sectionbody"> <sageglbl:GetTotalDiskspaceAvailable var="diskavailable"/> --- 207,211 ---- -- Video Disk Space --%> ! <div class="section gloss">Video Disk Space</div> <div class="sectionbody"> <sageglbl:GetTotalDiskspaceAvailable var="diskavailable"/> *************** *** 394,398 **** -- Program Guide --%> ! <div class="section">Program Guide</div> <div class="sectionbody"> <sageglbl:GetLastEPGDownloadTime var="lastEPGDownloadTimeLong"/> --- 344,348 ---- -- Program Guide --%> ! <div class="section gloss">Program Guide</div> <div class="sectionbody"> <sageglbl:GetLastEPGDownloadTime var="lastEPGDownloadTimeLong"/> |
