Cleaning code of the left side bar...

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 61baee37c85a25eca72aaea993c58e316ea78698..b1c175eecc81cd1e815e6f3bae63e1e037c6614e 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -102,13 +102,11 @@ void do_iconbar(void) {
                 _("CITADEL")
         );
 
-       wprintf("<div id=\"button\">\n"
-               "<ul>\n"
-       );
+       wprintf("<ul id=\"button\">\n");
 
-       wprintf("<li><div align=\"center\"><a href=\"javascript:switch_to_room_list()\">");
+       wprintf("<li class=\"switch\"><a href=\"javascript:switch_to_room_list()\">");
        wprintf(_("switch to room list"));
-       wprintf("</a></div>");
+       wprintf("</a></li>");
 
        if (ib_summary) {
                wprintf("<li><a href=\"summary\" "
@@ -318,16 +316,16 @@ void do_iconbar(void) {
        wprintf("</a></li>\n");
 
        wprintf(
-               "<li><div align=\"center\">"
+               "<li class=\"switch\">"
                "<a href=\"display_customize_iconbar\" "
                "title=\"%s\" "
                ">%s"
-               "</a></div></li>\n",
+               "</a></li>\n",
                _("Customize this menu"),
                _("customize this menu")
        );
 
-       wprintf("</ul></div>\n");
+       wprintf("</ul>\n");
 }
 
 
@@ -387,17 +385,11 @@ void do_iconbar_roomlist(void) {
                 _("CITADEL")
         );
 
-       wprintf("<div id=\"button\">\n"
-               "<ul>\n"
-       );
-
-       wprintf("<div id=\"button\">\n"
-               "<ul>\n"
-       );
+       wprintf("<ul id=\"button\">\n");
 
-       wprintf("<li><div align=\"center\"><a href=\"javascript:switch_to_menu_buttons()\">");
+       wprintf("<li class=\"switch\"><a href=\"javascript:switch_to_menu_buttons()\">");
        wprintf(_("switch to menu"));
-       wprintf("</a></div>");
+       wprintf("</a></li>");
 
        wprintf("<li>"
                "<a href=\"termquit\" title=\"%s\" "
@@ -415,7 +407,7 @@ void do_iconbar_roomlist(void) {
        }
        wprintf("</a></li>\n");
 
-       wprintf("</ul></div>\n");
+       wprintf("</ul>\n");
 
        /** embed the room list */
        list_all_rooms_by_floor("iconbar");

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 72637ca4952dd20b8a8229bb824273284c602146..c8467a4d1b56555825218a13c6e00584737fc4c7 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -296,25 +296,24 @@ li.start_page {
 
 #button {
        width: 100%;
-       padding: 0 0 1em 0;
-       margin-bottom: 1em;
        background-color: #ffffee;
        color: #aaaaaa;
        font-size: 8pt;
-}
-
-#button ul {
        list-style: none;
        margin: 0;
        padding: 0;
        border: none;
 }
 
-#button li {
+#button li, #button li.switch {
        border-bottom: 1px solid #aaaaaa;
        margin: 0;
 }
 
+#button li.switch {
+       text-align: center;
+}
+
 #button img {
        vertical-align: middle;
        padding-left: 2px;