diff --git a/wagtail/wagtailcore/models.py b/wagtail/wagtailcore/models.py index 8b337f180..569c2e84e 100644 --- a/wagtail/wagtailcore/models.py +++ b/wagtail/wagtailcore/models.py @@ -944,9 +944,9 @@ class PageRevision(models.Model): PAGE_PERMISSION_TYPE_CHOICES = [ - ('add', 'Add'), - ('edit', 'Edit'), - ('publish', 'Publish'), + ('add', 'Add / edit pages you own'), + ('edit', 'Add / edit any page'), + ('publish', 'Publish pages'), ] diff --git a/wagtail/wagtailusers/static/wagtailusers/scss/groups_edit.scss b/wagtail/wagtailusers/static/wagtailusers/scss/groups_edit.scss new file mode 100644 index 000000000..85a13f071 --- /dev/null +++ b/wagtail/wagtailusers/static/wagtailusers/scss/groups_edit.scss @@ -0,0 +1,9 @@ +.listing { + .field label{ + display:none; + } + input,select,textarea{ + font-size:1em; + } + +} \ No newline at end of file diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/create.html b/wagtail/wagtailusers/templates/wagtailusers/groups/create.html index b675694dc..0184871cd 100644 --- a/wagtail/wagtailusers/templates/wagtailusers/groups/create.html +++ b/wagtail/wagtailusers/templates/wagtailusers/groups/create.html @@ -2,8 +2,16 @@ {% load image_tags %} {% load wagtailusers_tags %} {% load i18n %} + {% block titletag %}{% trans "Add group" %}{% endblock %} {% block bodyclass %}menu-groups{% endblock %} + +{% block extra_css %} + {% compress css %} + + {% endcompress %} +{% endblock %} + {% block content %} {% trans "Add group" as add_group_str %} diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html b/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html index 68403bd55..3616f7d5a 100644 --- a/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html +++ b/wagtail/wagtailusers/templates/wagtailusers/groups/edit.html @@ -2,8 +2,17 @@ {% load image_tags %} {% load wagtailusers_tags %} {% load i18n %} +{% load compress %} + {% block titletag %}{% trans "Editing" %} {{ group.name }}{% endblock %} {% block bodyclass %}menu-groups{% endblock %} + +{% block extra_css %} + {% compress css %} + + {% endcompress %} +{% endblock %} + {% block content %} {% trans "Editing" as editing_str %} @@ -12,7 +21,7 @@
{% csrf_token %} - +