From 5c7b141ba10a79dde9faef15e3b47de91704bc3a Mon Sep 17 00:00:00 2001 From: Roberto Santos Date: Tue, 26 Jun 2018 09:24:08 +0100 Subject: [PATCH] Add transparency to categories colours. --- .../migrations/0019_auto_20180626_0809.py | 24 +++++++++++++++++++ geokey/categories/models.py | 1 + geokey/categories/views.py | 1 + .../categories/category_display.html | 7 ++++++ 4 files changed, 33 insertions(+) create mode 100644 geokey/categories/migrations/0019_auto_20180626_0809.py diff --git a/geokey/categories/migrations/0019_auto_20180626_0809.py b/geokey/categories/migrations/0019_auto_20180626_0809.py new file mode 100644 index 00000000..1047fecd --- /dev/null +++ b/geokey/categories/migrations/0019_auto_20180626_0809.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('categories', '0018_historicalcategory'), + ] + + operations = [ + migrations.AddField( + model_name='category', + name='transparency', + field=models.IntegerField(default=100), + ), + migrations.AddField( + model_name='historicalcategory', + name='transparency', + field=models.IntegerField(default=100), + ), + ] diff --git a/geokey/categories/models.py b/geokey/categories/models.py index b437e2e6..24d46191 100644 --- a/geokey/categories/models.py +++ b/geokey/categories/models.py @@ -49,6 +49,7 @@ class Category(models.Model): max_length=20 ) colour = models.TextField(default='#0033ff') + transparency = models.IntegerField(default=100) symbol = models.ImageField(upload_to='symbols', null=True, max_length=500) objects = CategoryManager() diff --git a/geokey/categories/views.py b/geokey/categories/views.py index 96afc9f0..8559b8f3 100644 --- a/geokey/categories/views.py +++ b/geokey/categories/views.py @@ -258,6 +258,7 @@ def post(self, request, project_id, category_id): if category: symbol = request.FILES.get('symbol') category.colour = data.get('colour') + category.transparency = data.get('transparency') if symbol is not None: category.symbol.delete() diff --git a/geokey/templates/categories/category_display.html b/geokey/templates/categories/category_display.html index fbd79234..8fb5e422 100644 --- a/geokey/templates/categories/category_display.html +++ b/geokey/templates/categories/category_display.html @@ -44,6 +44,13 @@

Category display

+
+ +
+ +
+
+