Download as
Browse Code »

Commit 5e0ed97e3f3eb0c93a491b80946a04e27b098649

Authored by Zambom
1 parent 0770923e
Exists in master and in 2 other branches amadeus_univasf, refactoring

Changing logo in contrast theme

Showing 11 changed files with 111 additions and 4 deletions   Show diff stats
amadeus/static/img/alto_contraste_logo_amadeus.png 0 → 100644
View file @5e0ed97

19 KB
links/migrations/0009_auto_20170920_2122.py 0 → 100644
  Diff comments   View file @5e0ed97
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10.4 on 2017-09-21 00:22
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.db import migrations, models
  6 +
  7 +
  8 +class Migration(migrations.Migration):
  9 +
  10 + dependencies = [
  11 + ('links', '0008_remove_link_description_brief'),
  12 + ]
  13 +
  14 + operations = [
  15 + migrations.AlterField(
  16 + model_name='link',
  17 + name='link_url',
  18 + field=models.CharField(max_length=250, verbose_name='Link_URL'),
  19 + ),
  20 + ]
themes/migrations/0001_initial.py
  Diff comments   View file @5e0ed97
@@ -21,6 +21,7 @@ class Migration(migrations.Migration): @@ -21,6 +21,7 @@ class Migration(migrations.Migration):
21 ('title', models.CharField(default='Projeto Amadeus', max_length=200, verbose_name='Title')), 21 ('title', models.CharField(default='Projeto Amadeus', max_length=200, verbose_name='Title')),
22 ('small_logo', models.ImageField(blank=True, default='logo_pequena_amadeus.png', upload_to='themes/', validators=[themes.models.validate_img_extension], verbose_name='Small Logo')), 22 ('small_logo', models.ImageField(blank=True, default='logo_pequena_amadeus.png', upload_to='themes/', validators=[themes.models.validate_img_extension], verbose_name='Small Logo')),
23 ('large_logo', models.ImageField(blank=True, default='logo_grande_amadeus.png', upload_to='themes/', validators=[themes.models.validate_img_extension], verbose_name='Large Logo')), 23 ('large_logo', models.ImageField(blank=True, default='logo_grande_amadeus.png', upload_to='themes/', validators=[themes.models.validate_img_extension], verbose_name='Large Logo')),
  24 + ('high_contrast_logo', models.ImageField(blank=True, default='alto_contraste_logo_amadeus.png', upload_to='themes/', validators=[themes.models.validate_img_extension], verbose_name='High Contrast Logo')),
24 ('footer_note', models.TextField(blank=True, verbose_name='Footer Note')), 25 ('footer_note', models.TextField(blank=True, verbose_name='Footer Note')),
25 ('css_style', models.CharField(default='green', max_length=50, verbose_name='Css Style')), 26 ('css_style', models.CharField(default='green', max_length=50, verbose_name='Css Style')),
26 ], 27 ],
themes/migrations/0007_themes_high_contrats_logo.py 0 → 100644
  Diff comments   View file @5e0ed97
@@ -0,0 +1,21 @@ @@ -0,0 +1,21 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10.4 on 2017-09-21 00:22
  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', '0006_auto_20170610_1512'),
  13 + ]
  14 +
  15 + operations = [
  16 + migrations.AddField(
  17 + model_name='themes',
  18 + name='high_contrats_logo',
  19 + field=models.ImageField(blank=True, null=True, upload_to='themes/', validators=[themes.models.validate_img_extension], verbose_name='High Contrast Logo'),
  20 + ),
  21 + ]
themes/migrations/0008_auto_20170920_2123.py 0 → 100644
  Diff comments   View file @5e0ed97
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10.4 on 2017-09-21 00:23
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.db import migrations
  6 +
  7 +
  8 +class Migration(migrations.Migration):
  9 +
  10 + dependencies = [
  11 + ('themes', '0007_themes_high_contrats_logo'),
  12 + ]
  13 +
  14 + operations = [
  15 + migrations.RenameField(
  16 + model_name='themes',
  17 + old_name='high_contrats_logo',
  18 + new_name='high_contrast_logo',
  19 + ),
  20 + ]
themes/models.py
  Diff comments   View file @5e0ed97
@@ -15,6 +15,7 @@ class Themes(models.Model): @@ -15,6 +15,7 @@ class Themes(models.Model):
15 favicon = models.ImageField(verbose_name = _("Favicon"), blank = True, null = True, upload_to = 'themes/', validators = [validate_img_extension]) 15 favicon = models.ImageField(verbose_name = _("Favicon"), blank = True, null = True, upload_to = 'themes/', validators = [validate_img_extension])
16 small_logo = models.ImageField(verbose_name = _("Small Logo"), blank = True, null = True, upload_to = 'themes/', validators = [validate_img_extension]) 16 small_logo = models.ImageField(verbose_name = _("Small Logo"), blank = True, null = True, upload_to = 'themes/', validators = [validate_img_extension])
17 large_logo = models.ImageField(verbose_name = _("Large Logo"), blank = True, null = True, upload_to = 'themes/', validators = [validate_img_extension]) 17 large_logo = models.ImageField(verbose_name = _("Large Logo"), blank = True, null = True, upload_to = 'themes/', validators = [validate_img_extension])
  18 + high_contrast_logo = models.ImageField(verbose_name = _("High Contrast Logo"), blank = True, null = True, upload_to = 'themes/', validators = [validate_img_extension])
