From 85960d2623a024381018f87369879f9f82a6d0ff Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Tue, 27 Nov 2018 18:15:06 +0530
Subject: Fix #530
- Fix Create Question Paper CSS and JS.
---
yaksh/static/yaksh/css/question_paper_creation.css | 6 +-
yaksh/static/yaksh/js/bootstrap-tabs.js | 80 ++++++++++++++++++++++
yaksh/templates/yaksh/design_questionpaper.html | 18 ++---
3 files changed, 93 insertions(+), 11 deletions(-)
create mode 100644 yaksh/static/yaksh/js/bootstrap-tabs.js
(limited to 'yaksh')
diff --git a/yaksh/static/yaksh/css/question_paper_creation.css b/yaksh/static/yaksh/css/question_paper_creation.css
index 588b65c..6a132c6 100644
--- a/yaksh/static/yaksh/css/question_paper_creation.css
+++ b/yaksh/static/yaksh/css/question_paper_creation.css
@@ -6,20 +6,20 @@ body {
color: #404040;
}
.tabs li {
+ padding-top: 1em;
+ padding-bottom: 1em;
text-align: center;
width: 33%;
}
.tabs li:last-child {
width: 34%;
}
-.tabs > .active > a {
+.tabs > .active{
border: 0;
background: lightgreen;
}
.tabs > .active > a:hover {
border: 0;
- background: green;
- color: #ffffff;
}
.tabs li a {
border-radius: 0;
diff --git a/yaksh/static/yaksh/js/bootstrap-tabs.js b/yaksh/static/yaksh/js/bootstrap-tabs.js
new file mode 100644
index 0000000..a3c7ee1
--- /dev/null
+++ b/yaksh/static/yaksh/js/bootstrap-tabs.js
@@ -0,0 +1,80 @@
+/* ========================================================
+ * 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/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index 791ac51..b9596d2 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -16,7 +16,7 @@ select
{% block script %}
-
+
{% endblock %}
@@ -36,19 +36,19 @@ select
Manual mode to design the {{lang}} Question Paper
-
-
+
STEP 1
Add Fixed Questions
-
-
+
STEP 2
Add Random Questions
-
-
+
STEP 3
Finish
@@ -60,7 +60,9 @@ select
-
Please select Question type and Marks
+
+
Please select Question type and Marks
+
{{ filter_form.question_type }}
@@ -71,12 +73,12 @@ select
{% csrf_token %}
-
Or
+
Or
-
Search using Tags:
+
Search using Tags:
+
Search Questions:
--
cgit
From f6d6cccbfb8f148dfb25193acb8d12f8d8ba87c9 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Mon, 14 Jan 2019 12:48:44 +0530
Subject: Remove empty class from tag
---
yaksh/templates/yaksh/design_questionpaper.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'yaksh')
diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index 40d2ab6..7745053 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -36,7 +36,7 @@ select
Manual mode to design the {{lang}} Question Paper
- -
+
-
STEP 1
Add Fixed Questions
--
cgit
From 511af2cca26eee698ba044ce1887f49b4df16b99 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Mon, 28 Jan 2019 11:59:34 +0530
Subject: Multiple Frontend changes: - Remove bootstrap-tabs.js - Minor UI
changes in some templates
---
yaksh/static/yaksh/js/bootstrap-tabs.js | 80 ------------------------
yaksh/templates/base.html | 1 +
yaksh/templates/yaksh/design_course_session.html | 2 +
yaksh/templates/yaksh/design_questionpaper.html | 6 +-
4 files changed, 6 insertions(+), 83 deletions(-)
delete mode 100644 yaksh/static/yaksh/js/bootstrap-tabs.js
(limited to 'yaksh')
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 @@
+ {% block subtitle %}{% endblock %}
{% block content %}
{% endblock %}
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 @@
Back to Courses
+
+
--
cgit
From 31f30afa47f727741279b0b26531ff3cdefd0bbf Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Mon, 28 Jan 2019 12:30:57 +0530
Subject: Resolve comments
---
yaksh/static/yaksh/css/question_paper_creation.css | 4 ----
yaksh/templates/yaksh/design_questionpaper.html | 2 --
2 files changed, 6 deletions(-)
(limited to 'yaksh')
diff --git a/yaksh/static/yaksh/css/question_paper_creation.css b/yaksh/static/yaksh/css/question_paper_creation.css
index 6cf0887..ff4bf32 100644
--- a/yaksh/static/yaksh/css/question_paper_creation.css
+++ b/yaksh/static/yaksh/css/question_paper_creation.css
@@ -6,10 +6,6 @@ body {
color: #404040;
}
.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
- -moz-border-bottom-colors: none;
- -moz-border-left-colors: none;
- -moz-border-right-colors: none;
- -moz-border-top-colors: none;
background-color: #FFFFFF;
border-color: #DDDDDD #DDDDDD rgba(0, 0, 0, 0);
border-image: none;
diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index d81d890..bf1f23e 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -251,8 +251,6 @@ select
$('#fixed').tab('show');
{% elif state == "random" %}
$("#random").tab('show');
- $('li').removeClass('active');
- $(this).addClass('active');
{% elif state == "finish" %}
$('#finished').tab('show');
{% endif %}
--
cgit