From 4f70001534beb026fea80433221dfe45c4530a8b Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Fri, 21 Feb 2014 15:54:05 +0100 Subject: [PATCH] Added views for about, institution and corresponding templates --- portal/about.py | 51 +++++++++ portal/institution.py | 51 +++++++++ portal/templates/about.html | 10 ++ .../fed4fire/fed4fire__widget-login.html | 26 +++++ .../fed4fire/fed4fire__widget-topmenu.html | 38 +++++++ .../fed4fire/fed4fire_home-view.html | 19 ++++ portal/templates/home-view.html | 8 +- portal/templates/institution.html | 31 ++++++ .../onelab/onelab__widget-login-manager.html | 26 +++++ .../onelab/onelab__widget-login-user.html | 26 +++++ .../onelab/onelab__widget-topmenu.html | 40 +++++++ portal/templates/onelab/onelab_home-view.html | 102 ++++++++++++++++++ portal/urls.py | 2 + ui/static/img/icon_authority_color.png | Bin 0 -> 9368 bytes 14 files changed, 426 insertions(+), 4 deletions(-) create mode 100644 portal/about.py create mode 100644 portal/institution.py create mode 100644 portal/templates/about.html create mode 100644 portal/templates/fed4fire/fed4fire__widget-login.html create mode 100644 portal/templates/fed4fire/fed4fire__widget-topmenu.html create mode 100644 portal/templates/fed4fire/fed4fire_home-view.html create mode 100644 portal/templates/institution.html create mode 100644 portal/templates/onelab/onelab__widget-login-manager.html create mode 100644 portal/templates/onelab/onelab__widget-login-user.html create mode 100644 portal/templates/onelab/onelab__widget-topmenu.html create mode 100644 portal/templates/onelab/onelab_home-view.html create mode 100644 ui/static/img/icon_authority_color.png diff --git a/portal/about.py b/portal/about.py new file mode 100644 index 00000000..ade6f6a5 --- /dev/null +++ b/portal/about.py @@ -0,0 +1,51 @@ +# this somehow is not used anymore - should it not be ? +from django.core.context_processors import csrf +from django.http import HttpResponseRedirect +from django.contrib.auth import authenticate, login, logout +from django.template import RequestContext +from django.shortcuts import render_to_response +from django.shortcuts import render + +from unfold.loginrequired import FreeAccessView + +from manifold.manifoldresult import ManifoldResult +from ui.topmenu import topmenu_items, the_user +from myslice.configengine import ConfigEngine + +from theme import ThemeView + +class AboutView (FreeAccessView, ThemeView): + template_name = 'about.html' + + # expose this so we can mention the backend URL on the welcome page + def default_env (self): + return { + 'MANIFOLD_URL':ConfigEngine().manifold_url(), + } + + def post (self,request): + env = self.default_env() + env['theme'] = self.theme + return render_to_response(self.template, env, context_instance=RequestContext(request)) + + def get (self, request, state=None): + env = self.default_env() + + if request.user.is_authenticated(): + env['person'] = self.request.user + else: + env['person'] = None + + env['theme'] = self.theme + + + env['username']=the_user(request) + env['topmenu_items'] = topmenu_items(None, request) + if state: env['state'] = state + elif not env['username']: env['state'] = None + # use one or two columns for the layout - not logged in users will see the login prompt + env['layout_1_or_2']="layout-unfold2.html" if not env['username'] else "layout-unfold1.html" + + + return render_to_response(self.template, env, context_instance=RequestContext(request)) + diff --git a/portal/institution.py b/portal/institution.py new file mode 100644 index 00000000..31d2d599 --- /dev/null +++ b/portal/institution.py @@ -0,0 +1,51 @@ +# this somehow is not used anymore - should it not be ? +from django.core.context_processors import csrf +from django.http import HttpResponseRedirect +from django.contrib.auth import authenticate, login, logout +from django.template import RequestContext +from django.shortcuts import render_to_response +from django.shortcuts import render + +from unfold.loginrequired import FreeAccessView + +from manifold.manifoldresult import ManifoldResult +from ui.topmenu import topmenu_items, the_user +from myslice.configengine import ConfigEngine + +from theme import ThemeView + +class InstitutionView (FreeAccessView, ThemeView): + template_name = 'institution.html' + + # expose this so we can mention the backend URL on the welcome page + def default_env (self): + return { + 'MANIFOLD_URL':ConfigEngine().manifold_url(), + } + + def post (self,request): + env = self.default_env() + env['theme'] = self.theme + return render_to_response(self.template, env, context_instance=RequestContext(request)) + + def get (self, request, state=None): + env = self.default_env() + + if request.user.is_authenticated(): + env['person'] = self.request.user + else: + env['person'] = None + + env['theme'] = self.theme + + + env['username']=the_user(request) + env['topmenu_items'] = topmenu_items(None, request) + if state: env['state'] = state + elif not env['username']: env['state'] = None + # use one or two columns for the layout - not logged in users will see the login prompt + env['layout_1_or_2']="layout-unfold2.html" if not env['username'] else "layout-unfold1.html" + + + return render_to_response(self.template, env, context_instance=RequestContext(request)) + diff --git a/portal/templates/about.html b/portal/templates/about.html new file mode 100644 index 00000000..375946cb --- /dev/null +++ b/portal/templates/about.html @@ -0,0 +1,10 @@ +{% extends "layout-unfold1.html" %} + +{% block unfold_main %} +
+
+ +

This portal is powered by MySlice

+More info + +{% endblock %} diff --git a/portal/templates/fed4fire/fed4fire__widget-login.html b/portal/templates/fed4fire/fed4fire__widget-login.html new file mode 100644 index 00000000..db7245cd --- /dev/null +++ b/portal/templates/fed4fire/fed4fire__widget-login.html @@ -0,0 +1,26 @@ +
+ {% if state %} + {{ state }} + {% endif %} +
+ {% csrf_token %} + {% if next %} + + {% endif %} +
+ + +
+
+ + +
+ + +
+
diff --git a/portal/templates/fed4fire/fed4fire__widget-topmenu.html b/portal/templates/fed4fire/fed4fire__widget-topmenu.html new file mode 100644 index 00000000..4b2ae0ee --- /dev/null +++ b/portal/templates/fed4fire/fed4fire__widget-topmenu.html @@ -0,0 +1,38 @@ +{% insert_str prelude "js/bootstrap.js" %} +{% insert_str prelude "css/bootstrap.css" %} +{% insert_str prelude "css/topmenu.css" %} +{% insert_str prelude "js/logout.js" %} +