applied thierry's banner mod patch

diff --git a/webcit/roomops.c b/webcit/roomops.c
index b79351d52e852178036527d1f250e5a0b830cc4a..bcb4b9562881b78fcf8e3a296a8f5405ac7dcd3b 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -354,11 +354,11 @@ void embed_view_o_matic(void) {
        int i;
 
        wprintf("<form name=\"viewomatic\" action=\"changeview\">\n"
-               "<span class=\"room_banner_new_messages\">");
+               "<div class=\"room_banner_new_messages\"><span>");
        wprintf(_("View as:"));
-       wprintf(" "
+       wprintf("</span> "
                "<SELECT NAME=\"newview\" SIZE=\"1\" "
-               "STYLE=\"font-size: 7pt; background: #444455; color: #ddddcc;\" "
+               "class=\"selectbox\" "
                "OnChange=\"location.href=viewomatic.newview.options"
                "[selectedIndex].value\">\n");
 
@@ -383,7 +383,7 @@ void embed_view_o_matic(void) {
                        wprintf("</OPTION>\n");
                }
        }
-       wprintf("</select></span></form>\n");
+       wprintf("</select></div></form>\n");
 }
 
 
@@ -392,13 +392,13 @@ void embed_view_o_matic(void) {
  */
 void embed_search_o_matic(void) {
        wprintf("<form name=\"searchomatic\" action=\"do_search\">\n"
-               "<span class=\"room_banner_new_messages\">");
+               "<div class=\"room_banner_new_messages\"><span>");
        wprintf(_("Search: "));
-       wprintf("<input "
+       wprintf("</span> <input "
                "type=\"text\" name=\"query\" size=\"20\" maxlength=\"128\" "
-               "style=\"font-size: 7pt; background: #444455; color: #ddddcc;\">\n"
+               "class=\"inputbox\">\n"
        );
-       wprintf("</select></span></form>\n");
+       wprintf("</select></div></form>\n");
 }
 
 
@@ -456,7 +456,7 @@ void embed_room_banner(char *got, int navbar_style) {
        do_template("roombanner");
        if (navbar_style != navbar_none) {
 
-               wprintf("<div style=\"position:absolute; bottom:0px; left:0px\">\n"
+               wprintf("<div id=\"navbar\">\n"
                        "<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\"><tr>\n");
 
 
@@ -2175,7 +2175,7 @@ void display_private(char *rname, int req_pass)
        );
 
        wprintf("<div class=\"fix_scrollbar_bug\">"
-               "<table border=0 width=100%% bgcolor=\"#ffffff\"><tr><td>\n");
+               "<table class=\"roomops_background\"><tr><td>\n");
 
        wprintf("<CENTER>\n");
        wprintf("<br />");
@@ -2189,7 +2189,7 @@ void display_private(char *rname, int req_pass)
        wprintf("<FORM METHOD=\"POST\" action=\"goto_private\">\n");
 
        wprintf("<table border=\"0\" cellspacing=\"5\" "
-               "cellpadding=\"5\" BGCOLOR=\"#EEEEEE\">\n"
+               "cellpadding=\"5\" class=\"roomops_background_alt\">\n"
                "<TR><TD>");
        wprintf(_("Enter room name:"));
        wprintf("</TD><TD>"

diff --git a/webcit/static/roombanner.html b/webcit/static/roombanner.html
index 79c3b6a5763de1aec562777ffbb86e63ccb5b01a..dee20e04d02f722c5c6c0bd5b61b9a3e880f74fd 100644 (file)
--- a/webcit/static/roombanner.html
+++ b/webcit/static/roombanner.html
@@ -1,22 +1,20 @@
 <! start roombanner.html>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="room_banner" >
 <tr>
-       <td align="left" valign="middle" bgcolor="#444455">
+       <td align="left" valign="middle" rowspan="2">
        <?ROOMPIC>
        </td>
-       <td align="left" valign="middle" bgcolor="#444455">
+       <td align="left" valign="middle" >
                <span class="room_banner_room_name"><?ROOMNAME></span>
        </td>
-       <td align="left" bgcolor="#444455">
+       <td align="right"><?SEARCHOMATIC></td>
+       <td align="right"><?VIEWOMATIC></td>
+</tr><tr>
+       <td>&nbsp;</td>
+       <td align="left" >
                <span class="room_banner_room_info"><?ROOMINFO></span>
        </td>
-       <td align="right" valign="top" bgcolor="#444455">
-               <table border=0 cellpadding=0 cellspacing=0>
-               <tr><td align="left"><?VIEWOMATIC></td></tr>
-               <tr><td align="left"><?SEARCHOMATIC></td></tr>
-               </table>
-       </td>
-       <td align="right" valign="top" bgcolor="#444455">
+       <td align="right" valign="top" colspan="2">
                <span class="room_banner_new_messages"><?NUMMSGS></span>
                <br />
                <span class="room_banner_start_page"><?START></span>

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 099e935c374051760d69a9a1787930ff43697ee7..470ed24e2b7804acf8f8d548ad3ce657d82a08a2 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -317,6 +317,18 @@ a:hover {
        color: #DDDDCC;
 }
 
+.selectbox, .inputbox {
+       font-size: 7pt; 
+       background: #444455; 
+       color: #ddddcc;
+}
+
+#navbar {
+       position: absolute; 
+       bottom: 0px; 
+       left: 0px;
+}
+
 .menubar_bg {
        background-color: #FF0000;
 }
@@ -582,24 +594,45 @@ div.auto_complete ul strong.highlight {
         background-color: #CCCCCC;
 }
 
-.auth_validate, .event_background, .calendar_background, .calendar_view_background, .graphics_background, .iconbar_background, .mainmenu_b
-ackground, .messages_background, .paging_background, .preferences_background, .roomops_background, .sieve_background, .siteconfig_backgrou
-nd, .smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .vcard_edit_background, .who_background   {
+.auth_validate, .event_background, .calendar_background, .calendar_view_background, .graphics_background, .iconbar_background {
         border: 0;
         width: 100%;
         background-color: #ffffff;
 }
 
-.auth_banner, .event_banner, .floors_banner, .calendar_banner, .graphics_banner, .iconbar_banner, .inetconf_banner, .listsub_banner, .mainmenu_banner, .netconf_banner, .paging_banner, .preferences_banner, .roomops_banner, .setup_banner, .sieve_banner, .siteconfig_banner, .smtpqueue_banner, .summary_banner, .useredit_banner, .userlist_banner, .vcard_edit_banner, .who_banner   {
+.mainmenu_background, .messages_background, .paging_background, .preferences_background, .roomops_background, .sieve_background, .siteconfig_background { 
+        border: 0;
+        width: 100%;
+        background-color: #ffffff;
+}
+
+.smtpqueue_background, .tabs_background, .useredit_background, .userlist_background, .vcard_edit_background, .who_background   {
+        border: 0;
+        width: 100%;
+        background-color: #ffffff;
+}
+
+.auth_banner, .event_banner, .floors_banner, .calendar_banner, .graphics_banner, .iconbar_banner, .inetconf_banner, .listsub_banner {
         border: 0;
         width: 100%;
         background-color: #444455;
 }
 
+.mainmenu_banner, .netconf_banner, .paging_banner, .preferences_banner, .roomops_banner, .setup_banner, .sieve_banner, .siteconfig_banner {
+        border: 0;
+        width: 100%;
+        background-color: #444455;
+}
 
-.vcard_edit_background_alt {
+.smtpqueue_banner, .summary_banner, .useredit_banner, .userlist_banner, .vcard_edit_banner, .who_banner, .room_banner   {
         border: 0;
         width: 100%;
-        background-color: #dddddd;
+        background-color: #444455;
 }
 
+
+.vcard_edit_background_alt, .roomops_background_alt {
+        border: 0;
+        width: 100%;
+        background-color: #dddddd;
+}