From b723d7d626be8be33b01f2514512b26f26bbfff8 Mon Sep 17 00:00:00 2001
From: NGPixel <github@ngpixel.com>
Date: Thu, 18 Jun 2020 22:49:26 -0400
Subject: [PATCH] fix: markdown core props + styles/scripts permissions

---
 .../admin/admin-groups-edit-permissions.vue        | 14 ++++++++++++++
 client/components/admin/admin-rendering.vue        |  2 +-
 .../modules/rendering/markdown-core/definition.yml | 14 +++++++-------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/client/components/admin/admin-groups-edit-permissions.vue b/client/components/admin/admin-groups-edit-permissions.vue
index 15eed86a..e02987d6 100644
--- a/client/components/admin/admin-groups-edit-permissions.vue
+++ b/client/components/admin/admin-groups-edit-permissions.vue
@@ -80,6 +80,20 @@ export default {
               restrictedForSystem: true,
               disabled: false
             },
+            {
+              permission: 'write:styles',
+              hint: 'Can insert CSS styles in pages, as specified in the Page Rules',
+              warning: false,
+              restrictedForSystem: true,
+              disabled: false
+            },
+            {
+              permission: 'write:scripts',
+              hint: 'Can insert JavaScript in pages, as specified in the Page Rules',
+              warning: false,
+              restrictedForSystem: true,
+              disabled: false
+            },
             {
               permission: 'read:source',
               hint: 'Can view pages source, as specified in the Page Rules',
diff --git a/client/components/admin/admin-rendering.vue b/client/components/admin/admin-rendering.vue
index cc98cc0f..5ef1b24a 100644
--- a/client/components/admin/admin-rendering.vue
+++ b/client/components/admin/admin-rendering.vue
@@ -45,7 +45,7 @@
                 )
                 v-spacer
                 .body-2 {{core.input}}
-                v-icon.mx-2 mdi-arrow-right-bold-hexagon-outline
+                v-icon.mx-2 mdi-arrow-right-circle
                 .caption {{core.output}}
                 v-spacer
             v-expansion-panel-content
diff --git a/server/modules/rendering/markdown-core/definition.yml b/server/modules/rendering/markdown-core/definition.yml
index b7ccab9a..7d3eea7b 100644
--- a/server/modules/rendering/markdown-core/definition.yml
+++ b/server/modules/rendering/markdown-core/definition.yml
@@ -10,7 +10,7 @@ props:
     type: Boolean
     default: true
     title: Allow HTML
-    hint: Enable HTML tags in content
+    hint: Enable HTML tags in content.
     order: 1
     public: true
   linkify:
@@ -27,18 +27,18 @@ props:
     hint: Add linebreaks within paragraphs.
     order: 3
     public: true
-  typographer:
+  underline:
     type: Boolean
     default: false
-    title: Typographer
-    hint: Enable some language-neutral replacement + quotes beautification
+    title: Underline Emphasis
+    hint: Enable text underlining by using _underline_ syntax.
     order: 4
     public: true
-  underline:
+  typographer:
     type: Boolean
     default: false
-    title: Underline Support
-    hint: Enable underline by using _underline_
+    title: Typographer
+    hint: Enable some language-neutral replacement + quotes beautification.
     order: 5
     public: true
   quotes: