diff --git a/VERSION b/VERSION index 22005520..c42f638d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.08.25.07.39.32 +Version 2.6.0-development+timestamp.2013.08.25.19.34.35 diff --git a/applications/admin/controllers/wizard.py b/applications/admin/controllers/wizard.py index 8e6e405d..d3b62b24 100644 --- a/applications/admin/controllers/wizard.py +++ b/applications/admin/controllers/wizard.py @@ -83,20 +83,20 @@ def step1(): from gluon.contrib.simplejson import loads import urllib if not session.themes: - url = LAYOUTS_APP + '/default/layouts.json' - try: - data = urllib.urlopen(url).read() - session.themes = ['Default'] + loads(data)['layouts'] - except: - session.themes = ['Default'] + #url = LAYOUTS_APP + '/default/layouts.json' + #try: + # data = urllib.urlopen(url).read() + # session.themes = ['Default'] + loads(data)['layouts'] + #except: + session.themes = ['Default'] themes = session.themes if not session.plugins: - url = PLUGINS_APP + '/default/plugins.json' - try: - data = urllib.urlopen(url).read() - session.plugins = loads(data)['plugins'] - except: - session.plugins = [] + #url = PLUGINS_APP + '/default/plugins.json' + #try: + # data = urllib.urlopen(url).read() + # session.plugins = loads(data)['plugins'] + #except: + session.plugins = [] plugins = [x.split('.')[2] for x in session.plugins] response.view = 'wizard/step.html' params = dict(session.app['params'])