summaryrefslogtreecommitdiff
path: root/yaksh/templates
diff options
context:
space:
mode:
authoradityacp2020-09-15 13:50:24 +0530
committeradityacp2020-09-15 13:50:24 +0530
commita9a8f286767468a55709215fbe584157f32a7300 (patch)
tree7411a6b6da257a3eb692c55e0f099c093c374cc4 /yaksh/templates
parent98908b86a94da4a2552564e057457c48b46d4ac3 (diff)
downloadonline_test-a9a8f286767468a55709215fbe584157f32a7300.tar.gz
online_test-a9a8f286767468a55709215fbe584157f32a7300.tar.bz2
online_test-a9a8f286767468a55709215fbe584157f32a7300.zip
Change multiple sections
- Show lesson topic description as per the video time - Fix description preview for module and lesson - Order table of contents by time
Diffstat (limited to 'yaksh/templates')
-rw-r--r--yaksh/templates/yaksh/add_lesson.html12
-rw-r--r--yaksh/templates/yaksh/show_lesson_statistics.html2
-rw-r--r--yaksh/templates/yaksh/show_video.html55
3 files changed, 41 insertions, 28 deletions
diff --git a/yaksh/templates/yaksh/add_lesson.html b/yaksh/templates/yaksh/add_lesson.html
index 6018e54..8d889f3 100644
--- a/yaksh/templates/yaksh/add_lesson.html
+++ b/yaksh/templates/yaksh/add_lesson.html
@@ -68,6 +68,16 @@
{% endif %}
{{lesson_form.name}}
<br>
+ <div class="card" id="preview_text_div">
+ <div class="card-header">
+ <center>
+ <h3>Description Preview</h3>
+ </center>
+ </div>
+ <div class="card-body" id="description_body" style="max-height: 400px; overflow-y: auto;">
+ </div>
+ </div>
+ <br>
{{lesson_form.description}}
<br>
Active:&nbsp;{{lesson_form.active}}
@@ -138,7 +148,7 @@
</form>
</div>
<br><br>
- <div class="col">
+ <div class="col-md-5">
<br>
<div class="card">
<div class="card-header">
diff --git a/yaksh/templates/yaksh/show_lesson_statistics.html b/yaksh/templates/yaksh/show_lesson_statistics.html
index f3e40b4..e7c99d8 100644
--- a/yaksh/templates/yaksh/show_lesson_statistics.html
+++ b/yaksh/templates/yaksh/show_lesson_statistics.html
@@ -136,7 +136,7 @@
</span>
{% else %}
<span class="badge badge-secondary">
- Not correct
+ Incorrect
</span>
{% endif %}
</td>
diff --git a/yaksh/templates/yaksh/show_video.html b/yaksh/templates/yaksh/show_video.html
index f6e247c..9e9d0b4 100644
--- a/yaksh/templates/yaksh/show_video.html
+++ b/yaksh/templates/yaksh/show_video.html
@@ -179,6 +179,7 @@
{{content.time}}
</td>
<input type="hidden" id="toc_{{content.id}}" value="{% url 'yaksh:get_marker_quiz' course.id content.id %}" data-content="{{content.content}}"/>
+ <input type="hidden" id="toc_desc_{{content.id}}" value="{{content.content_object.description|safe}}" data-content="{{content.content}}"/>
</tr>
{% endwith %}
{% empty %}
@@ -192,33 +193,35 @@
</div>
</div>
<div class="col-md-8">
- <div class="card-body">
- <a href="{% url 'yaksh:next_unit' course.id learning_module.id current_unit.id %}" class="btn btn-info btn-lg" >
- Next&nbsp;<i class="fa fa-step-forward"></i>
- </a>
- <hr>
- <h3><strong>Lesson Description</strong></h3>
- <hr>
- <div class="col" style="width: 100%">
- {{lesson.html_data|safe}}
- </div>
- <div class="col-md-7">
- {% with lesson.get_files as lesson_files %}
- {% if lesson_files %}
- <div class="card">
- <div class="card-header">
- Files for this lesson
- </div>
- <div class="card-body">
- {% for f in lesson_files %}
- <a href="{{f.file.url}}" class="list-group-item">
- {{forloop.counter}}.{{ f.file.name|file_title }}
- </a>
- {% endfor %}
+ <a href="{% url 'yaksh:next_unit' course.id learning_module.id current_unit.id %}" class="btn btn-info btn-lg" >
+ Next&nbsp;<i class="fa fa-step-forward"></i>
+ </a>
+ <br><br>
+ <div class="card">
+ <div class="card-header"><h3><strong>Lesson Description</strong></h3></div>
+ <div class="card-body">
+ <div class="col" style="width: 100%">
+ {{lesson.html_data|safe}}
+ </div>
+ <div class="card-body" id="topic-description"></div>
+ <div class="col-md-7">
+ {% with lesson.get_files as lesson_files %}
+ {% if lesson_files %}
+ <div class="card">
+ <div class="card-header">
+ Files for this lesson
+ </div>
+ <div class="card-body">
+ {% for f in lesson_files %}
+ <a href="{{f.file.url}}" class="list-group-item">
+ {{forloop.counter}}.{{ f.file.name|file_title }}
+ </a>
+ {% endfor %}
+ </div>
</div>
- </div>
- {% endif %}
- {% endwith %}
+ {% endif %}
+ {% endwith %}
+ </div>
</div>
</div>
</div>