From 89556e225cc0917d0710c356e0557e410c191feb Mon Sep 17 00:00:00 2001
From: Sonny <sonnyba871@gmail.com>
Date: Tue, 26 May 2020 22:20:21 +0200
Subject: [PATCH] Fix checkboxes

---
 src/newsreader/conf/base.py                      |  3 +++
 .../templates/news/collection/views/rules.html   |  4 ++--
 .../core/templates/news/core/widgets/rule.html   |  7 +++++--
 .../scss/elements/checkbox/_checkbox.scss        |  2 +-
 src/newsreader/scss/partials/_colors.scss        |  1 +
 .../templates/components/form/checkbox.html      |  4 +++-
 .../templates/components/form/form.html          |  9 ++-------
 src/newsreader/utils/__init__.py                 |  0
 src/newsreader/utils/admin.py                    |  3 +++
 src/newsreader/utils/apps.py                     |  5 +++++
 src/newsreader/utils/form.py                     | 16 ++++++++++++++++
 src/newsreader/utils/migrations/__init__.py      |  0
 src/newsreader/utils/models.py                   |  3 +++
 src/newsreader/utils/templatetags/filters.py     |  9 +++++++++
 src/newsreader/utils/tests.py                    |  3 +++
 src/newsreader/utils/views.py                    |  3 +++
 16 files changed, 59 insertions(+), 13 deletions(-)
 create mode 100644 src/newsreader/utils/__init__.py
 create mode 100644 src/newsreader/utils/admin.py
 create mode 100644 src/newsreader/utils/apps.py
 create mode 100644 src/newsreader/utils/form.py
 create mode 100644 src/newsreader/utils/migrations/__init__.py
 create mode 100644 src/newsreader/utils/models.py
 create mode 100644 src/newsreader/utils/templatetags/filters.py
 create mode 100644 src/newsreader/utils/tests.py
 create mode 100644 src/newsreader/utils/views.py

diff --git a/src/newsreader/conf/base.py b/src/newsreader/conf/base.py
index ee5a296..5d46230 100644
--- a/src/newsreader/conf/base.py
+++ b/src/newsreader/conf/base.py
@@ -31,6 +31,7 @@ INSTALLED_APPS = [
     "axes",
     # app modules
     "newsreader.accounts",
+    "newsreader.utils",
     "newsreader.news",
     "newsreader.news.core",
     "newsreader.news.collection",
@@ -70,6 +71,8 @@ TEMPLATES = [
     }
 ]
 
+FORM_RENDERER = "newsreader.utils.form.FormRenderer"
+
 WSGI_APPLICATION = "newsreader.wsgi.application"
 
 # Database
diff --git a/src/newsreader/news/collection/templates/news/collection/views/rules.html b/src/newsreader/news/collection/templates/news/collection/views/rules.html
index 11137b0..692e10a 100644
--- a/src/newsreader/news/collection/templates/news/collection/views/rules.html
+++ b/src/newsreader/news/collection/templates/news/collection/views/rules.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n static %}
+{% load i18n static filters %}
 
 {% block content %}
   <main id="rules--page" class="main">
@@ -37,7 +37,7 @@
             {% for rule in rules %}
               <tr class="table__row rules-table__row">
                 <td class="table__item rules-table__item">
-                  {% with "rules_"|add:rule.pk as id_for_label %}
+                  {% with rule|id_for_label:"rules" as id_for_label %}
                     {% include "components/form/checkbox.html" with name="rules" value=rule.pk id=id_for_label id_for_label=id_for_label %}
                   {% endwith %}
                 </td>
diff --git a/src/newsreader/news/core/templates/news/core/widgets/rule.html b/src/newsreader/news/core/templates/news/core/widgets/rule.html
index b3c7b68..11cdef5 100644
--- a/src/newsreader/news/core/templates/news/core/widgets/rule.html
+++ b/src/newsreader/news/core/templates/news/core/widgets/rule.html
@@ -1,5 +1,8 @@
-<input class="input category-form__input" type="{{ option.type }}"
-       name="{{ option.name }}" value="{{ option.value|stringformat:'s' }}"{% if option.selected %} checked{% endif %} />
+{% load filters %}
+
+{% with option.instance|id_for_label:"category" as id_for_label %}
+  {% include "components/form/checkbox.html" with name=option.name value=option.value|stringformat:'s' id=id_for_label id_for_label=id_for_label checked=option.selected only %}
+{% endwith %}
 
 {% if option.instance.favicon %}
   <img class="favicon" src="{{ option.instance.favicon }}" />
diff --git a/src/newsreader/scss/elements/checkbox/_checkbox.scss b/src/newsreader/scss/elements/checkbox/_checkbox.scss
index 6403672..f23a7c3 100644
--- a/src/newsreader/scss/elements/checkbox/_checkbox.scss
+++ b/src/newsreader/scss/elements/checkbox/_checkbox.scss
@@ -14,7 +14,7 @@
 
     &:checked + .checkbox__label {
       .checkbox__box {
-        background-color: $focus-blue;
+        background-color: $checkbox-blue;
       }
     }
   }
