Commit 03db64781c7b55a43ecfa7804f4a4ff56f7e493c
Exists in
master
and in
3 other branches
Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring
Showing
2 changed files
with
7 additions
and
7 deletions
Show diff stats
amadeus/templates/base.html
... | ... | @@ -12,7 +12,7 @@ |
12 | 12 | <script type="text/javascript" src="{% static 'js/jquery-ui.js' %}"></script> |
13 | 13 | |
14 | 14 | <meta http-equiv="Cache-Control" content="no-cache, no-store" /> |
15 | - <link href="{{ theme.favicon }}" rel="shortcut icon" /> | |
15 | + <link href="{{ theme.favicon_url }}" rel="shortcut icon" /> | |
16 | 16 | <!-- Roboto font --> |
17 | 17 | <link rel="stylesheet" href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700" type="text/css"> |
18 | 18 | <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> | ... | ... |
subjects/templates/subjects/list.html
... | ... | @@ -65,11 +65,11 @@ |
65 | 65 | </a> |
66 | 66 | <ul class="dropdown-menu pull-right" aria-labelledby="moreActions"> |
67 | 67 | {% if request.user.is_staff %} |
68 | - <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li> | |
68 | + <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i> {% trans 'Replicate' %}</a></li> | |
69 | 69 | {% endif %} |
70 | - <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li> | |
70 | + <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i> {% trans 'Edit' %}</a></li> | |
71 | 71 | <li> |
72 | - <a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')" aria-hidden="true"></i> {% trans 'Remove' %}</a></li> | |
72 | + <a href="javascript:delete_course.get('{% url 'categories:delete' category.slug %}?view=index','#category','#modal_course')" aria-hidden="true"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li> | |
73 | 73 | </ul> |
74 | 74 | {% endif %} |
75 | 75 | <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> |
... | ... | @@ -125,10 +125,10 @@ |
125 | 125 | </a> |
126 | 126 | <ul class="dropdown-menu pull-right" aria-labelledby="moreActions"> |
127 | 127 | {% if request.user.is_staff %} |
128 | - <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li> | |
128 | + <li><a href="{% url 'categories:replicate' category.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i> {% trans 'Replicate' %}</a></li> | |
129 | 129 | {% endif %} |
130 | - <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li> | |
131 | - <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> | |
130 | + <li><a href="{% url 'categories:update' category.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i> {% trans 'Edit' %}</a></li> | |
131 | + <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> | |
132 | 132 | </ul> |
133 | 133 | {% endif %} |
134 | 134 | <a href="" ><i class="fa fa-list" aria-hidden="true"></i></a> | ... | ... |