summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormaheshgudi2016-09-16 14:41:07 +0530
committermaheshgudi2016-09-16 14:41:07 +0530
commitaa09318a4332575bfb309c430a9db88cd2b55537 (patch)
treed062677b9733c0f2221f70952e4b7b0681eca36f
parentf84e689e4fc71aebf32facbcc2aef3955295f95d (diff)
downloadonline_test-aa09318a4332575bfb309c430a9db88cd2b55537.tar.gz
online_test-aa09318a4332575bfb309c430a9db88cd2b55537.tar.bz2
online_test-aa09318a4332575bfb309c430a9db88cd2b55537.zip
consistent indentation of 4 spaces in view_answerpaper.css and minor changes in grade_user.html
-rw-r--r--yaksh/static/yaksh/css/view_answerpaper.css72
-rw-r--r--yaksh/templates/yaksh/grade_user.html14
2 files changed, 44 insertions, 42 deletions
diff --git a/yaksh/static/yaksh/css/view_answerpaper.css b/yaksh/static/yaksh/css/view_answerpaper.css
index fdcb1c6..fad081d 100644
--- a/yaksh/static/yaksh/css/view_answerpaper.css
+++ b/yaksh/static/yaksh/css/view_answerpaper.css
@@ -1,76 +1,74 @@
.panel {
- margin-bottom: 20px;
- background-color: #fff;
- border: 1px solid transparent;
- border-radius: 4px;
- -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+ margin-bottom: 20px;
+ background-color: #fff;
+ border: 1px solid transparent;
+ border-radius: 4px;
+ -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
}
.panel-body {
- padding: 15px;
+ padding: 15px;
}
.panel-heading {
- padding: 10px 15px;
- border-bottom: 1px solid transparent;
- border-top-left-radius: 3px;
- border-top-right-radius: 3px;
+ padding: 10px 15px;
+ border-bottom: 1px solid transparent;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
}
- .panel-info {
- border-color: #bce8f1;
+.panel-info {
+ border-color: #bce8f1;
}
.panel-info > .panel-heading {
- color: #31708f;
- background-color: #d9edf7;
- border-color: #bce8f1;
+ color: #31708f;
+ background-color: #d9edf7;
+ border-color: #bce8f1;
}
.panel-danger {
- border-color: #ebccd1;
+ border-color: #ebccd1;
}
.panel-danger > .panel-heading {
- color: #a94442;
- background-color: #f2dede;
- border-color: #ebccd1;
+ color: #a94442;
+ background-color: #f2dede;
+ border-color: #ebccd1;
}
.panel-danger > .panel-body > pre > code {
- background-color:transparent;
- color: red;
+ background-color:transparent;
+ color: red;
}
.panel-success {
- border-color: #d6e9c6;
+ border-color: #d6e9c6;
}
.panel-success > .panel-heading {
- color: #3c763d;
- background-color: #dff0d8;
- border-color: #d6e9c6;
+ color: #3c763d;
+ background-color: #dff0d8;
+ border-color: #d6e9c6;
}
.panel-success > .panel-body > pre > code {
- background-color:transparent;
- color: green;
+ background-color:transparent;
+ color: green;
}
.marks{
- float:right;
+ float:right;
}
mark{
- background-color: #dff0d8;
+ background-color: #dff0d8;
}
code{
- background-color: transparent;
+ background-color: transparent;
}
pre{
- background-color: transparent;
+ background-color: transparent;
}
-
/*for grade user*/
textarea
{
-width : 100%;
-height : 15%;
+ width : 100%;
+ height : 15%;
}
#attempt {
width: 157px;
position: relative; left:20%;
}
#myContent {
-margin: 5px 10px;
-
-} \ No newline at end of file
+ margin: 5px 10px;
+}
diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 7b79373..0e29512 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -5,7 +5,9 @@
{% block subtitle %} Grade User {% endblock %}
{% block css %}
- <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/view_answerpaper.css" type="text/css" />
+ <link rel="stylesheet"
+ href="{{ URL_ROOT }}/static/yaksh/css/view_answerpaper.css"
+ type="text/css" />
{% endblock %}
{% block manage %}
@@ -24,8 +26,9 @@
{% if course.get_quizzes %}
<td>
{% for quiz in course.get_quizzes %}
- <li><a href = "{{URL_ROOT}}/exam/manage/gradeuser/{{quiz.id}}">{{quiz.description}}</a></li>
-
+ <li><a href = "{{URL_ROOT}}/exam/manage/gradeuser/{{quiz.id}}">
+ {{quiz.description}}
+ </a></li>
{% endfor %}
</td>
{% else %}
@@ -40,7 +43,8 @@
{%if users %}
<div id = "student" class="span2">
{% for user in users %}
- <p><a href = "{{URL_ROOT}}/exam/manage/gradeuser/{{quiz_id}}/{{user.user__id}}">{{user.user__first_name}} {{user.user__last_name}}</a></p>
+ <p><a href = "{{URL_ROOT}}/exam/manage/gradeuser/{{quiz_id}}/{{user.user__id}}">
+ {{user.user__first_name}} {{user.user__last_name}}</a></p>
{% endfor %}
</div>
{% endif %}
@@ -177,7 +181,7 @@ Status : <b style="color: green;"> Passed </b><br/>
name="q{{ question.id }}_marks" size="4"
value="{{ answer.marks }}"><br><br>
{% endwith %}
- <hr>
+ <hr/>
{% endfor %} {# for question, answers ... #}
<h3>Teacher comments: </h3>