From b3fd805d40d592050c0ce9bcd9eb53c31aab18f7 Mon Sep 17 00:00:00 2001
From: Rodolphe Breard <rodolphe@what.tf>
Date: Fri, 28 Feb 2020 19:06:37 +0100
Subject: [PATCH] Remove the last parts of django-bulma

---
 .gitlab-ci.yml                                        | 11 ++---------
 README.md                                             | 10 ++--------
 khaganat/templates/khaganat/centered_dialog.html      |  1 -
 khaganat/templates/npb/paste_detail.html              |  1 -
 khaganat/templates/npb/paste_form.html                |  3 +--
 khaganat/templates/npb/report_form.html               |  3 +--
 neluser/templates/neluser/login.html                  |  3 +--
 neluser/templates/neluser/password_reset.html         |  3 +--
 neluser/templates/neluser/password_reset_confirm.html |  1 -
 neluser/templates/neluser/register.html               |  3 +--
 neluser/templates/neluser/settings/base.html          |  1 -
 .../templates/neluser/settings/preferences/nsfw.html  |  1 -
 .../neluser/settings/security/delete_account.html     |  3 +--
 .../templates/neluser/settings/security/password.html |  3 +--
 pwdb/templates/pwdb/authenticate.html                 |  1 -
 15 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9d37bd..4348ac3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,16 +16,9 @@ Build CSS:
     - apt-get install -y nodejs npm
 
     - pip3 install pipenv
-    
+
     - pipenv --three update
     - pipenv install django
     - pipenv install django-bulma
-    
-    - echo "KHAGANAT_SECRET_KEY= build" > .env
-    
-    - pipenv run ./manage.py bulma install
-    - pipenv run ./manage.py bulma build
 
