diff --git a/src/newsreader/news/collection/forms.py b/src/newsreader/news/collection/forms.py
index bfa0d90..7e5fc97 100644
--- a/src/newsreader/news/collection/forms.py
+++ b/src/newsreader/news/collection/forms.py
@@ -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):
diff --git a/src/newsreader/news/collection/templates/collection/rule-create.html b/src/newsreader/news/collection/templates/collection/rule-create.html
index b8db042..3b7ec34 100644
--- a/src/newsreader/news/collection/templates/collection/rule-create.html
+++ b/src/newsreader/news/collection/templates/collection/rule-create.html
@@ -1,9 +1,10 @@
-{% extends "collection/rule.html" %}
+{% extends "base.html" %}
-{% block form-header %}
-
-{% endblock %}
+{% load static %}
-{% block confirm-button %}
-
+{% block content %}
+
+ {% url "news:collection:rules" as cancel_url %}
+ {% include "form.html" with form=form title="Create rule" cancel_url=cancel_url only %}
+
{% endblock %}
diff --git a/src/newsreader/news/collection/templates/collection/rule-update.html b/src/newsreader/news/collection/templates/collection/rule-update.html
index 403f86e..bdb442f 100644
--- a/src/newsreader/news/collection/templates/collection/rule-update.html
+++ b/src/newsreader/news/collection/templates/collection/rule-update.html
@@ -1,9 +1,10 @@
-{% extends "collection/rule.html" %}
+{% extends "base.html" %}
-{% block form-header %}
-
-{% endblock %}
+{% load static %}
-{% block confirm-button %}
-
+{% block content %}
+
+ {% url "news:collection:rules" as cancel_url %}
+ {% include "form.html" with form=form title="Update rule" cancel_url=cancel_url only %}
+
{% endblock %}
diff --git a/src/newsreader/news/collection/templates/collection/rule.html b/src/newsreader/news/collection/templates/collection/rule.html
deleted file mode 100644
index c7f56f4..0000000
--- a/src/newsreader/news/collection/templates/collection/rule.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{% extends "base.html" %}
-
-{% load static %}
-
-{% block content %}
-
-
-
-{% endblock %}
diff --git a/src/newsreader/scss/elements/index.scss b/src/newsreader/scss/elements/index.scss
index f0d7be3..3e2a01c 100644
--- a/src/newsreader/scss/elements/index.scss
+++ b/src/newsreader/scss/elements/index.scss
@@ -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";
diff --git a/src/newsreader/scss/elements/select/_select.scss b/src/newsreader/scss/elements/select/_select.scss
new file mode 100644
index 0000000..65a3227
--- /dev/null
+++ b/src/newsreader/scss/elements/select/_select.scss
@@ -0,0 +1,11 @@
+.select {
+ max-height: 200px;
+
+ &:not([size]){
+ width: 40%;
+ }
+}
+
+select {
+ @extend .select;
+}
diff --git a/src/newsreader/scss/elements/select/index.scss b/src/newsreader/scss/elements/select/index.scss
new file mode 100644
index 0000000..8320088
--- /dev/null
+++ b/src/newsreader/scss/elements/select/index.scss
@@ -0,0 +1 @@
+@import "select";
diff --git a/src/newsreader/templates/form.html b/src/newsreader/templates/form.html
index c888754..eb9ff03 100644
--- a/src/newsreader/templates/form.html
+++ b/src/newsreader/templates/form.html
@@ -24,7 +24,7 @@
{{ field.errors }}
{{ field }}
- {{ field.help_text }}
+ {{ field.help_text }}
{% endfor %}