From 95dbbc6962986f735cb33ed1452811e342a774e8 Mon Sep 17 00:00:00 2001
From: "T. H. Wright" <thwright@redemption.studio>
Date: Wed, 13 Nov 2019 10:34:59 -0500
Subject: [PATCH] Add float and columns, move strikethrough.

---
 about.json           |  2 +-
 common/common.scss   | 15 +++++++++++++
 common/head_tag.html | 52 ++++++++++++++++++++++++--------------------
 settings.yml         | 20 +++++++++++++++--
 4 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/about.json b/about.json
index 30e719b..c62091f 100644
--- a/about.json
+++ b/about.json
@@ -4,6 +4,6 @@
   "license_url": null,
   "about_url": "https://www.mon-discourse.fr/themes/md-composer-extras/",
   "authors": "Steven",
-  "theme_version": "1.2",
+  "theme_version": "1.3",
   "learn_more": "https://meta.discourse.org/t/beginners-guide-to-using-discourse-themes/91966"
 }
diff --git a/common/common.scss b/common/common.scss
index b05689c..dbf7c7c 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -9,3 +9,18 @@
 [data-wrap="justify"] {
   text-align: justify;
 }
+
+[data-wrap="columns"] {
+  width: 50%;
+  float: left;
+}
+
+[data-wrap="floatl"] {
+  float: left;
+  margin-right: 10px;
+}
+
+[data-wrap="floatr"] {
+  float: right;
+  margin-left: 10px;
+}
diff --git a/common/head_tag.html b/common/head_tag.html
index e35f487..8285fe3 100644
--- a/common/head_tag.html
+++ b/common/head_tag.html
@@ -1,7 +1,5 @@
 <script type="text/discourse-plugin" version="0.8">
 const { iconNode } = require("discourse-common/lib/icon-library");
-
-
 // TOOLBAR
 api.onToolbarCreate(toolbar => {
     toolbar.addButton({
@@ -11,6 +9,14 @@ api.onToolbarCreate(toolbar => {
         perform: e => e.applySurround('[u]', '[/u]', 'underline_text')
     });
 });
+api.onToolbarCreate(toolbar => {
+    toolbar.addButton({
+        id: "strikethrough_button",
+        group: "fontStyles",
+        icon: "strikethrough",
+        perform: e => e.applySurround('<s>', '</s>', 'strikethrough_prompt')
+    });
+});
 api.onToolbarCreate(toolbar => {
     toolbar.addButton({
         id: "align_center_button",
@@ -35,25 +41,22 @@ api.onToolbarCreate(toolbar => {
         perform: e => e.applySurround('[wrap="justify"]\n', '\n[/wrap]', 'align_justify_text')
     });
 });
-
-
-// EXTRAS
-api.addToolbarPopupMenuOptionsCallback(() => {
-  return {
-      action: "strikethrough",
-      icon: "strikethrough",
-      label: "strikethrough_button"
-  };
+api.onToolbarCreate(toolbar => {
+    toolbar.addButton({
+        id: "columns_button",
+        group: "extras",
+        icon: "columns",
+        perform: e => e.applySurround('[wrap="columns"]\n', '\n[/wrap]', 'columns_text')
+    });
 });
-api.modifyClass("controller:composer", {
-  actions: {
-    strikethrough() {
-      this.get("toolbarEvent").applySurround("<s>", "</s>", "strikethrough_prompt");
-    },
-  }
+api.onToolbarCreate(toolbar => {
+    toolbar.addButton({
+        id: "float_left_button",
+        group: "extras",
+        icon: "indent",
+        perform: e => e.applySurround('[wrap="floatl"]\n', '\n[/wrap]', 'float_left_text')
+    });
 });
-
-
 // TEXTS
 let translations = I18n.translations[I18n.currentLocale()].js;
 if (!translations) {
@@ -69,16 +72,19 @@ translations.composer.underline_text =
 translations.composer.align_center_button_title = settings.align_center_button;
 translations.composer.align_center_text =
   settings.align_center_text;
-
 translations.composer.align_right_button_title = settings.align_right_button;
 translations.composer.align_right_text =
   settings.align_right_text;
-
 translations.composer.align_justify_button_title = settings.align_justify_button;
 translations.composer.align_justify_text =
   settings.align_justify_text;
-
 translations.strikethrough_button = settings.strikethrough_button;
 translations.composer.strikethrough_prompt =
   settings.strikethrough_prompt;
-</script>
\ No newline at end of file
+translations.composer.columns_button_title = settings.columns_button;
+translations.composer.columns_text =
+  settings.columns_text;
+translations.composer.float_left_button_title = settings.float_left_button;
+translations.composer.float_left_text =
+  settings.float_left_text;
+</script>
diff --git a/settings.yml b/settings.yml
index 2075af4..4e4322b 100644
--- a/settings.yml
+++ b/settings.yml
@@ -38,10 +38,26 @@ strikethrough_prompt:
   default: "Text"
   description:
     en: Enter the placeholder text that appears in the composer after the user clicks the button.
+float_left_button:
+  default: "Float left"
+  description:
+    en: Enter the text for the title of the button in the composer.
+float_left_text:
+  default: "Text"
+  description:
+    en: Enter the placeholder text that appears in the composer after the user clicks the button.
+columns_button:
+  default: "Columns"
+  description:
+    en: Enter the text for the title of the button in the composer.
+columns_text:
+  default: "Use the closing tag to mark where the column ends."
+  description:
+    en: Enter the placeholder text that appears in the composer after the user clicks the button.
 
 Svg_icons: 
   type: 'list'
   list_type: 'compact'
-  default: 'fa-align-center|fa-align-right|fa-align-justify|fa-strikethrough|fa-underline'
+  default: 'fa-align-center|fa-align-right|fa-align-justify|fa-strikethrough|fa-underline|fa-indent|fa-columns'
   description: 
-    en: "Include FontAwesome 5 icon classes for each icon used in the list."
\ No newline at end of file
+    en: "Include FontAwesome 5 icon classes for each icon used in the list."