diff --git a/src/newsreader/scss/partials/_colors.scss b/src/newsreader/scss/partials/_colors.scss
index aaf2b26..08c7169 100644
--- a/src/newsreader/scss/partials/_colors.scss
+++ b/src/newsreader/scss/partials/_colors.scss
@@ -32,6 +32,7 @@ $border-gray: rgba(227, 227, 227, 1);
 
 $button-blue: rgba(111, 164, 196, 1);
 $focus-blue: darken($azureish-white, +10%);
+$checkbox-blue: rgba(34, 170, 253, 1);
 $font-color: rgba(48, 51, 53, 1);
 $header-color: rgba(100, 101, 102, 1);
 
diff --git a/src/newsreader/templates/components/form/checkbox.html b/src/newsreader/templates/components/form/checkbox.html
index 10fc95e..5840ae2 100644
--- a/src/newsreader/templates/components/form/checkbox.html
+++ b/src/newsreader/templates/components/form/checkbox.html
@@ -2,7 +2,9 @@
   {% if field %}
     {{ field }}
   {% else %}
-    <input id="{{ id }}" name="{{ name }}" type="checkbox" value="{{ value }}" data-input="{{ data_input }}" />
+  <input id="{{ id }}" name="{{ name }}" type="checkbox" value="{{ value }}"
+         {% if data_input %}data-input="{{ data_input }}"{% endif %}
+         {% if checked %}checked{% endif %} />
   {% endif %}
   <label class="checkbox__label" for="{% if field %}{{ field.id_for_label }}{% else %}{{ id_for_label }}{% endif %}">
     <span class="checkbox__box"/>
diff --git a/src/newsreader/templates/components/form/form.html b/src/newsreader/templates/components/form/form.html
index 229a543..d854eb1 100644
--- a/src/newsreader/templates/components/form/form.html
+++ b/src/newsreader/templates/components/form/form.html
@@ -23,14 +23,9 @@
       {% for field in form.visible_fields %}
         <fieldset class="fieldset form__fieldset">
           {% include "components/form/label.html" %}
+
           {{ field.errors }}
-
-          {% if field.field.widget.input_type == "checkbox" %}
-            {% include "components/form/checkbox.html" with field=field %}
-          {% else %}
-            {{ field }}
-          {% endif %}
-
+          {{ field }}
           {% include "components/form/help-text.html" %}
         </fieldset>
       {% endfor %}
diff --git a/src/newsreader/utils/__init__.py b/src/newsreader/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/newsreader/utils/admin.py b/src/newsreader/utils/admin.py
new file mode 100644
index 0000000..6ee0469
--- /dev/null
+++ b/src/newsreader/utils/admin.py
@@ -0,0 +1,3 @@
+
+
+# Register your models here.
diff --git a/src/newsreader/utils/apps.py b/src/newsreader/utils/apps.py
new file mode 100644
index 0000000..3e82e49
--- /dev/null
+++ b/src/newsreader/utils/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class UtilsConfig(AppConfig):
+    name = "utils"
diff --git a/src/newsreader/utils/form.py b/src/newsreader/utils/form.py
new file mode 100644
index 0000000..dc619bf
--- /dev/null
+++ b/src/newsreader/utils/form.py
@@ -0,0 +1,16 @@
+from django.forms.renderers import DjangoTemplates
+from django.template.exceptions import TemplateDoesNotExist
+from django.template.loader import get_template
+
+
+class FormRenderer(DjangoTemplates):
+    """
+    Prioritizes templates from TEMPLATES setting and fall's back to django's
+    default FormRenderer behaviour
+    """
+
+    def get_template(self, template_name):
+        try:
+            return get_template(template_name)
+        except TemplateDoesNotExist:
+            return super().get_template(template_name)
diff --git a/src/newsreader/utils/migrations/__init__.py b/src/newsreader/utils/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/src/newsreader/utils/models.py b/src/newsreader/utils/models.py
new file mode 100644
index 0000000..b0b75a3
--- /dev/null
+++ b/src/newsreader/utils/models.py
@@ -0,0 +1,3 @@
+
+
+# Create your models here.
diff --git a/src/newsreader/utils/templatetags/filters.py b/src/newsreader/utils/templatetags/filters.py
new file mode 100644
index 0000000..94fa541
--- /dev/null
+++ b/src/newsreader/utils/templatetags/filters.py
@@ -0,0 +1,9 @@
+from django import template
+
+
+register = template.Library()
+
+
+@register.filter
+def id_for_label(instance, arg):
+    return f"{arg}_{instance.pk}"
diff --git a/src/newsreader/utils/tests.py b/src/newsreader/utils/tests.py
new file mode 100644
index 0000000..c1b49c8
--- /dev/null
+++ b/src/newsreader/utils/tests.py
@@ -0,0 +1,3 @@
+
+
+# Create your tests here.
diff --git a/src/newsreader/utils/views.py b/src/newsreader/utils/views.py
new file mode 100644
index 0000000..5f7e220
--- /dev/null
+++ b/src/newsreader/utils/views.py
@@ -0,0 +1,3 @@
+
+
+# Create your views here.