Menu
▾
▴
sageplugins-commic — CVS Checkin messages
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(2) |
Jun
|
Jul
(29) |
Aug
(20) |
Sep
(6) |
Oct
(89) |
Nov
(24) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(16) |
Feb
(1) |
Mar
(7) |
Apr
(32) |
May
(36) |
Jun
(21) |
Jul
(65) |
Aug
(6) |
Sep
|
Oct
(30) |
Nov
(26) |
Dec
(44) |
| 2006 |
Jan
(35) |
Feb
(15) |
Mar
(29) |
Apr
(24) |
May
(8) |
Jun
(2) |
Jul
(7) |
Aug
(11) |
Sep
(61) |
Oct
(36) |
Nov
(10) |
Dec
(14) |
| 2007 |
Jan
(6) |
Feb
(43) |
Mar
(55) |
Apr
(20) |
May
(26) |
Jun
(21) |
Jul
(24) |
Aug
(22) |
Sep
(24) |
Oct
(4) |
Nov
|
Dec
(60) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(51) |
Jul
(2) |
Aug
(13) |
Sep
|
Oct
(16) |
Nov
(99) |
Dec
(12) |
| 2009 |
Jan
(23) |
Feb
(44) |
Mar
(4) |
Apr
|
May
|
Jun
(9) |
Jul
(70) |
Aug
(14) |
Sep
(13) |
Oct
(6) |
Nov
|
Dec
(3) |
| 2010 |
Jan
(13) |
Feb
(17) |
Mar
(2) |
Apr
(3) |
May
(71) |
Jun
(19) |
Jul
(95) |
Aug
|
Sep
|
Oct
|
Nov
(71) |
Dec
(3) |
| 2011 |
Jan
(52) |
Feb
|
Mar
(34) |
Apr
(10) |
May
(8) |
Jun
(8) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: jreichen <jre...@us...> - 2011-03-15 01:06:06
|
Update of /cvsroot/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv21560
Modified Files:
web.xml
Log Message:
Store and edit client, extender, and placeshifter descriptive names in Sage.properties. Extenders.properties is no longer used.
Index: web.xml
===================================================================
RCS file: /cvsroot/sageplugins/webserver/web.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** web.xml 5 Jun 2010 19:10:04 -0000 1.6
--- web.xml 15 Mar 2011 01:06:04 -0000 1.7
***************
*** 279,282 ****
--- 279,291 ----
<servlet>
+ <servlet-name>ExtenderDetailsServlet</servlet-name>
+ <servlet-class>net.sf.sageplugins.webserver.ExtenderDetailsServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>ExtenderDetailsServlet</servlet-name>
+ <url-pattern>/ExtenderDetails</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
<servlet-name>TranscodeJobsServlet</servlet-name>
<servlet-class>net.sf.sageplugins.webserver.TranscodeJobsServlet</servlet-class>
|
|
From: jreichen <jre...@us...> - 2011-03-15 01:05:19
|
Update of /cvsroot/sageplugins/webserver/webserver/webroot/sage In directory vz-cvs-3.sog:/tmp/cvs-serv20201/webserver/webroot/sage Modified Files: about.html Log Message: Version 2.29 Index: about.html =================================================================== RCS file: /cvsroot/sageplugins/webserver/webserver/webroot/sage/about.html,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** about.html 19 Jul 2010 03:34:04 -0000 1.97 --- about.html 15 Mar 2011 01:05:17 -0000 1.98 *************** *** 68,71 **** --- 68,85 ---- <h3>Changelog</h3> + <h4>V2.29 14 Mar 2011 For SageTV 7.0</h4> + <pre> + BUGFIXES: + * (jreichen) An error "is not a valid directory on the server" was displayed on the XML Importer if the user didn't want to import from a directory of XML files and left the directory name blank + * (jreichen) Manual recording filter was not working on search page + * (jreichen) Favorite automatic conversion destination folder was required when Alternate Destination Folder was selected even if Automatic Conversion was not enabled + * (jreichen) Favorite automatic conversion setup failed with error "Must specify conversion destination folder" even when Alternate Destination Folder had a valid value + * (jreichen) Verify that Favorite automatic conversion Alternate Destination Folder exists and is writable + ENHANCEMENTS + * (jreichen) Changed to robogeek's SageTV v7-style skin + * (jreichen) Store client, extender, and placeshifter descriptive names in Sage.properties. Extenders.properties is no longer used. + * (jreichen) Edit client, extender, and placeshifter descriptive names from web interface (click on the context in the home page to go to the client/extender details page) + </pre> + <h4>V2.28 18 Jul 2010 For SageTV 7.0</h4> <pre> |
|
From: jreichen <jre...@us...> - 2011-03-15 01:04:54
|
Update of /cvsroot/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv19930
Modified Files:
plugin.xml
Log Message:
Version 2.29
Index: plugin.xml
===================================================================
RCS file: /cvsroot/sageplugins/webserver/plugin.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** plugin.xml 19 Jul 2010 03:34:04 -0000 1.2
--- plugin.xml 15 Mar 2011 01:04:52 -0000 1.3
***************
*** 14,17 ****
--- 14,27 ----
<ReleaseNotes>
<![CDATA[
+ Version 2.29
+ 1. An error "is not a valid directory on the server" was displayed on the XML Importer if the user didn't want to import from a directory of XML files and left the directory name blank
+ 2. Manual recording filter was not working on search page
+ 3. Favorite automatic conversion destination folder was required when Alternate Destination Folder was selected even if Automatic Conversion was not enabled
+ 4. Favorite automatic conversion setup failed with error "Must specify conversion destination folder" even when Alternate Destination Folder had a valid value
+ 5. Verify that Favorite automatic conversion Alternate Destination Folder exists and is writable
+ 6. Changed to robogeek's SageTV v7-style skin
+ 7. Store client, extender, and placeshifter descriptive names in Sage.properties. Extenders.properties is no longer used.
+ 8. Edit client, extender, and placeshifter descriptive names from web interface (click on the context in the home page to go to the client/extender details page)
+
Version 2.28
1. Fixed NullPointerException in auto conversion section of Favorite Details page
|
|
From: jreichen <jre...@us...> - 2011-03-15 00:56:41
|
Update of /cvsroot/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv16147
Modified Files:
build.xml
Log Message:
Version 2.29
Index: build.xml
===================================================================
RCS file: /cvsroot/sageplugins/webserver/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** build.xml 19 Jul 2010 03:33:06 -0000 1.11
--- build.xml 15 Mar 2011 00:56:39 -0000 1.12
***************
*** 2,6 ****
<!-- set global properties for this build -->
<property file="build.properties"/>
! <property name="plugin.version" value="2.28"/>
<property name="src" location="."/>
<property name="build" location="build"/>
--- 2,6 ----
<!-- set global properties for this build -->
<property file="build.properties"/>
! <property name="plugin.version" value="2.29"/>
<property name="src" location="."/>
<property name="build" location="build"/>
|
|
From: jreichen <jre...@us...> - 2011-03-15 00:55:57
|
Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv15820/net/sf/sageplugins/webserver
Modified Files:
Version.java
Log Message:
Version 2.29
Index: Version.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/Version.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** Version.java 19 Jul 2010 03:33:05 -0000 1.40
--- Version.java 15 Mar 2011 00:55:55 -0000 1.41
***************
*** 14,18 ****
*/
public abstract class Version {
! public static final String VERSION="2.28";
public static void main(String[] args){
System.out.println("Sage Webserver version "+VERSION);
--- 14,18 ----
*/
public abstract class Version {
! public static final String VERSION="2.29";
public static void main(String[] args){
System.out.println("Sage Webserver version "+VERSION);
|
|
From: jreichen <jre...@us...> - 2011-03-15 00:55:03
|
Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv15427/net/sf/sageplugins/webserver
Modified Files:
HomeServlet.java ExtenderCommandServlet.java
Added Files:
ExtenderDetailsServlet.java
Log Message:
Store and edit client, extender, and placeshifter descriptive names in Sage.properties. Extenders.properties is no longer used.
Index: ExtenderCommandServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/ExtenderCommandServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ExtenderCommandServlet.java 4 Feb 2009 15:02:48 -0000 1.4
--- ExtenderCommandServlet.java 15 Mar 2011 00:55:00 -0000 1.5
***************
*** 93,97 ****
out.println("<p>Are you sure you want to "+command+" the "+
(isMvp(uicontext)?"MVP":(isHDExtender(uicontext)?"HD Extender":"Placeshifter"))+
! " at "+UIContextTranslator.doTranslate(uicontext) +"?</p>");
out.println("<form method=\"get\" action=\"ExtenderCommand\">\n"+
--- 93,97 ----
out.println("<p>Are you sure you want to "+command+" the "+
(isMvp(uicontext)?"MVP":(isHDExtender(uicontext)?"HD Extender":"Placeshifter"))+
! " at "+UiContextProperties.getProperty(uicontext, "name") +"?</p>");
out.println("<form method=\"get\" action=\"ExtenderCommand\">\n"+
***************
*** 114,118 ****
if ( req.getParameter("confirm").equalsIgnoreCase("yes")) {
! Object ret;
if ( command.equalsIgnoreCase("poweroff")) {
if ( isMvp(uicontext))
--- 114,118 ----
if ( req.getParameter("confirm").equalsIgnoreCase("yes")) {
! Object ret = null;
if ( command.equalsIgnoreCase("poweroff")) {
if ( isMvp(uicontext))
***************
*** 132,138 ****
SageApi.ApiUI(uicontext, "Exit");
ret=Boolean.TRUE;
! } else
throw new Exception ("Invalid command passed");
!
if (ret instanceof String) {
--- 132,142 ----
SageApi.ApiUI(uicontext, "Exit");
ret=Boolean.TRUE;
! } else if ( command.equalsIgnoreCase("rename") ) {
! String contextName = req.getParameter("name");
! contextName = (contextName == null) ? "" : contextName;
! UiContextProperties.setProperty(uicontext, "name", contextName);
! } else {
throw new Exception ("Invalid command passed");
! }
if (ret instanceof String) {
--- NEW FILE: ExtenderDetailsServlet.java ---
/*
* Created on Mar 7, 2011
*
*/
package net.sf.sageplugins.webserver;
import java.io.PrintWriter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.sf.sageplugins.sageutils.SageApi;
/**
* @author Owner
*
*/
public class ExtenderDetailsServlet extends SageServlet {
/**
*
*/
private static final long serialVersionUID = -1282179705230630195L;
public ExtenderDetailsServlet() {
}
/* (non-Javadoc)
* @see net.sf.sageplugins.webserver.SageServlet#doServletGet(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
*/
protected void doServletGet(HttpServletRequest req, HttpServletResponse resp)
throws Exception {
String pageTitle = "";
String context = req.getParameter("context");
htmlHeaders(resp);
noCacheHeaders(resp);
PrintWriter out = getGzippedWriter(req,resp);
// must catch and report all errors within Gzipped Writer
try {
xhtmlHeaders(out);
out.println("<head>");
jsCssImport(req, out);
Boolean isClient = (Boolean) SageApi.ApiUI(context, "IsClient");
if (isClient) {
pageTitle = "Client Details";
} else {
pageTitle = "Extender Details";
}
out.println("<title>" + pageTitle + "</title>");
out.println("</head>");
out.println("<body>");
printTitle(out,pageTitle);
out.println("<div id=\"content\">");
out.println("<div id=\"airdetailedinfo\">");
out.println(" <form method=\"post\" action=\"ExtenderCommand\">");
out.println(" <dl>");
// Properties for ui contexts
// Context id
out.println(" <dt>Id:</dt>");
out.println(" <dd>");
out.println(" " + context);
out.println(" </dd>");
// Name
out.println(" <dt>Name:</dt>");
out.println(" <dd>");
out.println(" <input type=\"hidden\" name=\"context\" value=\"" + context + "\"/>");
out.println(" <input type=\"text\" name=\"name\" value=\"" + net.sf.sageplugins.webserver.UiContextProperties.getProperty(context, "name") + "\"/>");
out.println(" <input type=\"hidden\" name=\"confirm\" value=\"yes\"/>");
out.println(" <input type=\"hidden\" name=\"returnto\" value=\"ExtenderDetails?" + req.getQueryString() + "\"/>");
out.println(" <button type=\"submit\" name=\"command\" value=\"rename\">Rename</button>");
out.println(" ");
out.println(" </dd>");
// Type
String uiType = (String) SageApi.ApiUI(context, "GetRemoteUIType");
out.println(" <dt>Type:</dt>");
out.println(" <dd>");
out.println(" " + uiType);
out.println(" </dd>");
// Platform
// No API for GetOS that takes context as a parameter
// String platform = (String) SageApi.ApiUI(context, "GetOS");
// out.println(" <dt>Platform:</dt>");
// out.println(" <dd>");
// out.println(" " + platform);
// out.println(" </dd>");
// Version
String uiVersion = (String) SageApi.ApiUI(context, "GetRemoteClientVersion");
out.println(" <dt>Version:</dt>");
out.println(" <dd>");
out.println(" " + uiVersion);
out.println(" </dd>");
// Full screen
Boolean isFullScreen = (Boolean) SageApi.ApiUI(context, "IsFullScreen");
out.println(" <dt>Full Screen:</dt>");
out.println(" <dd>");
out.println(" " + (isFullScreen ? "Yes" : "No"));
out.println(" </dd>");
// Window Size
Integer width = (Integer) SageApi.ApiUI(context, "GetFullUIWidth");
Integer height = (Integer) SageApi.ApiUI(context, "GetFullUIHeight");
out.println(" <dt>Window Size:</dt>");
out.println(" <dd>");
out.println(" " + width + "x" + height);
out.println(" </dd>");
// Resolution
String uiResolution = (String) SageApi.ApiUI(context, "GetDisplayResolution");
out.println(" <dt>Display Resolution:</dt>");
out.println(" <dd>");
out.println(" " + uiResolution);
out.println(" </dd>");
// Display Resolution Options
String[] uiResolutionOptions = (String[]) SageApi.ApiUI(context, "GetDisplayResolutionOptions");
if ((uiResolutionOptions != null) && (uiResolutionOptions.length > 0))
{
out.println(" <dt>Display Resolution Options:</dt>");
out.println(" <dd>");
for (String uiResolutionOption : uiResolutionOptions)
{
out.println(" <p>" + uiResolutionOption + "</p>");
}
out.println(" </dd>");
}
// Available Update
// String availableUpdate = (String) SageApi.ApiUI(context, "GetAvailableUpdate");
// out.println(" <dt>Available Update:</dt>");
// out.println(" <dd>");
// out.println(" " + availableUpdate);
// out.println(" </dd>");
// Asleep
Boolean isAsleep = (Boolean) SageApi.ApiUI(context, "IsAsleep");
out.println(" <dt>Asleep:</dt>");
out.println(" <dd>");
out.println(" " + (isAsleep ? "Yes" : "No"));
out.println(" </dd>");
// End of properties, close the form element
out.println(" </form>");
out.println("</div>");//airdetailedinfo
out.println("<div id=\"commands\">");
out.println(" <ul>");
out.println(" <li>");
out.println(" (No Commands)");
out.println(" </li>");
out.println(" </ul>");
out.println("</div>");//commands
printFooter(req,out);
out.println("</div>");//content
printMenu(req,out);
out.println("</body>");
out.println("</html>");
out.close();
} catch (Throwable e) {
if (!resp.isCommitted()){
resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
resp.setContentType("text/html");
}
out.println();
out.println();
out.println("<body><pre>");
out.println("Exception while processing servlet:\r\n"+e.toString());
e.printStackTrace(out);
out.println("</pre>");
out.close();
log("Exception while processing servlet",e);
}
}
}
Index: HomeServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/HomeServlet.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** HomeServlet.java 17 Jul 2010 15:23:09 -0000 1.36
--- HomeServlet.java 15 Mar 2011 00:55:00 -0000 1.37
***************
*** 174,181 ****
if ( ! context.equals("SAGETV_PROCESS_LOCAL_UI")) {
! out.println("<h3>On Sage Extender at: "+UIContextTranslator.doTranslate(context)+":");
out.println("<a href=\""+xmlurl+"currplaying&context="+URLEncoder.encode(context,charset)+"\" title=\"Return currently playing in XML\"><img src=\"xml_button.png\" alt=\"[XML]\"/></a>");
out.println("<a href=\"webremote.html?context="+URLEncoder.encode(context,charset)
! +"&contextname="+URLEncoder.encode(UIContextTranslator.doTranslate(context),charset)
+"\" target=\"webremote\" title=\"Webremote for Sage Extender\" >"
+"[WebRemote]</a>\r\n");
--- 174,181 ----
if ( ! context.equals("SAGETV_PROCESS_LOCAL_UI")) {
! out.println("<h3>On Sage Extender at: <a href=\"ExtenderDetails?context="+URLEncoder.encode(context,charset)+"\">"+UiContextProperties.getProperty(context, "name")+"</a>:");
out.println("<a href=\""+xmlurl+"currplaying&context="+URLEncoder.encode(context,charset)+"\" title=\"Return currently playing in XML\"><img src=\"xml_button.png\" alt=\"[XML]\"/></a>");
out.println("<a href=\"webremote.html?context="+URLEncoder.encode(context,charset)
! +"&contextname="+URLEncoder.encode(UiContextProperties.getProperty(context, "name"),charset)
+"\" target=\"webremote\" title=\"Webremote for Sage Extender\" >"
+"[WebRemote]</a>\r\n");
***************
*** 236,243 ****
{
String context = ConnectedClients[i];
! out.println("<h3>On Sage Client at: "+UIContextTranslator.doTranslate(context)+":");
out.println("<a href=\""+xmlurl+"currplaying&context="+URLEncoder.encode(context,charset)+"\" title=\"Return currently playing in XML\"><img src=\"xml_button.png\" alt=\"[XML]\"/></a>");
out.println("<a href=\"webremote.html?context="+URLEncoder.encode(context,charset)
! +"&contextname="+URLEncoder.encode(UIContextTranslator.doTranslate(context),charset)
+"\" target=\"webremote\" title=\"Webremote for Sage Extender\" >"
+"[WebRemote]</a>\r\n");
--- 236,243 ----
{
String context = ConnectedClients[i];
! out.println("<h3>On Sage Client at: <a href=\"ExtenderDetails?context="+URLEncoder.encode(context,charset)+"\">"+UiContextProperties.getProperty(context, "name")+"</a>:");
out.println("<a href=\""+xmlurl+"currplaying&context="+URLEncoder.encode(context,charset)+"\" title=\"Return currently playing in XML\"><img src=\"xml_button.png\" alt=\"[XML]\"/></a>");
out.println("<a href=\"webremote.html?context="+URLEncoder.encode(context,charset)
! +"&contextname="+URLEncoder.encode(UiContextProperties.getProperty(context, "name"),charset)
+"\" target=\"webremote\" title=\"Webremote for Sage Extender\" >"
+"[WebRemote]</a>\r\n");
|
|
From: jreichen <jre...@us...> - 2011-03-14 03:50:45
|
Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv15805/net/sf/sageplugins/webserver
Modified Files:
DetailedInfoServlet.java
Log Message:
Store client, extender, and placeshifter descriptive names in Sage.properties. Extenders.properties is no longer used.
Index: DetailedInfoServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/DetailedInfoServlet.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** DetailedInfoServlet.java 17 Jul 2010 15:12:53 -0000 1.61
--- DetailedInfoServlet.java 14 Mar 2011 03:50:43 -0000 1.62
***************
*** 898,902 ****
out.print("<input type=\"hidden\" name=\"returnto\" value=\""+req.getRequestURI()+"?"+Translate.encode(req.getQueryString())+"\"/>");
out.print("<input type=\"hidden\" name=\"" + airing.getIdArgName() + "\" value=\""+airing.id+"\"/>");
! out.print("<input type=\"submit\" value=\""+Translate.encode(UIContextTranslator.doTranslate(context))+"\" onclick=\"return AiringCommand('"
+"MediaFileCommand?command=WatchNow&context="+context+"&" + airing.getIdArg()
+"&returnto=" + req.getRequestURI()+"?"+Translate.encode(req.getQueryString()) + "')\"/>" );
--- 898,902 ----
out.print("<input type=\"hidden\" name=\"returnto\" value=\""+req.getRequestURI()+"?"+Translate.encode(req.getQueryString())+"\"/>");
out.print("<input type=\"hidden\" name=\"" + airing.getIdArgName() + "\" value=\""+airing.id+"\"/>");
! out.print("<input type=\"submit\" value=\""+Translate.encode(UiContextProperties.getProperty(context, "name"))+"\" onclick=\"return AiringCommand('"
+"MediaFileCommand?command=WatchNow&context="+context+"&" + airing.getIdArg()
+"&returnto=" + req.getRequestURI()+"?"+Translate.encode(req.getQueryString()) + "')\"/>" );
***************
*** 918,922 ****
out.print("<input type=\"hidden\" name=\"returnto\" value=\""+req.getRequestURI()+"?"+Translate.encode(req.getQueryString())+"\"/>");
out.print("<input type=\"hidden\" name=\"" + airing.getIdArgName() + "\" value=\""+airing.id+"\"/>");
! out.print("<input type=\"submit\" value=\""+Translate.encode(UIContextTranslator.doTranslate(context))+"\" onclick=\"return AiringCommand('"
+"MediaFileCommand?command=WatchNow&context="+context+"&" + airing.getIdArg()
+"&returnto=" + req.getRequestURI()+"?"+Translate.encode(req.getQueryString()) + "')\"/>" );
--- 918,922 ----
out.print("<input type=\"hidden\" name=\"returnto\" value=\""+req.getRequestURI()+"?"+Translate.encode(req.getQueryString())+"\"/>");
out.print("<input type=\"hidden\" name=\"" + airing.getIdArgName() + "\" value=\""+airing.id+"\"/>");
! out.print("<input type=\"submit\" value=\""+Translate.encode(UiContextProperties.getProperty(context, "name"))+"\" onclick=\"return AiringCommand('"
+"MediaFileCommand?command=WatchNow&context="+context+"&" + airing.getIdArg()
+"&returnto=" + req.getRequestURI()+"?"+Translate.encode(req.getQueryString()) + "')\"/>" );
|
|
From: jreichen <jre...@us...> - 2011-03-14 03:47:05
|
Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv14069/net/sf/sageplugins/webserver
Added Files:
UiContextProperties.java
Log Message:
Store client, extender, and placeshifter descriptive names in Sage.properties. Extenders.properties is no longer used.
--- NEW FILE: UiContextProperties.java ---
package net.sf.sageplugins.webserver;
import java.lang.reflect.InvocationTargetException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import sage.SageTV;
/**
* Stores and retrieves descriptive names - or other properties - for Sage's UI
* contexts in Sage.properties. Names used to be stored in webserver/extenders.properties
* but are being moved so the file can be obsoleted and other plugins can easily use the
* same properties.
* The contexts ids are either MAC addresses for placeshifters and extenders, or
* IP addresses for client.
*
*/
public class UiContextProperties
{
private static Pattern CLIENT_CONTEXT_PATTERN = Pattern.compile("/(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}):(\\d{1,5})");
private UiContextProperties()
{
}
public static String getProperty(String contextName, String contextPropertyName)
{
return getProperty(contextName, contextPropertyName, contextName);
}
public static String getProperty(String contextName, String contextPropertyName, String defaultValue)
{
String returnValue = null;
try
{
String propertyName = createPropertyName(contextName, contextPropertyName);
returnValue = (String) SageTV.api("GetServerProperty",
new Object[] {propertyName, null});
// value not in Sage.properties, fallback to extenders.properties
if (returnValue == null)
{
// copy context name from extenders.properties
returnValue = UIContextTranslator.doTranslate(contextName);
if ((returnValue != null) && (!returnValue.equals(contextName)))
{
// copy property to Sage.properties if it exists and is not the same as the context
setProperty(contextName, contextPropertyName, returnValue);
}
else
{
// set a blank value so next time this won't read from extenders.properties
setProperty(contextName, contextPropertyName, "");
}
}
}
catch (InvocationTargetException e)
{
e.printStackTrace();
}
if ((returnValue == null) || (returnValue.trim().length() == 0))
{
returnValue = defaultValue;
}
return returnValue;
}
public static void setProperty(String contextName, String contextPropertyName, String value)
{
String propertyName = createPropertyName(contextName, contextPropertyName);
try
{
SageTV.api("SetServerProperty", new Object[] {propertyName, value});
}
catch (InvocationTargetException e)
{
e.printStackTrace();
}
}
private static String createPropertyName(String contextName, String contextPropertyName)
{
Matcher contextMatcher = CLIENT_CONTEXT_PATTERN.matcher(contextName);
if (contextMatcher.matches())
{
// if the ui context is for a SageTV Client, strip off the leading forward
// slash and the trailing colon and port number
contextName = contextMatcher.group(1);
}
String propertyName = "sagex/uicontexts/" +
contextName + "/" +
contextPropertyName;
return propertyName;
}
}
|
|
From: jreichen <jre...@us...> - 2011-03-14 03:44:51
|
Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv13511/net/sf/sageplugins/webserver
Modified Files:
UIContextTranslator.java
Log Message:
Store client, extender, and placeshifter descriptive names in Sage.properties. Extenders.properties is no longer used.
Index: UIContextTranslator.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/UIContextTranslator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UIContextTranslator.java 17 Jul 2010 15:06:32 -0000 1.3
--- UIContextTranslator.java 14 Mar 2011 03:44:49 -0000 1.4
***************
*** 14,17 ****
--- 14,18 ----
import net.sf.sageplugins.sageutils.SageApi;
+ @Deprecated
public class UIContextTranslator {
private UIContextTranslator() {
|
|
From: jreichen <jre...@us...> - 2011-03-14 03:37:19
|
Update of /cvsroot/sageplugins/webserver/webserver/webroot/sage
In directory vz-cvs-3.sog:/tmp/cvs-serv11284/webserver/webroot/sage
Modified Files:
sage_all.css
Log Message:
SageTV v7 skin
Index: sage_all.css
===================================================================
RCS file: /cvsroot/sageplugins/webserver/webserver/webroot/sage/sage_all.css,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** sage_all.css 15 Jul 2009 04:29:53 -0000 1.28
--- sage_all.css 14 Mar 2011 03:37:16 -0000 1.29
***************
*** 1,1042 ****
! /* ---------------------------------------------------- */
! /* Global settings */
!
! body {
! font-family: Arial, Tahoma, "lucida console", sans-serif;
! font-size: 10pt;
! background-color: #0b3f6f;
! color:#FFFFFF;
! background-image: url('Background.jpg');
! background-repeat: repeat;
[...2056 lines suppressed...]
! text-decoration: underline;
! overflow: hidden;
! white-space: nowrap;
! }
!
!
! .m0l1mdowno {
! background-color: #999;
! border : 1px solid #ffffff;
! border-top-style: none;
! margin: 0px;
! }
! /*-------------------------------------------------- */
! table.DateTimeEdit {
! border: none;
! }
! table.DateTimeEdit td {
! border: none;
! text-align: center;
! }
|
|
From: jreichen <jre...@us...> - 2011-03-14 01:51:37
|
Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv11750/net/sf/sageplugins/webserver
Modified Files:
FavoriteCommandServlet.java Favorite.java
Log Message:
- Favorite automatic conversion setup failed with error "Must specify conversion destination folder" even when Alternate Destination Folder had a valid value
- Verify that Favorite automatic conversion Alternate Destination Folder exists and is writable
Index: FavoriteCommandServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/FavoriteCommandServlet.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FavoriteCommandServlet.java 17 Jul 2010 15:21:57 -0000 1.10
--- FavoriteCommandServlet.java 14 Mar 2011 01:51:35 -0000 1.11
***************
*** 107,111 ****
String favoriteAutomaticConversionFormat = req.getParameter("transcodeMode");
boolean isFavoriteAutomaticConversionDestinationOriginalDir = "yes".equals(req.getParameter("origDestDir"));
! String favoriteAutomaticConversionDestination = req.getParameter("destfoldername");
String parentalRating = req.getParameter("parentalrating");
String rated = req.getParameter("rated");
--- 107,111 ----
String favoriteAutomaticConversionFormat = req.getParameter("transcodeMode");
boolean isFavoriteAutomaticConversionDestinationOriginalDir = "yes".equals(req.getParameter("origDestDir"));
! String favoriteAutomaticConversionDestination = req.getParameter("destDir");
String parentalRating = req.getParameter("parentalrating");
String rated = req.getParameter("rated");
Index: Favorite.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/Favorite.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Favorite.java 14 Mar 2011 00:58:01 -0000 1.16
--- Favorite.java 14 Mar 2011 01:51:35 -0000 1.17
***************
*** 611,618 ****
if (isAutomaticConversionSupported &&
isAutoConvert &&
! !isFavoriteAutomaticConversionDestinationOriginalDir &&
! favoriteAutomaticConversionDestination == null)
! {
! throw new IllegalArgumentException("Must specify conversion destination folder");
}
--- 611,631 ----
if (isAutomaticConversionSupported &&
isAutoConvert &&
! !isFavoriteAutomaticConversionDestinationOriginalDir)
! {
! if ((favoriteAutomaticConversionDestination == null) || favoriteAutomaticConversionDestination.trim().length() == 0)
! {
! throw new IllegalArgumentException("Must specify conversion destination folder");
! }
!
! File favoriteAutomaticConversionDestinationFile = new File(favoriteAutomaticConversionDestination);
! if (!favoriteAutomaticConversionDestinationFile.exists())
! {
! throw new IllegalArgumentException("Conversion destination folder does not exist");
! }
!
! if (!favoriteAutomaticConversionDestinationFile.canWrite())
! {
! throw new IllegalArgumentException("Unable to write to conversion destination folder");
! }
}
|
|
From: jreichen <jre...@us...> - 2011-03-14 00:58:03
|
Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv28619/net/sf/sageplugins/webserver
Modified Files:
Favorite.java
Log Message:
Favorite automatic conversion destination folder was required when Alternate Destination Folder was selected even if Automatic Conversion was not enabled
Index: Favorite.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/Favorite.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Favorite.java 17 Jul 2010 15:21:57 -0000 1.15
--- Favorite.java 14 Mar 2011 00:58:01 -0000 1.16
***************
*** 610,613 ****
--- 610,614 ----
if (isAutomaticConversionSupported &&
+ isAutoConvert &&
!isFavoriteAutomaticConversionDestinationOriginalDir &&
favoriteAutomaticConversionDestination == null)
|
|
From: jreichen <jre...@us...> - 2011-03-14 00:41:22
|
Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv23780/net/sf/sageplugins/webserver
Modified Files:
Search.java
Log Message:
Manual recording filter was not working on search page
Index: Search.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/Search.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Search.java 1 Jan 2010 18:15:37 -0000 1.10
--- Search.java 14 Mar 2011 00:41:20 -0000 1.11
***************
*** 469,472 ****
--- 469,473 ----
setHDTV(req.getParameter("hdtv"));
//setFiltertime(false);
+ setManRec(req.getParameter("manrec"));
setMusic("on".equals(req.getParameter("Music")));
setPartials(req.getParameter("partials"));
|
|
From: jreichen <jre...@us...> - 2011-03-14 00:30:26
|
Update of /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver
In directory vz-cvs-3.sog:/tmp/cvs-serv20124/net/sf/sageplugins/webserver
Modified Files:
XmlImporterServlet.java
Log Message:
- An error "is not a valid directory on the server" was displayed on the XML Importer if the user didn't want to import from a directory of XML files and left the directory name blank.
Index: XmlImporterServlet.java
===================================================================
RCS file: /cvsroot/sageplugins/webserver/net/sf/sageplugins/webserver/XmlImporterServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** XmlImporterServlet.java 17 Jul 2010 15:03:34 -0000 1.6
--- XmlImporterServlet.java 14 Mar 2011 00:30:24 -0000 1.7
***************
*** 319,323 ****
}
// import for mediafile
! if ( directoryXml != null ) {
out.println("Error: directory import feature cannot be used when attaching to a single media file");
out.println("</div>");//content
--- 319,323 ----
}
// import for mediafile
! if ( (directoryXml != null ) && (directoryXml.trim().length() > 0)) {
out.println("Error: directory import feature cannot be used when attaching to a single media file");
out.println("</div>");//content
***************
*** 385,389 ****
ArrayList<SageXmlReader> listOfXMLFiles = new ArrayList<SageXmlReader>();
! if(directoryXml != null){
//Process an entire folder structure
File directory = new File(directoryXml);
--- 385,389 ----
ArrayList<SageXmlReader> listOfXMLFiles = new ArrayList<SageXmlReader>();
! if((directoryXml != null) && (directoryXml.trim().length() > 0)){
//Process an entire folder structure
File directory = new File(directoryXml);
|
|
From: PiX64 <pi...@us...> - 2011-01-26 02:18:31
|
Update of /cvsroot/sageplugins/webapp/WebContent/WEB-INF In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4615/WebContent/WEB-INF Modified Files: mobile_menu.json Log Message: Added Web Remote heading. PiX64 Index: mobile_menu.json =================================================================== RCS file: /cvsroot/sageplugins/webapp/WebContent/WEB-INF/mobile_menu.json,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** mobile_menu.json 5 Nov 2010 03:08:01 -0000 1.6 --- mobile_menu.json 26 Jan 2011 02:18:23 -0000 1.7 *************** *** 36,39 **** --- 36,48 ---- ] }, + { + 'title' : 'Web Remote', + 'link' : null, + 'image' : 'images/MediaCenter.png', + 'items' : + [ + + ] + }, { 'title' : 'Schedule', |
|
From: PiX64 <pi...@us...> - 2011-01-26 02:17:49
|
Update of /cvsroot/sageplugins/webapp/WebContent/m In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4356/WebContent/m Modified Files: menu.jsp Log Message: Modified menu to include web remote links for all connected devices. Index: menu.jsp =================================================================== RCS file: /cvsroot/sageplugins/webapp/WebContent/m/menu.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** menu.jsp 5 Nov 2010 03:08:01 -0000 1.5 --- menu.jsp 26 Jan 2011 02:17:42 -0000 1.6 *************** *** 10,13 **** --- 10,14 ---- <%@ page import="org.json.*"%> <%@ page import="org.mortbay.log.*" %> + <%@ taglib prefix="sageglbl" tagdir="/WEB-INF/tags/sage/api/global" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> *************** *** 62,65 **** --- 63,92 ---- <div class="menu section"><b><%= menuName.toString() %></b></div> <% + //************Custom code for web remote sub menus************* + if (menuName.equals("Web Remote")){%> + <sageglbl:GetUIContextNames var="contexts"/> + <sageglbl:GetConnectedClients var="connectedClients"/> + <table cellpadding="0" cellspacing="0"> + <c:forEach var="context" items="${contexts}"> + <c:set var="contextName" value="<%= sagex.webserver.UIContextTranslator.doTranslate(pageContext.getAttribute("context").toString()) %>"/> + <tr> + <td class="menuimage"></td> + <td class="menuitem"> + <a href="webremote.jsp?context=${context}">${contextName}</a> + </td> + </tr> + </c:forEach> + <c:forEach var="client" items="${connectedClients}"> + <tr> + <c:set var="clientName" value= "<%= sagex.webserver.UIContextTranslator.doTranslate(pageContext.getAttribute("client").toString()) %>"/> + <td class="menuimage"></td> + <td class="menuitem"> + <a href="webremote.jsp?context=${client}">${clientName}</a> + </td> + </tr> + </c:forEach> + </table> + <%} + //************End custom code for web remote sub menus******************* JSONArray items = menu.optJSONArray("items"); //if (menu.length() >= 4) *************** *** 89,92 **** --- 116,120 ---- request.setAttribute("menuItemImage", JSONObject.NULL.equals(menuItemImage) ? null : menuItemImage); %> + <tr> <td class="menuimage"><c:if test="${!empty menuItemImage}"><img src="${menuItemImage}"/></c:if></td> *************** *** 96,99 **** --- 124,128 ---- } %> + </table> <% *************** *** 101,105 **** } %> ! </div> --- 130,134 ---- } %> ! </div> |
|
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"/> |
|
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> |
|
From: PiX64 <pi...@us...> - 2011-01-26 02:10:13
|
Update of /cvsroot/sageplugins/webapp/WebContent/m In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2253/WebContent/m Added Files: webremote.jsp Log Message: Initial load of webremote.jsp by PiX64 --- NEW FILE: webremote.jsp --- <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd"> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="sagefav" tagdir="/WEB-INF/tags/sage/api/favorite" %> <%@ taglib prefix="sageglbl" tagdir="/WEB-INF/tags/sage/api/global" %> <%@ taglib prefix="sagemf" tagdir="/WEB-INF/tags/sage/api/mediafile" %> <%@ taglib prefix="sagedb" tagdir="/WEB-INF/tags/sage/api/database" %> <%@ taglib prefix="sageshow" tagdir="/WEB-INF/tags/sage/api/show" %> <%@ taglib prefix="sageair" tagdir="/WEB-INF/tags/sage/api/airing" %> <%@ taglib prefix="sagecfg" tagdir="/WEB-INF/tags/sage/api/configuration" %> <%@ taglib prefix="sagetc" tagdir="/WEB-INF/tags/sage/api/transcode" %> <%@ taglib prefix="sageutil" tagdir="/WEB-INF/tags/sage/api/utility" %> <%@ taglib prefix="sageairfn" tagdir="/WEB-INF/tags/sage/functions/airing" %> <%@ taglib prefix="sageutilfn" tagdir="/WEB-INF/tags/sage/functions/utility" %> <%@ taglib prefix="sagecapdevfn" tagdir="/WEB-INF/tags/sage/functions/capturedevice" %> <html xmlns="http://www.w3.org/1999/xhtml"> <script language="JavaScript"> function updateOrientation() { // window.alert('change'); var orientation = window.orientation; switch(orientation) { case 90: case -90: orientation = 'landscape'; break; default: orientation = 'portrait'; } // set the class on the HTML element (i.e. ) document.body.parentNode.setAttribute('class', orientation); window.alert(document.body.parentNode.getAttribute('class')); } // event triggered every 90 degrees of rotation window.addEventListener('orientationchange', updateOrientation, false); // initialize the orientation updateOrientation(); // window.addEventListener('DOMContentLoaded', updateOrientation, false); </script> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <%@ include file="/WEB-INF/jspf/m/cacheheaders.jspf" %> <%@ include file="/WEB-INF/jspf/m/contextpath.jspf"%> <%@ include file="/WEB-INF/jspf/m/htmlheaders.jspf"%> <title>SageTV Web Remote</title> </head> <body> <c:set var="context" value="<%= request.getParameter("context") %>"/> <c:set var="contextName" value="<%= sagex.webserver.UIContextTranslator.doTranslate(pageContext.getAttribute("context").toString()) %>"/> <jsp:include page="/WEB-INF/jspf/m/header.jspf"> <jsp:param name="pageTitle" value="${contextName} Web Remote" /> </jsp:include> <%-- START OF WEB REMOTE CODE --%> <div id="content"> <c:set var="formId" value="webRemote"/> <form id="${formId}" method="post" action="${cp}/m/Command"> <input type="hidden" name="context" value="${context}"/> <table align="center"> <tr> <!-- <td> <button type="submit" name="command" value="Power">Power</button> </td> --> <td> <button type="submit" name="command" value="Home">Home</button> </td> <td> <button type="submit" name="command" value="TV">TV</button> </td> <td> <button type="submit" name="command" value="Guide">Guide</button> </td> <td> <button type="submit" name="command" value="Options">Options</button> </td> </tr> <tr> <td> <button type="submit" name="command" value="Back">Back</button> </td> <td colspan="2"> <button type="submit" name="command" value="Up"><img src="${cp}/m/images/webremote/up_arrow.gif" /></button> </td> <td> <button type="submit" name="command" value="Info">Info</button> </td> </tr> <tr> <td> <button type="submit" name="command" value="Left"><img src="${cp}/m/images/webremote/left_arrow.gif" /></button> </td> <td colspan="2"> <button type="submit" name="command" value="Select"><img src="${cp}/m/images/webremote/ok.gif" /></button> </td> <td> <button type="submit" name="command" value="Right"><img src="${cp}/m/images/webremote/right_arrow.gif" /></button> </td> <td> </td> </tr> <tr> <td> <button type="submit" name="command" value="Watched">Watched</button> </td> <td colspan="2"> <button type="submit" name="command" value="Down"><img src="${cp}/m/images/webremote/down_arrow.gif" /></button> </td> <td> <button type="submit" name="command" value="Favorite">Fav.</button> </td> </tr> <tr> <td colspan="2"> <button type="submit" name="command" value="Channel Up/Page Up">Ch/Pg Up</button> </td> <td colspan="2"> <button type="submit" name="command" value="Channel Down/Page Down">Ch/Pg Down</button> </td> </tr> <tr> <td> <button type="submit" name="command" value="Play">Play</button> </td> <td> <button type="submit" name="command" value="Pause">Pause</button> </td> <td> <button type="submit" name="command" value="Stop">Stop</button> </td> <td> <button type="submit" name="command" value="Delete">Del</button> </td> </tr> <tr> <td colspan="2"> <button type="submit" name="command" value="Skip Bkwd/Page Left">Skip Back</button> </td> <td colspan="2"> <button type="submit" name="command" value="Skip Fwd/Page Right">Skip Fwd</button> </td> </tr> </table> </form> <script language="JavaScript"> $('#${formId}').ajaxForm(); </script> </div> <%-- content --%> <%@ include file="/WEB-INF/jspf/m/footer.jspf" %> </body> </html> |
Update of /cvsroot/sageplugins/webapp/WebContent/m/images/webremote In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1831/WebContent/m/images/webremote Added Files: volup.gif left_arrow.gif back.gif recordingschedule.gif zero.gif last.gif fastrewind2.gif arrow_left.png right_arrow.gif two.gif right.gif chdn.gif play.gif home.gif guide.gif down.gif fastforward.gif fullscreen.gif six.gif three.gif timescroll.gif one.gif custom5.gif ok.gif chup.gif rewind.gif down_arrow.gif four.gif custom4.gif seven.gif info.gif five.gif livetv.gif voldn.gif enter2.gif stop.gif up_arrow.gif pause.gif enter.gif mute.gif power.gif nine.gif delete.gif forward.gif record.gif left.gif up.gif sagetvrecordings.gif setup.gif videolibrary.gif eight.gif musicjukebox.gif space.gif fastforward2.gif picturelibrary.gif Log Message: Initial load of images used on current version of webremote.jsp --- NEW FILE: last.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: chup.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fastforward.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fastforward2.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: back.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: voldn.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: eight.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: chdn.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: stop.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: right.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: info.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: setup.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: one.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: down_arrow.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: up_arrow.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fullscreen.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: zero.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: left_arrow.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mute.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fastrewind2.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: five.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: timescroll.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: right_arrow.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pause.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: down.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: livetv.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: custom4.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: enter2.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: home.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: musicjukebox.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: guide.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: space.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: custom5.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: enter.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: delete.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: record.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: play.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: four.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: sagetvrecordings.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: recordingschedule.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: rewind.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: volup.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: nine.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: arrow_left.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: left.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: seven.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ok.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: power.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: six.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: forward.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: picturelibrary.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: up.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: two.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: videolibrary.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: three.gif --- (This appears to be a binary file; contents omitted.) |
|
From: PiX64 <pi...@us...> - 2011-01-26 02:08:53
|
Update of /cvsroot/sageplugins/webapp/WebContent/m/images/webremote In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1813/WebContent/m/images/webremote Log Message: Directory /cvsroot/sageplugins/webapp/WebContent/m/images/webremote added to the repository |
|
From: jreichen <jre...@us...> - 2011-01-25 04:30:15
|
Update of /cvsroot/sageplugins/webapp/WebContent/m In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7650/WebContent/m Modified Files: recordings.jsp Log Message: - Show message on recordings page if no recordings exist Index: recordings.jsp =================================================================== RCS file: /cvsroot/sageplugins/webapp/WebContent/m/recordings.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** recordings.jsp 5 Nov 2010 03:08:01 -0000 1.3 --- recordings.jsp 25 Jan 2011 04:30:07 -0000 1.4 *************** *** 24,28 **** </head> <body> ! <jsp:include page="/WEB-INF/jspf/m/header.jspf"> <jsp:param name="pageTitle" value="${pageTitle}" /> --- 24,28 ---- </head> <body> ! <jsp:include page="/WEB-INF/jspf/m/header.jspf"> <jsp:param name="pageTitle" value="${pageTitle}" /> *************** *** 55,58 **** --- 55,72 ---- </c:if> + <c:if test="${empty recordings}"> + <div class="content"> + <div class="simplemessage"> + <c:if test="${empty param.Title}"> + There are no recordings. + </c:if> + <c:if test="${!empty param.Title}"> + There are no recordings of "${param.Title}". + </c:if> + </div> + </div> + </c:if> + + <c:if test="${!empty recordings}"> <div class="content"> <form method="post" action="${cp}/m/Command"> *************** *** 152,155 **** --- 166,170 ---- </form> </div> + </c:if> <jsp:include page="/WEB-INF/jspf/m/footer.jspf"/> |
|
From: jreichen <jre...@us...> - 2011-01-25 04:07:57
|
Update of /cvsroot/sageplugins/webapp/WebContent/WEB-INF/jspf/m In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3341/WebContent/WEB-INF/jspf/m Modified Files: htmlheaders.jspf Log Message: - Don't identify Android browsers as Safari Index: htmlheaders.jspf =================================================================== RCS file: /cvsroot/sageplugins/webapp/WebContent/WEB-INF/jspf/m/htmlheaders.jspf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** htmlheaders.jspf 5 Nov 2010 03:10:39 -0000 1.1 --- htmlheaders.jspf 25 Jan 2011 04:07:49 -0000 1.2 *************** *** 17,21 **** <c:set var="isMozilla" value="${!empty userAgent and fn:contains(userAgent, 'Mozilla')}"/> <c:set var="isFirefox" value="${!empty userAgent and fn:contains(userAgent, 'Firefox')}"/> ! <c:set var="isSafari" value="${!empty userAgent and fn:contains(userAgent, 'Safari') and !isChrome}"/> <c:set var="isDesktopSafari" value="${isSafari and !isMobile}"/> <c:set var="isMobileSafari" value="${isSafari and isMobile}"/> --- 17,21 ---- <c:set var="isMozilla" value="${!empty userAgent and fn:contains(userAgent, 'Mozilla')}"/> <c:set var="isFirefox" value="${!empty userAgent and fn:contains(userAgent, 'Firefox')}"/> ! <c:set var="isSafari" value="${!empty userAgent and fn:contains(userAgent, 'Safari') and !isChrome and !isAndroid}"/> <c:set var="isDesktopSafari" value="${isSafari and !isMobile}"/> <c:set var="isMobileSafari" value="${isSafari and isMobile}"/> |
|
From: jreichen <jre...@us...> - 2011-01-25 03:53:59
|
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 ---- |
|
From: jreichen <jre...@us...> - 2011-01-25 03:53:13
|
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> |
