From d0cbfb251f2cd606bee2b9cd7a8692f1d1146b47 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Wed, 30 Nov 2016 17:38:26 +0530
Subject: Render Instructions from textarea

---
 yaksh/templates/yaksh/add_quiz.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/add_quiz.html b/yaksh/templates/yaksh/add_quiz.html
index 2df97a2..b3b49ae 100644
--- a/yaksh/templates/yaksh/add_quiz.html
+++ b/yaksh/templates/yaksh/add_quiz.html
@@ -20,14 +20,17 @@
   <center>
   <table class=span1>
   {{ form.as_table }}
+  </table>
   <script type="text/javascript">
     $("#id_start_date_time").datetimepicker({format: 'Y-m-d H:i:s'});
     $("#id_end_date_time").datetimepicker({format: 'Y-m-d H:i:s'});
   </script>
   </table>
+  <br/><br/>
   </center>
 
-  <center><button class="btn" type="submit" id="submit" name="questionpaper"> Save </button>
+  <center><button class="btn" type="submit" id="submit" name="questionpaper"> Save
+  </button>
 
   <button class="btn" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/courses/");'>Cancel</button> </center>
   
@@ -55,4 +58,9 @@
    <a href="" onclick="$('#help').hide(); return false"> Close </a>
    </div>
  {% endif %}
+ <style type="text/css">
+   #rendered_text{
+    width: 550px;
+   }
+ </style>
 {% endblock %}
-- 
cgit 


From d1c6bf1f0342cbc7cfaeed74161a525ed206f3ab Mon Sep 17 00:00:00 2001
From: adityacp
Date: Wed, 30 Nov 2016 17:44:53 +0530
Subject: Quiz instructions fetched from database instead of default text

---
 yaksh/templates/yaksh/intro.html | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/intro.html b/yaksh/templates/yaksh/intro.html
index 81c460f..29723fa 100644
--- a/yaksh/templates/yaksh/intro.html
+++ b/yaksh/templates/yaksh/intro.html
@@ -21,24 +21,7 @@
               </div>
          {% endif %}
           <p> Welcome <strong>{{user.first_name.title}} {{user.last_name.title}}</strong>, to the programming quiz! </p>
-          <p>
-              This examination system has been developed with the intention of making you 
-              learn programming and be assessed in an interactive and fun manner.
-              You will be presented with a series of programming questions and problems that 
-              you will answer online and get immediate feedback for.
-          </p>
-          <p> Here are some important instructions and rules that you should understand carefully.</p> 
-         <ul>
-          <li>For any programming questions, you can submit solutions as many times as you want without a penalty.  You may skip questions and solve  them later.
-          </li>
-          <li> You <strong>may</strong> use your computer's Python/IPython shell or an editor to solve the problem and cut/paste the solution to the web interface.
-          </li>
-          <li> <strong>You are <strong>not allowed</strong> to use any internet resources, i.e. no google etc.</strong> </li>
-          <li> Do not copy or share the questions or answers with anyone until the exam is complete <strong>for everyone</strong>.</li>
-          <li> <strong>All</strong> your attempts at the questions are logged. Do not try to outsmart and break the testing system.  If you do, we know who you are and we will expel you from the course.  You have been warned.
-          </li>
-         </ul>
-         <p> We hope you enjoy taking this exam !!!</p>
+          {{ questionpaper.quiz.instructions|safe }}
         <div class="row">
             <div class="col-md-6">
               {% if user == "moderator" %}
-- 
cgit 


From 4b501a76d19e0ecbb2f75d4e2402a24a3bb47429 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 1 Dec 2016 16:00:14 +0530
Subject: removed extra html tag and changed alignment of rendered text

---
 yaksh/templates/yaksh/add_quiz.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/add_quiz.html b/yaksh/templates/yaksh/add_quiz.html
index b3b49ae..38773b5 100644
--- a/yaksh/templates/yaksh/add_quiz.html
+++ b/yaksh/templates/yaksh/add_quiz.html
@@ -25,7 +25,6 @@
     $("#id_start_date_time").datetimepicker({format: 'Y-m-d H:i:s'});
     $("#id_end_date_time").datetimepicker({format: 'Y-m-d H:i:s'});
   </script>
-  </table>
   <br/><br/>
   </center>
 
-- 
cgit