From 019a428295a52a7d5f1862ba5d0bda10dcea55a1 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 5 Oct 2017 11:53:49 +0530
Subject: Show logged in user info in all templates

---
 yaksh/static/yaksh/css/dashboard.css           | 8 ++++++++
 yaksh/templates/base.html                      | 6 +++++-
 yaksh/templates/user.html                      | 5 +++++
 yaksh/templates/yaksh/intro.html               | 5 +++++
 yaksh/templates/yaksh/moderator_dashboard.html | 5 +++++
 yaksh/templates/yaksh/question.html            | 6 ++++++
 6 files changed, 34 insertions(+), 1 deletion(-)

(limited to 'yaksh')

diff --git a/yaksh/static/yaksh/css/dashboard.css b/yaksh/static/yaksh/css/dashboard.css
index 28040c4..94005e1 100644
--- a/yaksh/static/yaksh/css/dashboard.css
+++ b/yaksh/static/yaksh/css/dashboard.css
@@ -87,3 +87,11 @@ body {
 .sidebar-right {
     float: right;
 }
+
+.info {
+  height: 70px;
+  padding:0 5%;
+  position:absolute;
+  bottom:0;
+  width: 100%;
+}
\ No newline at end of file
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index cbe396f..efac26d 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -52,7 +52,11 @@
 	       {% block content %}
 	       {% endblock %}
      </div>
-     <footer class="footer">
+     <footer class="footer" id="footer_div">
+      <div class="info" align="center">
+            {% block info %}
+            {% endblock %}
+        </div>
      <div class="container">
          <p align="center">Developed by FOSSEE group, IIT Bombay</p>
      </div>
diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index b068fae..83aea13 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -40,3 +40,8 @@
     </div>
 </div>
 {% endblock %}
+{% if user %}
+  {% block info %}
+  <h5>{{user.get_full_name|title}}({{user.profile.roll_number}}) Logged in as {{user.username}}</h5>
+  {% endblock %}
+{% endif %}
diff --git a/yaksh/templates/yaksh/intro.html b/yaksh/templates/yaksh/intro.html
index 29723fa..3b9ba82 100644
--- a/yaksh/templates/yaksh/intro.html
+++ b/yaksh/templates/yaksh/intro.html
@@ -43,3 +43,8 @@
             </div>
         </div>
 {% endblock content %}
+{% if user %}
+  {% block info %}
+  <h5>{{user.get_full_name|title}}({{user.profile.roll_number}}) Logged in as {{user.username}}</h5>
+  {% endblock %}
+{% endif %}
\ No newline at end of file
diff --git a/yaksh/templates/yaksh/moderator_dashboard.html b/yaksh/templates/yaksh/moderator_dashboard.html
index c61675d..25bd580 100644
--- a/yaksh/templates/yaksh/moderator_dashboard.html
+++ b/yaksh/templates/yaksh/moderator_dashboard.html
@@ -79,3 +79,8 @@
   </div>
   {% endif %}
 {% endblock %}
+{% if user %}
+  {% block info %}
+  <h5>{{user.get_full_name|title}}({{user.profile.roll_number}}) Logged in as {{user.username}}</h5>
+  {% endblock %}
+{% endif %}
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index eb6eb3d..bc7acf1 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -88,6 +88,7 @@ function call_skip(url)
 }
 init_val = '{{ last_attempt|escape_quotes|safe }}';
 lang = "{{ question.language }}"
+
 </script>
 
 {% endblock script %}
@@ -250,3 +251,8 @@ lang = "{{ question.language }}"
       </div>
    </div>
 {% endblock main %}
+{% if user %}
+  {% block info %}
+  <h5>{{user.get_full_name|title}}({{user.profile.roll_number}}) Logged in as {{user.username}}</h5>
+  {% endblock %}
+{% endif %}
-- 
cgit