Commit a81d9d514b4f65c5bdbf40b41c7766977ab0a144
Exists in
master
and in
3 other branches
Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring
Showing
1 changed file
with
52 additions
and
50 deletions
Show diff stats
notifications/templates/notifications/_view.html
| ... | ... | @@ -2,63 +2,65 @@ |
| 2 | 2 | |
| 3 | 3 | <div class="row"> |
| 4 | 4 | <div class="col-md-12"> |
| 5 | - <div class="pendency"> | |
| 6 | - <ul class="breadcrumb"> | |
| 7 | - <li> | |
| 8 | - <a href="">{% trans 'Home' %}</a> | |
| 9 | - </li> | |
| 10 | - <li> | |
| 11 | - <a href="">{{ notification.task.resource.topic.subject.category }}</a> | |
| 12 | - </li> | |
| 13 | - <li> | |
| 14 | - <a href="">{{ notification.task.resource.topic.subject }}</a> | |
| 15 | - </li> | |
| 16 | - <li> | |
| 17 | - <a href="">{{ notification.task.resource.topic }}</a> | |
| 18 | - </li> | |
| 19 | - <li> | |
| 20 | - <a href="">{{ notification.task.resource }}</a> | |
| 21 | - </li> | |
| 22 | - </ul> | |
| 23 | - <div class="row"> | |
| 24 | - <div class="col-md-6"> | |
| 25 | - <h4>{{ notification }}</h4> | |
| 26 | - <p>{% trans 'Final Date/Time' %}: {{ notification.task.end_date|default:_('Not Informed') }}</p> | |
| 5 | + <div class="panel panel-default"> | |
| 6 | + <div class="pendency panel-body"> | |
| 7 | + <ul class="breadcrumb"> | |
| 8 | + <li> | |
| 9 | + <a href="">{% trans 'Home' %}</a> | |
| 10 | + </li> | |
| 11 | + <li> | |
| 12 | + <a href="">{{ notification.task.resource.topic.subject.category }}</a> | |
| 13 | + </li> | |
| 14 | + <li> | |
| 15 | + <a href="">{{ notification.task.resource.topic.subject }}</a> | |
| 16 | + </li> | |
| 17 | + <li> | |
| 18 | + <a href="">{{ notification.task.resource.topic }}</a> | |
| 19 | + </li> | |
| 20 | + <li> | |
| 21 | + <a href="">{{ notification.task.resource }}</a> | |
| 22 | + </li> | |
| 23 | + </ul> | |
| 24 | + <div class="row"> | |
| 25 | + <div class="col-md-6"> | |
| 26 | + <h4>{{ notification }}</h4> | |
| 27 | + <p>{% trans 'Final Date/Time' %}: {{ notification.task.end_date|default:_('Not Informed') }}</p> | |
| 27 | 28 | |
| 28 | - {% if notification.level == 2 %} | |
| 29 | - <p class="meta">{% trans 'Your goal was to realize this in' %}: {{ notification.meta }}</p> | |
| 30 | - {% elif notification.level == 4 %} | |
| 31 | - <p class="meta">{% trans 'Task finished in' %}: {{ notification.task.limit_date }}</p> | |
| 32 | - {% endif %} | |
| 29 | + {% if notification.level == 2 %} | |
| 30 | + <p class="meta">{% trans 'Your goal was to realize this in' %}: {{ notification.meta }}</p> | |
| 31 | + {% elif notification.level == 4 %} | |
| 32 | + <p class="meta">{% trans 'Task finished in' %}: {{ notification.task.limit_date }}</p> | |
| 33 | + {% endif %} | |
| 33 | 34 | |
| 34 | - <b>{{ notification|done_percent }}%</b> {% trans 'of the participants already realized this task.' %} | |
| 35 | - </div> | |
| 36 | - <div class="col-md-6"> | |
| 37 | - <div class="alert {{ notification.level|warning_class }}"> | |
| 38 | - <i class="fa fa-exclamation-triangle"></i> | |
| 39 | - <span>{{ notification.level|warning_msg }}</span> | |
| 35 | + <b>{{ notification|done_percent|floatformat:2 }}%</b> {% trans 'of the participants already realized this task.' %} | |
| 36 | + </div> | |
| 37 | + <div class="col-md-6"> | |
| 38 | + <div class="alert {{ notification.level|warning_class }}"> | |
| 39 | + <i class="fa fa-exclamation-triangle"></i> | |
| 40 | + <span>{{ notification.level|warning_msg }}</span> | |
| 41 | + </div> | |
| 40 | 42 | </div> |
| 41 | 43 | </div> |
| 42 | - </div> | |
| 43 | - <div class="row text-center"> | |
| 44 | - <a href="" class="btn btn-success btn-raised"> | |
| 45 | - {% if notification.level == 4 %} | |
| 46 | - {% trans 'Access the task' %} | |
| 47 | - {% else %} | |
| 48 | - {% trans 'Realize the task' %} | |
| 49 | - {% endif %} | |
| 50 | - </a> | |
| 51 | - | |
| 52 | - {% if notification.level < 3 %} | |
| 53 | - <button class="btn btn-default no_button">{% trans 'or' %}</button> | |
| 54 | - <a href="" class="btn btn-default btn-raised"> | |
| 55 | - {% if notification.level == 1 %} | |
| 56 | - {% trans 'Define goal to realization' %} | |
| 44 | + <div class="row text-center"> | |
| 45 | + <a href="" class="btn btn-success btn-raised"> | |
| 46 | + {% if notification.level == 4 %} | |
| 47 | + {% trans 'Access the task' %} | |
| 57 | 48 | {% else %} |
| 58 | - {% trans 'Define new goal' %} | |
| 49 | + {% trans 'Realize the task' %} | |
| 59 | 50 | {% endif %} |
| 60 | 51 | </a> |
| 61 | - {% endif %} | |
| 52 | + | |
| 53 | + {% if notification.level < 3 %} | |
| 54 | + <button class="btn btn-default no_button">{% trans 'or' %}</button> | |
| 55 | + <a href="" class="btn btn-default btn-raised"> | |
| 56 | + {% if notification.level == 1 %} | |
| 57 | + {% trans 'Define goal to realization' %} | |
| 58 | + {% else %} | |
| 59 | + {% trans 'Define new goal' %} | |
| 60 | + {% endif %} | |
| 61 | + </a> | |
| 62 | + {% endif %} | |
| 63 | + </div> | |
| 62 | 64 | </div> |
| 63 | 65 | </div> |
| 64 | 66 | </div> | ... | ... |