18 footer_note = models.TextField(_("Footer Note"), blank = True) 19 footer_note = models.TextField(_("Footer Note"), blank = True)
19 css_style = models.CharField(_("Css Style"), max_length = 50, default = "green", choices = (("green", _('Green')),("contrast",_('Contrast')),("red", _('Red')), ("black", _('Black')))) 20 css_style = models.CharField(_("Css Style"), max_length = 50, default = "green", choices = (("green", _('Green')),("contrast",_('Contrast')),("red", _('Red')), ("black", _('Black'))))
20 21
@@ -48,3 +49,11 @@ class Themes(models.Model): @@ -48,3 +49,11 @@ class Themes(models.Model):
48 return self.large_logo.url 49 return self.large_logo.url
49 50
50 return static('img/logo_grande_amadeus.png') 51 return static('img/logo_grande_amadeus.png')
  52 +
  53 + @property
  54 + def high_contrast_logo_url(self):
  55 + if self.high_contrast_logo and hasattr(self.high_contrast_logo, 'url'):
  56 + if path.exists(self.high_contrast_logo.path):
  57 + return self.high_contrast_logo.url
  58 +
  59 + return static('img/alto_contraste_logo_amadeus.png')
users/templates/users/forgot_password.html
  Diff comments   View file @5e0ed97
@@ -15,7 +15,11 @@ @@ -15,7 +15,11 @@
15 {% block content %} 15 {% block content %}
16 <div class="row"> 16 <div class="row">
17 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> 17 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
18 - <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus"> 18 + {% if contrast_cookie %}
  19 + <img src="{{ theme.high_contrast_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus" />
  20 + {% else %}
  21 + <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus" />
  22 + {% endif %}
19 </div> 23 </div>
20 </div> 24 </div>
21 25
users/templates/users/login.html
  Diff comments   View file @5e0ed97
@@ -15,7 +15,11 @@ @@ -15,7 +15,11 @@
15 {% block content %} 15 {% block content %}
16 <div class="row"> 16 <div class="row">
17 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> 17 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
18 - <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login " alt="logo amadeus"> 18 + {% if contrast_cookie %}
  19 + <img src="{{ theme.high_contrast_logo_url }}" class="img-responsive center-block logo-login " alt="logo amadeus" />
  20 + {% else %}
  21 + <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login " alt="logo amadeus" />
  22 + {% endif %}
19 </div> 23 </div>
20 </div> 24 </div>
21 25
users/templates/users/new_password.html
  Diff comments   View file @5e0ed97
@@ -15,7 +15,11 @@ @@ -15,7 +15,11 @@
15 {% block content %} 15 {% block content %}
16 <div class="row"> 16 <div class="row">
17 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> 17 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
18 - <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus"> 18 + {% if contrast_cookie %}
  19 + <img src="{{ theme.high_contrast_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus" />
  20 + {% else %}
  21 + <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus" />
  22 + {% endif %}
19 </div> 23 </div>
20 </div> 24 </div>
21 25
users/templates/users/register.html
  Diff comments   View file @5e0ed97
@@ -16,7 +16,11 @@ @@ -16,7 +16,11 @@
16 {% block content %} 16 {% block content %}
17 <div class="row"> 17 <div class="row">
18 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> 18 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
19 - <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus"> 19 + {% if contrast_cookie %}
  20 + <img src="{{ theme.high_contrast_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus" />
  21 + {% else %}
  22 + <img src="{{ theme.large_logo_url }}" class="img-responsive center-block logo-login logo-register" alt="logo amadeus" />
  23 + {% endif %}
20 </div> 24 </div>
21 </div> 25 </div>
22 26
youtube_video/migrations/0002_auto_20170920_2122.py 0 → 100644
  Diff comments   View file @5e0ed97
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10.4 on 2017-09-21 00:22
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.db import migrations, models
  6 +
  7 +
  8 +class Migration(migrations.Migration):
  9 +
  10 + dependencies = [
  11 + ('youtube_video', '0001_initial'),
  12 + ]
  13 +
  14 + operations = [
  15 + migrations.AlterField(
  16 + model_name='ytvideo',
  17 + name='url',
  18 + field=models.CharField(max_length=250, verbose_name='URL'),
  19 + ),
  20 + ]