From 98116201dd5bfd49f9109fc0a54602bf546bb06b Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 26 Jan 2009 01:45:30 +0000 Subject: [PATCH] * Move iconbar out of global div so I can shuffle main content position rules --- webcit/static/t/head.html | 3 +++ webcit/static/t/iconbar.html | 4 ++-- webcit/static/webcit.css | 11 +++++++---- webcit/webcit.c | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html index 1a4ba1700..059c6c717 100644 --- a/webcit/static/t/head.html +++ b/webcit/static/t/head.html @@ -32,5 +32,8 @@ + + +
diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html index 80cbf1a7d..6ec4938e5 100644 --- a/webcit/static/t/iconbar.html +++ b/webcit/static/t/iconbar.html @@ -2,7 +2,7 @@ -
+
    @@ -76,7 +76,7 @@ title="">
-
+
diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css index 14276b258..ba4e64b0d 100644 --- a/webcit/static/webcit.css +++ b/webcit/static/webcit.css @@ -70,7 +70,7 @@ body { text-transform: uppercase; } -#iconbar ul li, #room_infos, #address_book_popup,.roomops_cell, .roomops_cell_edit, .mimepart, #ib_logoff, #switch, #customize { +#iconbar ul li, #room_infos, #address_book_popup,.roomops_cell, .roomops_cell_edit, .mimepart, #ib_logoff, .iconbar_text { background-color: #F0FFFF; color: #333; } @@ -105,7 +105,7 @@ body { border: none; } -.logo,.logo_citadel, #switch, #customize { +.logo,.logo_citadel, .iconbar_text { border: none; border-bottom: 1px solid #AAA; } @@ -728,15 +728,18 @@ body, #global { /* Iconbar */ -.logo, .logo_citadel, #iconbar #button, #switch, #customize, #ib_logoff { +.logo, .logo_citadel, #iconbar #button, .iconbar_text, #ib_logoff { margin: 0; padding: 0; } -.logo, #citlogo, #switch, #customize, #online_users li { +.logo, #citlogo, .iconbar_text, #online_users li { text-align: center; } +.iconbar_text > span { + cursor: pointer; +} #iconbar #button { width: 100%; } diff --git a/webcit/webcit.c b/webcit/webcit.c index 49884f250..d63afdd64 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -175,7 +175,7 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers } if ( (WC->logged_in) && (!unset_cookies) ) { - DoTemplate(HKEY("iconbar"), NULL, &NoCtx); + //DoTemplate(HKEY("iconbar"), NULL, &NoCtx); page_popup(); } -- 2.30.2