diff options
| -rw-r--r-- | static/website/css/main.css | 8 | ||||
| -rw-r--r-- | static/website/images/cc-logo-88x31.png | bin | 0 -> 5083 bytes | |||
| -rw-r--r-- | static/website/templates/ajax-duration.html | 10 | ||||
| -rw-r--r-- | static/website/templates/base.html | 14 | ||||
| -rw-r--r-- | website/templatetags/count_tags.py | 1 | ||||
| -rw-r--r-- | website/views.py | 2 |
6 files changed, 22 insertions, 13 deletions
diff --git a/static/website/css/main.css b/static/website/css/main.css index 9e7ed71..5587da7 100644 --- a/static/website/css/main.css +++ b/static/website/css/main.css @@ -272,6 +272,14 @@ table .title a { #footer-inner a{ color: #ffffff; } +#footer-inner .cc{ + font-size: 13px; + text-align: center; +} + +#footer-inner .cc-logo{ + padding-right: 5px; +} .field_error { border: 1px solid red; } diff --git a/static/website/images/cc-logo-88x31.png b/static/website/images/cc-logo-88x31.png Binary files differnew file mode 100644 index 0000000..f0a944e --- /dev/null +++ b/static/website/images/cc-logo-88x31.png diff --git a/static/website/templates/ajax-duration.html b/static/website/templates/ajax-duration.html index e02fcff..af253a6 100644 --- a/static/website/templates/ajax-duration.html +++ b/static/website/templates/ajax-duration.html @@ -3,7 +3,15 @@ <div id="minutes"> <option value="">min</option> {% for i in minutes|inc|get_range %} - <option value="{{ i }}-{{ i|inc }}">{{ i }}-{{ i|inc }} </option> + {% if i < 10 %} + {% if i == 9 %} + <option value="0{{ i }}-{{ i|inc }}">{{ i }}-{{ i|inc }} </option> + {% else %} + <option value="0{{ i }}-0{{ i|inc }}">{{ i }}-{{ i|inc }} </option> + {% endif %} + {% else %} + <option value="{{ i }}-{{ i|inc }}">{{ i }}-{{ i|inc }} </option> + {% endif %} {% endfor %} </div> <!-- /#minutes --> diff --git a/static/website/templates/base.html b/static/website/templates/base.html index 4a4f553..86ca41a 100644 --- a/static/website/templates/base.html +++ b/static/website/templates/base.html @@ -97,17 +97,11 @@ <div id="footer-wrapper" class="container"> <div id="footer-inner" class="col-lg-12 col-md-12 col-sm-12"> - <div class="pull-left"> - <!--[if lte IE 8]><span style="filter: FlipH; -ms-filter: "FlipH"; display: inline-block;"><![endif]--> - <span style="-moz-transform: scaleX(-1); -o-transform: scaleX(-1); -webkit-transform: scaleX(-1); transform: scaleX(-1); display: inline-block;"> - <a href="http://www.gnu.org/copyleft/" target="_blank">©</a> - </span> - <!--[if lte IE 8]></span><![endif]--> - 2013 <a href="http://spoken-tutorial.org" target="_blank">spoken-tutorial.org</a> + <div class="cc"> + <a class="cc-logo" rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/" target="_blank"> + <img src="/static/website/images/cc-logo-88x31.png" alt="CC logo"> + </a> Spoken Tutorial Forum by <a href="http://www.iitb.ac.in" target="_blank">IIT Bombay</a> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/" target="_blank">Creative Commons Attribution-ShareAlike 4.0 International License</a> </div> - <div class="pull-right"> - Developed at IIT Bombay - </div> </div> <!-- /#footer-inner --> </div> <!-- /#footer-wrapper --> </div> <!-- /#page-wrapper --> diff --git a/website/templatetags/count_tags.py b/website/templatetags/count_tags.py index 735675a..3a14d2b 100644 --- a/website/templatetags/count_tags.py +++ b/website/templatetags/count_tags.py @@ -30,7 +30,6 @@ def get_range(value, arg=''): step = int(args[1]) else: raise TypeError('get_range() takes maximum 2 arguments, {} given'.format(n)) - return range(start, limit, step) register.filter('get_range', get_range) diff --git a/website/views.py b/website/views.py index 5c772ae..df35fa7 100644 --- a/website/views.py +++ b/website/views.py @@ -203,7 +203,7 @@ def filter(request, category=None, tutorial=None, minute_range=None, second_ran if 'qid' in request.GET: context['qid'] = int(request.GET['qid']) - context['questions'] = questions.order_by('date_created').reverse() + context['questions'] = questions.order_by('category', 'tutorial', 'minute_range', 'second_range') return render(request, 'website/templates/filter.html', context) @login_required |
