Added formatter button to set text color

boards/forms/__init__.py

@@ -29,7 +29,7 b' from boards.utils import validate_file_s'
     FILE_EXTENSION_DELIMITER, get_tripcode_from_text
 
 FORMAT_PANEL_BUTTON = '<span class="mark_btn" ' \
-                      'onClick="addMarkToMsg(\'{}\',  \'{}\')">{}{}{}</span>'
+                      'onClick="addMarkToMsg(\'{}\', {}, \'{}\')">{}{}{}</span>'
 
 
 REGEX_USERNAMES = re.compile(r'^[\w\s\d,]+$', re.UNICODE)
@@ -110,8 +110,9 b' class FormatPanel(forms.Textarea):'
 
     def _get_button(self, formatter):
         return FORMAT_PANEL_BUTTON.format(
-            formatter.format_left,
-            formatter.format_right,
+            formatter.tag_name,
+            formatter.has_input,
+            formatter.input_prompt,
             formatter.preview_left,
             formatter.name,
             formatter.preview_right)

boards/mdx_neboard.py

@@ -9,6 +9,7 b' from urllib.parse import unquote'
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.urls import reverse
+from django.utils.translation import ugettext_lazy as _
 
 import boards
 from boards import settings
@@ -44,9 +45,11 b' class TextFormatter:'
     preview_left = ''
     preview_right = ''
 
-    # Left and right characters for the textarea input
-    format_left = ''
-    format_right = ''
+    # Tag name to enclose the text in the form
+    tag_name = ''
+
+    has_input = 'false'
+    input_prompt = ''
 
 
 class AutolinkPattern:
@@ -64,8 +67,7 b' class QuotePattern(TextFormatter):'
     preview_left = '<span class="quote">'
     preview_right = '</span>'
 
-    format_left = '[quote]'
-    format_right = '[/quote]'
+    tag_name = 'quote'
 
 
 class SpoilerPattern(TextFormatter):
@@ -73,8 +75,7 b' class SpoilerPattern(TextFormatter):'
     preview_left = '<span class="spoiler">'
     preview_right = '</span>'
 
-    format_left = '[spoiler]'
-    format_right = '[/spoiler]'
+    tag_name = 'spoiler'
 
 
 class CommentPattern(TextFormatter):
@@ -82,8 +83,7 b' class CommentPattern(TextFormatter):'
     preview_left = '<span class="comment">// '
     preview_right = '</span>'
 
-    format_left = '[comment]'
-    format_right = '[/comment]'
+    tag_name = 'comment'
 
 
 # TODO Use <s> tag here
@@ -92,8 +92,7 b' class StrikeThroughPattern(TextFormatter'
     preview_left = '<span class="strikethrough">'
     preview_right = '</span>'
 
-    format_left = '[s]'
-    format_right = '[/s]'
+    tag_name = 's'
 
 
 class ItalicPattern(TextFormatter):
@@ -101,8 +100,7 b' class ItalicPattern(TextFormatter):'
     preview_left = '<i>'
     preview_right = '</i>'
 
-    format_left = '[i]'
-    format_right = '[/i]'
+    tag_name = 'i'
 
 
 class BoldPattern(TextFormatter):
@@ -110,8 +108,7 b' class BoldPattern(TextFormatter):'
     preview_left = '<b>'
     preview_right = '</b>'
 
-    format_left = '[b]'
-    format_right = '[/b]'
+    tag_name = 'b'
 
 
 class CodePattern(TextFormatter):
@@ -119,8 +116,7 b' class CodePattern(TextFormatter):'
     preview_left = '<code>'
     preview_right = '</code>'
 
-    format_left = '[code]'
-    format_right = '[/code]'
+    tag_name = 'code'
 
 
 class HintPattern(TextFormatter):
@@ -128,8 +124,18 b' class HintPattern(TextFormatter):'
     preview_left = '<span class="hint">'
     preview_right = '</span>'
 
-    format_left = '[hint]'
-    format_right = '[/hint]'
+    tag_name = 'hint'
+
+
+class ColorPattern(TextFormatter):
+    name = 'color'
+    preview_left = '<span style="color:yellow;">'
+    preview_right = '</span>'
+
+    tag_name = 'color'
+
+    has_input = 'true'
+    input_prompt = _('Enter color (name or #ccc code)')
 
 
 def render_reflink(tag_name, value, options, parent, context):
@@ -227,6 +233,7 b' formatters = ['
     StrikeThroughPattern,
     CodePattern,
     HintPattern,
+    ColorPattern,
 ]
 
 

boards/static/js/panel.js

@@ -29,7 +29,21 b''
  * @param start Start (left) text
  * @param end End (right) text
  */
-function addMarkToMsg(start, end) {
+function addMarkToMsg(tagName, hasInput, inputPrompt) {
+    var startingTag = tagName;
+
+    if (hasInput) {
+        var inputText = prompt(inputPrompt);
+        if (inputText) {
+            startingTag = startingTag + '=' + inputText;
+        } else {
+            return false;
+        }
+    }
+
+    var start = '[' + startingTag + ']';
+    var end = '[/' + tagName + ']';
+
     var textareas = getPostTextarea();
 
     for (var i = 0; i < textareas.length; i++) {