ICAL: add conflict handling

[citadel.git] / webcit / static / t / iconbar.html

diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index 4b24c6ef55f6feaf170d83356f01b00d74490237..0ba06be5cf9d68ca5d0b36b1bb48306ec15b5425 100644 (file)
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -43,7 +43,7 @@
                                <li id="ib_rooms" class="ib_button">
                                        <a class="ib_button_link" href="knrooms?template=knrooms?SortBy=byfloorroom?SortOrder=1" title="<?_("List all your accessible rooms")>">
                                                <img id="expand_roomlist"
-                                                       src=<?%("COND:ICONBAR:ROOMLISTEXPANDED", 1, 1, 1, '"static/collapse.gif" alt="-"', '"static/expand.gif" alt="+"')>
+                                                       src=<?%("COND:ICONBAR:ROOMLISTEXPANDED", 1, 1, 1, '"static/webcit_icons/collapse.gif" alt="-"', '"static/webcit_icons/expand.gif" alt="+"')>
                                                onClick="return toggle_roomlist();">
                                                <span><?_("Rooms")></span>
                                        </a>
@@ -52,7 +52,7 @@
                                <li id="ib_users" class="ib_button">
                                        <a class="ib_button_link" href="do_template?template=who" title="<?_("See who is online right now")>">
                                                <img id="expand_wholist"
-                                                       src=<?%("COND:ICONBAR:WHOLISTEXPANDED", 1, 1, 1, '"static/collapse.gif" alt="-"', '"static/expand.gif" alt="+"')>
+                                                       src=<?%("COND:ICONBAR:WHOLISTEXPANDED", 1, 1, 1, '"static/webcit_icons/collapse.gif" alt="-"', '"static/webcit_icons/expand.gif" alt="+"')>
                                                onClick="return toggle_wholist();">
                                                <span><?_("Online users")></span>
                                        </a>
@@ -84,7 +84,7 @@
                </div>
        <??("X",2)>
        <?!("COND:LOGGEDIN",4)>
-               <div id="ib_logoff" class="ib_button">
+               <div id="ib_login" class="ib_button">
                        <a class="ib_button_link" href="javascript:GetLoggedInFirst('do_welcome')" title="<?_("Log in")>"><span><?_("Log in")></span></a>
                </div>
        <?!("X",4)>