Merge branch 'master' of https://github.com/FOSSEE/online_test into regrade_papers

Resolved
Conflicts:
	yaksh/models.py
	yaksh/test_models.py
	yaksh/urls.py
	yaksh/views.py

3 files changed, 28 insertions, 4 deletions

diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html
index 9e004e6..63c0ea7 100644
--- a/yaksh/templates/manage.html
+++ b/yaksh/templates/manage.html
@@ -78,6 +78,26 @@
                     <h4>Moderator's Dashboard!</h4>
                     <h5>Click on the button given below to add a new course.</h5>
                     <button class="btn" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/add_course");'>Add New Course</button>
+                    <h5>Click on the button to Create a Demo course.
+                    <a href="" onclick="$('#help').show(); return false;">Help </a></h5>
+                    <button class="btn" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/create_demo_course");'>Create Demo Course</button>
+                    <div style="display: none;" id="help">
+                    <ol>
+                    <ul>
+                    <li>A Demo Course and Demo Quiz will be created (Click Courses link on nav bar to view courses).</li>
+                    <li>Some Demo Questions are also created for you (Click Questions link on nav bar to view questions).</li>
+                    <li>In Courses you can view Demo Quiz.</li>
+                    <li>Click on the Demo Quiz and Click on User Mode or God Mode to take the quiz.
+                    </li>
+                    <li>You can also edit the Demo quiz.
+                    </li>
+                    </ul>
+                    </p>
+                    <a href="" onclick="$('#help').hide(); return false"> Close </a>
+                    </div>
+                    {% if msg %}
+                    <h4>{{ msg }}</h4>
+                    {% endif %}
                 </center>
                 {% if trial_paper %}
                   <h5/> You have trial papers.
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 109b996..43f323b 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -15,6 +15,10 @@
 {% else %}
 <center><h3> Course(s) Created</h3></center>
     {% for course in courses %}
+    {% if user != course.creator %}
+        <h4> {{course.creator.get_full_name}} added you to this course</h4>
+    {% endif %}
+    
     <div class="row show-grid">
         <div class="span14">
             <div class="row">
@@ -81,10 +85,9 @@
     <br><br>
     {% endfor %}
     {% endif %}
-
+<hr/>
 {% if allotted_courses %}
     <center><h3> Course(s) Allotted </h3></center>
-
     {% for course in allotted_courses %}
         <div class="row show-grid">
         <div class="span14">
@@ -141,6 +144,7 @@
                     {% endif %}
                 </div>
             </div>
+            <br/>
             <button class="btn primary"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button>
         </div>
     </div>
@@ -150,6 +154,6 @@
     <center><h4> No new Courses allotted</h4></center>
     <br><br>
 {% endif %}
+<hr/>
 <center><button class="btn primary" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/add_course");'>Add New Course</button></center>
-
 {% endblock %}
diff --git a/yaksh/templates/yaksh/showquestions.html b/yaksh/templates/yaksh/showquestions.html
index 2f4d218..185cbfb 100644
--- a/yaksh/templates/yaksh/showquestions.html
+++ b/yaksh/templates/yaksh/showquestions.html
@@ -11,7 +11,7 @@
 
 {% block manage %}
 
-<h4>Upload json file for adding questions</h4>
+<h4>Upload ZIP file for adding questions</h4>
 <form action="" method="post"  enctype="multipart/form-data">
 {% csrf_token %}
 {{ upload_form.as_p }}