Moving top-level navigation links, login information into header section of pages

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/login.css b/koha-tmpl/intranet-tmpl/prog/en/css/login.css
index 53e19fa..7e3364e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/login.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/login.css
@@ -51,6 +51,9 @@ label {
        border: 1px solid #a2a2a2;
        margin: 5em auto;
        padding: 1.5em;
+       position : relative;
+       top : auto;
+       right : auto;
        width: 25em;
 }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 3540d6e..f331354 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1,5 +1,13 @@
 @import url( /intranet-tmpl/prog/en/lib/yui/reset-fonts-grids.css) all;
 
+a, a:link, a:visited, a:active {
+       color : #316494;
+}
+
+a:hover {
+       color : #669ACC;
+}
+
 body {
        text-align : left;
 }
@@ -59,10 +67,18 @@ h6 {
 .yui-u {
 }
 
-#onlinehelp {
+#doc3 {
+       padding-top : 1em;
+}
+
+#login  {
        position : absolute;
        top : 3px;
-       right : 10px;
+       right : 40px;
+}
+
+#login a {
+
 }
 
 ul {
@@ -75,34 +91,51 @@ li {
 }
 
 #header {
+       border-bottom : 1px solid #E8E8E8;
+}
+
+#header:after { /* clearing without presentational markup, IE gets extra treatment */
+    display: block;
+    clear: both;
+    content: " ";
+}
+
+#title {
        background-image : url("../../img/koha-logo-black.png");
-       background-position : left;
+       background-position : 5px 2px;
        background-repeat : no-repeat;
+       float : left;
        height : 54px;
-       padding-left : 45px;
+       padding-left : 50px;
 }
 
-#header h1 {
-       height : 54px;
-       vertical-align : middle;
+#title h1 {
+       display : inline;
+       line-height : 54px;
 }
 
-#header h1 a {
+#title h1 a {
        text-decoration : none;
 }
 
+#toplevelnav {
+       float : left;
+       line-height : 54px;
+       margin-left : 1em;
+}
+
 #submenu {
        margin : .5em 0;
 }
 
-#submenu li {
+#toplevelnav li, #submenu li {
        display : inline;
        border-right : 1px solid #E8E8E8;
        padding : 0 .5em;
        white-space : nowrap;
 }
 
-#submenu li:last-child {
+#toplevelnav li:last-child, #submenu li:last-child {
        border : 0;
 }
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 1e4570a..ea4f1c0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -1,6 +1,14 @@
-<div id="header">
+<div id="header"><div id="title">
     <h1><a href="/cgi-bin/koha/mainpage.pl">Koha Staff Client</a></h1>
-<div id="onlinehelp">
-    <a href="#" onclick="window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[?]</a>
 </div>
-</div>
\ No newline at end of file
+       
+<div id="toplevelnav">
+<ul>
+       <li><a href="/cgi-bin/koha/mainpage.pl">Home</a></li>
+       <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></li>
+       <li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>
+       <li><a href="/cgi-bin/koha/catalogue/advsearch.pl">Catalogue</a></li>
+</ul>
+</div>
+       
+<div id="login"><p><!-- TMPL_IF NAME="loggedinusername" --><span class="loggedinusername"><!-- TMPL_VAR NAME="loggedinusername" --></span></p> <p><!-- TMPL_IF NAME="AutoLocation" --><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong><!-- TMPL_ELSE --><a href="/cgi-bin/koha/circ/selectbranchprinter.pl"><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong></a><!-- /TMPL_IF --></p> <p><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a> | <!-- TMPL_ELSE -->You are not logged in | <!-- /TMPL_IF --><a href="/cgi-bin/koha/help.pl" id="helper" onclick="window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[ ? ]</a></p></div></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
index 02cda03..75498a4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
@@ -70,20 +70,5 @@
         <!-- TMPL_VAR NAME="IntranetNav" -->
     <!-- /TMPL_IF -->
        
-    <div id="login">
-        <!-- TMPL_IF NAME="loggedinusername" -->
-        <ul>
-        <li>Logged in as: <strong> <!-- TMPL_VAR NAME="loggedinusername" --> </strong>
-            at <strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong></li>
-            <!-- TMPL_IF NAME="AutoLocation" -->
-                <li>autolocate activated</li>
-        <!-- TMPL_ELSE -->
-            <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Change Settings</a></li>
-        <!-- /TMPL_IF -->
-            <li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li>
-        </ul>
-        <!-- /TMPL_IF -->
-       </div>
-
 </div>
 </div>
\ No newline at end of file