From: Ciro Scognamiglio Date: Tue, 1 Apr 2014 08:46:52 +0000 (+0200) Subject: added titles to pages X-Git-Tag: myslice-1.1~151^2~7 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d08e5d9101b056425d1a00d2b7b434ee31eada74;p=unfold.git added titles to pages --- diff --git a/portal/about.py b/portal/about.py index 5080601f..99434a70 100644 --- a/portal/about.py +++ b/portal/about.py @@ -37,7 +37,7 @@ class AboutView (FreeAccessView, ThemeView): env['person'] = None env['theme'] = self.theme - + env['section'] = "About" env['username']=the_user(request) env['topmenu_items'] = topmenu_items(None, request) diff --git a/portal/accountview.py b/portal/accountview.py index 8243e392..67c765d9 100644 --- a/portal/accountview.py +++ b/portal/accountview.py @@ -203,6 +203,7 @@ class AccountView(LoginRequiredAutoLogoutView, ThemeView): # so we can sho who is logged context['username'] = the_user(self.request) context['theme'] = self.theme + context['section'] = "User account" # context ['firstname'] = config['firstname'] prelude_env = page.prelude_env() context.update(prelude_env) diff --git a/portal/contactview.py b/portal/contactview.py index b89aa753..95fb44e8 100644 --- a/portal/contactview.py +++ b/portal/contactview.py @@ -77,4 +77,5 @@ class ContactView (FreeAccessView, ThemeView): 'topmenu_items': topmenu_items('Contact', request), 'theme' : self.theme, 'username': username, + 'section': "Contact" }) diff --git a/portal/homeview.py b/portal/homeview.py index 7c47d99c..62b41366 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -26,6 +26,8 @@ class HomeView (FreeAccessView, ThemeView): def post (self,request): env = self.default_env() env['theme'] = self.theme + env['section'] = "Dashboard" + username = request.POST.get('username') password = request.POST.get('password') @@ -78,7 +80,7 @@ class HomeView (FreeAccessView, ThemeView): env['person'] = None env['theme'] = self.theme - + env['section'] = "Dashboard" env['username']=the_user(request) env['topmenu_items'] = topmenu_items(None, request) diff --git a/portal/institution.py b/portal/institution.py index 4ee9016b..792fc6b0 100644 --- a/portal/institution.py +++ b/portal/institution.py @@ -75,6 +75,7 @@ class InstitutionView (FreeAccessView, ThemeView): env['person'] = None env['theme'] = self.theme + env['section'] = "Institution" env['pi'] = pi env['username']=the_user(request) env['topmenu_items'] = topmenu_items(None, request) diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index fc093d12..1f377d84 100644 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@ -110,7 +110,8 @@ class SliceRequestView (LoginRequiredAutoLogoutView, ThemeView): 'user_hrn': user_hrn, 'cc_myself': True, 'authorities': authorities, - 'theme': self.theme + 'theme': self.theme, + 'section': "Slice request" } template_env.update(slice_request) template_env.update(page.prelude_env()) diff --git a/portal/sliceview.py b/portal/sliceview.py index 10cab7cd..e79b48e8 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -20,4 +20,4 @@ class SliceView (LoginRequiredView, ThemeView): template_name = "slice-view.html" def get(self, request, slicename): - return render_to_response(self.template, {"slice": slicename, "theme": self.theme, "username": request.user, "section":"slice"}, context_instance=RequestContext(request)) + return render_to_response(self.template, {"slice": slicename, "theme": self.theme, "username": request.user, "section": "Slice %s" % slicename }, context_instance=RequestContext(request)) diff --git a/portal/supportview.py b/portal/supportview.py index f42bbd87..5bd0d754 100644 --- a/portal/supportview.py +++ b/portal/supportview.py @@ -33,7 +33,7 @@ class SupportView (FreeAccessView, ThemeView): env['person'] = None env['theme'] = self.theme - + env['section'] = "Support" env['username']=the_user(request) diff --git a/portal/templates/about.html b/portal/templates/about.html index eab31c08..4c4817a5 100644 --- a/portal/templates/about.html +++ b/portal/templates/about.html @@ -1,4 +1,4 @@ -{% extends "layout.html" %} +{% extends "layout_wide.html" %} {% block content %}
diff --git a/portal/validationview.py b/portal/validationview.py index 9ecd9627..b5170b9b 100644 --- a/portal/validationview.py +++ b/portal/validationview.py @@ -263,6 +263,7 @@ class ValidatePendingView(FreeAccessView, ThemeView): context['username'] = the_user(self.request) context['theme'] = self.theme + context['section'] = "Requests" # XXX We need to prepare the page for queries #context.update(page.prelude_env())