From 37a92b0f31b83c438176c71c5c9a595444cfcf38 Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Thu, 12 Jan 2017 20:56:35 -0200
Subject: [PATCH] Adjusting theme images

---
 amadeus/static/css/base/amadeus.css       |  5 +++++
 themes/models.py                          | 21 ++++++++++++---------
 themes/templates/themes/basic_update.html |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css
index bc08547..317c667 100755
--- a/amadeus/static/css/base/amadeus.css
+++ b/amadeus/static/css/base/amadeus.css
@@ -598,4 +598,9 @@ ul, li {
 }
 .footer p {
     margin: 0px;
+}
+
+.form-group input[type=file] {
+    margin-top: 20px;
+    height: initial;
 }
\ No newline at end of file
diff --git a/themes/models.py b/themes/models.py
index 6d4d5cf..a94acdf 100644
--- a/themes/models.py
+++ b/themes/models.py
@@ -27,20 +27,23 @@ class Themes(models.Model):
 	@property
 	def favicon_url(self):
 		if self.favicon and hasattr(self.favicon, 'url'):
-			return self.favicon.url
-		else:
-			return static('img/favicon_amadeus.png')
+			if self.favicon.url != 'favicon_amadeus.png':
+				return self.favicon.url
+		
+		return static('img/favicon_amadeus.png')
 
 	@property
 	def small_logo_url(self):
 		if self.small_logo and hasattr(self.small_logo, 'url'):
-			return self.small_logo.url
-		else:
-			return static('img/logo_pequena_amadeus.png')
+			if self.small_logo.url != 'logo_pequena_amadeus.png':
+				return self.small_logo.url
+		
+		return static('img/logo_pequena_amadeus.png')
 
 	@property
 	def large_logo_url(self):
 		if self.large_logo and hasattr(self.large_logo, 'url'):
-			return self.large_logo.url
-		else:
-			return static('img/logo_grande_amadeus.png')
\ No newline at end of file
+			if self.large_logo.url != 'logo_grande_amadeus.png':
+				return self.large_logo.url
+		
+		return static('img/logo_grande_amadeus.png')
\ No newline at end of file
diff --git a/themes/templates/themes/basic_update.html b/themes/templates/themes/basic_update.html
index 9c325d9..5f07ad8 100644
--- a/themes/templates/themes/basic_update.html
+++ b/themes/templates/themes/basic_update.html
@@ -26,7 +26,7 @@
 									<label for="{{ field.auto_id }}">{{ field.label }}</label>
 								{% endif %}
 								
-								{% render_field field class='form-control' %}
+								{% render_field field %}
 								
 								<div class="input-group common-file-input">
 				                  	<input type="text" readonly="" class="form-control" placeholder="{% trans 'Choose your photo...' %}">
--
libgit2 0.21.2