Author: duncan
Date: Thu Oct 11 13:37:17 2007
New Revision: 9950
Log:
Run through reindent.py
Modified:
branches/rel-1/freevo/src/www/htdocs/config.rpy
branches/rel-1/freevo/src/www/htdocs/viewlogfile.rpy
branches/rel-1/freevo/src/www/htdocs/youtube.rpy
Modified: branches/rel-1/freevo/src/www/htdocs/config.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/config.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/config.rpy Thu Oct 11 13:37:17 2007
@@ -42,7 +42,7 @@
fconf = lconf_hld.readlines()
return fconf
-
+
def ParseConfigFile(rconf):
cnt = 0
fconfig = []
@@ -134,9 +134,9 @@
if lparsed['ctrlname'].startswith('"'):
lparsed['type'] = ""
return lparsed
-
-
-
+
+
+
def CheckSyntax(fvsetting):
status = False
try :
@@ -173,7 +173,7 @@
grps.sort()
return grps
-
+
def getCtrlType(cname , cvalue, vtype):
if vtype == 'boolean':
return 'boolean'
@@ -188,7 +188,7 @@
if vtype == 'list':
return 'itemlist'
return 'textbox'
-
+
def isNumber(s):
try:
i = int(s)
@@ -231,7 +231,7 @@
if cvalue.startswith('True') or cvalue.startswith('False'):
return 'boolean'
return 'Unknow'
-
+
def CreateNewLineControl():
ctrl = '<div align="left">'
@@ -275,7 +275,7 @@
def CreateFileItemList(cname,cvalue,cenabled):
ctrl = '<span class="FileList">'
vitems = GetItemsArray(cvalue)
-
+
spDisable_open = ''
spDisable_close = ''
if not cenabled:
@@ -341,10 +341,10 @@
ctrl += txtbox % (spDisable_open, ctrl2type,cname,r+1,1,'""',
spDisable_close) + '</li>'
ctrl += '</ul>'
ctrl += '}</span>'
-
+
if cenabled:
ctrl += '</span>'
-
+
return ctrl
@@ -359,9 +359,9 @@
print 'DISPABLED CONNTROL !!! %' + cname
spDisable_open = '<span class="disablecontrol">'
spDisable_close = '</span>'
-
+
print spDisable_open + spDisable_close
-
+
ctrl = '<span class="ItemList">['
ctrl += '<ul class="ItemList">'
vitems = GetItemsArray(cvalue)
@@ -457,7 +457,7 @@
disable_span_open = '<span class="disablecontrol">'
disable_span_close = '</span>'
-
+
htmlctrl.res += '%s<span id="%s_check" class="check">%s</span>%s' %
(disable_span_open, cname , lcheck, disable_span_close)
ctrltype = getCtrlType(cname,cvalue, vtype)
jsonChange = 'onchange=CheckValue("%s","%s",0) ' % (cname , ctrltype )
@@ -474,7 +474,7 @@
jsSave = 'onclick=SaveValue("%s","%s")' % (cname , ctrltype)
btnupdate = '<input type="button" style="display:none;" id="%s_btn_update"
class="button.config" value="Update" %s >\n' % (cname , jsSave )
- htmlctrl.res += btnupdate
+ htmlctrl.res += btnupdate
if nctrl['type'] == 'textbox':
inputbox =
CreateTextBox(cname,cvalue,nctrl['vartype'],plugin_group,nctrl['checked'])
@@ -497,15 +497,15 @@
if cname == 'TV_CHANNELS':
ctrl = CreateTV_Channels_ctrl(cname,cvalue,cenabled)
return ctrl
-
+
if plugin_group == "Enable":
if cvalue == 1:
cvalue = "True"
else :
cvalue = "False"
ctrl = CreateListBoxControl(cname,bllist,cvalue,
'onchange=CheckValue("%s","textbox",0)')
- return ctrl
-
+ return ctrl
+
if FileTypeVarArray(cname):
ctrl = CreateFileItemList(cname,cvalue,cenabled)
return ctrl
@@ -549,11 +549,11 @@
displayStyle = ''
fv.res += '<ul class="GroupHeader">'
-
+
for grp in groups:
dopts = 'class="GroupHeader"'
aopts = ''
-
+
fv.res += '<li>'
fv.res += '<a %s onclick=ShowList("%s")>%s</a>\n' % (aopts , grp, grp)
fv.res += ' <ul id="%s" style= display:%s>\n' % (grp , displayStyle )
@@ -564,8 +564,8 @@
fv.res += ' </ul>\n'
fv.res += '</li>'
# </div>\n'
- fv.res += '</ul>'
-
+ fv.res += '</ul>'
+
return fv.res
Modified: branches/rel-1/freevo/src/www/htdocs/viewlogfile.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/viewlogfile.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/viewlogfile.rpy Thu Oct 11
13:37:17 2007
@@ -4,9 +4,9 @@
# -----------------------------------------------------------------------
# $Id$
#
-# Notes: viewlogfile.rpy args : displayfile="logfile to display" eg
-#
-# Todo:
+# Notes: viewlogfile.rpy args : displayfile="logfile to display" eg
+#
+# Todo:
#
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
@@ -104,7 +104,7 @@
delayamount = 9999
fv.printHeader(_('viewlog'),
'styles/main.css','scripts/viewlogfile.js',selected=_('View Logs'))
-
+
fv.res += '\n<link rel="stylesheet" href="styles/viewlogfile.css"
type="text/css" />\n'
fv.res += '\n<br><div class="viewlog">'
fv.res += '\n<form id="viewlog_form" name="viewlog_form"
action="viewlogfile.rpy" method="get">'
@@ -119,7 +119,7 @@
txt_ctrl = '<input type="textbox" name=%s id=%s value="%s" size="3" %s
>'
fv.res += txt_ctrl % (txt_name, txt_name , delayamount , js_delay)
fv.res += ' Refresh Delay '
-
+
fv.res += txt_ctrl % ( "rows", "rows", rows , js_update )
fv.res += 'Rows'
fv.res += addPageRefresh()
Modified: branches/rel-1/freevo/src/www/htdocs/youtube.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/youtube.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/youtube.rpy Thu Oct 11 13:37:17 2007
@@ -39,8 +39,8 @@
def xmlStatus(fstatus):
xmlstatus = ''
- xmlstatus += '<PERCENT>%s</PERCENT>' % fstatus['percent']
- xmlstatus += '<DOWNLOADED>%s</DOWNLOADED>' % fstatus['downloaded']
+ xmlstatus += '<PERCENT>%s</PERCENT>' % fstatus['percent']
+ xmlstatus += '<DOWNLOADED>%s</DOWNLOADED>' % fstatus['downloaded']
xmlstatus += '<FILESIZE>%s</FILESIZE>' % fstatus['filesize']
xmlstatus += '<SPEED>%s</SPEED>' % fstatus['speed']
xmlstatus += '<ETA>%s</ETA>' % fstatus['eta']
@@ -151,7 +151,7 @@
os.chdir(pwdcur)
def convert_file_to_flv(convert_file):
-
+
source_file = config.YOUTUBE_DIR + convert_file
destin_file = source_file + ".flv"
@@ -211,7 +211,7 @@
def doFlowPlayer(pfile, flow_player = 'FlowPlayerThermo.swf' ):
# pfile = "stoneham.avi.flv"
-
+
flash = '\n<script type="text/javascript"
src="flowplayer/swfobject.js"></script>'
flash += '\n<div align="center" style= display:"" id="flowplayerholder">'
flash += '\n<a href="http://flowplayer.org/";>flowplayer.org</a>'
@@ -251,13 +251,13 @@
convert_file = fv.formValue(form,'convert_file')
if cmd == 'Convert' and convert_file:
- convert_file_to_flv(convert_file)
+ convert_file_to_flv(convert_file)
playfile = fv.formValue(form,'playfile')
flow_player = fv.formValue(form,'flow_player')
if not flow_player:
flow_player = 'FlowPlayerThermo.swf'
-
+
if cmd == "Play" and playfile:
flowplayer_html = doFlowPlayer(playfile,flow_player)
return String( flowplayer_html )
@@ -301,7 +301,7 @@
download_youtube(dlurl)
if dltype == 'downloadurl':
download_url(dlurl)
-
+
blxml = fv.formValue(form,"xml")
if blxml :
fv.res = getXML()
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
