diff options
Diffstat (limited to 'yaksh')
| -rw-r--r-- | yaksh/static/yaksh/js/bootstrap-tabs.js | 80 | ||||
| -rw-r--r-- | yaksh/templates/base.html | 1 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/design_course_session.html | 2 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/design_questionpaper.html | 6 |
4 files changed, 6 insertions, 83 deletions
diff --git a/yaksh/static/yaksh/js/bootstrap-tabs.js b/yaksh/static/yaksh/js/bootstrap-tabs.js deleted file mode 100644 index a3c7ee1..0000000 --- a/yaksh/static/yaksh/js/bootstrap-tabs.js +++ /dev/null @@ -1,80 +0,0 @@ -/* ======================================================== - * bootstrap-tabs.js v1.4.0 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2011 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function( $ ){ - - "use strict" - - function activate ( element, container ) { - container - .find('> .active') - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - } - - function tab( e ) { - var $this = $(this) - , $ul = $this.closest('ul:not(.dropdown-menu)') - , href = $this.attr('href') - , previous - , $href - - if ( /^#\w+/.test(href) ) { - e.preventDefault() - - if ( $this.parent('li').hasClass('active') ) { - return - } - - previous = $ul.find('.active a').last()[0] - $href = $(href) - - activate($this.parent('li'), $ul) - activate($href, $href.parent()) - - $this.trigger({ - type: 'change' - , relatedTarget: previous - }) - } - } - - - /* TABS/PILLS PLUGIN DEFINITION - * ============================ */ - - $.fn.tabs = $.fn.pills = function ( selector ) { - return this.each(function () { - $(this).delegate(selector || '.tabs li > a, .pills > li > a', 'click', tab) - }) - } - - $(document).ready(function () { - $('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a') - }) - -}( window.jQuery || window.ender ); diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html index e5d1a56..5fd53a1 100644 --- a/yaksh/templates/base.html +++ b/yaksh/templates/base.html @@ -62,6 +62,7 @@ <div class="header"> <h3><center>{% block pagetitle %}{% endblock pagetitle %}</center></h3> </div> + <h4><center>{% block subtitle %}{% endblock %}</center></h4> {% block content %} {% endblock %} </div> diff --git a/yaksh/templates/yaksh/design_course_session.html b/yaksh/templates/yaksh/design_course_session.html index c2f4b2b..2deb95f 100644 --- a/yaksh/templates/yaksh/design_course_session.html +++ b/yaksh/templates/yaksh/design_course_session.html @@ -18,6 +18,8 @@ <a href="{{URL_ROOT}}/exam/manage/courses/" class="btn btn-primary"> Back to Courses </a> +<br/> +<br/> <form action="{{URL_ROOT}}/exam/manage/courses/designcourse/{{course_id}}/" method="POST" id="design_course_form"> {% csrf_token %} <div class="tab-pane active" id="available-lesson-quiz"> diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html index 7745053..d81d890 100644 --- a/yaksh/templates/yaksh/design_questionpaper.html +++ b/yaksh/templates/yaksh/design_questionpaper.html @@ -15,9 +15,9 @@ select {% endblock %} {% block script %} - <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.9.1.min.js"></script> + <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-3.3.1.min.js"></script> + <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-ui.js"></script> <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap.min.js"></script> - <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-tabs.js"></script> <script src="{{ URL_ROOT }}/static/yaksh/js/question_paper_creation.js"></script> {% endblock %} @@ -148,7 +148,7 @@ select </div> <!-- /.row --> <br> <div class="pull-right"> - <a class="btn btn-primary" id="fixed-next">Next ></a> + <a class="btn btn-info" id="fixed-next">Next ></a> </div> </div> <!-- /#fixed-questions --> |