[Sageplugins-commit] webapp/WebContent/m details.jsp,1.7,1.8

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

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

Modified Files:
	details.jsp 
Log Message:
- Store client, extender, and placeshifter descriptive names in Sage.properties


Index: details.jsp
===================================================================
RCS file: /cvsroot/sageplugins/webapp/WebContent/m/details.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** details.jsp	5 Nov 2010 03:08:01 -0000	1.7
--- details.jsp	23 Jan 2011 18:05:23 -0000	1.8
***************
*** 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>
!                   &nbsp;&nbsp;&nbsp;<a href="${fileSegmentUrl}">${file}</a><br />
                 </c:forEach>
                 </p>
--- 286,290 ----
                       <c:param name="Segment" value="${status.index}"></c:param>  
                    </c:url>
!                   &nbsp;&nbsp;&nbsp;<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.UIContextTranslator.doTranslate(pageContext.getAttribute("context").toString()) %>"/>
                          <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.UiContextProperties.getProperty(pageContext.getAttribute("context").toString(), "name") %>"/>
                          <c:if test="${contextName == 'SAGETV_PROCESS_LOCAL_UI'}">
                             <c:set var="contextName" value="SageTV"/>
***************
*** 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.UIContextTranslator.doTranslate(pageContext.getAttribute("client").toString()) %></button> 
                       </form>
                       <script language="JavaScript">
--- 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">