From aa4ac4f1a8b8509f316b7bd0c7590f7c232388f0 Mon Sep 17 00:00:00 2001 From: Gunvor4 Date: Fri, 18 Aug 2023 10:36:52 +0200 Subject: [PATCH 01/31] Created new model Lore Created Lore model, modified save() method to always slugify title, set up compression of images, and added new model to Django admin --- src/internal/admin.py | 8 ++++++- src/internal/migrations/0027_lore.py | 30 +++++++++++++++++++++++++ src/internal/models.py | 33 +++++++++++++++++++++++++++- 3 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 src/internal/migrations/0027_lore.py diff --git a/src/internal/admin.py b/src/internal/admin.py index ef5c45fcf..0c70db9d5 100644 --- a/src/internal/admin.py +++ b/src/internal/admin.py @@ -5,7 +5,7 @@ from util import html_utils from util.admin_utils import DefaultAdminWidgetsMixin, UserSearchFieldsMixin, search_escaped_and_unescaped -from .models import Member, Quote, Secret, SystemAccess +from .models import Member, Quote, Secret, SystemAccess, Lore class MemberAdmin(DefaultAdminWidgetsMixin, SimpleHistoryAdmin): @@ -93,7 +93,13 @@ class QuoteAdmin(DefaultAdminWidgetsMixin, UserSearchFieldsMixin, admin.ModelAdm autocomplete_fields = ('author',) +class LoreAdmin(admin.ModelAdmin): + ordering = ('title',) + exclude = ('slug',) + + admin.site.register(Member, MemberAdmin) admin.site.register(SystemAccess, SystemAccessAdmin) admin.site.register(Secret, SecretAdmin) admin.site.register(Quote, QuoteAdmin) +admin.site.register(Lore, LoreAdmin) diff --git a/src/internal/migrations/0027_lore.py b/src/internal/migrations/0027_lore.py new file mode 100644 index 000000000..54b14cbd3 --- /dev/null +++ b/src/internal/migrations/0027_lore.py @@ -0,0 +1,30 @@ +# Generated by Django 4.1.7 on 2023-08-18 08:29 + +from django.db import migrations, models +import functools +import internal.models +import util.modelfields +import util.storage + + +class Migration(migrations.Migration): + + dependencies = [ + ('internal', '0026_add_secret_permissions'), + ] + + operations = [ + migrations.CreateModel( + name='Lore', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=50, verbose_name='title')), + ('slug', models.SlugField()), + ('text', models.TextField(verbose_name='text')), + ('image', util.modelfields.CompressedImageField(blank=True, max_length=200, storage=util.storage.OverwriteStorage(), upload_to=functools.partial(util.storage.UploadToUtils._actual_upload_to, *(), **{'upload_to': internal.models.internal_subclass_directory_path}), verbose_name='image')), + ], + options={ + 'verbose_name_plural': 'Lore articles', + }, + ), + ] diff --git a/src/internal/models.py b/src/internal/models.py index 02afa34cd..fafe81a29 100644 --- a/src/internal/models.py +++ b/src/internal/models.py @@ -5,7 +5,7 @@ from django.db.models import F from django.db.models.functions import Lower from django.utils import timezone -from django.utils.text import capfirst +from django.utils.text import capfirst, slugify from django.utils.translation import gettext_lazy as _ from phonenumber_field.modelfields import PhoneNumberField from phonenumber_field.phonenumber import PhoneNumber @@ -15,6 +15,8 @@ from groups.models import Committee from users.models import User from util.auth_utils import perm_to_str, perms_to_str +from util.modelfields import CompressedImageField +from util.storage import OverwriteStorage, UploadToUtils from util.url_utils import reverse_internal from web.modelfields import UnlimitedCharField from .modelfields import SemesterField @@ -314,3 +316,32 @@ class Meta: def __str__(self): return _("“{quote}” —{quoted}").format(quote=self.quote, quoted=self.quoted) + + +def internal_subclass_directory_path(instance: 'Lore', filename: str): + model_name = instance._meta.model_name + return f"internal/{model_name}s/{filename}" + + +class Lore(models.Model): + title = models.CharField(max_length=50, verbose_name=_("title"), null=False) + slug = models.SlugField() + text = models.TextField(verbose_name=_("text")) + image = CompressedImageField( + upload_to=UploadToUtils.get_pk_prefixed_filename_func(internal_subclass_directory_path), + max_length=200, + storage=OverwriteStorage(), + blank=True, + verbose_name=_("image") + ) + + def __str__(self): + return _("{title}").format(title=self.title) + + def save(self, *args, **kwargs): + self.slug = slugify(self.title) + super().save(*args, **kwargs) + + class Meta: + verbose_name_plural = 'Lore articles' + From 17d65c58dc29aa18ba2502440e084e926e006088 Mon Sep 17 00:00:00 2001 From: Gunvor4 Date: Fri, 18 Aug 2023 10:39:22 +0200 Subject: [PATCH 02/31] Made form for lore articles Made form to be used when adding or changing lore articles --- src/internal/forms.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/internal/forms.py b/src/internal/forms.py index 8918a8528..7431cc5d3 100644 --- a/src/internal/forms.py +++ b/src/internal/forms.py @@ -6,7 +6,7 @@ from card.formfields import CardNumberField from users.models import User from web.widgets import SemanticDateInput, SemanticMultipleSelectInput, SemanticSearchableChoiceInput -from .models import Member, Quote, Secret, SystemAccess +from .models import Member, Quote, Secret, SystemAccess, Lore class AddMemberForm(forms.ModelForm): @@ -176,3 +176,9 @@ class Meta: widgets = { 'date': SemanticDateInput(), } + + +class LoreForm(forms.ModelForm): + class Meta: + model = Lore + fields = ('title', 'text', 'image') From 612185f56bd8634303be7e3ecd2d7fcbc3bf5adc Mon Sep 17 00:00:00 2001 From: Gunvor4 Date: Fri, 18 Aug 2023 10:50:47 +0200 Subject: [PATCH 03/31] Added urls, views and template for lore wiki Added URLs and views for viewing the general lore article page and for viewing a particular lore article, for adding new lore article, and changing and deleting existing articles. Modified form_valid() method for the CreateView and the UpdateView, so the page throws an error if a user tries to write a new article on a topic that already exists. Added new template for viewing lore articles, and added lore wiki to the internal header. --- src/internal/templates/internal/header.html | 4 + .../templates/internal/lore_list.html | 63 ++++++++++++ src/internal/urls.py | 12 +++ src/internal/views.py | 99 ++++++++++++++++++- 4 files changed, 175 insertions(+), 3 deletions(-) create mode 100644 src/internal/templates/internal/lore_list.html diff --git a/src/internal/templates/internal/header.html b/src/internal/templates/internal/header.html index bcf274d8d..c278ca7b2 100644 --- a/src/internal/templates/internal/header.html +++ b/src/internal/templates/internal/header.html @@ -20,6 +20,10 @@
{% translate "Quotes" %}
+ +
{% translate "MAKE Lore" %}
+
+
{% translate "Misc." %}
diff --git a/src/internal/templates/internal/lore_list.html b/src/internal/templates/internal/lore_list.html new file mode 100644 index 000000000..495dddf61 --- /dev/null +++ b/src/internal/templates/internal/lore_list.html @@ -0,0 +1,63 @@ +{% extends 'internal/base.html' %} +{% load i18n %} +{% load static %} + + +{% block title %} + {% translate "The wiki of MAKE lore" %} +{% endblock title %} + +{% block header_links %} + + +{% endblock header_links %} + +{% block body %} +
+

{% translate "Topics" %} + {% if perms.internal.add_lore %} + + + + {% endif %}

+ +
+
+ {% if show_article %} +

{{ lore_article.title|capfirst }} + {% if perms.internal.delete_lore %} + + + + {% endif %} + {% if perms.internal.change_lore %} + + + + {% endif %}

+
+ {% if lore_article.image %} + {{ lore_article.title }} + {% endif %} +

{{ lore_article.text|linebreaks }}

+
+ {% else %} +

{% translate "Welcome to the wiki of MAKE lore" %}

+

{% translate "Click a topic in the menu to access a wiki article" %}

+ {% endif %} +
+{% endblock body %} + +{% block footer %}{% endblock footer %} diff --git a/src/internal/urls.py b/src/internal/urls.py index 33fc36665..5f83c36ff 100644 --- a/src/internal/urls.py +++ b/src/internal/urls.py @@ -72,6 +72,17 @@ path("/", include(specific_quote_urlpatterns)), ] +specific_lore_urlpatterns = [ + path("", views.LoreDetailView.as_view(), name='lore_article'), + path("change/", views.LoreUpdateView.as_view(), name='update_lore'), + path("delete/", views.LoreDeleteView.as_view(), name='delete_lore'), +] +lore_urlpatterns = [ + path("", views.LoreListView.as_view(), name='lore_list'), + path("add/", views.LoreCreateView.as_view(), name='add_lore'), + path("/", include(specific_lore_urlpatterns)), +] + internal_urlpatterns = [ path("", views.HomeView.as_view(url_name='home'), name='home'), path("bulletins/", include(committee_bulletin_urlpatterns)), @@ -82,6 +93,7 @@ path("members/", decorator_include(permission_required_else_denied('internal.view_member'), member_urlpatterns)), path("secrets/", decorator_include(permission_required_else_denied('internal.view_secret'), secret_urlpatterns)), path("quotes/", decorator_include(permission_required_else_denied('internal.view_quote'), quote_urlpatterns)), + path("lore/", decorator_include(permission_required_else_denied('internal.view_lore'), lore_urlpatterns)), ] urlpatterns += i18n_patterns( diff --git a/src/internal/views.py b/src/internal/views.py index d846bb07e..0c5d4084e 100644 --- a/src/internal/views.py +++ b/src/internal/views.py @@ -7,8 +7,9 @@ from django.shortcuts import get_object_or_404 from django.urls import reverse, reverse_lazy from django.utils import timezone +from django.utils.text import slugify from django.utils.translation import gettext_lazy as _ -from django.views.generic import CreateView, DeleteView, ListView, UpdateView +from django.views.generic import CreateView, DeleteView, ListView, UpdateView, DetailView from django.views.generic.detail import SingleObjectMixin from contentbox.views import ContentBoxDetailView, ContentBoxUpdateView @@ -16,9 +17,9 @@ from util.view_utils import CustomFieldsetFormMixin, PreventGetRequestsMixin from .forms import ( AddMemberForm, ChangeMemberForm, MemberQuitForm, MemberRetireForm, MemberStatusForm, QuoteForm, RestrictedChangeMemberForm, SecretsForm, - SystemAccessValueForm, + SystemAccessValueForm, LoreForm ) -from .models import Member, Quote, Secret, SystemAccess +from .models import Member, Quote, Secret, SystemAccess, Lore class InternalContentBoxDetailView(ContentBoxDetailView): @@ -332,3 +333,95 @@ def has_permission(self): self.request.user.has_perm('internal.delete_quote') or self.request.user == self.get_object().author ) + + +class LoreListView(ListView): + template_name = 'internal/lore_list.html' + model = Lore + context_object_name = 'lore_topics' + ordering = 'title' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['show_article'] = False + return context + + +class LoreDetailView(DetailView): + template_name = 'internal/lore_list.html' + model = Lore + context_object_name = 'lore_article' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['show_article'] = True + lore_topics = Lore.objects.all().order_by('title') + context['lore_topics'] = lore_topics + return context + + +class LoreFormMixin(CustomFieldsetFormMixin, ABC): + model = Lore + form_class = LoreForm + base_template = 'internal/base.html' + back_button_link = reverse_lazy('lore_list') + back_button_text = _("Lore wiki") + + +class LoreCreateView(PermissionRequiredMixin, LoreFormMixin, CreateView): + permission_required = ('internal.add_lore',) + form_title = _("New lore article") + + def form_valid(self, form): + title = form.cleaned_data['title'] + slug = slugify(title) + if Lore.objects.filter(slug=slug).exists(): + form.add_error('title', _("An article with this title already exists. Please merge your text with the existing one!")) + return self.form_invalid(form) + else: + return super().form_valid(form) + + def get_success_url(self): + slug = slugify(self.object) + return reverse_lazy('lore_article', args=[slug]) + + +class LoreUpdateView(PermissionRequiredMixin, LoreFormMixin, UpdateView): + form_title = _("Edit lore article") + back_button_text = _("Lore article") + + def has_permission(self): + return ( + self.request.user.has_perm('internal.change_lore') + or self.request.user == self.get_object().author + ) + + def get_back_button_link(self): + title = self.get_form_kwargs()['instance'] + slug = slugify(title) + return reverse_lazy('lore_article', args=[slug]) + + def form_valid(self, form): + title = form.cleaned_data['title'] + slug = slugify(title) + article = super().get_object() + if (article.slug != slug) and (Lore.objects.filter(slug=slug).exists()): + form.add_error('title', _("An article with this title already exists. Please merge your text with the existing one!")) + return self.form_invalid(form) + else: + return super().form_valid(form) + + def get_success_url(self): + slug = slugify(self.object) + return reverse_lazy('lore_article', args=[slug]) + + +class LoreDeleteView(PermissionRequiredMixin, PreventGetRequestsMixin, DeleteView): + model = Lore + success_url = reverse_lazy('lore_list') + + def has_permission(self): + return ( + self.request.user.has_perm('internal.delete_lore') + or self.request.user == self.get_object().author + ) From 1a3e879501ec5ed0044e12b15f4710127cfc7323 Mon Sep 17 00:00:00 2001 From: Gunvor4 Date: Fri, 18 Aug 2023 10:51:31 +0200 Subject: [PATCH 04/31] Added styling to lore wiki --- .../static/internal/css/make_lore.css | 72 +++++++++++++++++++ .../templates/internal/lore_list.html | 1 + 2 files changed, 73 insertions(+) create mode 100644 src/internal/static/internal/css/make_lore.css diff --git a/src/internal/static/internal/css/make_lore.css b/src/internal/static/internal/css/make_lore.css new file mode 100644 index 000000000..648d5221f --- /dev/null +++ b/src/internal/static/internal/css/make_lore.css @@ -0,0 +1,72 @@ +#lore-wiki-list { + float: left; + width: 20%; + padding: 3rem 0 0 40px; +} + +#lore-wiki-list a { + color: black; +} + +#lore-wiki-list ul { + list-style-type: none; + list-style-position: inside; + padding: 0; +} + +#lore-wiki-list .selected-lore-article { + font-weight: bold; +} + +#lore-article { + float: left; + width: 80%; + padding: 3rem 25% 0 5%; +} + +#lore-article p { + text-align: justify; +} + +#lore-article .lore-img { + width: 35%; + float: right; + margin: 7px 0 15px 35px; +} + +#lore-article .lore-container { + margin-bottom: 50px; +} + +#lore-article .right.floated { + float: right; +} + +#lore-wiki-list .plus.icon { + font-size: 90%; +} + +#lore-article .trash.icon, +#lore-article .pencil.icon { + font-size: 70%; +} + +@media screen and (max-width: 991.98px) { + #lore-wiki-list { + float: none; + width: 100%; + padding: 2rem 15% 0 15%; + } + + #lore-article { + float: none; + width: 100%; + padding: 3rem 15% 2rem 15%; + } + + #lore-article .lore-img { + float: none; + width: 100%; + margin: 10px 0 10px 0; + } +} diff --git a/src/internal/templates/internal/lore_list.html b/src/internal/templates/internal/lore_list.html index 495dddf61..c546f1772 100644 --- a/src/internal/templates/internal/lore_list.html +++ b/src/internal/templates/internal/lore_list.html @@ -8,6 +8,7 @@ {% endblock title %} {% block header_links %} + {% endblock header_links %} From 99080f8d873898fc775f1ae8f73f87f888a4fbfd Mon Sep 17 00:00:00 2001 From: Gunvor4 Date: Fri, 18 Aug 2023 10:52:08 +0200 Subject: [PATCH 05/31] Updated translation files Updated translation files before rebasing --- src/locale/nb/LC_MESSAGES/django.mo | Bin 53765 -> 54533 bytes src/locale/nb/LC_MESSAGES/django.po | 200 ++++++++++++++++++---------- 2 files changed, 127 insertions(+), 73 deletions(-) diff --git a/src/locale/nb/LC_MESSAGES/django.mo b/src/locale/nb/LC_MESSAGES/django.mo index c098d9c25ecbd39e3cd4d857990b029674e911d5..a12d410479f49a8f9eda27153723104d9dae411d 100644 GIT binary patch delta 15241 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 Ky7;Rr(fd?g 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 Kw)6*I6#G9{