From 0fdd830eff93a9c39cda5f3ffc4e5161d8478869 Mon Sep 17 00:00:00 2001
From: felipebormann <felipe.bormann@gmail.com>
Date: Tue, 7 Feb 2017 17:17:58 -0300
Subject: [PATCH] fixed create pdf file template and language selector specs

---
 amadeus/static/css/base/amadeus_responsive.css |  8 ++++++++
 amadeus/templates/base.html                    | 14 +++++++-------
 file_link/templates/file_links/_form.html      |  2 +-
 pdf_file/templates/pdf_file/create.html        |  2 +-
 pdf_file/views.py                              |  5 ++++-
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/amadeus/static/css/base/amadeus_responsive.css b/amadeus/static/css/base/amadeus_responsive.css
index 4ed2511..5eebe6d 100644
--- a/amadeus/static/css/base/amadeus_responsive.css
+++ b/amadeus/static/css/base/amadeus_responsive.css
@@ -53,6 +53,11 @@
 	    display:none;
 	}
 
+	.language-selector-on-header{
+		display:block;
+		position: relative;
+	}
+
 	.language-selector-on-header h4{
 		color:rgba(255,255,255,.84);
 		padding-left: 5px;
@@ -63,6 +68,9 @@
 		position: relative;
 	}
 
+	.navbar-header{
+		width: 30% !important;
+	}
 
 	#btn-search {
 		margin-top: -5px;
diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index 4f1557e..40d80f4 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -92,14 +92,15 @@
                         </div>
                     </form>
                 </div>
-                
-                <li class="dropdown language-selector-on-header"> 
-                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true">
+                <ul class="nav navbar-nav">
+                <li class="dropdown language-selector-on-header {{ settings_menu_active }}" title data-original-title="{% trans 'Language Selector' %}"> 
+                        <a href="#" class="dropdown-toggle hidden-xs" data-toggle="dropdown" data-close-others="true">
                             <img src="{% static "img/brazilicon.png" %}" />
                         </a>
 
                         <a href="#" class="dropdown-toggle title" data-toggle="dropdown" data-close-others="true">
-                            <h4 >{% trans "Language Selector" %}</h4>
+                            <i class="fa fa-cog hidden-xs" aria-hidden="true"></i>
+                            <span class="visible-xs-inline">{% trans 'Language Selector' %}</span>
                         </a>
                         <ul class="dropdown-menu">
                             <li class="active">
@@ -114,8 +115,7 @@
                                 <span>{% trans "EN-US" %}</span>
                               </a>
                             </li>
-
-                            <li >
+                            <li>
                               <a href="#">
                                 <img src="{% static "img/euaicon.png" %}" />
                                 <span>{% trans "EN" %}</span>
@@ -123,7 +123,7 @@
                             </li>
                         </ul>
                 </li>
-                
+                </ul>
                 <ul class="nav navbar-nav navbar-right notifications">
 
 
diff --git a/file_link/templates/file_links/_form.html b/file_link/templates/file_links/_form.html
index a54fff7..9917a5b 100644
--- a/file_link/templates/file_links/_form.html
+++ b/file_link/templates/file_links/_form.html
@@ -27,7 +27,7 @@
 	</div>
 
 	<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
-		{% render_field form.file_content %}
+		{% render_field form.file_content class='file-selector' %}
 		
 		<div class="input-group common-file-input">
 	      	<input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}">
diff --git a/pdf_file/templates/pdf_file/create.html b/pdf_file/templates/pdf_file/create.html
index 03fd602..1ea1b7d 100644
--- a/pdf_file/templates/pdf_file/create.html
+++ b/pdf_file/templates/pdf_file/create.html
@@ -25,7 +25,7 @@
 	<div class="card">
 		<div class="card-content">
 			<div class="card-body">
-				{% include 'file_links/_form.html' %}
+				{% include 'pdf_file/_form.html' %}
 			</div>
 		</div>
 	</div>
diff --git a/pdf_file/views.py b/pdf_file/views.py
index 5e8751a..6483c91 100644
--- a/pdf_file/views.py
+++ b/pdf_file/views.py
@@ -127,4 +127,7 @@ class PDFFileCreateView(LoginRequiredMixin, LogMixin , generic.CreateView):
 	def get_success_url(self):
 		messages.success(self.request, _('The PDF File "%s" was added to the Topic "%s" of the virtual environment "%s" successfully!')%(self.object.name, self.object.topic.name, self.object.topic.subject.name))
 
-		return reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
\ No newline at end of file
+		return reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
+
+
+
--
libgit2 0.21.2