Merge pull request #161 from adityacp/quiz_instructions_editable

Quiz instructions editable

2 files changed, 10 insertions, 20 deletions

diff --git a/yaksh/templates/yaksh/add_quiz.html b/yaksh/templates/yaksh/add_quiz.html
index 2df97a2..38773b5 100644
--- a/yaksh/templates/yaksh/add_quiz.html
+++ b/yaksh/templates/yaksh/add_quiz.html
@@ -20,14 +20,16 @@
   <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 +57,9 @@
    <a href="" onclick="$('#help').hide(); return false"> Close </a>
    </div>
  {% endif %}
+ <style type="text/css">
+   #rendered_text{
+    width: 550px;
+   }
+ </style>
 {% endblock %}
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" %}