Merged with default branch

boards/static/css/base.css

@@ -154,3 +154,8 b' textarea, input {'
     -webkit-filter: grayscale(100%);
 }
 
+#quote-button {
+    position: absolute;
+    display: none;
+    cursor: pointer;
+}
  No newline at end of file

boards/static/css/md/base_page.css

@@ -571,3 +571,13 b' ul {'
 .post-blink {
     background-color: #000;
 }
+
+#quote-button {
+    background-color: black;
+    border: solid white 1px;
+    padding: 2px;
+}
+
+#quote-button:hover {
+    background-color: #2d3955;
+}
  No newline at end of file

boards/static/css/pg/base_page.css

@@ -381,3 +381,13 b' input[type="submit"]:hover {'
 .post-blink {
     background-color: #333;
 }
+
+#quote-button {
+    background-color: #e2c48f;
+    border: solid #000000 1px;
+    padding: 2px;
+}
+
+#quote-button:hover {
+    background-color: #bde2a6;
+}
  No newline at end of file

boards/static/css/sw/base_page.css

@@ -416,3 +416,13 b' audio {'
 .post-blink {
     background-color: #ccc;
 }
+
+#quote-button {
+    background-color: #99a3e2;
+    border: solid #000000 1px;
+    padding: 2px;
+}
+
+#quote-button:hover {
+    background-color: #b9c4e2;
+}
  No newline at end of file

boards/static/js/thread.js

@@ -67,12 +67,10 b' function addQuickReply(postId) {'
     if (getForm().prev().attr('id') == postId) {
         resetFormPosition();
     } else {
+        var blockToInsert = null;
+        var textAreaJq = $('textarea');
         var postLinkRaw = '[post]' + postId + '[/post]'
-
             var textToAdd = '';
-        var blockToInsert = null;
-
-        var textAreaJq = $('textarea');
 
         if (postId != null) {
             var post = $('#' + postId);
@@ -83,27 +81,63 b' function addQuickReply(postId) {'
                 textToAdd += postLinkRaw + '\n';
             }
 
+            textAreaJq.val(textAreaJq.val()+ textToAdd);
             blockToInsert = post;
         } else {
             blockToInsert = $('.thread');
         }
+        showFormAfter(blockToInsert);
 
+        textAreaJq.focus();
+
+        var textarea = document.getElementsByTagName('textarea')[0];
+        moveCaretToEnd(textarea);
+    }
+}
+
+function addQuickQuote() {
+    var textToAdd = '';
+    var textAreaJq = $('textarea');
         var selection = window.getSelection().toString();
+    if (selection.length == 0) {
+        selection = $("#quote-button").attr('data-text');
+    }
         if (selection.length > 0) {
             textToAdd += '[quote]' + selection + '[/quote]\n';
         }
 
         textAreaJq.val(textAreaJq.val()+ textToAdd);
 
-        showFormAfter(blockToInsert);
+    textAreaJq.focus();
 
-        textAreaJq.focus();
         var textarea = document.getElementsByTagName('textarea')[0];
         moveCaretToEnd(textarea);
     }
-}
 
 function scrollToBottom() {
     $html.animate({scrollTop: $html.height()}, "fast");
 }
 
+function showQuoteButton() {
+    var selection = window.getSelection().getRangeAt(0).getBoundingClientRect();
+    var quoteButton = $("#quote-button");
+    if (selection.width > 0) {
+        // quoteButton.offset({ top: selection.top - selection.height, left: selection.left });
+        quoteButton.css({top: selection.top + $(window).scrollTop() - 30, left: selection.left});
+        quoteButton.show();
+
+        var text = window.getSelection().toString();
+        quoteButton.attr('data-text', text);
+    } else {
+        quoteButton.hide();
+    }
+}
+
+$(document).ready(function() {
+    $('body').on('mouseup', function() {
+        showQuoteButton();
+    });
+    $("#quote-button").click(function() {
+        addQuickQuote();
+    })
+});
  No newline at end of file

boards/templates/boards/thread_normal.html

@@ -9,6 +9,8 b''
     {% get_current_language as LANGUAGE_CODE %}
     {% get_current_timezone as TIME_ZONE %}
 
+    <div id="quote-button">{% trans 'Quote' %}</div>
+
     <div class="tag_info">
         <h2>
             <form action="{% url 'thread' opening_post.id %}" method="post" class="post-button-form">