Don't use \r\n with ctdl_printf() because it adds a \n on its own. Only add \r when...

diff --git a/webcit-ng/messages.c b/webcit-ng/messages.c
index adc4260adc5d5da5430049f902d91c65930d8636..ed88c9970ed2d1764669059347ab5a7e4e153f5d 100644 (file)
--- a/webcit-ng/messages.c
+++ b/webcit-ng/messages.c
@@ -157,12 +157,13 @@ void dav_put_message(struct http_transaction *h, struct ctdlsession *c, char *eu
                return;
        }
 
+       // Remember, ctdl_printf() appends \n on its own, so we only need \r here.
        content_type = header_val(h, "Content-type");
-       ctdl_printf(c, "Content-type: %s\r\n", (content_type ? content_type : "application/octet-stream"));
-       ctdl_printf(c, "\r\n");
+       ctdl_printf(c, "Content-type: %s\r", (content_type ? content_type : "application/octet-stream"));
+       ctdl_printf(c, "\r");
        ctdl_write(c, h->request_body, h->request_body_length);
        if (h->request_body[h->request_body_length] != '\n') {
-               ctdl_printf(c, "\r\n");
+               ctdl_printf(c, "\r");
        }
        ctdl_printf(c, "000");
 

diff --git a/webcit-ng/static/css/webcit.css b/webcit-ng/static/css/webcit.css
index a692e77506246819a6d8621de7d29db5c64697b4..93b082d3e4e2e5c2a58bbb8cbf35fa3aa8db7a96 100644 (file)
--- a/webcit-ng/static/css/webcit.css
+++ b/webcit-ng/static/css/webcit.css
@@ -9,15 +9,19 @@ html,body,h1,h2,h3,h4,h5 {
 }
 
 .ctdl-msg-reading-pane {
-       background-color: #123456;
+       background-color: #456789;
 }
 
 .ctdl-msg-wrapper {
        overflow: hidden;
-       border-radius: 25px;
+       border-radius: 10px;
        background-color: white;
-       margin: 8px;
-       padding: 4px;           /* inside the box */
+       margin: 1vw;
+       padding: 5px;           /* inside the box */
+}
+
+.ctdl-msg-reply {
+       margin-left: 5vw;
 }
 
 .ctdl-msg-header {

diff --git a/webcit-ng/static/index.html b/webcit-ng/static/index.html
index d25dc4cadba741a47990f7f317d17d374ceb69cc..741805247328995a8ab5de1d6f61ebe2abb2b346 100644 (file)
--- a/webcit-ng/static/index.html
+++ b/webcit-ng/static/index.html
@@ -52,15 +52,13 @@
        </div>
        <div class="w3-bar-block">
                <a href="#" class="w3-bar-item w3-button w3-padding-16 w3-hide-large w3-dark-grey w3-hover-black" onclick="w3_close()" title="close menu"><i class="fa fa-remove fa-fw"></i>  Close Menu</a>
-               <a href="#" class="w3-bar-item w3-button w3-padding w3-blue"><i class="fa fa-users fa-fw"></i>  Rooms</a>
+               <a href="#" class="w3-bar-item w3-button w3-padding w3-blue"><i class="fa fa-users fa-fw"></i>  Mail</a>
                <div id="roomlist">rooms go here</div>
-               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-eye fa-fw"></i>  Users</a>
-               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-users fa-fw"></i>  Bombs</a>
-               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-bullseye fa-fw"></i>  Missiles</a>
-               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-diamond fa-fw"></i>  Tards</a>
-               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-bell fa-fw"></i>  News</a>
-               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-bank fa-fw"></i>  General</a>
-               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-history fa-fw"></i>  History</a>
+               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-users fa-fw"></i>  Forums</a>
+               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-eye fa-fw"></i>  Calendar</a>
+               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-bullseye fa-fw"></i>  Contacts</a>
+               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-bell fa-fw"></i>  Blogs</a>
+               <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-bank fa-fw"></i>  Wikis</a>
                <a href="#" class="w3-bar-item w3-button w3-padding"><i class="fa fa-cog fa-fw"></i>  Settings</a><br><br>
        </div>
 </nav>

diff --git a/webcit-ng/static/js/view_forum.js b/webcit-ng/static/js/view_forum.js
index 94bd03121ce3730d10860e6c95d8a265d2499b44..53c12969e2015f1388e3b9a3d2fb60b507e0be3e 100644 (file)
--- a/webcit-ng/static/js/view_forum.js
+++ b/webcit-ng/static/js/view_forum.js
@@ -194,7 +194,7 @@ function open_reply_box(prefix, msgnum, is_quoted) {
        // FIXME - we need to retain the message number being replied to
 
        replybox =
-         "<div class=\"ctdl-msg-wrapper\">"                            // begin message wrapper
+         "<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\" "
        + "onerror=\"this.parentNode.innerHTML='&lt;i class=&quot;fa fa-user-circle fa-2x&quot;&gt;&lt;/i&gt; '\">"
@@ -349,7 +349,7 @@ function forum_save_message(div_name, reply_to_msgnum) {
                                if (error_message.length == 0) {
                                        error_message = _("An error has occurred.");
                                }
-                               alert(error_message);                                           // FIXME make this pretty
+                               alert(error_message);
                        }
                }
        };