lost quote...

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index d0382c79e29648c6199eb3042b239bdf74295347..6d18d0cb8b2ec507db8360df12e08a05fd020961 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -81,31 +81,31 @@ void do_iconbar(void) {
                if (!strcasecmp(key, "ib_citadel")) ib_citadel = atoi(value);
        }
 
+        if (ib_logo) {
+                if (ib_displayas != IB_TEXTONLY) {
+                        wprintf("<div class=\"logo\"> <img "
+                                "src=\"image&name=hello\" alt=\"&nbsp;\"> "
+                                "</div>\n"
+                        );
+                }
+                wprintf("\n");
+        }
+
+        if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
+                "<div class=\"logo_citadel\"> "
+                "<a href=\"http://www.citadel.org\" "
+                "title=\"%s\" target=\"aboutcit\"> "
+                "<img "
+                "src=\"static/citadel-logo.gif\" alt=\"%s\"></a> "
+                "</div>\n",
+                _("Find out more about Citadel"),
+                _("CITADEL")
+        );
+
        wprintf("<div id=\"button\">\n"
                "<ul>\n"
        );
 
-       if (ib_logo) {
-               wprintf("<li>");
-               if (ib_displayas != IB_TEXTONLY) {
-                       wprintf("<IMG BORDER=\"0\" WIDTH=\"120\" "
-                               "src=\"image&name=hello\" ALT=\"&nbsp;\">\n"
-                       );
-               }
-               wprintf("</li>\n");
-       }
-
-       if (ib_citadel) if (ib_displayas != IB_TEXTONLY) wprintf(
-               "<li><div align=\"center\">"
-               "<a href=\"http://www.citadel.org\" "
-               "title=\"%s\" target=\"aboutcit\">"
-               "<img border=\"0\" "
-               "src=\"static/citadel-logo.gif\" ALT=\"%s\"></a>"
-               "</div></li>\n",
-               _("Find out more about Citadel"),
-               _("CITADEL")
-       );
-
        wprintf("<li><div align=\"center\"><a href=\"javascript:switch_to_room_list()\">");
        wprintf(_("switch to room list"));
        wprintf("</a></div>");

diff --git a/webcit/static/login.html b/webcit/static/login.html
index 65a764795d8fe6a0cd96ea1c09c2e92a675164f3..a2b76479e62de1c757b6a973894574718437ec2d 100644 (file)
--- a/webcit/static/login.html
+++ b/webcit/static/login.html
@@ -1,7 +1,7 @@
 <?=beginbox>
-<div class="login_hello"><?HELLO></div>
+<?HELLO>
 <div class="login_message"><?MESG></div>
-<form action="login" method="POST"  class="box" id=login_form">
+<form action="login" method="POST"  class="box" id="login_form">
         <label for="uname"><?USERNAME_BOX></label>
         <input type="text" name="name" id="uname" > <br>
         <label for="pname"><?PASSWORD_BOX></label>

diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 582f95fdda20a6bb3a5f7d4a89889cd766097bbb..21f98183e35208375ca441aaa1a73f9eead976bc 100644 (file)
--- a/webcit/static/webcit.css
+++ b/webcit/static/webcit.css
@@ -35,6 +35,18 @@ body {
        background: #ffffee;
 }
 
+.logo, .logo_citadel {
+        display: block;
+        text-align: center;
+        border-bottom: 1px solid #aaaaaa;
+        margin: 0;
+        padding: 0;
+}
+
+.logo_citadel a, .logo_citadel img {
+        border: none;
+}
+
 #banner {
        position:fixed;
        display:block;