Improved get server friendly name

* Add server friendly name to page title
This commit is contained in:
Jonathan Wong 2015-11-15 21:35:53 -08:00
parent e9bc767c3b
commit f8b75eadc6
5 changed files with 41 additions and 23 deletions

View file

@ -46,9 +46,13 @@ def serve_template(templatename, **kwargs):
_hplookup = TemplateLookup(directories=[template_dir])
# Get the server name
pms_connect = pmsconnect.PmsConnect()
server_name = pms_connect.get_server_friendly_name()
try:
template = _hplookup.get_template(templatename)
return template.render(**kwargs)
return template.render(server_name=server_name, **kwargs)
except:
return exceptions.html_error_template().render()
@ -1137,10 +1141,25 @@ class WebInterface(object):
logger.warn('Unable to retrieve data.')
@cherrypy.expose
def get_server_prefs(self, **kwargs):
def get_server_friendly_name(self, **kwargs):
pms_connect = pmsconnect.PmsConnect()
result = pms_connect.get_server_prefs(output_format='json')
result = pms_connect.get_server_friendly_name()
if result:
cherrypy.response.headers['Content-type'] = 'application/json'
return result
else:
logger.warn('Unable to retrieve data.')
@cherrypy.expose
def get_server_prefs(self, pref=None, **kwargs):
if pref:
pms_connect = pmsconnect.PmsConnect()
result = pms_connect.get_server_pref(pref=pref)
else:
result = None
if result:
cherrypy.response.headers['Content-type'] = 'application/json'