From 0119af11d6d02201c2d55f07fdd666e05db1301e Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 7 Jun 2016 13:58:13 +1200
Subject: [PATCH] Finesse security table text and general layout

---
 .../resources/describe-settings.json          | 19 ++++++++++---------
 domain-server/resources/web/css/style.css     | 10 ++++++++++
 .../resources/web/settings/js/settings.js     |  4 ++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json
index 26a368fd04..2314a0551c 100644
--- a/domain-server/resources/describe-settings.json
+++ b/domain-server/resources/describe-settings.json
@@ -99,14 +99,15 @@
         {
           "name": "standard_permissions",
           "type": "table",
-          "label": "Domain-Wide Permissions",
-          "help": "Standard Permissions:",
+          "label": "Domain-Wide User Permissions",
+          "help": "Indicate which users or groups can have which domain-wide permissions.",
+          "caption": "Standard Permissions",
           "can_add_new_rows": false,
 
           "columns": [
             {
               "name": "permissions_id",
-              "label": "User/Group"
+              "label": "User / Group"
             },
             {
               "name": "id_can_connect",
@@ -117,7 +118,7 @@
             },
             {
               "name": "id_can_adjust_locks",
-              "label": "Lock/Unlock",
+              "label": "Lock / Unlock",
               "type": "checkbox",
               "editable": true,
               "default": false
@@ -131,7 +132,7 @@
             },
             {
               "name": "id_can_rez_tmp",
-              "label": "Rez Temp",
+              "label": "Rez Temporary",
               "type": "checkbox",
               "editable": true,
               "default": false
@@ -158,13 +159,13 @@
         {
           "name": "permissions",
           "type": "table",
-          "help": "Permissions for Specific Users:",
+          "caption": "Permissions for Specific Users",
           "can_add_new_rows": true,
 
           "columns": [
             {
               "name": "permissions_id",
-              "label": "User/Group"
+              "label": "User / Group"
             },
             {
               "name": "id_can_connect",
@@ -175,7 +176,7 @@
             },
             {
               "name": "id_can_adjust_locks",
-              "label": "Lock/Unlock",
+              "label": "Lock / Unlock",
               "type": "checkbox",
               "editable": true,
               "default": false
@@ -189,7 +190,7 @@
             },
             {
               "name": "id_can_rez_tmp",
-              "label": "Rez Temp",
+              "label": "Rez Temporary",
               "type": "checkbox",
               "editable": true,
               "default": false
diff --git a/domain-server/resources/web/css/style.css b/domain-server/resources/web/css/style.css
index 4bf9c81b39..35cb6ad492 100644
--- a/domain-server/resources/web/css/style.css
+++ b/domain-server/resources/web/css/style.css
@@ -111,6 +111,16 @@ table {
   word-wrap: break-word;
 }
 
+caption {
+    color: #333;
+    font-weight: 700;
+    padding-top: 0;
+}
+
+table[name="security.standard_permissions"] .headers td + td, table[name="security.permissions"] .headers td + td {
+    text-align: center;
+}
+
 #xs-advanced-container {
   margin-bottom: 20px;
 }
diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index a38d544502..71abae76f8 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -927,6 +927,10 @@ function makeTable(setting, keypath, setting_value, isLocked) {
     + "' name='" + keypath + "' id='" + (typeof setting.html_id !== 'undefined' ? setting.html_id : keypath)
     + "' data-setting-type='" + (isArray ? 'array' : 'hash') + "'>";
 
+  if (setting.caption) {
+    html += "<caption>" + setting.caption + "</caption>"
+  }
+
   // Column names
   html += "<tr class='headers'>"