Author: duncan
Date: Sat Oct 13 11:00:31 2007
New Revision: 9959
Log:
Fixed Unicode problems and some white space clean-up
Modified:
branches/rel-1/freevo/src/www/htdocs/config.rpy
branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy
branches/rel-1/freevo/src/www/web_types.py
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 Sat Oct 13 11:00:31 2007
@@ -1,4 +1,5 @@
# -*- coding: iso-8859-1 -*-
+#
vim:autoindent:tabstop=4:softtabstop=4:shiftwidth=4:expandtab:filetype=python:
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2002 Krister Lagerstrom, et al.
@@ -25,19 +26,21 @@
# config.rpy?expAll=True - Will Expand all the settings.
#
# Required configedit.rpy - To write the settings to the local_conf.py
-#
-# Edit Date - Oct. 1, 8:30pm 2007
import sys
import os.path
-import config
import string
import types
import time
import urllib
from www.web_types import HTMLResource, FreevoResource
+import config
+import util
def ReadConfig(cfile):
+ '''
+ '''
+ _debug_('ReadConfig(cfile=%r)' % (cfile), 2)
lconf = cfile
lconf_hld = open(lconf, 'r')
fconf = lconf_hld.readlines()
@@ -45,6 +48,9 @@
def ParseConfigFile(rconf):
+ '''
+ '''
+ _debug_('ParseConfigFile(rconf=%r)' % (rconf), 2)
cnt = 0
fconfig = []
while cnt < len(rconf):
@@ -88,6 +94,9 @@
def ParseLine(cline):
+ '''
+ '''
+ _debug_('ParseLine(cline=%r)' % (cline), 2)
lparsed = {'ctrlname': '',
'ctrlvalue': '',
'checked': True,
@@ -128,7 +137,7 @@
ctrlvalue = fsplit[1].split('#')
if len(ctrlvalue) == 2:
lparsed['comments'] = ctrlvalue[1]
- lparsed['ctrlvalue'] = ctrlvalue[0].strip()
+ lparsed['ctrlvalue'] = Unicode(ctrlvalue[0].strip())
lparsed['vartype'] = VarType(lparsed['ctrlvalue'])
lparsed['ctrlvalue'] = lparsed['ctrlvalue'].replace('"', "'")
@@ -139,16 +148,22 @@
def CheckSyntax(fvsetting):
+ '''
+ '''
+ _debug_('CheckSyntax(fvsetting=%r)' % (fvsetting), 2)
status = False
- try :
+ try:
exec fvsetting
status = True
- except :
+ except:
status = False
return status
def GetItemsArray(cvalue):
+ '''
+ '''
+ _debug_('GetItemsArray(cvalue=%r)' % (cvalue), 2)
itemlist = None
cmd = 'itemlist = ' + cvalue
if CheckSyntax(cmd):
@@ -157,6 +172,9 @@
def GetGroupList(cfgvars):
+ '''
+ '''
+ _debug_('GetGroupList(cfgvars=%r)' % (cfgvars), 2)
grps = ['Other']
agrps = []
for vrs in cfgvars:
@@ -176,6 +194,9 @@
def getCtrlType(cname, cvalue, vtype):
+ '''
+ '''
+ _debug_('getCtrlType(cname=%r, cvalue=%r, vtype=%r)' % (cname, cvalue,
vtype), 2)
if vtype == 'boolean':
return 'boolean'
if cname == 'TV_CHANNELS':
@@ -191,6 +212,9 @@
return 'textbox'
def isNumber(s):
+ '''
+ '''
+ _debug_('isNumber(s=%r) % (s)', 2)
try:
i = int(s)
return True
@@ -199,6 +223,9 @@
def FileTypeVarArray(cname):
+ '''
+ '''
+ _debug_('FileTypeVarArray(cname=%r)' % (cname), 2)
filevars = ['VIDEO_ITEMS', 'AUDIO_ITEMS', 'IMAGE_ITEMS', 'GAME_ITEMS']
if cname in filevars:
@@ -207,6 +234,9 @@
def FileTypeVar(cname):
+ '''
+ '''
+ _debug_('FileTypeVar(cname)', 2)
vtype = cname.split('_')[-1]
filetypes = ['PATH', 'DIR', 'FILE', 'DEV', 'DEVICE']
filevars = ['XMLTV_GRABBER', 'RSS_AUDIO', 'RSS_VIDEO', 'RSS_FEEDS',
'XMLTV_SORT', 'LIRCRC']
@@ -219,6 +249,9 @@
def VarType(cvalue):
+ '''
+ '''
+ _debug_('VarType(cvalue)', 2)
if cvalue.startswith("'") and cvalue.endswith("'"):
return 'string'
if isNumber(cvalue):
@@ -235,6 +268,9 @@
def CreateNewLineControl():
+ '''
+ '''
+ _debug_('CreateNewLineControl()', 2)
ctrl = '<div align="left">'
ctrl += '<input id="newname" name="newname" size="4"> ='
ctrl += '<input id="newvalue" name="newvalue" size="40">'
@@ -245,6 +281,9 @@
def CreateTV_Channels_ctrl(cname, cvalue, cenabled):
+ '''
+ '''
+ _debug_('CreateTV_Channels_ctrl(cname, cvalue, cenabled)', 2)
ctrl = '<span class="Tv_Channels">'
btnUp = ''
btnDown = ''
@@ -274,6 +313,9 @@
def CreateFileItemList(cname, cvalue, cenabled):
+ '''
+ '''
+ _debug_('CreateFileItemList(cname, cvalue, cenabled)', 2)
ctrl = '<span class="FileList">'
vitems = GetItemsArray(cvalue)
@@ -290,11 +332,14 @@
ctrl += '<li>'
if type(e) == types.StringType or type(e) == types.IntType:
- ctrl += '%s<input type="textbox" %s
id="%s_label%i"value="%s">%s' % (spDisable_open, txtops, cname, r, e,
spDisable_close)
+ ctrl += '%s<input type="textbox" %s
id="%s_label%i"value="%s">%s' % \
+ (spDisable_open, txtops, cname, r, e, spDisable_close)
else:
- txtLabelBox = '%s<input type="textbox" id="%s_label%i"
"value="%s">%s' % (spDisable_open, cname, r, e[0], spDisable_close)
+ txtLabelBox = '%s<input type="textbox" id="%s_label%i"
"value="%s">%s' % \
+ (spDisable_open, cname, r, e[0], spDisable_close)
jsCheckFile = 'onchange=CheckValue("%s", "fileitemlist",
"%i")' % (cname, r)
- txtFolderBox = '%s<input type="textbox" id="%s_file%i"
value="%s" %s>%s' % (spDisable_open, cname, r, e[1], jsCheckFile,
spDisable_close)
+ txtFolderBox = '%s<input type="textbox" id="%s_file%i"
value="%s" %s>%s' % \
+ (spDisable_open, cname, r, e[1], jsCheckFile,
spDisable_close)
ctrl += txtLabelBox + txtFolderBox
filecheck = ''
@@ -302,7 +347,8 @@
if not os.path.exists(e[1]):
filecheck = 'Missing File'
chkClass = 'CheckWarning'
- ctrl += '%s<span class="%s" id="%s_check_%i">%s</span>%s' %
(spDisable_open, chkClass, cname, r, filecheck, spDisable_close)
+ ctrl += '%s<span class="%s" id="%s_check_%i">%s</span>%s' % \
+ (spDisable_open, chkClass, cname, r, filecheck,
spDisable_close)
ctrl += '</li>'
r += 1;
@@ -319,6 +365,9 @@
def CreateDictionaryControl(cname, cvalue, cenabled):
+ '''
+ '''
+ _debug_('CreateDictionaryControl(cname, cvalue, cenabled)', 2)
ctrl2type = 'textbox'
if cname =='WWW_USERS':
ctrl2type = 'password'
@@ -351,18 +400,16 @@
def CreateListControl(cname, cvalue, cenable):
+ '''
+ '''
+ _debug_('CreateListControl(cname=%r, cvalue=%r, cenable=%r)' % (cname,
cvalue, cenable), 2)
spDisable_open = ''
spDisable_close = ''
- print "List Conftrol %s " % cname
- print cenable
if not cenable:
- 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)
@@ -370,7 +417,8 @@
if vitems:
txtops = ''
- txtbox = '%s<input type="textbox" onchange=CheckValue("' + cname + '",
"itemlist", 0) %s id="%s_item%i%i"value="%s">%s'
+ txtbox = '%s<input type="textbox" onchange=CheckValue("' + cname + \
+ '", "itemlist", 0) %s id="%s_item%i%i"value="%s">%s'
for r, e in enumerate(vitems):
vtype = type(e)
if vtype == types.StringType or vtype == types.FloatType or vtype
== types.IntType:
@@ -401,6 +449,9 @@
def CreateTextArea(cname, cvalue):
+ '''
+ '''
+ _debug_('CreateTextArea(cname, cvalue)', 2)
elemsep = ')'
rows = cvalue.count(elemsep) + 1
if rows > 5:
@@ -412,6 +463,9 @@
def CreateListBoxControl(cname, grps, cvalue, opts=""):
+ '''
+ '''
+ _debug_('CreateListBoxControl(cname, grps, cvalue, opts="")', 2)
ctrl = '\n<select name="%s" value="%s" id="%s" %s >' % (cname, cvalue,
cname, opts)
for grp in grps:
if grp == cvalue:
@@ -423,6 +477,9 @@
def CreateConfigLine(nctrl, expALL, plugin_group):
+ '''
+ '''
+ _debug_('CreateConfigLine(nctrl=%r, expALL=%r, plugin_group=%r)' % (nctrl,
expALL, plugin_group), 2)
htmlctrl = HTMLResource()
cname = nctrl['ctrlname']
@@ -458,12 +515,14 @@
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)
+ 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)
- chkbox = '%s<input type="checkbox" id = "%s_chk" %s %s>%s\n' %
(disable_span_open, cname, checked, jsonChange, disable_span_close)
- delbtn = '%s<input type="button" class="configbutton"
onclick=DeleteLines("%s", %i, %i) value="Delete">%s\n' % (disable_span_open,
cname, sline, eline, disable_span_close)
+ chkbox = '%s<input type="checkbox" id = "%s_chk" %s %s>%s\n' % \
+ (disable_span_open, cname, checked, jsonChange, disable_span_close)
+ delbtn = '%s<input type="button" class="configbutton"
onclick=DeleteLines("%s", %i, %i) value="Delete">%s\n' % \
+ (disable_span_open, cname, sline, eline, disable_span_close)
htmlctrl.res += delbtn
htmlctrl.res += chkbox
@@ -486,6 +545,9 @@
def CreateTextBox(cname, cvalue, vtype, plugin_group, cenabled):
+ '''
+ '''
+ _debug_('CreateTextBox(cname, cvalue, vtype, plugin_group, cenabled)', 2)
cvalue = cvalue.replace(' ', '')
cvalue = cvalue.strip()
bllist = ['True', 'False']
@@ -536,6 +598,9 @@
def CreateNumberControl(cname, cvalue):
+ '''
+ '''
+ _debug_('CreateNumberControl(cname, cvalue)', 2)
tbClass = 'VarInputInt'
ctrl = '<span class="%s">' % tbClass
ctrl += '<input type=textbox id="%s" name="%s" value="%s"
onchange=CheckValue("%s", "textbox", 0) size="50" >' \
@@ -545,6 +610,9 @@
def DisplayGroups(fconfig, expALL):
+ '''
+ '''
+ _debug_('DisplayGroups(fconfig=%r, expALL=%r)' % (fconfig, expALL), 2)
fv = HTMLResource()
groups = GetGroupList(fconfig)
@@ -567,7 +635,6 @@
fv.res += ' <li>' + lctrl + '</li>'
fv.res += ' </ul>\n'
fv.res += '</li>'
- # </div>\n'
fv.res += '</ul>'
return fv.res
@@ -576,6 +643,9 @@
class ConfigResource(FreevoResource):
def _render(self, request):
+ '''
+ '''
+ _debug_('_render(self, request)', 2)
fv = HTMLResource()
form = request.args
fv.printHeader(_('Config'), 'styles/main.css', 'scripts/config.js',
selected=_('Config'))
@@ -588,13 +658,15 @@
if not configfile:
if (not config.__dict__.has_key('CONFIG_EDIT_FILE')):
fv.printMessages(['Unable to find local_conf.py setting
CONFIG_EDIT_FILE'])
- return String (fv.res)
+ return fv.res
+ #return String (fv.res)
else:
configfile = config.CONFIG_EDIT_FILE
if not os.path.exists(configfile):
fv.printMessages(['Unable to find file - ' + configfile])
- return String (fv.res)
+ return fv.res
+ #return String (fv.res)
rconf = ReadConfig(configfile)
fconfig = ParseConfigFile(rconf)
@@ -608,9 +680,10 @@
fv.res += '<input type="hidden" id="configfile" value="%s"\n>' %
configfile
fv.res += '<div class="VarGroups">\n'
fv.res += '\n<form id="config" class="searchform" action="config.rpy"
method="get">\n'
- fv.res += DisplayGroups(str(fconfig), expandAll)
+ fv.res += DisplayGroups(fconfig, expandAll)
fv.res + '</div>\n'
fv.res += '\n</form><br>\n'
- return String(fv.res)
+ return str(fv.res)
+ #return String(fv.res)
resource = ConfigResource()
Modified: branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy
==============================================================================
--- branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy (original)
+++ branches/rel-1/freevo/src/www/htdocs/pluginconfig.rpy Sat Oct 13
11:00:31 2007
@@ -31,8 +31,9 @@
import sys, time
import urllib
+import config
from www.web_types import HTMLResource, FreevoResource
-import util, config
+import util
from plugin import is_active
from helpers.plugins import parse_plugins
from helpers.plugins import info_html
@@ -43,6 +44,9 @@
def ReadConfig(cfile):
+ '''
+ '''
+ _debug_('ReadConfig(cfile=%r)' % (cfile), 2)
lconf = cfile
lconf_hld = open(lconf, 'r')
fconf = lconf_hld.readlines()
@@ -51,6 +55,9 @@
def ParsePluginName(line):
+ '''
+ '''
+ _debug_('ParsePluginName(line=%r)' % (line), 2)
sline = line.replace('"', "'")
sline = sline.split("'")
if len(sline) > 2:
@@ -61,6 +68,9 @@
def GetConfigSetting(cfile, vname):
+ '''
+ '''
+ _debug_('GetConfigSetting(cfile=%r, vname=%r)' % (cfile, vname), 2)
lconf = ReadConfig(cfile)
ret = ''
@@ -75,6 +85,9 @@
def ReadConfigPlugins(cfile):
+ '''
+ '''
+ _debug_('ReadConfigPlugins(cfile=%r)' % (cfile), 2)
rconf = ReadConfig(cfile)
pluginlines = []
cnt = 0
@@ -100,6 +113,9 @@
def GetPlugConfig(plugin):
+ '''
+ '''
+ _debug_('GetPlugConfig(plugin=%r)' % (plugin), 2)
config_list = []
if plugin[5].find('config') > 0:
@@ -110,6 +126,9 @@
def SortPlugins(pluginlist, plugin_grps):
+ '''
+ '''
+ _debug_('SortPlugins(pluginlist=%r, plugin_grps=%r)' % (pluginlist,
plugin_grps), 2)
sorted = []
for plugin in pluginlist:
pgrp = plugin[0].split('.')[0]
@@ -119,30 +138,37 @@
return sorted
def CreateListBox(cname, grps, cvalue, opts):
+ '''
+ '''
+ _debug_('CreateListBox(cname=%r, grps=%r, cvalue=%r, opts=%r)' % (cname,
grps, cvalue, opts), 2)
ctrl = '\n<select name="%s" value="" id="%s" %s>' % (cname, cname, opts)
for grp in grps:
if grp == cvalue:
- ctrl += '\n <option value="' + grp + '" selected="yes">' + grp
+ '</option>'
+ ctrl += '\n <option value="' + grp + '" selected="yes">' + grp
+ '</option>'
else:
- ctrl += '\n <option value="' + grp + '">' + grp + '</option>'
+ ctrl += '\n <option value="' + grp + '">' + grp + '</option>'
ctrl += '\n</select>'
return ctrl
-def get_config_setting(lconf, plugin_name) :
+def get_config_setting(lconf, plugin_name):
+ '''
+ '''
+ _debug_('get_config_setting(lconf=%r, plugin_name=%r)' % (lconf,
plugin_name), 2)
conf_line = 'None'
confentry = False
linenumber = -1
for lnum, lcline in enumerate(lconf):
-
if lcline['name'] == plugin_name:
-
conf_line = lcline['orgline']
linenumber = lcline['lineno']
confentry = True
return conf_line, linenumber
-def plugin_level_control(lconf_line, plugin) :
+def plugin_level_control(lconf_line, plugin):
+ '''
+ '''
+ _debug_('plugin_level_control(lconf_line=%r, plugin=%r)' % (lconf_line,
plugin), 2)
# check to see if the plugin supports levels.
lconf_line = lconf_line.replace(' ', '')
if lconf_line.find('level=') == -1:
@@ -158,12 +184,15 @@
level_ctrl = ''
if level <> "none":
- level_ctrl = 'Level :<input id="%s_level" name="newname" size="2"
value="%s">' % (plugin[0], level)
+ level_ctrl = 'Level: <input id="%s_level" name="newname" size="2"
value="%s">' % (plugin[0], level)
return level_ctrl
-def get_plugin_status(plugin_name, lconfline) :
+def get_plugin_status(plugin_name, lconfline):
+ '''
+ '''
+ _debug_('get_plugin_status(plugin_name=%r, lconfline=%r)' % (plugin_name,
lconfline), 2)
status = 'Deactive'
if is_active(plugin_name):
@@ -178,16 +207,21 @@
return status
def get_plugin_args(config_line):
+ '''
+ '''
+ _debug_('get_plugin_args(config_line=%r)' % (config_line), 2)
plugin_args = ''
if config_line.find("args=") <> -1:
plugin_args = config_line.split('args=')[1]
- print "PLugin Args Found !!!"
return plugin_args
def displayplugin(cfile, plugin, lconf, expAll):
+ '''
+ '''
+ _debug_('displayplugin(cfile=%r, plugin=%r, lconf=%r, expAll=%r)' %
(cfile, plugin, lconf, expAll), 2)
ctrlopts = ['Active', 'Deactive', 'Remove']
html = HTMLResource()
@@ -215,50 +249,62 @@
html.res += spDisable_open
html.res += CreateListBox(pluginname + '_cmd', ctrlopts, status, pc_opts)
html.res += '<input type="hidden" id="%s_lineno" value="%i">\n' %
(pluginname, linenumber)
- html.res += '<a onclick=DisplayList("%s_info")>%s</a></li>\n' %
(pluginname, pluginname)
+ html.res += '<a onclick=DisplayList("%s_info")>%s</a></li>\n' %
(pluginname, pluginname)
html.res += spDisable_close
html.res += '<span id=%s_updateinfo></span>' % pluginname
- html.res += '<ul id="%s_info" style="display:%s;")>\n' % (pluginname,
dstyle)
- html.res += '<li><span id="%s_config_line" class="config_line">%i -
%s</span></li>' % (pluginname, linenumber, lconfline)
+ html.res += '<ul id="%s_info" style="display:%s;")>\n' % (pluginname,
dstyle)
+ html.res += '<li><span id="%s_config_line" class="config_line">%i -
%s</span></li>' % \
+ (pluginname, linenumber, lconfline)
html.res += '<li>' + plugin_level_control(lconfline, plugin) + '</li>'
- html.res += '<li> Plugin Args :<input id="%s_args" name="newname"
size="20" value="%s">%s</li>' % \
+ html.res += '<li> Plugin Args: <input id="%s_args" name="newname"
size="20" value="%s">%s</li>' % \
(pluginname, plugin_args, plugin_args)
- html.res += dispay_vars(plugin, cfile)
+ html.res += display_vars(plugin, cfile)
html.res += '<li><div class="plugin_info">%s</div></li>' %
plugin[4].replace('\n', '<br>\n')
html.res += '</ul>'
return html.res
-def dispay_vars(plugin, cfile) :
-
- clist = GetPlugConfig(plugin)
- dsp_vars = '<ul class="plugin_vars">'
- for cnt, vr in enumerate(clist):
- curvalue = GetConfigSetting(cfile, vr[0])
- dsp_vars += '<li>\n'
- dsp_vars += vr[0] + '\n'
- dsp_vars += curvalue
- dsp_vars += vr[2]
- dsp_vars += '</li>\n'
- dsp_vars += '</ul>\n'
+def display_vars(plugin, cfile):
+ '''
+ '''
+ _debug_('display_vars(plugin=%r, cfile=%r)' % (plugin, cfile), 2)
+
+ try:
+ clist = GetPlugConfig(plugin)
+ dsp_vars = '<ul class="plugin_vars">'
+ for cnt, vr in enumerate(clist):
+ curvalue = GetConfigSetting(cfile, vr[0])
+ dsp_vars += '<li>\n'
+ dsp_vars += vr[0] + '\n'
+ dsp_vars += curvalue
+ dsp_vars += vr[2]
+ dsp_vars += '</li>\n'
+ dsp_vars += '</ul>\n'
+ except SyntaxError, e:
+ dsp_vars = 'plugin=%r %s\n' % (plugin[0], e)
+ print plugin[0], e
return dsp_vars
def display_group(dsp_group, splugins, configfile, lcplugins, expandAll):
+ '''
+ '''
+ _debug_('display_group(dsp_group=%r, splugins=%r, configfile=%r,
lcplugins=%r, expandAll=%r)' % \
+ (dsp_group, splugins, configfile, lcplugins, expandAll), 2)
grpheader = ''
grpheader += '<li><a onclick=DisplayList("%s_list")>%s</a>\n'
- grouplist = grpheader % (dsp_group, dsp_group)
- grouplist+= ' <ul id="%s_list" class="GroupHeader" >\n' % dsp_group
+ grouplist = grpheader % (dsp_group, dsp_group)
+ grouplist += ' <ul id="%s_list" class="GroupHeader" >\n' % dsp_group
for plugin in splugins:
if dsp_group == plugin[0]:
pluginname = plugin[1][0]
pluginctrl = displayplugin(configfile, plugin[1], lcplugins,
expandAll)
grouplist += pluginctrl
- grouplist += '</ul>\n'
+ grouplist += ' </ul>\n'
grouplist += '</li>\n'
return grouplist
@@ -267,6 +313,9 @@
class ConfigurePluginsResource(FreevoResource):
def _render(self, request):
+ '''
+ '''
+ _debug_('_render(request)', 2)
fv = HTMLResource()
form = request.args
@@ -282,13 +331,13 @@
if not configfile:
if (not config.__dict__.has_key('CONFIG_EDIT_FILE')):
fv.printMessages(["Unable to find local_conf.py setting
CONFIG_EDIT_FILE"])
- return String (fv.res)
+ return str(fv.res)
else:
configfile = config.CONFIG_EDIT_FILE
if not os.path.exists(configfile):
fv.res += "Error unable to find File - %s" % configfile
- return String (fv.res)
+ return str(fv.res)
all_plugins = config.all_plugins
group_list = ['Global', 'tv', 'video', 'audio', 'image', 'idlebar']
@@ -302,18 +351,19 @@
if expAll:
expandAll = True
- fv.res += '<link rel="stylesheet" href="styles/config.css"
type="text/css" />'
- fv.res += '\n<div class="VarGroups">\n'
+ fv.res += '<link rel="stylesheet" href="styles/config.css"
type="text/css" />\n'
+ fv.res += '<div class="VarGroups">\n'
fv.res += '<form action="#" class="searchform">\n'
fv.res += '<ul class="GroupHeader">\n'
for grp in group_list:
- fv.res += display_group(grp, splugins, configfile, lcplugins,
expandAll)
+ #fv.res += display_group(grp, splugins, configfile, lcplugins,
expandAll)
+ fv.res += Unicode(display_group(grp, splugins, configfile,
lcplugins, expandAll))
fv.res += '</ul>\n'
fv.res += '</div>\n'
fv.res += '</form>\n'
- return String(fv.res)
+ return str(fv.res)
resource = ConfigurePluginsResource()
Modified: branches/rel-1/freevo/src/www/web_types.py
==============================================================================
--- branches/rel-1/freevo/src/www/web_types.py (original)
+++ branches/rel-1/freevo/src/www/web_types.py Sat Oct 13 11:00:31 2007
@@ -204,8 +204,8 @@
(_('Search'),_('Advanced Search Page'),'%ssearch.rpy' %
str(strprefix)),
(_('Help'),_('View Online Help and Documentation'),'%shelp/'
% str(strprefix))]
# maybe also a personal web pages
- if hasattr(config, 'PERSONAL_WWW_PAGE'):
- for page in config.PERSONAL_WWW_PAGE:
+ if hasattr(config, 'WWW_PERSONAL_PAGE'):
+ for page in config.WWW_PERSONAL_PAGE:
items.append((page[0], page[1], '%s%s' % (str(strprefix),
page[2])))
if hasattr(config, 'ICECAST_WWW_PAGE') and config.ICECAST_WWW_PAGE:
items.append((_('Icecast List'),_('Change Icecast
List'),'%siceslistchanger.rpy' % (strprefix)))
-------------------------------------------------------------------------
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
