mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-26 03:21:05 +00:00
Code Issues Projects Releases Wiki Activity

Manually add theme path rather than options

Browse source
This commit is contained in:
Mouse Reeve 2022-03-13 13:11:24 -07:00
parent 753cd36f86
commit 3885ae789b
3 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bookwyrm/forms.py
View file

@ -468,7 +468,12 @@ class ThemeForm(CustomForm):
fields = ["name", "path"] fields = ["name", "path"]
widgets = { widgets = {
"name": forms.TextInput(attrs={"aria-describedby": "desc_name"}), "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
"path": forms.Select(attrs={"aria-describedby": "desc_path"}), "path": forms.TextInput(
attrs={
"aria-describedby": "desc_path",
"placeholder": "css/themes/theme-name.scss",
}
),
} }

22
bookwyrm/templates/settings/themes.html
View file

@ -56,12 +56,7 @@
class="box" class="box"
enctype="multipart/form-data" enctype="multipart/form-data"
> >
{% if not choices %} <fieldset>
<div class="notification is-warning">
{% trans "No available theme files detected" %}
</div>
{% endif %}
<fieldset {% if not choices %}disabled{% endif %}>
{% csrf_token %} {% csrf_token %}
<div class="columns"> <div class="columns">
<div class="column is-half"> <div class="column is-half">
@ -79,20 +74,7 @@
{% trans "Theme filename" %} {% trans "Theme filename" %}
</label> </label>
<div class="control"> <div class="control">
<div class="select"> {{ theme_form.path }}
<select
name="path"
aria-describedby="desc_path"
class=""
id="id_path"
>
{% for choice in choices %}
<option value="{{ choice }}">
{{ choice }}
</option>
{% endfor %}
</select>
</div>
{% include 'snippets/form_errors.html' with errors_list=theme_form.path.errors id="desc_path" %} {% include 'snippets/form_errors.html' with errors_list=theme_form.path.errors id="desc_path" %}
</div> </div>
</div> </div>

5
bookwyrm/views/admin/themes.py
View file

@ -1,7 +1,5 @@
""" manage themes """ """ manage themes """
from django.contrib.auth.decorators import login_required, permission_required from django.contrib.auth.decorators import login_required, permission_required
from django.contrib.staticfiles.utils import get_files
from django.contrib.staticfiles.storage import StaticFilesStorage
from django.shortcuts import get_object_or_404, redirect from django.shortcuts import get_object_or_404, redirect
from django.template.response import TemplateResponse from django.template.response import TemplateResponse
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
@ -41,11 +39,8 @@ class Themes(View):
def get_view_data(): def get_view_data():
"""data for view""" """data for view"""
choices = list(get_files(StaticFilesStorage(), location="css/themes"))
current = models.Theme.objects.values_list("path", flat=True)
return { return {
"themes": models.Theme.objects.all(), "themes": models.Theme.objects.all(),
"choices": [c for c in choices if c not in current and c[-5:] == ".scss"],
"theme_form": forms.ThemeForm(), "theme_form": forms.ThemeForm(),
} }