Download as
Browse Code »

Commit b78f9c8d6c4c4a2a64a6f9954e93ec136982eba5

Authored by felipebormann
2 parents 0872c975 ba5dfe0f
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Showing 5 changed files with 7 additions and 14 deletions   Show diff stats
categories/templates/categories/list.html
  Diff comments   View file @b78f9c8
@@ -74,8 +74,6 @@ @@ -74,8 +74,6 @@
74 <li><a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li> 74 <li><a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li>
75 </ul> 75 </ul>
76 {% endif %} 76 {% endif %}
77 - <a href=""><i class="fa fa-bar-chart" aria-hidden="true"></i></a>  
78 - <a href=""><i class="fa fa-exclamation-triangle" aria-hidden="true"></i></a>  
79 </div> 77 </div>
80 </div> 78 </div>
81 </div> 79 </div>
notifications/templates/notifications/_view.html
  Diff comments   View file @b78f9c8
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 </div> 43 </div>
44 </div> 44 </div>
45 <div class="row text-center"> 45 <div class="row text-center">
46 - <a href="{% url notification.task.resource.access_link notification.task.resource.slug %}" class="btn btn-success btn-raised" {% if notification.task.resource.show_window %}target="_blank"{% endif %}> 46 + <a href="{{ notification.task.resource.access_link }}" class="btn btn-success btn-raised" {% if notification.task.resource.show_window %}target="_blank"{% endif %}>
47 {% if notification.level == 4 %} 47 {% if notification.level == 4 %}
48 {% trans 'Access the task' %} 48 {% trans 'Access the task' %}
49 {% else %} 49 {% else %}
subjects/templates/subjects/list.html
  Diff comments   View file @b78f9c8
@@ -80,11 +80,6 @@ @@ -80,11 +80,6 @@
80 </ul> 80 </ul>
81 {% endif %} 81 {% endif %}
82 82
83 - <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>  
84 - <a href="{% url 'notifications:manage_cat' category.slug %}" class="pull-right action_icon">  
85 - <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>  
86 - {% notifies_cat_number category request.user %}  
87 - </a>  
88 </div> 83 </div>
89 </div> 84 </div>
90 </div> 85 </div>
@@ -145,12 +140,7 @@ @@ -145,12 +140,7 @@
145 <li><a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li> 140 <li><a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li>
146 </ul> 141 </ul>
147 {% endif %} 142 {% endif %}
148 -  
149 - <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>  
150 - <a href="" class="pull-right action_icon">  
151 - <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>  
152 - {% notifies_cat_number category request.user %}  
153 - </a> 143 +
154 </div> 144 </div>
155 </div> 145 </div>
156 </div> 146 </div>
subjects/templates/subjects/subject_card.html
  Diff comments   View file @b78f9c8
@@ -39,6 +39,8 @@ @@ -39,6 +39,8 @@
39 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> 39 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
40 {% notifies_number subject request.user %} 40 {% notifies_number subject request.user %}
41 </a> 41 </a>
  42 + <a href="" class="pull-right action_icon"><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
  43 + <a href="" class="pull-right action_icon"><i class="fa fa-list" aria-hidden="true"></i></a>
42 </div> 44 </div>
43 </div> 45 </div>
44 </div> 46 </div>
subjects/templates/subjects/view.html
  Diff comments   View file @b78f9c8
@@ -55,11 +55,14 @@ @@ -55,11 +55,14 @@
55 <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li> 55 <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
56 </ul> 56 </ul>
57 {% endif %} 57 {% endif %}
  58 +
58 <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a> 59 <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
59 <a href="{% url 'notifications:view' subject.slug %}" class="pull-right action_icon"> 60 <a href="{% url 'notifications:view' subject.slug %}" class="pull-right action_icon">
60 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> 61 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
61 {% notifies_number subject request.user %} 62 {% notifies_number subject request.user %}
62 </a> 63 </a>
  64 + <a href="" class="pull-right action_icon"><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
  65 + <a href="" class="pull-right action_icon"><i class="fa fa-list" aria-hidden="true"></i></a>
63 </div> 66 </div>
64 </div> 67 </div>
65 </div> 68 </div>