diff options
Diffstat (limited to 'yaksh')
| -rw-r--r-- | yaksh/templates/yaksh/course_detail.html | 25 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/courses.html | 60 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/design_questionpaper.html | 3 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/login.html | 4 |
4 files changed, 39 insertions, 53 deletions
diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index 94f29a3..c54f153 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -4,15 +4,12 @@ {% block subtitle %} {{ course.name }} {% endblock %} -{% block css %} -<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/course.css" /> -{% endblock %} {% block script %} <script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/course.js"></script> {% endblock %} {% block content %} <div class="row"> - <div class="span6 wrap"> + <div class="col-md-6"> <center><b><u>Requests</u></b></center><br> {% if course.get_requests %} <input type="checkbox" class="checkall"/> <font size="2">Select all</font> @@ -22,7 +19,7 @@ {% for request in course.get_requests %} <div class="well"> <div class="row"> - <div class="span3" style="padding-top:10px"> + <div class="col-md-3" style="padding-top:10px"> <input type="checkbox" name="check" value="{{ request.id }}"> <a href="#" data-toggle="tooltip" title=" Full Name: {{ request.get_full_name }}
Institute: {{ request.profile.institute }}
Department: {{ request.profile.department}}
Roll Number: {{ request.profile.roll_number }}"> {{ request.username }}</a> </div> @@ -35,7 +32,7 @@ {% endif %} </form> </div> - <div class="span6 wrap"> + <div class="col-md-6"> <center><b><u>Rejected</u></b></center><br> {% if course.get_rejected %} <input type="checkbox" class="enroll"/> <font size="2">Select all</font> @@ -45,15 +42,15 @@ {% csrf_token %} <div class="well"> <div class="row"> - <div class="span4" style="padding-top:10px"> + <div class="col-md-4" style="padding-top:10px"> <input type="checkbox" name="check" value="{{ rejected.id }}"> <a href="#" data-toggle="tooltip" title=" Full Name: {{ rejected.get_full_name }}
Institute: {{ rejected.profile.institute }}
Department: {{ rejected.profile.department}}
Roll Number: {{ rejected.profile.roll_number }}"> {{ rejected.username }}</a> </div> - <a class="btn success" href="{{URL_ROOT}}/exam/manage/enroll/rejected/{{ course.id }}/{{ rejected.id }}/"> Enroll </a> + <a class="btn btn-success" href="{{URL_ROOT}}/exam/manage/enroll/rejected/{{ course.id }}/{{ rejected.id }}/"> Enroll </a> </div> </div> {% endfor %} - <button class="btn success" type="submit" name='enroll' value='enroll'>Enroll Selected</button> + <button class="btn btn-success" type="submit" name='enroll' value='enroll'>Enroll Selected</button> </div> {% endif %} </form> @@ -61,7 +58,7 @@ </div> <br> <div class="row"> - <div class="span6 offset4 wrap"> + <div class="col-md-6"> <center><b><u>Enrolled</u></b></center><br> {% if course.get_enrolled %} <input type="checkbox" class="reject"/> <font size="2">Select all</font> @@ -71,21 +68,21 @@ {% csrf_token %} <div class="well"> <div class="row"> - <div class="span4" style="padding-top:10px"> + <div class="col-md-4" style="padding-top:10px"> <input type="checkbox" name="check" value="{{ enrolled.id }}"> <a href="#" data-toggle="tooltip" title=" Full Name: {{ enrolled.get_full_name }}
Institute: {{ enrolled.profile.institute }}
Department: {{ enrolled.profile.department}}
Roll Number: {{ enrolled.profile.roll_number }}"> {{ enrolled.username }}</a> </div> - <a class="btn danger" href="{{URL_ROOT}}/exam/manage/enrolled/reject/{{ course.id }}/{{ enrolled.id }}/"> Reject </a> + <a class="btn btn-danger" href="{{URL_ROOT}}/exam/manage/enrolled/reject/{{ course.id }}/{{ enrolled.id }}/"> Reject </a> </div> </div> {% endfor %} - <button class="btn danger" type="submit" name='reject' value='reject'>Reject Selected</button> + <button class="btn btn-danger" type="submit" name='reject' value='reject'>Reject Selected</button> </div> {% endif %} </form> </div> </div> <div class="pull-right"> - <a class="btn primary" href="{{URL_ROOT}}/exam/manage/toggle_status/{{ course.id }}/">{% if course.active %}Deactivate Course {% else %} Activate Course {% endif %}</a> + <a class="btn btn-primary" href="{{URL_ROOT}}/exam/manage/toggle_status/{{ course.id }}/">{% if course.active %}Deactivate Course {% else %} Activate Course {% endif %}</a> </div> {% endblock %} diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index 24e29af..ecd3a13 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -1,15 +1,7 @@ {% extends "manage.html" %} -{% block title %} Courses {% endblock title %} - -{% block subtitle %} Courses {% endblock %} - -{% block css %} -<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/course.css" /> -{% endblock %} - +{% block pagetitle %} Courses {% endblock pagetitle %} {% block content %} - {% if not courses %} <center><h4> No new Courses created </h4></center> {% else %} @@ -18,23 +10,23 @@ {% if user != course.creator %} <h4> {{course.creator.get_full_name}} added you to this course</h4> {% endif %} - <div class="row show-grid"> - <div class="span14"> + <div class="row"> + <div class="col-md-12"> <div class="row"> - <div class="span4"> + <div class="col-md-6"> <p> <b><u>Course</u></b> {% if course.active %} - <span class="label success">Active</span> + <span class="label label-success">Active</span> {% else %} - <span class="label important">Closed</span> + <span class="label label-danger">Closed</span> {% endif %} </p> <a href="{{URL_ROOT}}/exam/manage/course_detail/{{course.id}}/">{{ course.name }}</a> </br></br> {% if user == course.creator %} <div class="row"> - <div class="span3 wrap"> + <div class="col-md-4 "> <center><b><u>Teacher(s) Added to {{ course }}</u></b></center> {% if course.get_teachers %} <div align="left"> @@ -43,13 +35,13 @@ {% for teacher in course.get_teachers %} <div class="well"> <div class="row"> - <div class="span3" style="width: auto;"> + <div class="col-md-333" style="width: auto;"> <input type="checkbox" name="remove" value="{{ teacher.id }}"> {{ teacher.get_full_name }} </div> </div> </div> {% endfor %} - <button class="btn success" type="submit">Remove Selected</button> + <button class="btn btn-danger" type="submit">Remove Selected</button> </div> {% else %} <center><b>No Teacher(s) Added</b></center> @@ -60,25 +52,23 @@ {% endif %} </div> {% if user == course.creator %} - <div class="span6"> <p><b><a href="{{URL_ROOT}}/exam/manage/searchteacher/{{course.id}}/">Add Teacher</a></b></p> - </div> {% endif %} - <div class="span4" style="text-align:left"> + <div class="col-md-2" style="text-align:left"> {% if course.get_quizzes %} <p><b><u>Quiz(zes)</u></b></p> {% for quiz in course.get_quizzes %} <a href="{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/{{quiz.id}}/">{{ quiz.description }}</a><br> {% endfor %} </div> - <div class="span4" style="text-align:left"> + <div class="col-md-4" style="text-align:left"> <p><b><u>Question Paper(s)</u></b></p> {% for quiz in course.get_quizzes %} {% if quiz.questionpaper_set.get %} <a href="{{URL_ROOT}}/exam/manage/designquestionpaper/{{ quiz.id }}/{{quiz.questionpaper_set.get.id}}/">Question Paper for {{ quiz.description }}</a><br> {% else %} - <p><b>No Question Paper </b> - <button class="btn small primary" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/quiz/designquestionpaper/{{ quiz.id }}/");'>Add</button> + <p>No Question Paper + <a href="#" onClick='location.replace("{{URL_ROOT}}/exam/manage/quiz/designquestionpaper/{{ quiz.id }}/");'>Add</a> </p> {% endif %} {% endfor %} @@ -88,7 +78,7 @@ </div> </div> <br/> - <button class="btn primary"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button> + <button class="btn btn-primary pull-right"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button> </div> </div> <br><br> @@ -98,22 +88,22 @@ {% if allotted_courses %} <center><h3> Course(s) Allotted </h3></center> {% for course in allotted_courses %} - <div class="row show-grid"> - <div class="span14"> + <div class="row"> + <div class="col-md-12"> <div class="row"> - <div class="span6"> + <div class="col-md-6"> <p> <b><u>Course</u></b> {% if course.active %} - <span class="label success">Active</span> + <span class="label label-success">Active</span> {% else %} - <span class="label important">Closed</span> + <span class="label label-danger">Closed</span> {% endif %} </p> <a href="{{URL_ROOT}}/exam/manage/course_detail/{{course.id}}/">{{ course.name }}</a> </br></br> <div class="row"> - <div class="span6 wrap"> + <div class="col-md-4 wrap"> <center><b><u> Course Creator</u></b></center> {{course.creator}} <center><b><u>Teacher(s) Added to {{ course }}</u></b></center> @@ -124,13 +114,13 @@ {% for teacher in course.get_teachers %} <div class="well"> <div class="row"> - <div class="span3" style="width: auto;"> + <div class="col-md-3" style="width: auto;"> <input type="checkbox" name="remove" value="{{ teacher.id }}"> {{ teacher.get_full_name }} </div> </div> </div> {% endfor %} - <button class="btn success" type="submit">Remove Selected</button> + <button class="btn btn-danger" type="submit">Remove Selected</button> </div> {% else %} <center><b>No Teacher(s) Added</b></center> @@ -139,10 +129,10 @@ </div> </div> </div> - <div class="span6"> + <div class="col-md-4"> <p><b><a href="{{URL_ROOT}}/exam/manage/searchteacher/{{course.id}}/">Add Teacher</a></b></p> </div> - <div class="span6"> + <div class="col-md-4"> <p><b><u>Quiz(zes)</u></b></p> {% if course.get_quizzes %} {% for quiz in course.get_quizzes %} @@ -154,7 +144,7 @@ </div> </div> <br/> - <button class="btn primary"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button> + <button class="btn btn-primary pull-right"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button> </div> </div> <br><br> diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html index 387402a..4418c27 100644 --- a/yaksh/templates/yaksh/design_questionpaper.html +++ b/yaksh/templates/yaksh/design_questionpaper.html @@ -5,7 +5,6 @@ {% block subtitle %} Design Question Paper {% endblock %} {% block css %} - <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/bootstrap.css" /> <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/question_paper_creation.css" /> <style> select @@ -29,7 +28,7 @@ select {% csrf_token %} <input type=hidden name="is_active" id="is_active" value="{{ state }}"> <center><b>Manual mode to design the {{lang}} Question Paper</center><br> - <ul class="tabs" data-tabs="tabs"> + <ul class="nav nav-tabs tabs" data-tabs="tabs"> <li class="active" id="fixed-tab"> <a href="#fixed-questions" id="fixed"> STEP 1<br> diff --git a/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html index 8d5e682..e5cfcc4 100644 --- a/yaksh/templates/yaksh/login.html +++ b/yaksh/templates/yaksh/login.html @@ -15,10 +15,10 @@ <a href="{{URL_ROOT}}/exam/register/">New User? Sign-Up </a> <h3> Login with </h3> <a class="btn btn-social-icon btn-google" href="{% url 'social:begin' 'google-oauth2' %}"> - <span class="fa fa-google" style="background-color: #dd4b39;" ></span> + <span class="fa fa-google" style="font-size:32px;color:red" ></span> </a> <a class="btn btn-social-icon btn-facebook" href="{% url 'social:begin' 'facebook' %}"> - <span class="fa fa-facebook" style="background-color: #3b5998;" ></span> + <span class="fa fa-facebook-square" style="font-size:32px"></span> </a> </form> |