diff options
Diffstat (limited to 'yaksh')
| -rw-r--r-- | yaksh/static/yaksh/css/base.css | 9 | ||||
| -rw-r--r-- | yaksh/static/yaksh/css/question.css | 5 | ||||
| -rw-r--r-- | yaksh/templates/user.html | 10 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/course_detail.html | 2 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/login.html | 2 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/question.html | 8 |
6 files changed, 16 insertions, 20 deletions
diff --git a/yaksh/static/yaksh/css/base.css b/yaksh/static/yaksh/css/base.css index af3ba8b..2273263 100644 --- a/yaksh/static/yaksh/css/base.css +++ b/yaksh/static/yaksh/css/base.css @@ -221,7 +221,7 @@ body { box-shadow: 0 1px 2px rgba(0,0,0,.15); } .content .span10, -.content { +.content .span14{ min-height: 475px; } .content .span4 { @@ -495,8 +495,6 @@ h4 small { } h5 { font-size: 14px; - color:white; - text-align:left; } h6 { font-size: 13px; @@ -1796,7 +1794,6 @@ footer { -ms-transition: 0.1s linear all; -o-transition: 0.1s linear all; transition: 0.1s linear all; - margin-right:50px } .btn:hover { background-position: 0 -15px; @@ -2360,7 +2357,6 @@ height:100px; width:730px; resize:None; overflow:hidden; - } .bash{ padding:0; @@ -2370,3 +2366,6 @@ resize:none; overflow:hidden; background-color:white; } +textarea[readonly]{ +cursor: not-allowed; +} diff --git a/yaksh/static/yaksh/css/question.css b/yaksh/static/yaksh/css/question.css index 06109e5..5d5607a 100644 --- a/yaksh/static/yaksh/css/question.css +++ b/yaksh/static/yaksh/css/question.css @@ -13,11 +13,11 @@ } .td1-class { - width:300px; + width:300px; } .td2-class { - width:50px; + width:50px; padding: 5px 10px 9px; } .page-header { @@ -43,4 +43,3 @@ .lineObj{ color: grey; } - diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html index b3931cf..936601e 100644 --- a/yaksh/templates/user.html +++ b/yaksh/templates/user.html @@ -28,11 +28,11 @@ <div class="container"> <h3 class="brand"><strong>Online Test</h3></strong> <ul> - <li><a href="{{ URL_ROOT }}/exam/quizzes">Quizzes</a></li> - <li><a href="{{ URL_ROOT }}/exam/results">Results</a></li> - <li><a href="{{ URL_ROOT }}/exam/viewprofile">My Profile</a></li> - <li><a href="{{ URL_ROOT }}/exam/changepassword">Change Password</a></li> - </ul> + <li><a href="{{ URL_ROOT }}/exam/quizzes">Quizzes</a></li> + <li><a href="{{ URL_ROOT }}/exam/results">Results</a></li> + <li><a href="{{ URL_ROOT }}/exam/viewprofile">My Profile</a></li> + <li><a href="{{ URL_ROOT }}/exam/changepassword">Change Password</a></li> + </ul> <ul style="float:right;"> <li><strong><a style='cursor:pointer' onClick='location.replace("{{URL_ROOT}}/exam/complete/");'>Log out</a></strong></li> </ul> diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index dbb7b73..60834e6 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -24,7 +24,7 @@ <div class="well"> <div class="row"> <div class="span3" style="padding-top:10px"> - <input type="checkbox" name="check" value="{{ request.id }}"> <a href="#" data-toggle="tooltip" title=" Institute: {{ request.profile.institute }}
Department: {{ request.profile.department}}
Roll Number: {{ request.profile.roll_number }}"> {{ request.username }}</a><br> + <input type="checkbox" name="check" value="{{ request.id }}"> <a href="#" data-toggle="tooltip" title=" Institute: {{ request.profile.institute }}
Department: {{ request.profile.department}}
Roll Number: {{ request.profile.roll_number }}"> {{ request.username }}</a> </div> <a class="btn success" href="{{URL_ROOT}}/exam/manage/enroll/{{ course.id }}/{{ request.id }}/"> Enroll </a> <a class="btn danger" href="{{URL_ROOT}}/exam/manage/reject/{{ course.id }}/{{ request.id }}/"> Reject </a> </div> diff --git a/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html index d679748..dfeac1e 100644 --- a/yaksh/templates/yaksh/login.html +++ b/yaksh/templates/yaksh/login.html @@ -14,7 +14,7 @@ <center><table class=span1> {{ form.as_table }} </table></center> - <center><button class="btn" type="submit" style="margin-left: 50px">Login</button> <button class="btn" type="reset">Cancel</button></center> + <center><button class="btn" type="submit">Login</button> <button class="btn" type="reset">Cancel</button></center> <br><center><a href="{{URL_ROOT}}/exam/forgotpassword/">Forgot Password?</a></center><br> <center><a href="{{URL_ROOT}}/exam/register/">New User? Sign-Up </a></center> </form> diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index 1fb70b8..e542fe9 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -116,11 +116,9 @@ function call_skip(url) <div class="fill"> <div class="container"> <h3 class="brand"><strong>Online Test</h3></strong> - <ul> - <li><h5><a> Hi {{ paper.user.first_name.title}} {{ paper.user.last_name.title}} </a></h5></li> - </ul><br> - <div class=time-div id="time_left"></div> - <h5>You have {{ paper.questions_left }} question(s) left in {{ paper.question_paper.quiz.description }}</h5> + <h5><a> Hi {{ paper.user.first_name.title}} {{ paper.user.last_name.title}} </a></h5> + <div class=time-div id="time_left"></div><br> + <b style="color: white; font-size: 14px;">You have {{ paper.questions_left }} question(s) left in {{ paper.question_paper.quiz.description }}</b> </div> </div> </div> |