-  artifacts:
-     paths:
-       - static_extra/bulma/css/*
+    - echo "KHAGANAT_SECRET_KEY= build" > .env
diff --git a/README.md b/README.md
index b93e994..23202bd 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 In order to have a single Python coding style, please use [black](https://github.com/psf/black). However, auto-generated files and parts of external projects should not be reformatted.
 
 ```
-$ black $(find . -type f -name "*\.py" -not -path "*/migrations/*" -not -path "./static_extra/bulma/*" -print)
+$ black $(find . -type f -name "*\.py" -not -path "*/migrations/*" -print)
 ```
 
 
@@ -33,16 +33,10 @@ To run this web application, you need a database. The simplest way is to downloa
 
 ```
 $ pipenv run ./manage.py migrate
+$ pipenv run ./manage.py compilemessages
 $ pipenv run ./manage.py createsuperuser
 ```
 
-In order to display the Khaganat theme, you have to install bulma and build it :
-
-```
-$ pipenv run ./manage.py bulma install
-$ pipenv run ./manage.py bulma build
-```
-
 Now that everything has been set-up, you may run Django's internal debug server.
 
 ```
diff --git a/khaganat/templates/khaganat/centered_dialog.html b/khaganat/templates/khaganat/centered_dialog.html
index a721b74..6b3a9c7 100644
--- a/khaganat/templates/khaganat/centered_dialog.html
+++ b/khaganat/templates/khaganat/centered_dialog.html
@@ -1,5 +1,4 @@
 {% extends "khaganat/base.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block content %}
diff --git a/khaganat/templates/npb/paste_detail.html b/khaganat/templates/npb/paste_detail.html
index e920ba6..0d461cf 100644
--- a/khaganat/templates/npb/paste_detail.html
+++ b/khaganat/templates/npb/paste_detail.html
@@ -1,5 +1,4 @@
 {% extends "khaganat/base.html" %}
-{% load bulma_tags %}
 {% load static %}
 {% load i18n %}
 
diff --git a/khaganat/templates/npb/paste_form.html b/khaganat/templates/npb/paste_form.html
index 5d2ccc8..3b80fbb 100644
--- a/khaganat/templates/npb/paste_form.html
+++ b/khaganat/templates/npb/paste_form.html
@@ -1,5 +1,4 @@
 {% extends "khaganat/centered_dialog.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block title %}{% trans 'New paste' %}{% endblock %}
@@ -9,7 +8,7 @@
 {% block dialog %}
 <form action="" method="post">
     {% csrf_token %}
-    {{ form|bulma }}
+    {{ form.as_p }}
     <button type="submit" class="button is-link">{% trans "Submit" %}</button>
 </form>
 {% endblock %}
diff --git a/khaganat/templates/npb/report_form.html b/khaganat/templates/npb/report_form.html
index b756789..c90dfcb 100644
--- a/khaganat/templates/npb/report_form.html
+++ b/khaganat/templates/npb/report_form.html
@@ -1,5 +1,4 @@
 {% extends "khaganat/centered_dialog.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block title %}{% trans 'Report paste' %}{% endblock %}
@@ -9,7 +8,7 @@
 {% block dialog %}
 <form action="" method="post">
     {% csrf_token %}
-    {{ form|bulma }}
+    {{ form.as_p }}
     <button type="submit" class="button is-warning">{% trans "Submit" %}</button>
 </form>
 {% endblock %}
diff --git a/neluser/templates/neluser/login.html b/neluser/templates/neluser/login.html
index e7d992f..dee62bd 100644
--- a/neluser/templates/neluser/login.html
+++ b/neluser/templates/neluser/login.html
@@ -1,5 +1,4 @@
 {% extends "khaganat/centered_dialog.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block title %}{% trans "login"|capfirst %}{% endblock %}
@@ -8,7 +7,7 @@
 {% block dialog %}
 <form method="post" action="{% url 'login' %}">
     {% csrf_token %}
-    {{ form|bulma }}
+    {{ form.as_p }}
     <input type="hidden" name="next" value="{{ request.GET.next }}" />
     <button type="submit" class="button is-link">{% trans "login"|capfirst %}</button>
     <a class="button is-light" href="{% url "password_reset" %}" role="button">{% trans "forgotten_password"|capfirst %}</a>
diff --git a/neluser/templates/neluser/password_reset.html b/neluser/templates/neluser/password_reset.html
index ffb2fa0..e82c1d4 100644
--- a/neluser/templates/neluser/password_reset.html
+++ b/neluser/templates/neluser/password_reset.html
@@ -1,5 +1,4 @@
 {% extends "khaganat/centered_dialog.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block title %}{% trans "password_reset"|capfirst %}{% endblock %}
@@ -8,7 +7,7 @@
 {% block dialog %}
 <form method="post" action="{% url 'password_reset' %}">
     {% csrf_token %}
-    {{ form|bulma }}
+    {{ form.as_p }}
     <button type="submit" class="button is-link">{% trans "reset_my_password"|capfirst %}</button>
 </form>
 {% endblock %}
diff --git a/neluser/templates/neluser/password_reset_confirm.html b/neluser/templates/neluser/password_reset_confirm.html
index 573701a..315d544 100644
--- a/neluser/templates/neluser/password_reset_confirm.html
+++ b/neluser/templates/neluser/password_reset_confirm.html
@@ -1,5 +1,4 @@
 {% extends "khaganat/centered_dialog.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block title %}{% if validlink %}{% trans "set_new_password"|capfirst %}{% else %}{% trans "password_reset"|capfirst %}{% endif %}{% endblock %}
diff --git a/neluser/templates/neluser/register.html b/neluser/templates/neluser/register.html
index 83b3c8b..ab18b37 100644
--- a/neluser/templates/neluser/register.html
+++ b/neluser/templates/neluser/register.html
@@ -1,5 +1,4 @@
 {% extends "khaganat/centered_dialog.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block title %}{% trans "register"|capfirst %}{% endblock %}
@@ -9,7 +8,7 @@
 {% block dialog %}
 <form method="post" action="{% url 'register' %}">
     {% csrf_token %}
-    {{ form|bulma }}
+    {{ form.as_p }}
     <button type="submit" class="button is-link">{% trans "register"|capfirst %}</button>
 </form>
 {% endblock %}
diff --git a/neluser/templates/neluser/settings/base.html b/neluser/templates/neluser/settings/base.html
index 149828d..5ec1dc6 100644
--- a/neluser/templates/neluser/settings/base.html
+++ b/neluser/templates/neluser/settings/base.html
@@ -1,5 +1,4 @@
 {% extends "khaganat/base.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block content %}
diff --git a/neluser/templates/neluser/settings/preferences/nsfw.html b/neluser/templates/neluser/settings/preferences/nsfw.html
index 3491056..d53b00e 100644
--- a/neluser/templates/neluser/settings/preferences/nsfw.html
+++ b/neluser/templates/neluser/settings/preferences/nsfw.html
@@ -1,5 +1,4 @@
 {% extends "neluser/settings/preferences/base.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block title %}{% trans "NSFW content" %}{% endblock %}
diff --git a/neluser/templates/neluser/settings/security/delete_account.html b/neluser/templates/neluser/settings/security/delete_account.html
index 9fe0f15..74435f1 100644
--- a/neluser/templates/neluser/settings/security/delete_account.html
+++ b/neluser/templates/neluser/settings/security/delete_account.html
@@ -1,5 +1,4 @@
 {% extends "neluser/settings/security/base.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block title %}{% trans "delete_account"|capfirst %}{% endblock %}
@@ -7,7 +6,7 @@
 {% block inner_panel %}
 <form action="" method="post">
     {% csrf_token %}
-    {{ form|bulma }}
+    {{ form.as_p }}
     <button type="submit" class="button is-danger">{% trans "Permanently delete my account"|capfirst %}</button>
 </form>
 {% endblock %}
diff --git a/neluser/templates/neluser/settings/security/password.html b/neluser/templates/neluser/settings/security/password.html
index 9d50e66..182155b 100644
--- a/neluser/templates/neluser/settings/security/password.html
+++ b/neluser/templates/neluser/settings/security/password.html
@@ -1,5 +1,4 @@
 {% extends "neluser/settings/security/base.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block title %}{% trans "Password"|capfirst %}{% endblock %}
@@ -7,7 +6,7 @@
 {% block inner_panel %}
 <form action="" method="post">
     {% csrf_token %}
-    {{ form|bulma }}
+    {{ form.as_p }}
     <button type="submit" class="button is-link">{% trans "change_my_password"|capfirst %}</button>
 </form>
 {% endblock %}
diff --git a/pwdb/templates/pwdb/authenticate.html b/pwdb/templates/pwdb/authenticate.html
index 7045d17..3f2deae 100644
--- a/pwdb/templates/pwdb/authenticate.html
+++ b/pwdb/templates/pwdb/authenticate.html
@@ -1,5 +1,4 @@
 {% extends "khaganat/centered_dialog.html" %}
-{% load bulma_tags %}
 {% load i18n %}
 
 {% block title %}{% trans "authenticate"|capfirst %}{% endblock %}