Adding favicon to themes form

Zambom
1 parent 6ac8d813
Showing 6 changed files with 52 additions and 4 deletions Show diff stats
amadeus/static/js/themes.js
amadeus/templates/base.html
themes/forms.py
themes/migrations/0004_themes_favicon.py
themes/models.py
themes/templates/themes/basic_update.html
@@ -8,6 +8,7 @@ if (window.File &amp;&amp; window.FileList &amp;&amp; window.FileReader) {
 function Init() {
 	var small = $("#id_small_logo"),
 		large = $("#id_large_logo"),
+		fav = $("#id_favicon"),
 		filedrag = $(".filedrag"),
 		common = $(".common-file-input");
@@ -5,7 +5,7 @@
 <html>
 <head>
-	<title>{{ title }} | Amadeus</title>
+	<title>{{ title }} | {{ theme.title }}</title>
     <!-- jQuery & jQuery UI -->
     <script type="text/javascript" src="{% static 'js/jquery-3.1.0.min.js' %}"></script>
@@ -5,6 +5,18 @@ from .models import Themes
 class BasicElemetsForm(forms.ModelForm):
+	def clean_favicon(self):
+		image = self.cleaned_data.get('favicon', False)
+
+		if image:
+			if hasattr(image, '_size'):
+				if image._size > self.MAX_UPLOAD_SIZE:
+					self._errors['favicon'] = [_("The image is too large. It should have less than 2MB.")]
+
+					return ValueError
+
+		return image
+
 	def clean_small_logo(self):
 		image = self.cleaned_data.get('small_logo', False)
@@ -31,7 +43,7 @@ class BasicElemetsForm(forms.ModelForm):
 	class Meta:
 		model = Themes
-		fields = ['title', 'small_logo', 'large_logo', 'footer_note']
+		fields = ['title', 'favicon', 'small_logo', 'large_logo', 'footer_note']
 class CSSStyleForm(forms.ModelForm):
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-12 20:42
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import themes.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('themes', '0003_auto_20170112_1408'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='themes',
+            name='favicon',
+            field=models.ImageField(blank=True, default='favicon_amadeus.png', upload_to='themes/', validators=[themes.models.validate_img_extension], verbose_name='Favicon'),
+        ),
+    ]
@@ -10,6 +10,7 @@ def validate_img_extension(value):
 class Themes(models.Model):
 	title = models.CharField(_("Title"), max_length = 200, default = "Projeto Amadeus")
+	favicon = models.ImageField(verbose_name = _("Favicon"), blank = True, upload_to = 'themes/', default = 'favicon_amadeus.png', validators = [validate_img_extension])
 	small_logo = models.ImageField(verbose_name = _("Small Logo"), blank = True, upload_to = 'themes/', default = 'logo_pequena_amadeus.png', validators = [validate_img_extension])
 	large_logo = models.ImageField(verbose_name = _("Large Logo"), blank = True, upload_to = 'themes/', default = 'logo_grande_amadeus.png', validators = [validate_img_extension])
 	footer_note = models.TextField(_("Footer Note"), blank = True)
@@ -19,7 +19,7 @@
 					{% csrf_token %}
 					{% for field in form %}
 						<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
-							{% if field.auto_id == 'id_small_logo' or field.auto_id == 'id_large_logo' %}
+							{% if field.auto_id == 'id_small_logo' or field.auto_id == 'id_large_logo' or field.auto_id == 'id_favicon' %}
 				        		{% if field.field.required %}
 									<label for="{{ field.auto_id }}">{{ field.label }} <span>*</span></label>
 								{% else %}
@@ -36,7 +36,20 @@
 				                   		</button>
 				                  	</span>
 				                </div>
-			                  	<div class="filedrag">{% trans 'Click or drop files here' %}</div>
+			                  	<div class="filedrag">
+			                  		{% trans 'Click or drop files here' %}<br />
+			                  		
+			                  		{% trans 'Recommended dimensions' %}:
+
+			                  		{% if field.auto_id == 'id_small_logo' %}
+			                  			927px x 955px <br />
+			                  			<small>{% trans 'It is recommended to be a white image' %}</small>
+			                  		{% elif field.auto_id == 'id_favicon' %}
+			                  			927px x 955px
+			                  		{% else %}
+			                  			1286px x 955px
+			                  		{% endif %}
+		                  		</div>
 				            {% elif field.auto_id == 'id_footer_note' %}
 				            	{% if field.field.required %}
	@@ -8,6 +8,7 @@ if (window.File && window.FileList && window.FileReader) {		@@ -8,6 +8,7 @@ if (window.File && window.FileList && window.FileReader) {
8	function Init() {	8	function Init() {
9	var small = $("#id_small_logo"),	9	var small = $("#id_small_logo"),
10	large = $("#id_large_logo"),	10	large = $("#id_large_logo"),
		11	+ fav = $("#id_favicon"),
11	filedrag = $(".filedrag"),	12	filedrag = $(".filedrag"),
12	common = $(".common-file-input");	13	common = $(".common-file-input");
13		14
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5		5
6	<html>	6	<html>
7	<head>	7	<head>
8	- <title>{{ title }} \| Amadeus</title>	8	+ <title>{{ title }} \| {{ theme.title }}</title>
9		9
10	<!-- jQuery & jQuery UI -->	10	<!-- jQuery & jQuery UI -->
11	<script type="text/javascript" src="{% static 'js/jquery-3.1.0.min.js' %}"></script>	11	<script type="text/javascript" src="{% static 'js/jquery-3.1.0.min.js' %}"></script>
	@@ -5,6 +5,18 @@ from .models import Themes		@@ -5,6 +5,18 @@ from .models import Themes
5		5
6	class BasicElemetsForm(forms.ModelForm):	6	class BasicElemetsForm(forms.ModelForm):
7		7
		8	+ def clean_favicon(self):
		9	+ image = self.cleaned_data.get('favicon', False)
		10	+
		11	+ if image:
		12	+ if hasattr(image, '_size'):
		13	+ if image._size > self.MAX_UPLOAD_SIZE:
		14	+ self._errors['favicon'] = [_("The image is too large. It should have less than 2MB.")]
		15	+
		16	+ return ValueError
		17	+
		18	+ return image
		19	+
8	def clean_small_logo(self):	20	def clean_small_logo(self):
9	image = self.cleaned_data.get('small_logo', False)	21	image = self.cleaned_data.get('small_logo', False)
10		22
	@@ -31,7 +43,7 @@ class BasicElemetsForm(forms.ModelForm):		@@ -31,7 +43,7 @@ class BasicElemetsForm(forms.ModelForm):
31		43
32	class Meta:	44	class Meta:
33	model = Themes	45	model = Themes
34	- fields = ['title', 'small_logo', 'large_logo', 'footer_note']	46	+ fields = ['title', 'favicon', 'small_logo', 'large_logo', 'footer_note']
35		47
36	class CSSStyleForm(forms.ModelForm):	48	class CSSStyleForm(forms.ModelForm):
37		49
@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2017-01-12 20:42
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+import themes.models
	7	+
	8	+
	9	+class Migration(migrations.Migration):
	10	+
	11	+ dependencies = [
	12	+ ('themes', '0003_auto_20170112_1408'),
	13	+ ]
	14	+
	15	+ operations = [
	16	+ migrations.AddField(
	17	+ model_name='themes',
	18	+ name='favicon',
	19	+ field=models.ImageField(blank=True, default='favicon_amadeus.png', upload_to='themes/', validators=[themes.models.validate_img_extension], verbose_name='Favicon'),
	20	+ ),
	21	+ ]
	@@ -10,6 +10,7 @@ def validate_img_extension(value):		@@ -10,6 +10,7 @@ def validate_img_extension(value):
10		10
11	class Themes(models.Model):	11	class Themes(models.Model):
12	title = models.CharField(_("Title"), max_length = 200, default = "Projeto Amadeus")	12	title = models.CharField(_("Title"), max_length = 200, default = "Projeto Amadeus")
		13	+ favicon = models.ImageField(verbose_name = _("Favicon"), blank = True, upload_to = 'themes/', default = 'favicon_amadeus.png', validators = [validate_img_extension])
13	small_logo = models.ImageField(verbose_name = _("Small Logo"), blank = True, upload_to = 'themes/', default = 'logo_pequena_amadeus.png', validators = [validate_img_extension])	14	small_logo = models.ImageField(verbose_name = _("Small Logo"), blank = True, upload_to = 'themes/', default = 'logo_pequena_amadeus.png', validators = [validate_img_extension])
14	large_logo = models.ImageField(verbose_name = _("Large Logo"), blank = True, upload_to = 'themes/', default = 'logo_grande_amadeus.png', validators = [validate_img_extension])	15	large_logo = models.ImageField(verbose_name = _("Large Logo"), blank = True, upload_to = 'themes/', default = 'logo_grande_amadeus.png', validators = [validate_img_extension])
15	footer_note = models.TextField(_("Footer Note"), blank = True)	16	footer_note = models.TextField(_("Footer Note"), blank = True)
	@@ -19,7 +19,7 @@		@@ -19,7 +19,7 @@
19	{% csrf_token %}	19	{% csrf_token %}
20	{% for field in form %}	20	{% for field in form %}
21	<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">	21	<div class="form-group{% if form.has_error %} has-error {% endif %} is-fileinput">
22	- {% if field.auto_id == 'id_small_logo' or field.auto_id == 'id_large_logo' %}	22	+ {% if field.auto_id == 'id_small_logo' or field.auto_id == 'id_large_logo' or field.auto_id == 'id_favicon' %}
23	{% if field.field.required %}	23	{% if field.field.required %}
24	<label for="{{ field.auto_id }}">{{ field.label }} <span>*</span></label>	24	<label for="{{ field.auto_id }}">{{ field.label }} <span>*</span></label>
25	{% else %}	25	{% else %}
	@@ -36,7 +36,20 @@		@@ -36,7 +36,20 @@
36	</button>	36	</button>
37	</span>	37	</span>
38	</div>	38	</div>
39	- <div class="filedrag">{% trans 'Click or drop files here' %}</div>	39	+ <div class="filedrag">
		40	+ {% trans 'Click or drop files here' %}<br />
		41	+
		42	+ {% trans 'Recommended dimensions' %}:
		43	+
		44	+ {% if field.auto_id == 'id_small_logo' %}
		45	+ 927px x 955px <br />
		46	+ <small>{% trans 'It is recommended to be a white image' %}</small>
		47	+ {% elif field.auto_id == 'id_favicon' %}
		48	+ 927px x 955px
		49	+ {% else %}
		50	+ 1286px x 955px
		51	+ {% endif %}
		52	+ </div>
40		53
41	{% elif field.auto_id == 'id_footer_note' %}	54	{% elif field.auto_id == 'id_footer_note' %}
42	{% if field.field.required %}	55	{% if field.field.required %}