Author: duncan
Date: Sun Feb 3 11:38:09 2008
New Revision: 10326
Log:
[ 1885751 ] File info popup encoding
Patch from George Kibardin applied
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/src/www/htdocs/fileinfo.rpy
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/src/www/htdocs/fileinfo.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:38:09 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 file info not having an ecoding header (B#1885751)
* 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/fileinfo.rpy
==============================================================================
--- branches/rel-1-7/freevo/src/www/htdocs/fileinfo.rpy (original)
+++ branches/rel-1-7/freevo/src/www/htdocs/fileinfo.rpy Sun Feb 3 11:38:09 2008
@@ -83,7 +83,7 @@
if fxd_info.has_key('plot'):
info += fxd_info['plot']+'<br/>'
if info != '':
- info += '<p>'
+ info += '<p>'
if fxd_info.has_key('year'):
info += '<b>Recorded:</b> '+fxd_info['year']+' '
if fxd_info.has_key('runtime'):
@@ -133,6 +133,8 @@
file_link = self.convert_dir(file)
fv.res += (
+ u"<html>\n<head>\n" \
+ u'<meta http-equiv="Content-Type" content= "text/html;
charset='+ config.encoding +'"/>\n' \
u"<script>\n" \
u"var doc = parent.top.document;\n" \
u"doc.getElementById('file-head').innerHTML = '%s';\n"\
@@ -141,7 +143,8 @@
u"doc.getElementById('file-play-using-vlc').onclick = %s;\n"\
u"doc.getElementById('program-waiting').style.display =
'none';\n" \
u"doc.getElementById('program-info').style.visibility =
'visible';\n" \
- u"</script>\n"
+ u"</script>\n" \
+ u"</head>\n<html>\n"
) % ( Unicode(title.replace("'", "\\'")),
Unicode(info.replace("'", "\\'")),
"function() { window.open(\"%s\"); }" %
(urllib.quote(file_link)),
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Sun Feb 3 11:38:09 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 file info not having an ecoding header (B#1885751)
* 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/fileinfo.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/fileinfo.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/fileinfo.rpy Sun Feb 3 11:38:09 2008
@@ -1,5 +1,5 @@
-#!/usr/bin/python
# -*- coding: iso-8859-1 -*-
+#
vim:autoindent:tabstop=4:softtabstop=4:shiftwidth=4:expandtab:filetype=python:
# -----------------------------------------------------------------------
# proginfo.rpy - Dynamically update program info popup box.
# -----------------------------------------------------------------------
@@ -83,7 +83,7 @@
if fxd_info.has_key('plot'):
info += fxd_info['plot']+'<br/>'
if info != '':
- info += '<p>'
+ info += '<p>'
if fxd_info.has_key('year'):
info += '<b>Recorded:</b> '+fxd_info['year']+' '
if fxd_info.has_key('runtime'):
@@ -133,6 +133,8 @@
file_link = self.convert_dir(file)
fv.res += (
+ u"<html>\n<head>\n" \
+ u'<meta http-equiv="Content-Type" content= "text/html;
charset='+ config.encoding +'"/>\n' \
u"<script>\n" \
u"var doc = parent.top.document;\n" \
u"doc.getElementById('file-head').innerHTML = '%s';\n"\
@@ -141,7 +143,8 @@
u"doc.getElementById('file-play-using-vlc').onclick = %s;\n"\
u"doc.getElementById('program-waiting').style.display =
'none';\n" \
u"doc.getElementById('program-info').style.visibility =
'visible';\n" \
- u"</script>\n"
+ u"</script>\n" \
+ u"</head>\n<html>\n"
) % ( Unicode(title.replace("'", "\\'")),
Unicode(info.replace("'", "\\'")),
"function() { window.open(\"%s\"); }" %
(urllib.quote(file_link)),
-------------------------------------------------------------------------
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
