[Sageplugins-commit] webapp/WebContent/WEB-INF/jspf/m tvcell.jspf, 1.3, 1.4

[jreichen <jre...@us...>]

Update of /cvsroot/sageplugins/webapp/WebContent/WEB-INF/jspf/m
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv32567/WebContent/WEB-INF/jspf/m

Modified Files:
	tvcell.jspf 
Log Message:
- Fix display of actual recording times in recording lists and detailed info page


Index: tvcell.jspf
===================================================================
RCS file: /cvsroot/sageplugins/webapp/WebContent/WEB-INF/jspf/m/tvcell.jspf,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tvcell.jspf	31 Jan 2009 01:53:18 -0000	1.3
--- tvcell.jspf	25 Jan 2011 03:53:52 -0000	1.4
***************
*** 22,27 ****
  <sageair:GetAiringChannelName var="channelName" airing="${airing}" />
  <sageair:GetAiringChannelNumber var="channelNumber" airing="${airing}" />
! <sageair:GetScheduleStartTime var="airingStartTime" airing="${airing}" />
! <sageair:GetScheduleEndTime var="airingEndTime" airing="${airing}" />
     <%--c:param name="MediaFileId" value="${mediaFileId}"></c:param--%>
  <c:url var="recordingDetailUrl" value="details.jsp">
--- 22,37 ----
  <sageair:GetAiringChannelName var="channelName" airing="${airing}" />
  <sageair:GetAiringChannelNumber var="channelNumber" airing="${airing}" />
! <sageair:GetAiringStartTime var="airingStartTime" airing="${airing}" />
! <sageair:GetAiringEndTime var="airingEndTime" airing="${airing}" />
! <sagemf:IsFileCurrentlyRecording var="isFileCurrentlyRecording" mediaFile="${mediaFile}"/>
! <c:if test="${isFileCurrentlyRecording}">
!    <sagemf:GetFileStartTime var="recordingStartTime" mediaFile="${mediaFile}" />
!    <sageair:GetScheduleEndTime var="recordingEndTime" airing="${airing}" />
! </c:if>
! <c:if test="${!isFileCurrentlyRecording}">
!    <sagemf:GetFileStartTime var="recordingStartTime" mediaFile="${mediaFile}" />
!    <sagemf:GetFileEndTime var="recordingEndTime" mediaFile="${mediaFile}" />
! </c:if>
! 
     <%--c:param name="MediaFileId" value="${mediaFileId}"></c:param--%>
  <c:url var="recordingDetailUrl" value="details.jsp">
***************
*** 50,58 ****
     <p><%@ include file="markers.jspf" %></p>
     <sageair:GetMediaFileForAiring var="mediaFile" airing="${airing}"/>
!    <sageutil:DateFormat var="airingDateFmt" date="${airingStartTime}" format="EEE, MMM d"/>
!    <sageutilfn:LongToDate var="airingStartDate" value="${airingStartTime}"/>
!    <sageutil:PrintTimeShort var="airingStartTimeFmt" time="${airingStartTime}"/>
!    <sageutil:PrintTimeShort var="airingEndTimeFmt" time="${airingEndTime}"/>
!    <p>${airingDateFmt}, ${airingStartTimeFmt} - ${airingEndTimeFmt}</p>
     <c:if test="${!empty channelNumber}"><p>${channelNumber}-${channelName}</p></c:if>	
  
--- 60,67 ----
     <p><%@ include file="markers.jspf" %></p>
     <sageair:GetMediaFileForAiring var="mediaFile" airing="${airing}"/>
!    <sageutil:DateFormat var="recordingDateFmt" date="${recordingStartTime}" format="EEE, MMM d"/>
!    <sageutil:PrintTimeShort var="recordingStartTimeFmt" time="${recordingStartTime}"/>
!    <sageutil:PrintTimeShort var="recordingEndTimeFmt" time="${recordingEndTime}"/>
!    <p>${recordingDateFmt}, ${recordingStartTimeFmt} - ${recordingEndTimeFmt}</p>
     <c:if test="${!empty channelNumber}"><p>${channelNumber}-${channelName}</p></c:if>	
  
***************
*** 75,77 ****
     </p>
  </div>
- 
--- 84,85 ----