From 5ff6f47c650b77f9eca2f06ce27c28a9bf6128b0 Mon Sep 17 00:00:00 2001 From: Tommy Godfrey Date: Thu, 4 Jul 2019 15:53:49 +0100 Subject: [PATCH] Changed pyramid templates to use asset specification (#203) * Changed pyramid templates to use asset specification * Fixes for pep8 line length --- phoenix/account/base.py | 4 ++-- phoenix/account/esgf.py | 2 +- phoenix/account/ldap.py | 2 +- phoenix/account/local.py | 2 +- phoenix/cart/views.py | 2 +- phoenix/dashboard/panels.py | 6 +++--- phoenix/dashboard/views.py | 2 +- phoenix/esgf/__init__.py | 6 +++--- phoenix/monitor/panels/__init__.py | 6 +++--- phoenix/monitor/panels/inputs.py | 2 +- phoenix/monitor/panels/outputs.py | 2 +- phoenix/monitor/views/details.py | 2 +- phoenix/monitor/views/list.py | 2 +- phoenix/monitor/views/status.py | 2 +- phoenix/people/views/list.py | 2 +- phoenix/people/views/profile.py | 2 +- phoenix/processes/views/execute.py | 5 ++++- phoenix/processes/views/list.py | 5 ++++- phoenix/processes/views/overview.py | 5 ++++- phoenix/services/views/registerservice.py | 2 +- phoenix/services/views/services.py | 4 ++-- phoenix/settings/views/ldap_config.py | 2 +- phoenix/settings/views/overview.py | 2 +- phoenix/settings/views/processes.py | 2 +- 24 files changed, 41 insertions(+), 32 deletions(-) diff --git a/phoenix/account/base.py b/phoenix/account/base.py index 78920f673..480bae0c3 100644 --- a/phoenix/account/base.py +++ b/phoenix/account/base.py @@ -19,7 +19,7 @@ LOGGER = logging.getLogger("PHOENIX") -@forbidden_view_config(renderer='templates/account/forbidden.pt') +@forbidden_view_config(renderer='phoenix:account/templates/account/forbidden.pt') def forbidden(request): request.response.status = 403 return dict() @@ -148,7 +148,7 @@ def logout(self): self.session.invalidate() # deleting the session return HTTPFound(location=self.request.route_path('home'), headers=headers) - @view_config(route_name='account_register', renderer='templates/account/register.pt') + @view_config(route_name='account_register', renderer='phoenix:account/templates/account/register.pt') def register(self): return dict() diff --git a/phoenix/account/esgf.py b/phoenix/account/esgf.py index 2d7bea53c..d65cdeed2 100644 --- a/phoenix/account/esgf.py +++ b/phoenix/account/esgf.py @@ -34,6 +34,6 @@ def _handle_appstruct(self, appstruct): provider=appstruct.get('provider'), _query=dict(username=appstruct.get('username')))) - @view_config(route_name='esgf_login', renderer='templates/account/login.pt') + @view_config(route_name='esgf_login', renderer='phoenix:account/templates/account/login.pt') def esgf_login(self): return self.login() diff --git a/phoenix/account/ldap.py b/phoenix/account/ldap.py index df91f1236..ab43e671a 100644 --- a/phoenix/account/ldap.py +++ b/phoenix/account/ldap.py @@ -48,7 +48,7 @@ def _handle_appstruct(self, appstruct): # Authentification failed return self.login_failure() - @view_config(route_name='ldap_login', renderer='templates/account/login.pt') + @view_config(route_name='ldap_login', renderer='phoenix:account/templates/account/login.pt') def ldap_login(self): self.init_ldap() return self.login() diff --git a/phoenix/account/local.py b/phoenix/account/local.py index 03aebb1c3..03f281a78 100644 --- a/phoenix/account/local.py +++ b/phoenix/account/local.py @@ -28,6 +28,6 @@ def _handle_appstruct(self, appstruct): return self.login_success(login_id="phoenix@localhost", name="Phoenix", local=True) return self.login_failure() - @view_config(route_name='sign_in', renderer='templates/account/sign_in.pt') + @view_config(route_name='sign_in', renderer='phoenix:account/templates/account/sign_in.pt') def sign_in(self): return self.login() diff --git a/phoenix/cart/views.py b/phoenix/cart/views.py index 7e1e0669d..c8846803b 100644 --- a/phoenix/cart/views.py +++ b/phoenix/cart/views.py @@ -8,6 +8,6 @@ class Cart(MyView): def __init__(self, request): super(Cart, self).__init__(request, name='cart', title='Cart') - @view_config(route_name='cart', renderer='templates/cart/cart.pt') + @view_config(route_name='cart', renderer='phoenix:cart/templates/cart/cart.pt') def view(self): return {} diff --git a/phoenix/dashboard/panels.py b/phoenix/dashboard/panels.py index 3225c21f6..08f3a0602 100644 --- a/phoenix/dashboard/panels.py +++ b/phoenix/dashboard/panels.py @@ -8,7 +8,7 @@ logger = logging.getLogger(__name__) -@panel_config(name='dashboard_overview', renderer='templates/dashboard/panels/overview.pt') +@panel_config(name='dashboard_overview', renderer='phoenix:dashboard/templates/dashboard/panels/overview.pt') def dashboard_overview(context, request): return dict(people=request.db.users.count(), jobs=request.db.jobs.count(), @@ -16,7 +16,7 @@ def dashboard_overview(context, request): tds=len(request.catalog.get_services(service_type=THREDDS_TYPE))) -@panel_config(name='dashboard_people', renderer='templates/dashboard/panels/people.pt') +@panel_config(name='dashboard_people', renderer='phoenix:dashboard/templates/dashboard/panels/people.pt') def dashboard_people(context, request): stats = dict(total=request.db.users.count()) stats['not_activated'] = request.db.users.find({"group": Guest}).count() @@ -29,7 +29,7 @@ def dashboard_people(context, request): return stats -@panel_config(name='dashboard_jobs', renderer='templates/dashboard/panels/jobs.pt') +@panel_config(name='dashboard_jobs', renderer='phoenix:dashboard/templates/dashboard/panels/jobs.pt') def dashboard_jobs(context, request): return dict(total=request.db.jobs.count(), running=request.db.jobs.find( diff --git a/phoenix/dashboard/views.py b/phoenix/dashboard/views.py index a9f75fd35..5594e3587 100644 --- a/phoenix/dashboard/views.py +++ b/phoenix/dashboard/views.py @@ -11,7 +11,7 @@ class Dashboard(MyView): def __init__(self, request): super(Dashboard, self).__init__(request, name='dashboard', title='Dashboard') - @view_config(route_name='dashboard', renderer='templates/dashboard/dashboard.pt') + @view_config(route_name='dashboard', renderer='phoenix:dashboard/templates/dashboard/dashboard.pt') def view(self): tab = self.request.matchdict.get('tab', 'overview') diff --git a/phoenix/esgf/__init__.py b/phoenix/esgf/__init__.py index 51cb7ad75..8e1473e57 100644 --- a/phoenix/esgf/__init__.py +++ b/phoenix/esgf/__init__.py @@ -7,12 +7,12 @@ def includeme(config): config.add_view('phoenix.esgf.views.ESGFLogon', route_name='esgflogon', attr='view', - renderer='templates/esgf/esgflogon.pt') + renderer='phoenix:esgf/templates/esgf/esgflogon.pt') config.add_route('esgflogon_loading', '/esgf/logon/loading') config.add_view('phoenix.esgf.views.ESGFLogon', route_name='esgflogon_loading', attr='loading', - renderer='templates/esgf/loading.pt') + renderer='phoenix:esgf/templates/esgf/loading.pt') config.add_route('esgf_check_logon', '/esgf/check_logon.json') config.add_view('phoenix.esgf.views.ESGFLogon', route_name='esgf_check_logon', @@ -23,7 +23,7 @@ def includeme(config): config.add_view('phoenix.esgf.views.ESGFSearchActions', route_name='esgfsearch', attr='search_datasets', - renderer='templates/esgf/esgfsearch.pt') + renderer='phoenix:esgf/templates/esgf/esgfsearch.pt') config.add_route('esgfsearch_items', '/esgfsearch/items') config.add_view('phoenix.esgf.views.ESGFSearchActions', route_name='esgfsearch_items', diff --git a/phoenix/monitor/panels/__init__.py b/phoenix/monitor/panels/__init__.py index d8c8051d9..9e71ffc65 100644 --- a/phoenix/monitor/panels/__init__.py +++ b/phoenix/monitor/panels/__init__.py @@ -29,20 +29,20 @@ def job_details(request, job_id): return details -@panel_config(name='job_details', renderer='../templates/monitor/panels/details.pt') +@panel_config(name='job_details', renderer='phoenix:monitor/templates/monitor/panels/details.pt') def details(context, request): job_id = request.matchdict.get('job_id') return dict(job=job_details(request, job_id=job_id)) -@panel_config(name='job_log', renderer='../templates/monitor/panels/log.pt') +@panel_config(name='job_log', renderer='phoenix:monitor/templates/monitor/panels/log.pt') def log(context, request): job_id = request.matchdict.get('job_id') job = request.db.jobs.find_one({'identifier': job_id}) return dict(log=job.get('log', [])) -@panel_config(name='job_xml', renderer='../templates/monitor/panels/xml.pt') +@panel_config(name='job_xml', renderer='phoenix:monitor/templates/monitor/panels/xml.pt') def xml(context, request): job_id = request.matchdict.get('job_id') job = request.db.jobs.find_one({'identifier': job_id}) diff --git a/phoenix/monitor/panels/inputs.py b/phoenix/monitor/panels/inputs.py index 9722b7905..bf36a7562 100644 --- a/phoenix/monitor/panels/inputs.py +++ b/phoenix/monitor/panels/inputs.py @@ -26,7 +26,7 @@ def __init__(self, context, request): self.request = request self.session = self.request.session - @panel_config(name='job_inputs', renderer='../templates/monitor/panels/media.pt') + @panel_config(name='job_inputs', renderer='phoenix:monitor/templates/monitor/panels/media.pt') def panel(self): job_id = self.request.matchdict.get('job_id') diff --git a/phoenix/monitor/panels/outputs.py b/phoenix/monitor/panels/outputs.py index 64477834f..29123c09d 100644 --- a/phoenix/monitor/panels/outputs.py +++ b/phoenix/monitor/panels/outputs.py @@ -29,7 +29,7 @@ def __init__(self, context, request): self.request = request self.session = self.request.session - @panel_config(name='job_outputs', renderer='../templates/monitor/panels/media.pt') + @panel_config(name='job_outputs', renderer='phoenix:monitor/templates/monitor/panels/media.pt') def panel(self): job_id = self.request.matchdict.get('job_id') items = [] diff --git a/phoenix/monitor/views/details.py b/phoenix/monitor/views/details.py index f5545bef5..c6672fcef 100644 --- a/phoenix/monitor/views/details.py +++ b/phoenix/monitor/views/details.py @@ -11,7 +11,7 @@ def __init__(self, request): self.job_id = self.request.matchdict.get('job_id') self.collection = self.request.db.jobs - @view_config(route_name='job_details', renderer='../templates/monitor/details.pt') + @view_config(route_name='job_details', renderer='phoenix:monitor/templates/monitor/details.pt') def view(self): job = self.collection.find_one({'identifier': self.job_id}) return dict(active=self.tab, job_id=self.job_id, status=job['status']) diff --git a/phoenix/monitor/views/list.py b/phoenix/monitor/views/list.py index 355dc77b8..342bb44ed 100644 --- a/phoenix/monitor/views/list.py +++ b/phoenix/monitor/views/list.py @@ -128,7 +128,7 @@ def process_labels_form(self, form): self.session.flash("Labels updated.", queue='success') return HTTPFound(location=self.request.route_path('monitor')) - @view_config(route_name='monitor', renderer='../templates/monitor/list.pt', accept='text/html') + @view_config(route_name='monitor', renderer='phoenix:monitor/templates/monitor/list.pt', accept='text/html') def view(self): if not self.request.has_permission('edit'): msg = """Warning: You are not allowed to monitor jobs. diff --git a/phoenix/monitor/views/status.py b/phoenix/monitor/views/status.py index d2c353d52..28be35969 100644 --- a/phoenix/monitor/views/status.py +++ b/phoenix/monitor/views/status.py @@ -13,7 +13,7 @@ def __init__(self, request): self.collection = self.request.db.jobs super(JobStatus, self).__init__(request, name='job_status', title='') - @view_config(route_name='job_status', renderer='../templates/monitor/status.pt') + @view_config(route_name='job_status', renderer='phoenix:monitor/templates/monitor/status.pt') def view(self): status = 'ProcessAccepted' log = None diff --git a/phoenix/people/views/list.py b/phoenix/people/views/list.py index 137ecac60..bf3ec6fe5 100644 --- a/phoenix/people/views/list.py +++ b/phoenix/people/views/list.py @@ -14,7 +14,7 @@ def __init__(self, request): super(People, self).__init__(request, name='people', title='') self.collection = self.request.db.users - @view_config(route_name='people', renderer='../templates/people/list.pt') + @view_config(route_name='people', renderer='phoenix:people/templates/people/list.pt') def view(self): user_items = list(self.collection.find().sort('last_login', -1)) grid = PeopleGrid( diff --git a/phoenix/people/views/profile.py b/phoenix/people/views/profile.py index 47488c8b8..6c828bf92 100644 --- a/phoenix/people/views/profile.py +++ b/phoenix/people/views/profile.py @@ -107,7 +107,7 @@ def process_form(self, form): self.request.session.flash("Your profile was updated.", queue='success') return HTTPFound(location=self.request.current_route_path()) - @view_config(route_name='profile', renderer='../templates/people/profile.pt') + @view_config(route_name='profile', renderer='phoenix:people/templates/people/profile.pt') def view(self): form = self.generate_form() diff --git a/phoenix/processes/views/execute.py b/phoenix/processes/views/execute.py index f5ee59669..3c9b55d60 100644 --- a/phoenix/processes/views/execute.py +++ b/phoenix/processes/views/execute.py @@ -182,7 +182,10 @@ def execute(self, appstruct): self.request.registry.notify(JobStarted(self.request, result.id)) return result.id - @view_config(route_name='processes_execute', renderer='../templates/processes/execute.pt', accept='text/html') + @view_config( + route_name='processes_execute', + renderer='phoenix:processes/templates/processes/execute.pt', + accept='text/html') def view(self): form = self.generate_form() if 'submit' in self.request.POST: diff --git a/phoenix/processes/views/list.py b/phoenix/processes/views/list.py index e88c10db0..e1d9a8bb8 100644 --- a/phoenix/processes/views/list.py +++ b/phoenix/processes/views/list.py @@ -22,7 +22,10 @@ def __init__(self, request): verify=False) super(ProcessList, self).__init__(request, name='processes_list', title='') - @view_config(route_name='processes_list', renderer='../templates/processes/list.pt', accept='text/html') + @view_config( + route_name='processes_list', + renderer='phoenix:processes/templates/processes/list.pt', + accept='text/html') def view(self): items = [] for process in self.wps.processes: diff --git a/phoenix/processes/views/overview.py b/phoenix/processes/views/overview.py index 102f030b5..d20b6010c 100644 --- a/phoenix/processes/views/overview.py +++ b/phoenix/processes/views/overview.py @@ -52,7 +52,10 @@ def pinned_processes(self): service_title=wps.identification.title)) return processes - @view_config(route_name='processes', renderer='../templates/processes/overview.pt', accept='text/html') + @view_config( + route_name='processes', + renderer='phoenix:processes/templates/processes/overview.pt', + accept='text/html') def view(self): return dict(title="Web Processing Services", items=self.wps_services(), diff --git a/phoenix/services/views/registerservice.py b/phoenix/services/views/registerservice.py index 4734e998f..ba3cba53c 100644 --- a/phoenix/services/views/registerservice.py +++ b/phoenix/services/views/registerservice.py @@ -82,7 +82,7 @@ def process_form(self, form): self.session.flash('Could not register Service {0}: {1}'.format(url, ex), queue="danger") return HTTPFound(location=self.request.route_path('services')) - @view_config(route_name="register_service", renderer='../templates/services/service_register.pt') + @view_config(route_name="register_service", renderer='phoenix:services/templates/services/service_register.pt') def view(self): form = self.generate_form() if 'register' in self.request.POST: diff --git a/phoenix/services/views/services.py b/phoenix/services/views/services.py index dc3cbb2d3..184456b43 100644 --- a/phoenix/services/views/services.py +++ b/phoenix/services/views/services.py @@ -16,7 +16,7 @@ def breadcrumbs(self): breadcrumbs.append(dict(route_path=self.request.route_path(self.name), title=self.title)) return breadcrumbs - @view_config(route_name='service_details', renderer='../templates/services/service_details.pt') + @view_config(route_name='service_details', renderer='phoenix:services/templates/services/service_details.pt') def details_view(self): service_id = self.request.matchdict.get('service_id') service = self.request.catalog.get_record_by_id(service_id) @@ -28,6 +28,6 @@ def details_view(self): self.session.flash("Error: This service is not available.", queue='danger') return dict(service=service, service_name=service_name) - @view_config(route_name="services", renderer='../templates/services/service_list.pt') + @view_config(route_name="services", renderer='phoenix:services/templates/services/service_list.pt') def list_view(self): return dict(items=self.request.catalog.get_services()) diff --git a/phoenix/settings/views/ldap_config.py b/phoenix/settings/views/ldap_config.py index f1aab518e..041cb2235 100644 --- a/phoenix/settings/views/ldap_config.py +++ b/phoenix/settings/views/ldap_config.py @@ -19,7 +19,7 @@ def breadcrumbs(self): breadcrumbs.append(dict(route_path=self.request.route_path(self.name), title=self.title)) return breadcrumbs - @view_config(route_name='settings_ldap', renderer='../templates/settings/ldap.pt') + @view_config(route_name='settings_ldap', renderer='phoenix:settings/templates/settings/ldap.pt') def view(self): # Get LDAP settings ldap_settings = self.request.db.ldap.find_one() diff --git a/phoenix/settings/views/overview.py b/phoenix/settings/views/overview.py index 588ad9219..8e1a16e51 100644 --- a/phoenix/settings/views/overview.py +++ b/phoenix/settings/views/overview.py @@ -8,7 +8,7 @@ class Overview(MyView): def __init__(self, request): super(Overview, self).__init__(request, name='settings', title='Overview') - @view_config(route_name='settings', renderer='../templates/settings/overview.pt') + @view_config(route_name='settings', renderer='phoenix:settings/templates/settings/overview.pt') def view(self): buttongroups = list() buttons = list() diff --git a/phoenix/settings/views/processes.py b/phoenix/settings/views/processes.py index b4de0af2b..8efec6dda 100644 --- a/phoenix/settings/views/processes.py +++ b/phoenix/settings/views/processes.py @@ -52,7 +52,7 @@ def appstruct(self): appstruct = self.collection.find_one() or {} return skip_csrf_token(appstruct) - @view_config(route_name='settings_processes', renderer='../templates/settings/processes.pt') + @view_config(route_name='settings_processes', renderer='phoenix:settings/templates/settings/processes.pt') def view(self): form = self.generate_form() if 'submit' in self.request.POST: