diff options
| author | ankitjavalkar | 2019-01-11 16:51:05 +0530 |
|---|---|---|
| committer | GitHub | 2019-01-11 16:51:05 +0530 |
| commit | aac9ac25844da39a498ad45d29c4d2c4313a6435 (patch) | |
| tree | 017acc364ef0a78885fddb7ba5d0a9515e79067f | |
| parent | 75c5ed2569715610dd0d4864659501d101eb640d (diff) | |
| parent | 53b9e2ae9b81fbd6a5196f6135bcc824f8307c1c (diff) | |
| download | online_test-aac9ac25844da39a498ad45d29c4d2c4313a6435.tar.gz online_test-aac9ac25844da39a498ad45d29c4d2c4313a6435.tar.bz2 online_test-aac9ac25844da39a498ad45d29c4d2c4313a6435.zip | |
Merge pull request #542 from CruiseDevice/unit-check-mark
[UI] Fixes check marks rendering incorrectly on Unit Completion.
| -rw-r--r-- | requirements/requirements-common.txt | 1 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/show_video.html | 63 |
3 files changed, 32 insertions, 33 deletions
diff --git a/requirements/requirements-common.txt b/requirements/requirements-common.txt index 484111e..e7e333c 100644 --- a/requirements/requirements-common.txt +++ b/requirements/requirements-common.txt @@ -3,6 +3,7 @@ invoke==0.21.0 django==1.10 django-taggit==0.18.1 pytz==2016.4 +requests-oauthlib>=0.6.1 python-social-auth==0.2.19 selenium==2.53.6 coverage @@ -19,6 +19,7 @@ install_requires = [ 'django==1.10', 'django-taggit==0.18.1', 'pytz==2016.4', + 'requests-oauthlib>=0.6.1', 'python-social-auth==0.2.19', 'tornado', 'psutil', diff --git a/yaksh/templates/yaksh/show_video.html b/yaksh/templates/yaksh/show_video.html index 575c296..9f92bc3 100644 --- a/yaksh/templates/yaksh/show_video.html +++ b/yaksh/templates/yaksh/show_video.html @@ -25,39 +25,36 @@ {{module}} </a> {% for unit in module.get_learning_units %} - <span id="menudrop"> - {% if unit.type == "quiz" %} - <a href="{{ URL_ROOT }}/exam/start/{{unit.quiz.questionpaper_set.get.id}}/{{module.id}}/{{course.id}}" class="list-group-item" data-parent="#menu1"> - {% if status == "completed" %} - <i class="fa fa-check-square yakshgreen"></i> - {% else %} - <i class="fa fa-square-o"></i> - {% endif %} - {% get_unit_status course module unit user as status %} - {{ unit.quiz.description }} - {% if unit.id == current_unit.id %} - <i class="fa fa-thumb-tack yakshred" data-toggle="tooltip" title="Currently on"> - </i> - {% endif %} - </a> - {% else %} - <a href="{{ URL_ROOT }}/exam/show_lesson/{{unit.lesson.id}}/{{module.id}}/{{course.id}}" class="list-group-item" data-parent="#menu1"> - {% if status == "completed" %} - <i class="fa fa-check-square yakshgreen"></i> - {% else %} - <i class="fa fa-square-o"></i> - {% endif %} - {% get_unit_status course module unit user as status %} - - - {{ unit.lesson.name }} - {% if unit.id == current_unit.id %} - <i class="fa fa-thumb-tack yakshred" data-toggle="tooltip" title="Currently on"> - </i> - {% endif %} - </a> - {% endif %} - </span> + {% get_unit_status course module unit user as status %} + <span id="menudrop"> + {% if unit.type == "quiz" %} + <a href="{{ URL_ROOT }}/exam/start/{{unit.quiz.questionpaper_set.get.id}}/{{module.id}}/{{course.id}}" class="list-group-item" data-parent="#menu1"> + {% if status == "completed" %} + <i class="fa fa-check-square yakshgreen"></i> + {% else %} + <i class="fa fa-square-o"></i> + {% endif %} + {{ unit.quiz.description }} + {% if unit.id == current_unit.id %} + <i class="fa fa-thumb-tack yakshred" data-toggle="tooltip" title="Currently on"> + </i> + {% endif %} + </a> + {% else %} + <a href="{{ URL_ROOT }}/exam/show_lesson/{{unit.lesson.id}}/{{module.id}}/{{course.id}}" class="list-group-item" data-parent="#menu1"> + {% if status == "completed" %} + <i class="fa fa-check-square yakshgreen"></i> + {% else %} + <i class="fa fa-square-o"></i> + {% endif %} + {{ unit.lesson.name }} + {% if unit.id == current_unit.id %} + <i class="fa fa-thumb-tack yakshred" data-toggle="tooltip" title="Currently on"> + </i> + {% endif %} + </a> + {% endif %} + </span> {% endfor %} </div> |