Author: duncan
Date: Sun Feb 3 11:33:21 2008
New Revision: 10325
Log:
[ 1885729 ] Program info popup has no content
Patch from George Kibardin applied
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/www/htdocs/proginfo.rpy
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/www/htdocs/proginfo.rpy
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Sun Feb 3 11:33:21 2008
@@ -46,6 +46,7 @@
* Fixed play lists not handling absolute paths (B#1872465)
* Fixed tv guide not scrolling to last channel from second channel (B#1858010)
* Fixed web server favorites and edit_favorite to use name and duplicate
detection (B#1857394)
+ * Fixed web server programme info having no content when the title has
newlines (B#1885729)
== Release 1.7.5 (2007-12-22) ==
--------------------------------
Modified: branches/rel-1-7/freevo/src/www/htdocs/proginfo.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/proginfo.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/proginfo.rpy Sun Feb 3 11:33:21 2008
@@ -54,7 +54,7 @@
if prog.start == starttime:
break
- title = prog.title
+ title = prog.title.strip().replace("'", "\\'").replace("\n", " ")
if prog.desc == '':
desc = (_('Sorry, the program description for %s is
unavailable.')) \
@@ -62,7 +62,7 @@
else:
desc = prog.desc
- desc = desc.lstrip()
+ desc = desc.strip().replace("'", "\\'").replace("\n", " ")
if MAX_DESCRIPTION_CHAR and len(desc) > MAX_DESCRIPTION_CHAR:
desc=desc[:desc[:MAX_DESCRIPTION_CHAR].rfind('.')] + '. [...]'
@@ -78,10 +78,12 @@
# desc = desc.encode('ascii', 'ignore')
start = time.strftime(config.TV_TIME_FORMAT,
time.localtime(prog.start))
stop = time.strftime(config.TV_TIME_FORMAT, time.localtime(prog.stop))
+ fv.res += u"<html>\n<head>\n"
+ fv.res += u'<meta http-equiv="Content-Type" content= "text/html;
charset='+ config.encoding +'"/>\n'
fv.res += u"<script>\n"
fv.res += u"var doc = parent.top.document;\n"
- fv.res += u"doc.getElementById('program-title').innerHTML =
'"+Unicode(title).replace("'", "\\'")+"';\n"
- fv.res += u"doc.getElementById('program-desc').innerHTML =
'"+Unicode(desc).replace("'", "\\'")+"';\n"
+ fv.res += u"doc.getElementById('program-title').innerHTML =
'"+title+"';\n"
+ fv.res += u"doc.getElementById('program-desc').innerHTML =
'"+desc+"';\n"
fv.res += u"doc.getElementById('program-start').innerHTML =
'"+start+"';\n"
fv.res += u"doc.getElementById('program-end').innerHTML =
'"+stop+"';\n"
fv.res += u"doc.getElementById('program-runtime').innerHTML = '%s';\n"
% int((prog.stop - prog.start) / 60)
@@ -92,6 +94,7 @@
fv.res += u"doc.getElementById('program-waiting').style.display =
'none';\n"
fv.res += u"doc.getElementById('program-info').style.visibility =
'visible';\n"
fv.res += u"</script>\n"
+ fv.res += u"</head>\n</html>\n"
return String(fv.res)
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Sun Feb 3 11:33:21 2008
@@ -52,6 +52,7 @@
* Fixed play lists not handling absolute paths (B#1872465)
* Fixed tv guide not scrolling to last channel from second channel (B#1858010)
* Fixed web server favorites and edit_favorite to use name and duplicate
detection (B#1857394)
+ * Fixed web server programme info having no content when the title has
newlines (B#1885729)
== Release 1.8.0rc1 (2007-12-22) ==
--------------------------------
Modified: branches/rel-1/freevo/src/www/htdocs/proginfo.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/proginfo.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/proginfo.rpy Sun Feb 3 11:33:21 2008
@@ -54,7 +54,7 @@
if prog.start == starttime:
break
- title = prog.title
+ title = prog.title.strip().replace("'", "\\'").replace("\n", " ")
if prog.desc == '':
desc = (_('Sorry, the program description for %s is
unavailable.')) \
@@ -62,7 +62,7 @@
else:
desc = prog.desc
- desc = desc.lstrip()
+ desc = desc.strip().replace("'", "\\'").replace("\n", " ")
if MAX_DESCRIPTION_CHAR and len(desc) > MAX_DESCRIPTION_CHAR:
desc=desc[:desc[:MAX_DESCRIPTION_CHAR].rfind('.')] + '. [...]'
@@ -78,10 +78,12 @@
# desc = desc.encode('ascii', 'ignore')
start = time.strftime(config.TV_TIME_FORMAT,
time.localtime(prog.start))
stop = time.strftime(config.TV_TIME_FORMAT, time.localtime(prog.stop))
+ fv.res += u"<html>\n<head>\n"
+ fv.res += u'<meta http-equiv="Content-Type" content= "text/html;
charset='+ config.encoding +'"/>\n'
fv.res += u"<script>\n"
fv.res += u"var doc = parent.top.document;\n"
- fv.res += u"doc.getElementById('program-title').innerHTML =
'"+Unicode(title).replace("'", "\\'")+"';\n"
- fv.res += u"doc.getElementById('program-desc').innerHTML =
'"+Unicode(desc).replace("'", "\\'")+"';\n"
+ fv.res += u"doc.getElementById('program-title').innerHTML =
'"+title+"';\n"
+ fv.res += u"doc.getElementById('program-desc').innerHTML =
'"+desc+"';\n"
fv.res += u"doc.getElementById('program-start').innerHTML =
'"+start+"';\n"
fv.res += u"doc.getElementById('program-end').innerHTML =
'"+stop+"';\n"
fv.res += u"doc.getElementById('program-runtime').innerHTML = '%s';\n"
% int((prog.stop - prog.start) / 60)
@@ -92,6 +94,7 @@
fv.res += u"doc.getElementById('program-waiting').style.display =
'none';\n"
fv.res += u"doc.getElementById('program-info').style.visibility =
'visible';\n"
fv.res += u"</script>\n"
+ fv.res += u"</head>\n</html>\n"
return String(fv.res)
-------------------------------------------------------------------------
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
