sonny/newsreader
1
0
Fork 0
Code Issues 13 Pull requests 2 Projects Releases 58 Packages Wiki Activity Actions

Refactor rule create/update views

Browse source
This commit is contained in:
sonny 2020-05-14 20:40:24 +02:00
parent 9a46fa7ab0
commit b866f48e3b
8 changed files with 34 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/newsreader/news/collection/forms.py
View file

@ -1,4 +1,5 @@
from django import forms
from django.utils.translation import gettext_lazy as _
import pytz
@ -11,6 +12,7 @@ class CollectionRuleForm(forms.ModelForm):
timezone = forms.ChoiceField(
widget=forms.Select(attrs={"size": len(pytz.all_timezones)}),
choices=((timezone, timezone) for timezone in pytz.all_timezones),
help_text=_("The timezone which the feed uses"),
)
def __init__(self, *args, **kwargs):

13
src/newsreader/news/collection/templates/collection/rule-create.html
View file

@ -1,9 +1,10 @@
{% extends "collection/rule.html" %}
{% extends "base.html" %}
{% block form-header %}
<h1 class="h1 form__title">Create a rule</h1>
{% endblock %}
{% load static %}
{% block confirm-button %}
<button class="button button--confirm">Create rule</button>
{% block content %}
<main id="rule--page" class="main">
{% url "news:collection:rules" as cancel_url %}
{% include "form.html" with form=form title="Create rule" cancel_url=cancel_url only %}
</main>
{% endblock %}

13
src/newsreader/news/collection/templates/collection/rule-update.html
View file

@ -1,9 +1,10 @@
{% extends "collection/rule.html" %}
{% extends "base.html" %}
{% block form-header %}
<h1 class="h1 form__title">Update rule</h1>
{% endblock %}
{% load static %}
{% block confirm-button %}
<button class="button button--confirm">Save rule</button>
{% block content %}
<main id="rule--page" class="main">
{% url "news:collection:rules" as cancel_url %}
{% include "form.html" with form=form title="Update rule" cancel_url=cancel_url only %}
</main>
{% endblock %}

55
src/newsreader/news/collection/templates/collection/rule.html
View file

@ -1,55 +0,0 @@
{% extends "base.html" %}
{% load static %}
{% block content %}
<main id="rule--page" class="main">
<form class="form rule-form" method="post">
{% csrf_token %}
{{ form.non_field_errors }}
<div class="form__header">
{% block form-header %}{% endblock %}
</div>
<section class="section form__section rule-form__section">
<fieldset class="form__fieldset rule-form__fieldset">
<label class="label" for="name">Name</label>
{{ form.name.errors }}
{{ form.name }}
</fieldset>
<fieldset class="form__fieldset rule-form__fieldset">
<label class="label" for="name">Category</label>
{{ form.category.errors }}
{{ form.category }}
</fieldset>
<fieldset class="form__fieldset rule-form__fieldset">
<label class="label" for="name">Feed url</label>
{{ form.url.errors }}
{{ form.url }}
</fieldset>
<fieldset class="form__fieldset rule-form__fieldset">
<label class="label" for="name">Favicon url</label>
{{ form.favicon.errors }}
{{ form.favicon }}
</fieldset>
<fieldset class="form__fieldset rule-form__fieldset">
<label class="label" for="name">Timezone</label>
<small class="small helptext">The timezone which the feed uses</small>
{{ form.timezone.errors }}
{{ form.timezone }}
</fieldset>
</section>
<section class="section form__section rule-form__section">
<fieldset class="form__fieldset rule-form__fieldset">
<a class="link button button--cancel" href="{% url 'news:collection:rules' %}">Cancel</a>
{% block confirm-button %}{% endblock %}
</fieldset>
</section>
</form>
</main>
{% endblock %}

9
src/newsreader/scss/elements/index.scss
View file

@ -1,10 +1,11 @@
@import "badge/index";
@import "button/index";
@import "help-text/index";
@import "input/index";
@import "label/index";
@import "link/index";
@import "h1/index";
@import "h2/index";
@import "h3/index";
@import "small/index";
@import "input/index";
@import "label/index";
@import "help-text/index";
@import "badge/index";
@import "select/index";

11
src/newsreader/scss/elements/select/_select.scss Normal file
View file

@ -0,0 +1,11 @@
.select {
max-height: 200px;
&:not([size]){
width: 40%;
}
}
select {
@extend .select;
}

1
src/newsreader/scss/elements/select/index.scss Normal file
View file

@ -0,0 +1 @@
@import "select";

2
src/newsreader/templates/form.html
View file

@ -24,7 +24,7 @@
{{ field.errors }}
{{ field }}
{{ field.help_text }}
<small class="small helptext">{{ field.help_text }}</small>
</fieldset>
{% endfor %}
</section>