Commit 1ca72e94 authored by Administrator's avatar Administrator

adding user name in menu.html template

parent 25d4c77f
...@@ -35,6 +35,7 @@ def home(request): ...@@ -35,6 +35,7 @@ def home(request):
return redirect('/login/?next=%s' % request.path) return redirect('/login/?next=%s' % request.path)
t = get_template('home.html') t = get_template('home.html')
user = request.user
date = datetime.datetime.now() date = datetime.datetime.now()
...@@ -42,6 +43,7 @@ def home(request): ...@@ -42,6 +43,7 @@ def home(request):
number = len(projects) number = len(projects)
html = t.render(Context({\ html = t.render(Context({\
'user': user,\
'date': date,\ 'date': date,\
'projects': projects,\ 'projects': projects,\
'number': number,\ 'number': number,\
...@@ -59,6 +61,7 @@ def project(request, p_id): ...@@ -59,6 +61,7 @@ def project(request, p_id):
raise Http404() raise Http404()
t = get_template('project.html') t = get_template('project.html')
user = request.user
date = datetime.datetime.now() date = datetime.datetime.now()
project = Project.objects.get(pk=p_id) project = Project.objects.get(pk=p_id)
...@@ -66,6 +69,7 @@ def project(request, p_id): ...@@ -66,6 +69,7 @@ def project(request, p_id):
number = len(corpora) number = len(corpora)
html = t.render(Context({\ html = t.render(Context({\
'user': user,\
'date': date,\ 'date': date,\
'project': project,\ 'project': project,\
'corpora' : corpora,\ 'corpora' : corpora,\
...@@ -84,6 +88,7 @@ def corpus(request, p_id, c_id): ...@@ -84,6 +88,7 @@ def corpus(request, p_id, c_id):
raise Http404() raise Http404()
t = get_template('corpus.html') t = get_template('corpus.html')
user = request.user
date = datetime.datetime.now() date = datetime.datetime.now()
...@@ -116,6 +121,7 @@ def corpus(request, p_id, c_id): ...@@ -116,6 +121,7 @@ def corpus(request, p_id, c_id):
html = t.render(Context({\ html = t.render(Context({\
'user': user,\
'date': date,\ 'date': date,\
'project': project,\ 'project': project,\
'corpus' : corpus,\ 'corpus' : corpus,\
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<ul class="nav pull-right"> <ul class="nav pull-right">
<li class="dropdown"> <li class="dropdown">
<a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Analyst:<i class="icon-user"></i> USER <i class="caret"></i> <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Analyst:<i class="icon-user"></i> {{ user }}<i class="caret"></i>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment