Download as
Browse Code »

Commit c866570d6639e26e49c368fdccc98efe5f34d01e

Authored by felipebormann
1 parent 813c728d
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

language selector has same hover design as settings and modified resource options in topic

Showing 4 changed files with 11 additions and 8 deletions   Show diff stats
amadeus/templates/base.html
  Diff comments   View file @c866570
... ... @@ -103,18 +103,12 @@
103 103 <span class="visible-xs-inline">{% trans 'Language Selector' %}</span>
104 104 </a>
105 105 <ul class="dropdown-menu">
106   - <li class="active">
  106 + <li >
107 107 <a href="#">
108 108 <img src="{% static "img/brazilicon.png" %}" />
109 109 <span>{% trans "PT-BR" %}</span>
110 110 </a>
111 111 </li>
112   - <li >
113   - <a href="#">
114   - <img src="{% static "img/euaicon.png" %}" />
115   - <span>{% trans "EN-US" %}</span>
116   - </a>
117   - </li>
118 112 <li>
119 113 <a href="#">
120 114 <img src="{% static "img/euaicon.png" %}" />
... ...
subjects/templates/subjects/list_search.html
  Diff comments   View file @c866570
... ... @@ -3,6 +3,13 @@
3 3 {% load static i18n pagination %}
4 4 {% load django_bootstrap_breadcrumbs subject_counter %}
5 5  
  6 +
  7 +{% block javascript%}
  8 + {{ block.super }}
  9 + <script type="text/javascript" src=" {% static "js/category.js" %} "></script>
  10 +{% endblock%}
  11 +
  12 +
6 13 {% block breadcrumbs %}
7 14 {% clear_breadcrumbs %}
8 15 {% breadcrumb 'Home' 'subjects:home' %}
... ...
subjects/templates/subjects/resource_card.html
  Diff comments   View file @c866570
... ... @@ -35,6 +35,7 @@
35 35 </div>
36 36  
37 37 <div id="{{resource.slug}}" class="panel-collapse collapse category-panel-content">
  38 +
38 39 <div class="row">
39 40 <div class="col-md-6">
40 41 {% if resource.topic.subject.professor.all|length > 0 %}
... ...
topics/templates/topics/list.html
  Diff comments   View file @c866570
... ... @@ -52,13 +52,14 @@
52 52 <i class="fa fa-angle-right"></i> {% trans 'Add Resource' %}
53 53 </button>
54 54 <ul class="dropdown-menu">
  55 + <li><a href="{% url 'pdf_files:create' topic.slug %}"><i class="fa fa-file-pdf-o"></i> {% trans "PDF File" %}</a></li>
55 56 <li><a href="{% url 'youtube:create' topic.slug %}"><i class="fa fa-video-camera"></i> {% trans 'Video Embed' %}</a></li>
56 57 <li><a href="#"><i class="fa fa-comments-o"></i> {% trans 'Forum' %}</a></li>
57 58 <li><a href="{% url 'file_links:create' topic.slug %}"><i class="fa fa-file-archive-o"></i> {% trans 'File Link' %}</a></li>
58 59 <li><a href="{% url 'links:create' topic.slug %}" > <i class="fa fa-globe"></i> {% trans "Link to Website" %}</a>
59 60 <li><a href="{% url 'webpages:create' topic.slug %}"><i class="fa fa-file-code-o"></i> {% trans 'Webpage' %}</a></li>
60 61 <li><a href="#"><i class="fa fa-question-circle-o"></i> {% trans 'Questionary' %}</a></li>
61   - <li><a href="{% url 'pdf_files:create' topic.slug %}"><i class="fa fa-file-pdf-o"></i> {% trans "PDF File" %}</a></li>
  62 +
62 63 </ul>
63 64 </div>
64 65 </div>
... ...