projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7d1fdb0)
* Move iconbar out of global div so I can shuffle main content position rules
authorMatt <matt@uncensored.citadel.org>
Mon, 26 Jan 2009 01:45:30 +0000 (01:45 +0000)
committerMatt <matt@uncensored.citadel.org>
Mon, 26 Jan 2009 01:45:30 +0000 (01:45 +0000)
webcit/static/t/head.html patch | blob | history
webcit/static/t/iconbar.html patch | blob | history
webcit/static/webcit.css patch | blob | history
webcit/webcit.c patch | blob | history

diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html
index 1a4ba1700f1618a443c888ffd8321902541253c2..059c6c717b57179d33b9bcc996226e85f8f8649d 100644 (file)
--- a/webcit/static/t/head.html
+++ b/webcit/static/t/head.html
@@ -32,5 +32,8 @@
 <script type="text/javascript" src="static/ctdldragdrop.js"></script>
 </head>
 <body>
+<??("COND:LOGGEDIN",1)>
+<?=("iconbar")>
+<??("X",1)>
 <div id="global">
 <!-- end head.html -->
diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index 80cbf1a7df930ac44836e73b15fad2a60e9776ec..6ec4938e5d94d38d8a07a2b42bfe1cf3fd9c93e7 100644 (file)
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -2,7 +2,7 @@
   <div id="citlogo" class="logo_citadel">
     <img src="/static/citadel-logo.gif" alt="<?_("Powered by Citadel")>">
   </div>
-  <div id="switch"><span></span></div>
+  <div id="switch" class="iconbar_text"><span></span></div>
   <div id="roomlist"></div>
   <div id="iconbar_menu">
 <ul id="button">
@@ -76,7 +76,7 @@ title="<?_("Log off")>">
 <span><?_("Log off")></span>
 </a>
 </div>
-<div id="customize">
+<div id="customize" class="iconbar_text">
   <span><a href="display_customize_iconbar"><?_("customize this menu")></a></span>
 </div>
 </div>
diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css
index 14276b258510db332ea340f631cf31cb655347f7..ba4e64b0dc770e38599dad457b46494050b2c83a 100644 (file)
--- 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 49884f250599197380206c1bb49990eca435ca42..d63afdd64db3ae36b6b1b82acb565c10c2bac02e 100644 (file)
--- 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();
                }
 
Citadel server, clients, utilities