Update of /cvsroot/sageplugins/webapp/WebContent/m
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32476/WebContent/m
Modified Files:
details.jsp
Log Message:
- Fix display of actual recording times in recording lists and detailed info page
- Fix First Run/ReRun info on detailed info page
Index: details.jsp
===================================================================
RCS file: /cvsroot/sageplugins/webapp/WebContent/m/details.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** details.jsp 23 Jan 2011 18:05:23 -0000 1.8
--- details.jsp 25 Jan 2011 03:53:04 -0000 1.9
***************
*** 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}">
--- 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}">
***************
*** 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
--- 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
***************
*** 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>
--- 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>
|
