From: Art Cancro Date: Tue, 26 Oct 2010 04:17:37 +0000 (-0400) Subject: Numerous style changes to the 'edit message' dialog. The save, X-Git-Tag: v8.01~636 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=b0e75f49b52705fd73ec9318c3748e5b42a0f147;p=citadel.git Numerous style changes to the 'edit message' dialog. The save, cancel, and address book buttons now occupy the navbar instead of a bunch of controls that shouldn't have been there anyway. I also fixed a javascript bug that was making the addressbook popup silently fail in the background if we were in a room that didn't require message recipients. The attachment dialog now sits above the message body pane, but this will soon get migrated into the navbar as well (maybe another popup). Finally, the background of the message entry div now more or less occupies the entire space available to it; this still needs more tuning in order to make the editor occupy the correct amount of space in the pane. --- diff --git a/webcit/messages.c b/webcit/messages.c index d62f69bdf..93521ee64 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -1076,7 +1076,7 @@ void post_message(void) return; } - if (havebstr("cancel_button")) { + if (!strcasecmp(bstr("submit_action"), "cancel")) { sprintf(WCC->ImportantMessage, _("Cancelled. Message was not posted.")); } else if (havebstr("attach_button")) { @@ -1125,7 +1125,7 @@ void post_message(void) int save_to_drafts; long HeaderLen; - save_to_drafts = havebstr("save_button"); + save_to_drafts = !strcasecmp(bstr("submit_action"), "drafts"); Buf = NewStrBuf(); if (save_to_drafts) { diff --git a/webcit/static/styles/login.css b/webcit/static/styles/login.css index c98d60822..8de9516d4 100644 --- a/webcit/static/styles/login.css +++ b/webcit/static/styles/login.css @@ -64,7 +64,6 @@ .logbuttons input { cursor: pointer; - -moz-border-radius: 8px; /* CSS3 draft and Mozilla */ text-align: center; font-weight: bold; } diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css index 890bf8df6..bd4758f2c 100644 --- a/webcit/static/styles/webcit.css +++ b/webcit/static/styles/webcit.css @@ -124,6 +124,12 @@ body { padding: 0; } +.entmsg { + position: absolute; + height: 95%; + width: 98%; +} + .message_header .message_subject { font-style: italic; float: left; @@ -388,16 +394,16 @@ a:visited { color: purple} color: #3E65AF; } -.button_link a, input, select, li.activeuser, .room_actions form select, .room_actions li.search input, .address_book_popup_title, .msgbuttons a, input#delbutton,.attachfile, .logbuttons input,.buttons input, .send_edit_msg input { +.button_link a, input, select, li.activeuser, .room_actions form select, .room_actions li.search input, .address_book_popup_title, .msgbuttons a, input#delbutton,.attachfile, .logbuttons input,.buttons input { background-color: #fbf4ca !important; /* needed for li.activeuser */ } -.button_link a, input, select, .room_actions form select, .room_actions li.search input, .address_book_popup_title, .msgbuttons a, input#delbutton,.attachfile, .logbuttons input,.buttons input, .send_edit_msg input { +.button_link a, input, select, .room_actions form select, .room_actions li.search input, .address_book_popup_title, .msgbuttons a, input#delbutton,.attachfile, .logbuttons input,.buttons input { border: 1px solid #999; color: #333; } -.button_link a, .msgbuttons a, input#delbutton,.attachfile, .buttons input, .send_edit_msg input { +.button_link a, .msgbuttons a, input#delbutton,.attachfile, .buttons input { cursor: pointer; -webkit-border-radius: 8px; -moz-border-radius: 8px; @@ -406,7 +412,7 @@ a:visited { color: purple} text-align: center; } -.button_link a, .attachfile,.buttons input, .send_edit_msg input { +.button_link a, .attachfile,.buttons input { font-weight: bold; } @@ -593,7 +599,7 @@ body { padding: 0 0 2px 0; } -.button_link a, .attachfile, .logbuttons input,.buttons input, .send_edit_msg input, .logbutton { +.button_link a, .attachfile, .logbuttons input,.buttons input .logbutton { margin: 3px; padding: 2px 4px 2px 4px; } @@ -684,26 +690,20 @@ body { vertical-align: middle } -.send_edit_msg { - float: right; - margin-top: 0 ; - margin-right: 0; - padding: 2px 50px 2px 50px; -} - .edit_msg_table th { text-align: right; + padding: 0px; padding-right: 5px; color: #333; width: 20%; } .edit_msg_table td { - width: 40%; + padding: 0px; } .edit_msg_table #recp_id, .edit_msg_table #cc_id, .edit_msg_table #bcc_id, .edit_msg_table #subject_id { - width: 98% + width: 98%; } .note { diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html index 91bd0dc68..26b783b91 100644 --- a/webcit/static/t/edit_message.html +++ b/webcit/static/t/edit_message.html @@ -9,18 +9,10 @@ "> "> "> + -

-"> -"> -  - "> -  - "> -

- - - @@ -75,15 +62,26 @@ - - +
+
" size=45 maxlength=1000 />
- |cc_id||bcc_id|');" title=""> -   - -
+ " size=45 maxlength=70>
- - +
+
+ + +    + +  "> +  "> +
+
+ - - - -
- - -    - -  "> -  "> - -
+ + + + diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html index 7f3a8e194..ba4126d8f 100644 --- a/webcit/static/t/login.html +++ b/webcit/static/t/login.html @@ -24,11 +24,11 @@
- " class="logbutton"> + " class="button"> - " class="logbutton" type="submit"> + " class="button" type="submit"> - " class="logbutton"> + " class="button">