Menu
▾
▴
[Sageplugins-commit] webapp/WebContent/m details.jsp,1.9,1.10
|
From: PiX64 <pi...@us...> - 2011-01-26 02:11:33
|
Update of /cvsroot/sageplugins/webapp/WebContent/m In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2991/WebContent/m Modified Files: details.jsp Log Message: Add it web remote link to details page in order to allow end user to navigate directly to the remote after sending content to the extender/client Index: details.jsp =================================================================== RCS file: /cvsroot/sageplugins/webapp/WebContent/m/details.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** details.jsp 25 Jan 2011 03:53:04 -0000 1.9 --- details.jsp 26 Jan 2011 02:11:25 -0000 1.10 *************** *** 152,159 **** <c:choose> <c:when test="${isFileCurrentlyRecording}"> ! <p><b>Recording:</b> ${fileStartTime} - ${scheduleEndTime}</p> </c:when> <c:when test="${isPastAiring and !empty mediaFile}"> ! <p><b>Recorded:</b> ${fileStartTime} - ${fileEndTime}</p> </c:when> <c:when test="${!isStartedAiring and !empty scheduledRecording}"> --- 152,159 ---- <c:choose> <c:when test="${isFileCurrentlyRecording}"> ! <p><b>Recording:</b> ${scheduleStartTime} - ${scheduleEndTime}</p> </c:when> <c:when test="${isPastAiring and !empty mediaFile}"> ! <p><b>Recorded:</b> ${scheduleStartTime} - ${scheduleEndTime}</p> </c:when> <c:when test="${!isStartedAiring and !empty scheduledRecording}"> *************** *** 178,182 **** <p><b>Category:</b> ${category}<c:if test="${!empty subcategory}">/${subcategory}</c:if> <c:if test="${!empty originalAiringLong and originalAiringLong != 0}"> ! <sageshow:IsShowFirstRun var="isShowFirstRun" airing="${airing}"/> <c:if test="${isShowFirstRun}"> - First Run --- 178,182 ---- <p><b>Category:</b> ${category}<c:if test="${!empty subcategory}">/${subcategory}</c:if> <c:if test="${!empty originalAiringLong and originalAiringLong != 0}"> ! <sageshow:IsShowFirstRun var="isShowFirstRun" airing="${show}"/> <c:if test="${isShowFirstRun}"> - First Run *************** *** 280,284 **** <sagemf:GetSegmentFiles var="segmentFiles" mediaFile="${airing}"/> <c:if test="${!empty segmentFiles}"> ! <p><b>Files:</b><br/> <c:forEach var="file" items="${segmentFiles}" varStatus="status"> <c:url var="fileSegmentUrl" value="../MediaFile"> --- 280,284 ---- <sagemf:GetSegmentFiles var="segmentFiles" mediaFile="${airing}"/> <c:if test="${!empty segmentFiles}"> ! <p><b>Files:</b><br /> <c:forEach var="file" items="${segmentFiles}" varStatus="status"> <c:url var="fileSegmentUrl" value="../MediaFile"> *************** *** 286,290 **** <c:param name="Segment" value="${status.index}"></c:param> </c:url> ! <a href="${fileSegmentUrl}">${file}</a><br/> </c:forEach> </p> --- 286,290 ---- <c:param name="Segment" value="${status.index}"></c:param> </c:url> ! <a href="${fileSegmentUrl}">${file}</a><br /> </c:forEach> </p> *************** *** 419,423 **** <c:set var="formId" value="${context}WatchNowForm"/> <form id="${formId}" method="post" action="${cp}/m/Command"> ! <c:set var="contextName" value="<%= sagex.webserver.UiContextProperties.getProperty(pageContext.getAttribute("context").toString(), "name") %>"/> <c:if test="${contextName == 'SAGETV_PROCESS_LOCAL_UI'}"> <c:set var="contextName" value="SageTV"/> --- 419,423 ---- <c:set var="formId" value="${context}WatchNowForm"/> <form id="${formId}" method="post" action="${cp}/m/Command"> ! <c:set var="contextName" value="<%= sagex.webserver.UIContextTranslator.doTranslate(pageContext.getAttribute("context").toString()) %>"/> <c:if test="${contextName == 'SAGETV_PROCESS_LOCAL_UI'}"> <c:set var="contextName" value="SageTV"/> *************** *** 431,435 **** </c:if> <input type="hidden" name="returnto" value="${cp}/m/details.jsp?${pageContext.request.queryString}"/> ! <button type="submit" name="command" value="WatchNow">${contextName}</button> </form> <script language="JavaScript"> --- 431,436 ---- </c:if> <input type="hidden" name="returnto" value="${cp}/m/details.jsp?${pageContext.request.queryString}"/> ! <button type="submit" name="command" value="WatchNow">${contextName}</button> ! <button type="button" onClick="location.href='webremote.jsp?context=${context}'">${contextName} Web Remote</button> </form> <script language="JavaScript"> *************** *** 447,450 **** --- 448,452 ---- <form id="${formId}" method="post" action="${cp}/m/Command"> <input type="hidden" name="context" value="${client}"/> + <c:set var="clientName" value="<%= sagex.webserver.UIContextTranslator.doTranslate(pageContext.getAttribute("client").toString()) %>"/> <c:if test="${isMediaFileObject}"> <input type="hidden" name="MediaFileId" value="${mediaFileId}"/> *************** *** 454,458 **** </c:if> <input type="hidden" name="returnto" value="${cp}/m/details.jsp?${pageContext.request.queryString}"/> ! <button type="submit" name="command" value="WatchNow"><%= sagex.webserver.UiContextProperties.getProperty(pageContext.getAttribute("client").toString(), "name") %></button> </form> <script language="JavaScript"> --- 456,461 ---- </c:if> <input type="hidden" name="returnto" value="${cp}/m/details.jsp?${pageContext.request.queryString}"/> ! <button type="submit" name="command" value="WatchNow"><%= sagex.webserver.UIContextTranslator.doTranslate(pageContext.getAttribute("client").toString()) %></button> ! <button type="button" onClick="location.href='webremote.jsp?context=${client}'">${clientName} Web Remote</button> </form> <script language="JavaScript"> *************** *** 518,524 **** </c:if> <%--if (! airing.getTitle().startsWith("Timed Record")) ! <c:if test=""--%> <input type="hidden" name="returnto" value="${cp}/m/details.jsp?AiringId=${airingId}"/> ! <%--/c:if--%> <button type="submit" name="command" value="CancelRecord">Cancel Recording</button> </form> --- 521,527 ---- </c:if> <%--if (! airing.getTitle().startsWith("Timed Record")) ! <c:if test=""--%> <input type="hidden" name="returnto" value="${cp}/m/details.jsp?AiringId=${airingId}"/> ! <%--/c:if--%> <button type="submit" name="command" value="CancelRecord">Cancel Recording</button> </form> |
