Skip to content

Commit

Permalink
Feedback when answer is wrong (refs #20)
Browse files Browse the repository at this point in the history
  • Loading branch information
GustavoVS committed Aug 23, 2017
1 parent d7094a6 commit 91683b2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<i class="fa fa-frown-o"></i> <span translate>Sua resposta está <strong>incompleta</strong>.</span>
</div>

<div ng-show="answer.given.length > 0 && (!changed && answer.correct === false && !answer.incomplete)" class="alert alert-danger">
<div ng-show="!changed && answer.correct === false && !answer.incomplete" class="alert alert-danger">
<i class="fa fa-frown-o"></i> <span translate>Sua resposta está <strong>incorreta</strong>. Reveja o conteúdo com mais atenção e tente novamente.</span>
</div>
<div ng-show="!changed && answer.correct === false && answer.negative_feedback" class="alert alert-danger">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ <h1 class="bottom top">Imagem</h1>
<br>
<button class="btn btn-danger btn-lg uppercase"
ng-click="thumbfile=null; addThumb=!currentActivity.image_url">Cancelar</button>

<button class="btn btn-success btn-lg uppercase"
ng-click="addThumb=(thumbfile===null); saveThumb()">Adicionar</button>
<button class="btn btn-success btn-lg uppercase"
ng-click="addThumb=(thumbfile===null); save_activity_image()">Adicionar</button>
</p>
Expand Down
8 changes: 2 additions & 6 deletions themes/default/templates/course.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,12 @@
<!-- ACTIONS -->
<div class="actions-menu" fixed-bar>
<div class="container">
<div class="actions-buttons align-left">
<!-- LEFT BUTTON GROUP -->
<button class="btn btn-success" ng-click="saveCourse()">{% trans 'Save' %} | <i class="fa fa-save"></i></button>
<button class="btn btn-success" title="{% trans 'Export course and download' %}" ng-click="export_course()">{% trans 'Export' %} | <i class="fa fa-download"></i></button>
<!-- END LEFT BUTTON GROUP -->
</div>
{% include 'administration/_alert.html' %}
<div class="actions-buttons align-right">
<!-- RIGHT BUTTON GROUP -->
<button class="btn btn-danger" title="{% trans 'Delete course' %}" ng-click="deleteCourse()">{% trans 'Delete' %} | <i class="fa fa-trash-o"></i></button>
<button class="btn btn-success" ng-click="saveCourse()">{% trans 'Save' %} | <i class="fa fa-save"></i></button>
<button class="btn btn-success" title="{% trans 'Export course and download' %}" ng-click="export_course()">{% trans 'Export' %} | <i class="fa fa-download"></i></button>
<!-- RIGHT BUTTON GROUP -->
</div>

Expand Down

0 comments on commit 91683b2

Please sign in to comment.