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

felipebormann
1 parent 813c728d
Showing 4 changed files with 11 additions and 8 deletions Show diff stats
amadeus/templates/base.html
subjects/templates/subjects/list_search.html
subjects/templates/subjects/resource_card.html
topics/templates/topics/list.html
@@ -103,18 +103,12 @@
                             <span class="visible-xs-inline">{% trans 'Language Selector' %}</span>
                         </a>
                         <ul class="dropdown-menu">
-                            <li class="active">
+                            <li >
                               <a href="#">
                                 <img src="{% static "img/brazilicon.png" %}" />
                                 <span>{% trans "PT-BR" %}</span>
                               </a>
                             </li>
-                            <li >
-                              <a href="#">
-                                <img src="{% static "img/euaicon.png" %}" />
-                                <span>{% trans "EN-US" %}</span>
-                              </a>
-                            </li>
                             <li>
                               <a href="#">
                                 <img src="{% static "img/euaicon.png" %}" />
@@ -3,6 +3,13 @@
 {% load static i18n pagination %}
 {% load django_bootstrap_breadcrumbs subject_counter %}
+
+{% block javascript%}
+    {{ block.super }}
+    <script type="text/javascript" src=" {% static "js/category.js" %} "></script>
+{% endblock%}
+
+
 {% block breadcrumbs %}
 	{% clear_breadcrumbs %}
    	{% breadcrumb 'Home' 'subjects:home' %}
@@ -35,6 +35,7 @@
 	  	</div>
 	  	 <div id="{{resource.slug}}" class="panel-collapse collapse category-panel-content">
+
             <div class="row">
                 <div class="col-md-6">
                     {% if resource.topic.subject.professor.all|length > 0  %}
@@ -52,13 +52,14 @@
 						  			<i class="fa fa-angle-right"></i> {% trans 'Add Resource' %}
 							  	</button>
 							  	<ul class="dropdown-menu">
+							  		<li><a href="{% url 'pdf_files:create' topic.slug %}"><i class="fa fa-file-pdf-o"></i> {% trans "PDF File" %}</a></li>
 							    	<li><a href="{% url 'youtube:create' topic.slug %}"><i class="fa fa-video-camera"></i> {% trans 'Video Embed' %}</a></li>
 							    	<li><a href="#"><i class="fa fa-comments-o"></i> {% trans 'Forum' %}</a></li>
 							    	<li><a href="{% url 'file_links:create' topic.slug %}"><i class="fa fa-file-archive-o"></i> {% trans 'File Link' %}</a></li>
 							    	<li><a href="{% url 'links:create' topic.slug %}" > <i class="fa fa-globe"></i> {% trans "Link to Website" %}</a>
 							    	<li><a href="{% url 'webpages:create' topic.slug %}"><i class="fa fa-file-code-o"></i> {% trans 'Webpage' %}</a></li>
 							    	<li><a href="#"><i class="fa fa-question-circle-o"></i> {% trans 'Questionary' %}</a></li>
-							  		<li><a href="{% url 'pdf_files:create' topic.slug %}"><i class="fa fa-file-pdf-o"></i> {% trans "PDF File" %}</a></li>
+							  		
 							  	</ul>
 							</div>
 						</div>
	@@ -3,6 +3,13 @@		@@ -3,6 +3,13 @@
3	{% load static i18n pagination %}	3	{% load static i18n pagination %}
4	{% load django_bootstrap_breadcrumbs subject_counter %}	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	{% block breadcrumbs %}	13	{% block breadcrumbs %}
7	{% clear_breadcrumbs %}	14	{% clear_breadcrumbs %}
8	{% breadcrumb 'Home' 'subjects:home' %}	15	{% breadcrumb 'Home' 'subjects:home' %}
	@@ -35,6 +35,7 @@		@@ -35,6 +35,7 @@
35	</div>	35	</div>
36		36
37	<div id="{{resource.slug}}" class="panel-collapse collapse category-panel-content">	37	<div id="{{resource.slug}}" class="panel-collapse collapse category-panel-content">
		38	+
38	<div class="row">	39	<div class="row">
39	<div class="col-md-6">	40	<div class="col-md-6">
40	{% if resource.topic.subject.professor.all\|length > 0 %}	41	{% if resource.topic.subject.professor.all\|length > 0 %}