From 51c6734d53e9fdb79500782992a74287f9bae259 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 20 Feb 2018 11:47:38 +0530
Subject: Change in complete.html and courses.html - Remove message from
 complete.html - Add/Change link for clone course

---
 yaksh/templates/yaksh/complete.html |  3 ---
 yaksh/templates/yaksh/courses.html  | 21 ++++++++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index e4317fe..19013ca 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -33,9 +33,6 @@ width="80" alt="YAKSH"></img>{% endblock %}
 	<center><h3>{{message}}</h3></center>
     <center>
     <br>
-    {% if not module_id %}
-        <br><center><h4>You may now close the browser.</h4></center><br>
-    {% endif %}
     <a href="{{URL_ROOT}}/exam/" id="home" class="btn btn-success"> Home </a>
     {% if module_id and not user == "moderator" %}
         {% if first_unit %}
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index a1fd48a..afd53d7 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -4,6 +4,7 @@
 {% block script %}
 <script>
     $(document).ready(function(){
+        $('[data-toggle="tooltip"]').tooltip();
         $("#created_courses").toggle();
         $("#link_created_courses").click(function() {
             if ($("#allotted_courses").is(":visible")){
@@ -24,6 +25,14 @@
     });
 </script>
 {% endblock %}
+{% block css %}
+<style>
+    .test + .tooltip.top > .tooltip-inner {
+      padding: 15px;
+      font-size: 12px;
+    }
+</style>
+{% endblock %}
 {% block content %}
 <div class="row">
     <div class="col-sm-3 col-md-2 sidebar">
@@ -99,7 +108,8 @@
         <br><br>
         <ul>
             <li>
-                <a href="{{URL_ROOT}}/exam/manage/courses/designcourse/{{course.id}}/">Design Course
+                <a href="{{URL_ROOT}}/exam/manage/courses/designcourse/{{course.id}}/" data-toggle="tooltip" title="Add/Remove/Change course modules" data-placement="top">
+                    Design Course
                 </a>
             </li>
             <br>
@@ -123,7 +133,12 @@
             </li>
             <br>
             <li>
-                <a href="{{URL_ROOT}}/exam/manage/duplicate_course/{{ course.id }}/">
+                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/copy/{{ course.id }}/" data-toggle="tooltip" title="Creates a new copy and link modules of selected course to the copy" data-placement="top">
+                Copy Course</a>
+            </li>
+            <br>
+            <li>
+                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/clone/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
                 Clone Course</a>
             </li>
         </ul>
@@ -259,7 +274,7 @@
             </li>
             <br>
             <li>
-                <a href="{{URL_ROOT}}/exam/manage/duplicate_course/{{ course.id }}/">
+                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/clone/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
                 Clone Course</a>
             </li>
         </ul>
-- 
cgit 


From 333859a8c1ab57e70ea57e92a22eaac6a1a1c0ac Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 22 Feb 2018 18:05:00 +0530
Subject: Change templates, test_views.py, urls.py, views.py

- Change copy_type to shallow and deep
---
 yaksh/templates/yaksh/courses.html               | 6 +++---
 yaksh/templates/yaksh/design_course_session.html | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 9c00957..b19f094 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -133,12 +133,12 @@
             </li>
             <br>
             <li>
-                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/copy/{{ course.id }}/" data-toggle="tooltip" title="Creates a new copy and link modules of selected course to the copy" data-placement="top">
+                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/shallow/{{ course.id }}/" data-toggle="tooltip" title="Creates a new copy and link modules of selected course to the copy" data-placement="top">
                 Copy Course</a>
             </li>
             <br>
             <li>
-                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/clone/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
+                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/deep/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
                 Clone Course</a>
             </li>
         </ul>
@@ -274,7 +274,7 @@
             </li>
             <br>
             <li>
-                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/clone/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
+                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/deep/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
                 Clone Course</a>
             </li>
         </ul>
diff --git a/yaksh/templates/yaksh/design_course_session.html b/yaksh/templates/yaksh/design_course_session.html
index ee530e0..6542e3c 100644
--- a/yaksh/templates/yaksh/design_course_session.html
+++ b/yaksh/templates/yaksh/design_course_session.html
@@ -23,7 +23,7 @@
         <div class="row">
             <div class="col-md-8 col-md-offset-2 available-list">
                 <div id="fixed-available-wrapper">
-                    <p><u><b>Available Lessons and quizzes: (Add Lessons and Quizzes)</b></u></p>
+                    <p><u><b>Available Modules:</b></u></p>
                     <div id="fixed-available">
                         <table id="course-details" class="table table-bordered">
                         <tr>
@@ -64,7 +64,7 @@
             </div>
             <div class="col-md-8 col-md-offset-2">
                 <div id="fixed-added-wrapper">
-                    <p><u><b>Choosen Lessons and quizzes:</b></u></p>
+                    <p><u><b>Choosen Modules:</b></u></p>
                     <div id="fixed-added">
                         <table id="course-details" class="table table-bordered">
                         <tr>
-- 
cgit 


From 0ae21e437775b056d346311bd9f50220e5d9fb28 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 27 Feb 2018 15:41:08 +0530
Subject: Change in models.py, views.py, urls.py, test_views.py, courses.html

- Allow only deep cloning of a course
- Remove tests for shallow course clone
---
 yaksh/templates/yaksh/courses.html | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index b19f094..78d21bf 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -133,12 +133,7 @@
             </li>
             <br>
             <li>
-                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/shallow/{{ course.id }}/" data-toggle="tooltip" title="Creates a new copy and link modules of selected course to the copy" data-placement="top">
-                Copy Course</a>
-            </li>
-            <br>
-            <li>
-                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/deep/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
+                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
                 Clone Course</a>
             </li>
         </ul>
@@ -274,7 +269,7 @@
             </li>
             <br>
             <li>
-                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/deep/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
+                <a class="test" href="{{URL_ROOT}}/exam/manage/duplicate_course/{{ course.id }}/" data-toggle="tooltip" title="Creates Copy of selected Course as well as its Modules, Lessons/Quizzes" data-placement="top">
                 Clone Course</a>
             </li>
         </ul>
-- 
cgit