4 files changed, 49 insertions, 25 deletions
diff --git a/templates/web/base/admin/category-checkboxes.html b/templates/web/base/admin/category-checkboxes.html
new file mode 100644
index 000000000..63acd4112
--- /dev/null
+++ b/templates/web/base/admin/category-checkboxes.html
@@ -0,0 +1,18 @@
+  <p>
+    <strong>[% loc('Categories:') %]</strong>
+  </p>
+  <ul>
+    <li>
+      [% loc('Select:') %]
+      <a href="#" data-select-all>[% loc('all') %]</a> /
+      <a href="#" data-select-none>[% loc('none') %]</a>
+    </li>
+    [% FOR contact IN contacts %]
+      <li>
+        <label>
+          <input type="checkbox" name="contacts[[% contact.id %]]" [% 'checked' IF contact.active %]/>
+          [% contact.category %]
+        </label>
+      </li>
+    [% END %]
+  </ul>
diff --git a/templates/web/base/admin/responsepriorities/edit.html b/templates/web/base/admin/responsepriorities/edit.html
index 89f41a069..4d838eed2 100644
--- a/templates/web/base/admin/responsepriorities/edit.html
+++ b/templates/web/base/admin/responsepriorities/edit.html
@@ -14,18 +14,17 @@
         <input type="text" name="name" class="required form-control" size="30" value="[% rp.name | html %]">
     </p>
     <p>
-      <strong>[% loc('Categories:') %]</strong>
-      <ul>
-        [% FOR contact IN contacts %]
-          <li>
-            <label>
-              <input type="checkbox" name="contacts[[% contact.id %]]" [% 'checked' IF contact.active %]/>
-              [% contact.category %]
-            </label>
-          </li>
-        [% END %]
-      </ul>
+        <strong>[% loc('Description:') %] </strong>
+        <input type="text" name="description" class="form-control" size="30" value="[% rp.description | html %]">
     </p>
+
+    <div class="admin-hint">
+      <p>
+        [% loc('If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories.') %]
+      </p>
+    </div>
+    [% INCLUDE 'admin/category-checkboxes.html' %]
+
     <p>
         <label>
           <input type="checkbox" name="deleted" id="deleted" value="1"[% ' checked' IF rp.deleted %]>
diff --git a/templates/web/base/admin/responsepriorities/list.html b/templates/web/base/admin/responsepriorities/list.html
index c893a4c70..4c05ca14d 100644
--- a/templates/web/base/admin/responsepriorities/list.html
+++ b/templates/web/base/admin/responsepriorities/list.html
@@ -4,13 +4,25 @@
     <thead>
     <tr>
         <th>  [% loc('Name') %] </th>
+        <th>  [% loc('Description') %] </th>
+        <th>  [% loc('Categories') %] </th>
         <th>  &nbsp; </th>
     </tr>
     </thead>
     <tbody>
       [% FOR p IN response_priorities %]
           <tr [% 'class="is-deleted"' IF p.deleted %]>
-              <td>  [% p.name %] </td>
+              <td>  [% p.name | html %] </td>
+              <td>  [% p.description | html %] </td>
+              <td>
+                [% UNLESS p.contacts.size %]
+                  <em>[% loc('All categories') %]</em>
+                [% ELSE %]
+                  [% FOR contact IN p.contacts %]
+                    [% contact.category %][% ',' UNLESS loop.last %]
+                  [% END %]
+                [% END %]
+              </td>
               <td> <a href="[% c.uri_for('', body.id, p.id) %]" class="btn">[% loc('Edit') %]</a> </td>
           </tr>
       [% END %]
diff --git a/templates/web/base/admin/template_edit.html b/templates/web/base/admin/template_edit.html
index 8ce3c28dd..b2e734756 100644
--- a/templates/web/base/admin/template_edit.html
+++ b/templates/web/base/admin/template_edit.html
@@ -23,19 +23,14 @@
         <input type="checkbox" name="auto_response" [% 'checked' IF rt.auto_response %] />
       </label>
     </p>
-    <p>
-      <strong>[% loc('Categories:') %]</strong>
-      <ul>
-        [% FOR contact IN contacts %]
-          <li>
-            <label>
-              <input type="checkbox" name="contacts[[% contact.id %]]" [% 'checked' IF contact.active %]/>
-              [% contact.category %]
-            </label>
-          </li>
-        [% END %]
-      </ul>
-    </p>
+
+    <div class="admin-hint">
+      <p>
+        [% loc('If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories.') %]
+      </p>
+    </div>
+    [% INCLUDE 'admin/category-checkboxes.html' %]
+
     <p>
       <input type="hidden" name="token" value="[% csrf_token %]" >
       <input type="submit" class="btn" name="Edit templates" value="[% rt.id ? loc('Save changes') : loc('Create template') %]" >