More work on standardizing toolbars. Also standardizing form markup in /tools

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / includes / menus.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
index 344b8b5..5fbe43e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
@@ -1,10 +1,4 @@
-<div id="kohalogo">
-    <img src="/intranet-tmpl/prog/images/koha-logo-white.png" height="60px"/>
-    <h3><a href="/cgi-bin/koha/mainpage.pl">Koha Staff Client</a></h3>
-</div>
-<div id="onlinehelp">
-    <a href="#" onclick="javascript:window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
-</div>
+
 <div id="mainmenu">
 
     <!-- TMPL_IF NAME="CAN_user_circulate" -->
@@ -48,7 +42,7 @@
                         <input type="submit" value=" OK " class="submit" />
                         </form>
                      </li>
-                    <li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual Shelves</a></li>
+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
                 </ul>
                 <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
@@ -80,7 +74,7 @@
             <b> Login information</b>
         </li>
         <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b>
-            at <b><!-- TMPL_VAR NAME="LoginBranchnameShort" --></b></li>
+            at <b><!-- TMPL_VAR NAME="LoginBranchcode" --></b></li>
             <!-- TMPL_IF NAME="AutoLocation" -->
                 <li>autolocate activated</li>
         <!-- TMPL_ELSE -->