summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--yaksh/templates/yaksh/course_detail_options.html5
-rw-r--r--yaksh/templates/yaksh/course_students.html2
-rw-r--r--yaksh/templates/yaksh/courses.html63
-rw-r--r--yaksh/templates/yaksh/quizzes_user.html4
-rw-r--r--yaksh/test_views.py4
-rw-r--r--yaksh/views.py9
6 files changed, 62 insertions, 25 deletions
diff --git a/yaksh/templates/yaksh/course_detail_options.html b/yaksh/templates/yaksh/course_detail_options.html
index 43422ed..6f9a711 100644
--- a/yaksh/templates/yaksh/course_detail_options.html
+++ b/yaksh/templates/yaksh/course_detail_options.html
@@ -20,11 +20,6 @@
</a>
</li>
<li class="nav-item">
- <a class="nav-link list-group-item" href="{% url 'yaksh:duplicate_course' course.id %}" data-toggle="tooltip" title="Creates copy of this course and all its contents" data-placement="top">
- Clone Course
- </a>
- </li>
- <li class="nav-item">
<a class="nav-link list-group-item {% if is_design_course %} active {% endif %}" href="{% url 'yaksh:design_course' course.id %}" title="Add modules to this course" data-placement="top" data-toggle="tooltip">
Design Course
</a>
diff --git a/yaksh/templates/yaksh/course_students.html b/yaksh/templates/yaksh/course_students.html
index fe64ce4..2052a69 100644
--- a/yaksh/templates/yaksh/course_students.html
+++ b/yaksh/templates/yaksh/course_students.html
@@ -52,7 +52,7 @@
</a>
</div>
</div>
-<div id="requested" class="collapse hide" data-parent="#accordion-request">
+<div id="requested" class="collapse show" data-parent="#accordion-request">
{% if requested %}
<br>
<input type="checkbox" class="checkall"/>&nbsp;
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 6a98ee3..0eb9a38 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -144,23 +144,45 @@
</div>
<hr>
<div class="row">
- <div class="col-md-4">
+ <div class="col-md-5">
<a href="{% url 'yaksh:edit_course' course.id %}" class="btn btn-info">
<i class="fa fa-edit"></i>
Edit Course
</a>
</div>
- <div class="col-md-4">
+ <div class="col-md-5">
<a href="{% url 'yaksh:course_detail' course.id %}" class="btn btn-primary">
<i class="fa fa-tasks"></i>
Manage Course
</a>
</div>
- <div class="col-md-4">
- <a href="{% url 'yaksh:download_course_csv' course.id %}" class="btn btn-secondary">
+ </div>
+ <br>
+ <div class="row">
+ <div class="col-md-5">
+ <a href="{% url 'yaksh:duplicate_course' course.id %}" class="btn btn-secondary">
+ <i class="fa fa-clone"></i>
+ Clone Course
+ </a>
+ </div>
+ <div class="col-md-5">
+ <div class="btn-group" role="group" aria-label="Button group with nested dropdown">
+ <button type="button" class="btn btn-secondary">
<i class="fa fa-download"></i>
- Download CSV
+ Download
+ </button>
+ <div class="btn-group" role="group">
+ <button id="btnGroupDrop1" type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
+ <div class="dropdown-menu" aria-labelledby="btnGroupDrop1" style="">
+ <a class="dropdown-item" href="{% url 'yaksh:download_course_csv' course.id %}">
+ CSV
+ </a>
+ <a class="dropdown-item" href="{% url 'yaksh:download_course' course.id %}">
+ Course
</a>
+ </div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -224,22 +246,41 @@
</div>
<hr>
<div class="row">
- <div class="col-md-4">
+ <div class="col-md-3">
<a href="{% url 'yaksh:edit_course' course.id %}" class="btn btn-info">
<i class="fa fa-edit"></i>
Edit Course
</a>
</div>
- <div class="col-md-4">
+ <div class="col-md-3">
<a href="{% url 'yaksh:course_detail' course.id %}" class="btn btn-primary">
<i class="fa fa-tasks"></i>
Manage Course
</a>
</div>
- <div class="col-md-4">
- <a href="{% url 'yaksh:download_course_csv' course.id %}" class="btn btn-secondary">
- <i class="fa fa-download"></i>
- Download CSV
+ <div class="col-md-3">
+ <div class="btn-group" role="group" aria-label="Button group with nested dropdown">
+ <button type="button" class="btn btn-secondary">
+ <i class="fa fa-download"></i>
+ Download
+ </button>
+ <div class="btn-group" role="group">
+ <button id="btnGroupDrop1" type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
+ <div class="dropdown-menu" aria-labelledby="btnGroupDrop1" style="">
+ <a class="dropdown-item" href="{% url 'yaksh:download_course_csv' course.id %}">
+ CSV
+ </a>
+ <a class="dropdown-item" href="{% url 'yaksh:download_course' course.id %}">
+ Course
+ </a>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-3">
+ <a href="{% url 'yaksh:duplicate_course' course.id %}" class="btn btn-secondary">
+ <i class="fa fa-clone"></i>
+ Clone Course
</a>
</div>
</div>
diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index 7771954..a9f5a43 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -8,7 +8,7 @@
{% block main %}
<div class="container">
<center>
- <h2>All Courses</h2>
+ <h2>{{title}}</h2>
</center>
<hr>
<div class="row justify-content-center">
@@ -25,7 +25,7 @@
</div>
</form>
</div>
- {% if title == "Search" %}
+ {% if "Search" in title %}
<div class="col-md-4">
<a href="{% url 'yaksh:quizlist_user' %}" class="btn btn-primary">
<i class="fa fa-times"></i>&nbsp;Clear search
diff --git a/yaksh/test_views.py b/yaksh/test_views.py
index 569b468..58c6633 100644
--- a/yaksh/test_views.py
+++ b/yaksh/test_views.py
@@ -448,7 +448,7 @@ class TestStudentDashboard(TestCase):
}
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, "yaksh/quizzes_user.html")
- self.assertEqual(response.context['title'], 'Search')
+ self.assertEqual(response.context['title'], 'Search Results')
self.assertEqual(response.context['courses'][0], courses_in_context)
@@ -2121,7 +2121,7 @@ class TestCourses(TestCase):
follow=True
)
err_msg = "You do not have permissions"
- self.assertEqual(response.status_code, 404)
+ self.assertEqual(response.status_code, 200)
messages = [m.message for m in get_messages(response.wsgi_request)]
self.assertIn(err_msg, messages[0])
diff --git a/yaksh/views.py b/yaksh/views.py
index 59efc59..0ae4a14 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -174,7 +174,7 @@ def quizlist_user(request, enrolled=None, msg=None):
course_code = request.POST.get('course_code')
hidden_courses = Course.objects.get_hidden_courses(code=course_code)
courses = hidden_courses
- title = 'Search'
+ title = 'Search Results'
else:
courses = list(Course.objects.filter(
active=True, is_trial=False,
@@ -2425,8 +2425,9 @@ def duplicate_course(request, course_id):
duplicate_course = course.create_duplicate_course(user)
msg = dedent(
'''\
- Course duplication successful with the name {0} , please check
- the courses page.'''.format(duplicate_course.name)
+ Course duplication successful with the name {0}'''.format(
+ duplicate_course.name
+ )
)
messages.success(request, msg)
else:
@@ -2436,7 +2437,7 @@ def duplicate_course(request, course_id):
your instructor/administrator.'''.format(course.name)
)
messages.warning(request, msg)
- return my_redirect(reverse('yaksh:course_detail', args=[course_id]))
+ return my_redirect(reverse('yaksh:courses'))
@login_required
generated by cgit (git 2.34.1) at 2024-12-21 14:46:09 +0000