From b310fcad017c171d6e99643cdf67aad1d851e575 Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Fri, 18 Jul 2014 16:04:50 +0100
Subject: [PATCH] styled list of page permissions to more resemble other
 permissions above

---
 wagtail/wagtailcore/models.py                 |  6 +-
 .../static/wagtailusers/scss/groups_edit.scss |  9 +++
 .../templates/wagtailusers/groups/create.html |  8 +++
 .../templates/wagtailusers/groups/edit.html   | 11 +++-
 .../includes/page_permissions_form.html       | 56 +++++++------------
 .../includes/page_permissions_formset.html    | 35 ++++++++++--
 6 files changed, 80 insertions(+), 45 deletions(-)
 create mode 100644 wagtail/wagtailusers/static/wagtailusers/scss/groups_edit.scss

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 %}
+        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailusers/scss/groups_edit.scss" type="text/x-scss" />
+    {% 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 %}
+        <link rel="stylesheet" href="{{ STATIC_URL }}wagtailusers/scss/groups_edit.scss" type="text/x-scss" />
+    {% endcompress %}
+{% endblock %}
+
 {% block content %}
 
     {% trans "Editing" as editing_str %}
@@ -12,7 +21,7 @@
     <div class="nice-padding">
         <form action="{% url 'wagtailusers_groups_edit' group.id %}" method="POST">
             {% csrf_token %}
-            
+
             <ul class="fields">
                 {% include "wagtailadmin/shared/field_as_li.html" with field=form.name %}
                 
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_form.html b/wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_form.html
index d43b1cdef..cf74e6ca4 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_form.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_form.html
@@ -1,38 +1,24 @@
 {% load i18n %}
-{% comment %}
-    TODO - DRY this form with /wagtailsearch/templates/wagtailsearch/editorspicks/includes/editorspicks_form.html
-{% endcomment %}
-<li id="inline_child_{{ form.prefix }}"{% if form.DELETE.value %} style="display: none;"{% endif %}>
-    <ul class="controls">
-        <li class="icon text-replace icon-bin" id="{{ form.DELETE.id_for_label }}-button">{% trans "Delete" %}</li>
-    </ul>
 
-    <fieldset>
-        <legend>{% trans "Page permissions" %}</legend>
-        <ul class="fields">
-            <li class="model_choice_field">
-                {% trans "Choose a different root page" as choose_another_text_str %}
-                {% trans "Choose a root page" as choose_one_text_str %}
-                {% if form.instance.page %}
-                    {% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.page page=form.instance.page is_chosen=True choose_one_text_str=choose_one_text_str choose_another_text_str=choose_another_text_str only %}
-                {% else %}
-                    {% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.page is_chosen=False choose_one_text_str=choose_one_text_str choose_another_text_str=choose_another_text_str only %}
-                {% endif %}
-            </li>
-            <li class="char_field">
-                {% include "wagtailadmin/edit_handlers/field_panel_field.html" with field=form.permission_type only %}
-            </li>
-        </ul>
+<td>
+    {% trans "Choose a different root page" as choose_another_text_str %}
+    {% trans "Choose a root page" as choose_one_text_str %}
+    
+    {% if form.instance.page %}
+        {% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.page page=form.instance.page is_chosen=True choose_one_text_str=choose_one_text_str choose_another_text_str=choose_another_text_str only %}
+    {% else %}
+        {% include "wagtailadmin/edit_handlers/page_chooser_panel.html" with field=form.page is_chosen=False choose_one_text_str=choose_one_text_str choose_another_text_str=choose_another_text_str only %}
+    {% endif %}
+</td>
+<td>
+    {% include "wagtailadmin/edit_handlers/field_panel_field.html" with field=form.permission_type only %}
+
+    {{ form.id }}
+    {{ form.ORDER }}
+    {{ form.DELETE }}
+</td>
+
+<td>
+    <button class="icon icon-bin" id="{{ form.DELETE.id_for_label }}-button">{% trans "Delete" %}</button>
+</td>
 
-        {{ form.id }}
-        {{ form.ORDER }}
-        {{ form.DELETE }}
-        {% if form.non_field_errors %}
-            <p class="error-message">
-                {% for error in form.non_field_errors %}
-                    <span>{{ error|escape }}</span>
-                {% endfor %}
-            </p>
-        {% endif %}
-    </fieldset>
-</li>
diff --git a/wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_formset.html b/wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_formset.html
index ccfffaf42..e552e8e38 100644
--- a/wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_formset.html
+++ b/wagtail/wagtailusers/templates/wagtailusers/groups/includes/page_permissions_formset.html
@@ -3,14 +3,37 @@
 
 {{ formset.management_form }}{# what is this? #}
 
-<ul class="multiple" id="id_{{ formset.prefix }}-FORMS">
-    {% for form in formset.forms %}
-        {% include "wagtailusers/groups/includes/page_permissions_form.html" with form=form only %}
-    {% endfor %}
-</ul>
+<table class="listing">
+    <col width="40%"/>
+    <col width="40%" />
+    <col />
+    <thead>
+        <tr>
+            <th>Page</th>
+            <th>Permission type</th>
+            <th></th>
+        </tr>
+    </thead>
+    <tbody id="id_{{ formset.prefix }}-FORMS">
+        {% for form in formset.forms %}
+            <tr id="inline_child_{{ form.prefix }}"{% if form.DELETE.value %} style="display: none;"{% endif %}>
+                {% if form.non_field_errors %}
+                    <p class="error-message">
+                        {% for error in form.non_field_errors %}
+                            <span>{{ error|escape }}</span>
+                        {% endfor %}
+                    </p>
+                {% endif %}
+                {% include "wagtailusers/groups/includes/page_permissions_form.html" with form=form only %}
+            </tr>
+        {% endfor %}
+    <tbody>
+</table>
 
 <script type="text/django-form-template" id="id_{{ formset.prefix }}-EMPTY_FORM_TEMPLATE">
-    {% include "wagtailusers/groups/includes/page_permissions_form.html" with form=formset.empty_form only %}
+    <tr>
+        {% include "wagtailusers/groups/includes/page_permissions_form.html" with form=formset.empty_form only %}
+    </tr>
 </script>
 
 <p class="add">