Download as
Browse Code »

Commit 0fdd830eff93a9c39cda5f3ffc4e5161d8478869

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

fixed create pdf file template and language selector specs

Showing 5 changed files with 21 additions and 10 deletions   Show diff stats
amadeus/static/css/base/amadeus_responsive.css
  Diff comments   View file @0fdd830
@@ -53,6 +53,11 @@ @@ -53,6 +53,11 @@
53 display:none; 53 display:none;
54 } 54 }
55 55
  56 + .language-selector-on-header{
  57 + display:block;
  58 + position: relative;
  59 + }
  60 +
56 .language-selector-on-header h4{ 61 .language-selector-on-header h4{
57 color:rgba(255,255,255,.84); 62 color:rgba(255,255,255,.84);
58 padding-left: 5px; 63 padding-left: 5px;
@@ -63,6 +68,9 @@ @@ -63,6 +68,9 @@
63 position: relative; 68 position: relative;
64 } 69 }
65 70
  71 + .navbar-header{
  72 + width: 30% !important;
  73 + }
66 74
67 #btn-search { 75 #btn-search {
68 margin-top: -5px; 76 margin-top: -5px;
amadeus/templates/base.html
  Diff comments   View file @0fdd830
@@ -92,14 +92,15 @@ @@ -92,14 +92,15 @@
92 </div> 92 </div>
93 </form> 93 </form>
94 </div> 94 </div>
95 -  
96 - <li class="dropdown language-selector-on-header">  
97 - <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true"> 95 + <ul class="nav navbar-nav">
  96 + <li class="dropdown language-selector-on-header {{ settings_menu_active }}" title data-original-title="{% trans 'Language Selector' %}">
  97 + <a href="#" class="dropdown-toggle hidden-xs" data-toggle="dropdown" data-close-others="true">
98 <img src="{% static "img/brazilicon.png" %}" /> 98 <img src="{% static "img/brazilicon.png" %}" />
99 </a> 99 </a>
100 100
101 <a href="#" class="dropdown-toggle title" data-toggle="dropdown" data-close-others="true"> 101 <a href="#" class="dropdown-toggle title" data-toggle="dropdown" data-close-others="true">
102 - <h4 >{% trans "Language Selector" %}</h4> 102 + <i class="fa fa-cog hidden-xs" aria-hidden="true"></i>
  103 + <span class="visible-xs-inline">{% trans 'Language Selector' %}</span>
103 </a> 104 </a>
104 <ul class="dropdown-menu"> 105 <ul class="dropdown-menu">
105 <li class="active"> 106 <li class="active">
@@ -114,8 +115,7 @@ @@ -114,8 +115,7 @@
114 <span>{% trans "EN-US" %}</span> 115 <span>{% trans "EN-US" %}</span>
115 </a> 116 </a>
116 </li> 117 </li>
117 -  
118 - <li > 118 + <li>
119 <a href="#"> 119 <a href="#">
120 <img src="{% static "img/euaicon.png" %}" /> 120 <img src="{% static "img/euaicon.png" %}" />
121 <span>{% trans "EN" %}</span> 121 <span>{% trans "EN" %}</span>
@@ -123,7 +123,7 @@ @@ -123,7 +123,7 @@
123 </li> 123 </li>
124 </ul> 124 </ul>
125 </li> 125 </li>
126 - 126 + </ul>
127 <ul class="nav navbar-nav navbar-right notifications"> 127 <ul class="nav navbar-nav navbar-right notifications">
128 128
129 129
file_link/templates/file_links/_form.html
  Diff comments   View file @0fdd830
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 </div> 27 </div>
28 28
29 <div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput"> 29 <div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
30 - {% render_field form.file_content %} 30 + {% render_field form.file_content class='file-selector' %}
31 31
32 <div class="input-group common-file-input"> 32 <div class="input-group common-file-input">
33 <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}"> 33 <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your file...' %}">
pdf_file/templates/pdf_file/create.html
  Diff comments   View file @0fdd830
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <div class="card"> 25 <div class="card">
26 <div class="card-content"> 26 <div class="card-content">
27 <div class="card-body"> 27 <div class="card-body">
28 - {% include 'file_links/_form.html' %} 28 + {% include 'pdf_file/_form.html' %}
29 </div> 29 </div>
30 </div> 30 </div>
31 </div> 31 </div>
pdf_file/views.py
  Diff comments   View file @0fdd830
@@ -127,4 +127,7 @@ class PDFFileCreateView(LoginRequiredMixin, LogMixin , generic.CreateView): @@ -127,4 +127,7 @@ class PDFFileCreateView(LoginRequiredMixin, LogMixin , generic.CreateView):
127 def get_success_url(self): 127 def get_success_url(self):
128 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)) 128 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))
129 129
130 - return reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})  
131 \ No newline at end of file 130 \ No newline at end of file
  131 + return reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
  132 +
  133 +
  134 +