Author: duncan
Date: Fri Mar 21 11:26:37 2008
New Revision: 10555
Log:
Merged changes from rel-1
Modified:
branches/rel-1-7/freevo/src/www/htdocs/library.rpy
branches/rel-1-7/freevo/src/www/htdocs/record.rpy
branches/rel-1-7/freevo/src/www/htdocs/webremote.rpy
branches/rel-1-7/freevo/src/www/htdocs/youtube.rpy
Modified: branches/rel-1-7/freevo/src/www/htdocs/library.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/library.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/library.rpy Fri Mar 21 11:26:37 2008
@@ -347,7 +347,7 @@
# sorry, have to pass without doing anything.
pass
else:
- fv.res += '<h4>The recording server is down, recording
information is unavailable.</h4>'
+ fv.res += '<h4>Recording server is not available,
recording information is unavailable.</h4>'
#generate our favorites regular expression
favre = ''
Modified: branches/rel-1-7/freevo/src/www/htdocs/record.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/record.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/record.rpy Fri Mar 21 11:26:37 2008
@@ -70,7 +70,6 @@
prog = what
if prog:
- print 'want to remove prog: %s' % String(prog)
ri.removeScheduledRecording(prog)
elif action == 'add':
(status, prog) = ri.findProg(chan, start)
@@ -87,7 +86,6 @@
ri.scheduleRecording(prog)
-
(status, recordings) = ri.getScheduledRecordings()
progs = recordings.getProgramList()
(status, favs) = ri.getFavorites()
@@ -113,7 +111,7 @@
for prog in progl:
status = 'basic'
- (isFav, junk) = ri.isProgAFavorite(prog, favs)
+ (isFav, message) = ri.isProgAFavorite(prog, favs)
if isFav:
status = 'favorite'
try:
Modified: branches/rel-1-7/freevo/src/www/htdocs/webremote.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/webremote.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/webremote.rpy Fri Mar 21
11:26:37 2008
@@ -73,132 +73,233 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
-<head>
- <title>Freevo | WebRemote</title>
- <meta http-equiv="Content-Type" content= "text/html; charset=UTF-8"/>
- <link rel="stylesheet" href="styles/main.css" type="text/css" />
-
- <style type="text/css" media="screen">
- body { background: #666699; }
- h3 { color: white; }
- table { width: auto; }
- td { padding: 1px; }
- button.remote { width: 60px; height: 30px; background: #eee; font-size:
12px; text-align: center; padding: 0; }
- button.remote:hover { background: #fed; }
- </style>
-
- <script type="text/javascript">
- <!--
- // Resize window
- function resizeWindow () {
- window.resizeTo(230, 495)
- window.toolbar.visible = false
- window.statusbar.visible = false
- window.scrollbars.visible = false
- window.personalbar.visible = false
- }
-
- // AJAX Functions
- var xmlHttp = false;
-
- function getXMLHttpObject () {
- if (window.XMLHttpRequest) {
- xmlHttp=new XMLHttpRequest()
- }
- else if (window.ActiveXObject) {
- xmlHttp=new ActiveXObject("Microsoft.XMLHTTP")
- }
- return xmlHttp
- try {
- xmlHttp = new ActiveXObject("Msxml2.XMLHTTP"); // Internet Explorer
1st try
- } catch (e) {
- try {
- xmlHttp = new ActiveXObject("Microsoft.XMLHTTP"); // Internet
Explorer 2nd try
- } catch (e2) {
- xmlHttp = false;
- }
- }
- if (!xmlHttp && typeof XMLHttpRequest != 'undefined') {
- xmlHttp = new XMLHttpRequest(); // Mozilla,
Firefox, Opera
- }
- }
-
- function send_code( code ) {
- if (! xmlHttp) {
- getXMLHttpObject();
- }
- var url = 'webremote.rpy?code=' + code + '&sid=' + Math.random();
- xmlHttp.open('GET', url, true);
- xmlHttp.send(null);
- }
- -->
- </script>
-</head>
-
-<body onLoad="resizeWindow();">
-
-<center>
-<h3>Freevo WebRemote</h3>
-
-<table border="0" cellspacing="1" cellpadding="0">
-
-<tr><td> </td>
- <td><button class="remote" accesskey="8" onClick="send_code('UP');"><img
src="/icons/up.png"></button></td>
- <td> </td>
-</tr>
-<tr><td><button class="remote" accesskey="4" onClick="send_code('LEFT');"><img
src="/icons/back.png"></button></td>
- <td><button class="remote" accesskey="5"
onClick="send_code('SELECT');"><img src="/icons/button_ok.png"></button></td>
- <td><button class="remote" accesskey="6"
onClick="send_code('RIGHT');"><img src="/icons/forward.png"></button></td>
-</tr>
-<tr><td> </td>
- <td><button class="remote" accesskey="2" onClick="send_code('DOWN');"><img
src="/icons/down.png"></button></td>
- <td> </td>
-</tr>
-
-<tr style="line-height: 8px;"><td colspan="3"> </td></tr>
-
-<tr><td><button class="remote" accesskey="x" onClick="send_code('EXIT');"><img
src="/icons/previous.png"></button></td>
- <td><button class="remote" accesskey="e"
onClick="send_code('ENTER');"><img src="/icons/button_ok.png"></button></td>
- <td><button class="remote" accesskey="d"
onClick="send_code('DISPLAY');"><img src="/icons/help.png"></button></td>
-</tr>
-<tr><td><button class="remote" accesskey="m" onClick="send_code('MENU');"><img
src="/icons/player_playlist.png"></button></td>
- <td><button class="remote" accesskey="c" onClick="send_code('REC');"
style="color:red">REC</button></td>
- <td><button class="remote" accesskey="j"
onClick="send_code('EJECT');"><img src="/icons/player_eject.png"></button></td>
-</tr>
-
-
-<tr style="line-height: 8px;"><td colspan="3"> </td></tr>
-
-<tr><td> </td>
- <td><button class="remote" accesskey="p" onClick="send_code('PLAY');"><img
src="/icons/player_play.png"></button></td>
- <td> </td>
-</tr>
-<tr><td><button class="remote" accesskey="r" onClick="send_code('REW');"><img
src="/icons/player_rew.png"></button></td>
- <td><button class="remote" accesskey="u"
onClick="send_code('PAUSE');"><img src="/icons/player_pause.png"></button></td>
- <td><button class="remote" accesskey="f" onClick="send_code('FFWD');"><img
src="/icons/player_fwd.png"></button></td>
-</tr>
-<tr><td> </td>
- <td><button class="remote" accesskey="s" onClick="send_code('STOP');"><img
src="/icons/player_stop.png"></button></td>
- <td> </td>
-</tr>
-
-<tr style="line-height: 8px;"><td colspan="3"> </td></tr>
-
-<tr><td><button class="remote" accesskey="+"
onClick="send_code('VOLP');">VOL+</button></td>
- <td><button class="remote" accesskey="m" onClick="send_code('MUTE');"><img
src="/icons/status/volume_mute.png">MUTE</button></td>
- <td><button class="remote" accesskey="c"
onClick="send_code('CHP');">CH+</button></td>
-</tr>
-<tr><td><button class="remote" accesskey="-"
onClick="send_code('VOLM');">VOL-</button></td>
- <td> </td>
- <td><button class="remote" accesskey="v"
onClick="send_code('CHM');">CH-</button></td>
-</tr>
-
-</table>
-</center>
-</body>
+ <head>
+ <title>Freevo | WebRemote</title>
+ <meta http-equiv="Content-Type" content= "text/html; charset=UTF-8"/>
+ <link rel="stylesheet" href="styles/main.css" type="text/css" />
+
+ <style type="text/css" media="screen">
+ body { background: #666699; }
+ h3 { color: white; }
+ table { width: auto; }
+ td { padding: 1px; }
+ button.remote { width: 60px; height: 30px; background: #eee; font-size:
12px; text-align: center; padding: 0; }
+ button.remote:hover { background: #fed; }
+ </style>
+
+ <script type="text/javascript">
+ <!--
+ // Resize window
+ function resizeWindow () {
+ window.resizeTo(230, 495)
+ window.toolbar.visible = false
+ window.statusbar.visible = false
+ window.scrollbars.visible = false
+ window.personalbar.visible = false
+ }
+
+ // AJAX Functions
+ var xmlHttp = false;
+
+ function getXMLHttpObject () {
+ if (window.XMLHttpRequest) {
+ xmlHttp=new XMLHttpRequest()
+ }
+ else if (window.ActiveXObject) {
+ xmlHttp=new ActiveXObject("Microsoft.XMLHTTP")
+ }
+ return xmlHttp
+ try {
+ xmlHttp = new ActiveXObject("Msxml2.XMLHTTP"); // Internet
Explorer 1st try
+ } catch (e) {
+ try {
+ xmlHttp = new ActiveXObject("Microsoft.XMLHTTP"); // Internet
Explorer 2nd try
+ } catch (e2) {
+ xmlHttp = false;
+ }
+ }
+ if (!xmlHttp && typeof XMLHttpRequest != 'undefined') {
+ xmlHttp = new XMLHttpRequest(); // Mozilla,
Firefox, Opera
+ }
+ }
+
+ function send_code( code ) {
+ if (! xmlHttp) {
+ getXMLHttpObject();
+ }
+ var url = 'webremote.rpy?code=' + code + '&sid=' + Math.random();
+ xmlHttp.open('GET', url, true);
+ xmlHttp.send(null);
+ }
+ -->
+ </script>
+ </head>
+
+ <body onLoad="resizeWindow();">
+
+ <center>
+ <h3>Freevo WebRemote</h3>
+
+ <table border="0" cellspacing="1" cellpadding="0">
+
+ <tr>
+ <td align="center">
+
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="8" onClick="send_code('UP');">
+ <img src="/icons/up.png"></button>
+ </td>
+ <td align="center">
+
+ </td>
+ </tr>
+
+ <tr>
+ <td align="center">
+ <button class="remote" accesskey="4" onClick="send_code('LEFT');">
+ <img src="/icons/back.png"></button>
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="5"
onClick="send_code('SELECT');">
+ <img src="/icons/button_ok.png"></button>
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="6" onClick="send_code('RIGHT');">
+ <img src="/icons/forward.png"></button>
+ </td>
+ </tr>
+
+ <tr>
+ <td align="center">
+
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="2" onClick="send_code('DOWN');">
+ <img src="/icons/down.png"></button>
+ </td>
+ <td align="center">
+
+ </td>
+ </tr>
+
+ <tr style="line-height: 8px;">
+ <td colspan="3">
+
+ </td>
+ </tr>
+
+ <tr>
+ <td align="center">
+ <button class="remote" accesskey="x" onClick="send_code('EXIT');">
+ <img src="/icons/previous.png"></button>
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="e" onClick="send_code('ENTER');">
+ <img src="/icons/button_ok.png"></button>
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="d"
onClick="send_code('DISPLAY');">
+ <img src="/icons/help.png"></button>
+ </td>
+ </tr>
+
+ <tr>
+ <td align="center">
+ <button class="remote" accesskey="m" onClick="send_code('MENU');">
+ <img src="/icons/player_playlist.png"></button>
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="c" onClick="send_code('REC');"
style="color:red">REC</button>
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="j" onClick="send_code('EJECT');">
+ <img src="/icons/player_eject.png"></button>
+ </td>
+ </tr>
+
+ <tr style="line-height: 8px;">
+ <td colspan="3">
+
+ </td>
+ </tr>
+
+ <tr>
+ <td align="center">
+
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="p" onClick="send_code('PLAY');">
+ <img src="/icons/player_play.png"></button>
+ </td>
+ <td align="center">
+
+ </td>
+ </tr>
+
+ <tr>
+ <td align="center">
+ <button class="remote" accesskey="r" onClick="send_code('REW');">
+ <img src="/icons/player_rew.png"></button>
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="u" onClick="send_code('PAUSE');">
+ <img src="/icons/player_pause.png"></button>
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="f" onClick="send_code('FFWD');">
+ <img src="/icons/player_fwd.png"></button>
+ </td>
+ </tr>
+
+ <tr>
+ <td align="center">
+
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="s" onClick="send_code('STOP');">
+ <img src="/icons/player_stop.png"></button>
+ </td>
+ <td align="center">
+
+ </td>
+ </tr>
+
+ <tr style="line-height: 8px;">
+ <td colspan="3">
+
+ </td>
+ </tr>
+
+ <tr>
+ <td align="center">
+ <button class="remote" accesskey="+"
onClick="send_code('VOLP');">VOL+</button>
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="m"
onClick="send_code('MUTE');">MUTE
+ <!--<img src="/icons/volume_mute.png">--></button>
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="c"
onClick="send_code('CHP');">CH+</button>
+ </td>
+ </tr>
+ <tr>
+ <td align="center">
+ <button class="remote" accesskey="-"
onClick="send_code('VOLM');">VOL-</button>
+ </td>
+ <td align="center">
+
+ </td>
+ <td align="center">
+ <button class="remote" accesskey="v"
onClick="send_code('CHM');">CH-</button>
+ </td>
+ </tr>
+
+ </table>
+ </center>
+ </body>
</html>
- """
-
- return String( fv.res )
+"""
+ return String(fv.res)
resource = WebRemoteResource()
Modified: branches/rel-1-7/freevo/src/www/htdocs/youtube.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/youtube.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/youtube.rpy Fri Mar 21 11:26:37 2008
@@ -6,7 +6,7 @@
# $Id$
#
# Notes:
-# Todo:
+# Todo:
#
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
