Download as
Browse Code »

Commit 37a92b0f31b83c438176c71c5c9a595444cfcf38

Authored by Zambom
1 parent 584e03b0
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

Adjusting theme images

Showing 3 changed files with 18 additions and 10 deletions   Show diff stats
amadeus/static/css/base/amadeus.css
  Diff comments   View file @37a92b0
@@ -598,4 +598,9 @@ ul, li { @@ -598,4 +598,9 @@ ul, li {
598 } 598 }
599 .footer p { 599 .footer p {
600 margin: 0px; 600 margin: 0px;
  601 +}
  602 +
  603 +.form-group input[type=file] {
  604 + margin-top: 20px;
  605 + height: initial;
601 } 606 }
602 \ No newline at end of file 607 \ No newline at end of file
themes/models.py
  Diff comments   View file @37a92b0
@@ -27,20 +27,23 @@ class Themes(models.Model): @@ -27,20 +27,23 @@ class Themes(models.Model):
27 @property 27 @property
28 def favicon_url(self): 28 def favicon_url(self):
29 if self.favicon and hasattr(self.favicon, 'url'): 29 if self.favicon and hasattr(self.favicon, 'url'):
30 - return self.favicon.url  
31 - else:  
32 - return static('img/favicon_amadeus.png') 30 + if self.favicon.url != 'favicon_amadeus.png':
  31 + return self.favicon.url
  32 +
  33 + return static('img/favicon_amadeus.png')
33 34
34 @property 35 @property
35 def small_logo_url(self): 36 def small_logo_url(self):
36 if self.small_logo and hasattr(self.small_logo, 'url'): 37 if self.small_logo and hasattr(self.small_logo, 'url'):
37 - return self.small_logo.url  
38 - else:  
39 - return static('img/logo_pequena_amadeus.png') 38 + if self.small_logo.url != 'logo_pequena_amadeus.png':
  39 + return self.small_logo.url
  40 +
  41 + return static('img/logo_pequena_amadeus.png')
40 42
41 @property 43 @property
42 def large_logo_url(self): 44 def large_logo_url(self):
43 if self.large_logo and hasattr(self.large_logo, 'url'): 45 if self.large_logo and hasattr(self.large_logo, 'url'):
44 - return self.large_logo.url  
45 - else:  
46 - return static('img/logo_grande_amadeus.png')  
47 \ No newline at end of file 46 \ No newline at end of file
  47 + if self.large_logo.url != 'logo_grande_amadeus.png':
  48 + return self.large_logo.url
  49 +
  50 + return static('img/logo_grande_amadeus.png')
48 \ No newline at end of file 51 \ No newline at end of file
themes/templates/themes/basic_update.html
  Diff comments   View file @37a92b0
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <label for="{{ field.auto_id }}">{{ field.label }}</label> 26 <label for="{{ field.auto_id }}">{{ field.label }}</label>
27 {% endif %} 27 {% endif %}
28 28
29 - {% render_field field class='form-control' %} 29 + {% render_field field %}
30 30
31 <div class="input-group common-file-input"> 31 <div class="input-group common-file-input">
32 <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}"> 32 <input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">