git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
[unfold.git]
/
portal
/
homeview.py
diff --git
a/portal/homeview.py
b/portal/homeview.py
index
c71481a
..
395cd96
100644
(file)
--- a/
portal/homeview.py
+++ b/
portal/homeview.py
@@
-4,6
+4,7
@@
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.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 unfold.loginrequired import FreeAccessView
@@
-11,8
+12,11
@@
from manifold.manifoldresult import ManifoldResult
from ui.topmenu import topmenu_items, the_user
from myslice.configengine import ConfigEngine
from ui.topmenu import topmenu_items, the_user
from myslice.configengine import ConfigEngine
-class HomeView (FreeAccessView):
+from theme import ThemeView
+class HomeView (FreeAccessView, ThemeView):
+ template_name = 'home-view.html'
+
# expose this so we can mention the backend URL on the welcome page
def default_env (self):
return {
# expose this so we can mention the backend URL on the welcome page
def default_env (self):
return {
@@
-21,6
+25,7
@@
class HomeView (FreeAccessView):
def post (self,request):
env = self.default_env()
def post (self,request):
env = self.default_env()
+ env['theme'] = self.theme
username = request.POST.get('username')
password = request.POST.get('password')
username = request.POST.get('username')
password = request.POST.get('password')
@@
-39,32
+44,50
@@
class HomeView (FreeAccessView):
# let's use ManifoldResult.__repr__
env['state']="%s"%manifoldresult
env['layout_1_or_2']="layout-unfold2.html"
# let's use ManifoldResult.__repr__
env['state']="%s"%manifoldresult
env['layout_1_or_2']="layout-unfold2.html"
- return render_to_response('home-view.html',env, context_instance=RequestContext(request))
+
+ return render_to_response(self.template,env, context_instance=RequestContext(request))
# user was authenticated at the backend
elif auth_result is not None:
user=auth_result
if user.is_active:
print "LOGGING IN"
login(request, user)
# user was authenticated at the backend
elif auth_result is not None:
user=auth_result
if user.is_active:
print "LOGGING IN"
login(request, user)
- return HttpResponseRedirect ('/login-ok')
+
+ if request.user.is_authenticated():
+ env['person'] = self.request.user
+ else:
+ env['person'] = None
+ return render_to_response(self.template,env, context_instance=RequestContext(request))
else:
env['state'] = "Your account is not active, please contact the site admin."
env['layout_1_or_2']="layout-unfold2.html"
else:
env['state'] = "Your account is not active, please contact the site admin."
env['layout_1_or_2']="layout-unfold2.html"
- return render_to_response('home-view.html',env, context_instance=RequestContext(request))
+
+ return render_to_response(self.template,env, context_instance=RequestContext(request))
# otherwise
else:
env['state'] = "Your username and/or password were incorrect."
env['layout_1_or_2']="layout-unfold2.html"
# otherwise
else:
env['state'] = "Your username and/or password were incorrect."
env['layout_1_or_2']="layout-unfold2.html"
- return render_to_response('home-view.html',env, context_instance=RequestContext(request))
+
+ return render_to_response(self.template, env, context_instance=RequestContext(request))
- # login-ok sets state="Welcome to MySlice" in urls.py
def get (self, request, state=None):
env = self.default_env()
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
env['username']=the_user(request)
env['topmenu_items'] = topmenu_items(None, request)
if state: env['state'] = state
- elif not env['username']: env['state'] =
"Please sign in"
+ 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"
# 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('home-view.html',env, context_instance=RequestContext(request))
+
+
+ return render_to_response(self.template, env, context_instance=RequestContext(request))