ReplyQuoted works now.

diff --git a/webcit-ng/static/css/webcit.css b/webcit-ng/static/css/webcit.css
index 484643380afaf1f02c2fae2176ba0a1afeb4ff8d..dbbedfdb9eab64add7b9d2d8071f3a9847db0c51 100644 (file)
--- a/webcit-ng/static/css/webcit.css
+++ b/webcit-ng/static/css/webcit.css
@@ -100,3 +100,34 @@ html,body,h1,h2,h3,h4,h5 {
 .ctdl-forum-nav a {
        text-decoration: none;
 }
+
+blockquote {
+       background-color: #f5f5f5 !important;
+       color: navy !important;
+}
+
+blockquote blockquote {
+       background-color: #ebebeb !important;
+       color: maroon !important;
+}
+
+blockquote blockquote blockquote {
+       background-color: #e1e1e1 !important;
+       color: green !important;
+}
+
+blockquote blockquote blockquote blockquote {
+       background-color: #d7d7d7 !important;
+       color: purple !important;
+}
+
+blockquote blockquote blockquote blockquote blockquote {
+       background-color: #cdcdcd !important;
+       color: teal !important;
+}
+
+blockquote pre {
+       margin-left: 1%;
+       margin-right: 1%;
+}
+

diff --git a/webcit-ng/static/js/view_forum.js b/webcit-ng/static/js/view_forum.js
index 130f695f2d6e3f64434a2d72be9e692a9e5f9e0c..f9952af95b4363e730cab9ebe40c879663ca543c 100644 (file)
--- a/webcit-ng/static/js/view_forum.js
+++ b/webcit-ng/static/js/view_forum.js
@@ -203,7 +203,7 @@ function forum_render_one(msg, existing_div) {
                }
                outmsg +=
                  "</div><br>"                                                  // end header
-               + "<div class=\"ctdl-msg-body\">"                               // begin body
+               + "<div class=\"ctdl-msg-body\" id=\"" + mdiv + "_body\">"      // begin body
                + msg.text
                + "</div>"                                                      // end body
                + "</div>"                                                      // end content
@@ -250,7 +250,7 @@ function open_reply_box(parent_div, is_quoted, references, msgid) {
        replybox =
          "<div class=\"ctdl-msg-wrapper ctdl-msg-reply\">"             // begin message wrapper
        + "<div class=\"ctdl-avatar\">"                                 // begin avatar
-       + "<img src=\"/ctdl/u/" + "FIXME my name" + "/userpic\" width=\"32\" "
+       + "<img src=\"/ctdl/u/" + current_user + "/userpic\" width=\"32\" "
        + "onerror=\"this.parentNode.innerHTML='&lt;i class=&quot;fa fa-user-circle fa-2x&quot;&gt;&lt;/i&gt; '\">"
        + "</div>"                                                      // end avatar
        + "<div class=\"ctdl-msg-content\">"                            // begin content
@@ -300,8 +300,16 @@ function open_reply_box(parent_div, is_quoted, references, msgid) {
        + compose_references(references,msgid) + "</span>"
                                                                        // begin body
        + "<div class=\"ctdl-msg-body\" id=\"ctdl-editor-body\" style=\"padding:5px;\" contenteditable=\"true\">"
-       + "\n"                                                          // empty initial content
-       + "</div>"                                                      // end body
+       + "\n";                                                         // empty initial content
+
+       if (is_quoted) {
+               replybox += "<br><blockquote>"
+                       + document.getElementById(parent_div+"_body").innerHTML
+                       + "</blockquote>";
+       }
+
+       replybox +=
+         "</div>"                                                      // end body
 
        + "<div class=\"ctdl-msg-header\">"                             // begin footer
        + "<span class=\"ctdl-msg-header-info\">"                       // begin footer info on left side