diff options
Diffstat (limited to 'yaksh/templates')
-rw-r--r-- | yaksh/templates/yaksh/course_detail_options.html | 5 | ||||
-rw-r--r-- | yaksh/templates/yaksh/course_students.html | 2 | ||||
-rw-r--r-- | yaksh/templates/yaksh/courses.html | 63 | ||||
-rw-r--r-- | yaksh/templates/yaksh/quizzes_user.html | 4 |
4 files changed, 55 insertions, 19 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"/> 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> Clear search |