updating a little the templates (main menu on the left). Another commit will come...

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
index 18f7fb6..8a029a1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
@@ -93,3 +93,46 @@ legend {
 
 /* end of css styles for reserves color alerts */
 
+/* MAIN MENU STYLES */
+#mainmenu {
+    display:block;
+    float:left;
+    margin-right:20px;
+    border-right:1px solid black;
+}
+
+#mainmenu a {
+    display:block;
+    margin:5px;
+    text-decoration:none;
+    color:black;
+}
+#mainmenu a:hover {
+    display:block;
+    margin:5px;
+    background-color:#6699cc;
+    color:white;
+}
+
+/* submenus styles */
+#submenu {
+    margin-left:10%;
+}
+#submenu a {
+    margin:5px;
+    text-decoration:none;
+    color:black;
+}
+#submenu a:hover {
+    margin:5px;
+    background-color:#6699cc;
+    color:white;
+}
+
+/* the USER information block */
+#librarian_information {
+/*     position:absolute; */
+    float:right;
+    font-size:10pt;
+}
+

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
index da6af93..0703fc9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
@@ -1,8 +1,8 @@
-<p>
+<div id="submenu">
     <a href="/cgi-bin/koha/acqui/acqui-home.pl">Main page</a>
     <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=0">Add supplier</a>
     <a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a>
     <a href="/cgi-bin/koha/acqui/histsearch.pl">History search</a>
     <a href="/cgi-bin/koha/suggestion/acceptorreject.pl">Manage suggestions</a>
     <a href="/cgi-bin/koha/admin/aqbookfund.pl">Parameters</a>
-</p>
+</div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
index b881c63..9246686 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
@@ -1,4 +1,4 @@
-<p>
+<div id="submenu">
        <a href="/cgi-bin/koha/admin/systempreferences.pl">System pref</a>
        <a href="/cgi-bin/koha/admin/branches.pl">Branches</a>
        <a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a>
@@ -15,4 +15,4 @@
        <a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a>
        <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a>
        <a href="/cgi-bin/koha/import/breeding.pl">Reservoir</a>
-</p>
\ No newline at end of file
+</div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
index 3f5eb66..a85aec7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
@@ -1,7 +1,7 @@
-<p>
+<div id="submenu">
        <a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">Search</a>
        <a href="/cgi-bin/koha/loadmodules.pl?module=addbiblio&amp;type=intranet">Add biblio</a>
        <a class="submenu serial" href="/cgi-bin/koha/serials/serials-home.pl">Subscriptions</a>
        <a href="/cgi-bin/koha/serials/lateissues.pl">Late issues</a>
        <a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a>
-</p>
\ No newline at end of file
+</div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
index 9605449..a89a64f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
@@ -1,8 +1,10 @@
-<a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-<a href="/cgi-bin/koha/circ/circulation.pl">Issues</a>
-<a href="/cgi-bin/koha/circ/returns.pl">Returns</a>
-<a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a>
-<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a>
-<a href="/cgi-bin/koha/circ/branchreserves.pl">Waiting reserves</a>
-<a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">Transfers to do</a>
-<a href="/cgi-bin/koha/circ/currenttransfers.pl">Transfers to recieve</a>
+<div id="submenu">
+    <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
+    <a href="/cgi-bin/koha/circ/circulation.pl">Issues</a>
+    <a href="/cgi-bin/koha/circ/returns.pl">Returns</a>
+    <a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a>
+    <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set branch</a>
+    <a href="/cgi-bin/koha/circ/branchreserves.pl">Waiting reserves</a>
+    <a href="/cgi-bin/koha/circ/waitingreservestransfers.pl">Transfers to do</a>
+    <a href="/cgi-bin/koha/circ/currenttransfers.pl">Transfers to recieve</a>
+</div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
index 45819ad..e98c41b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
@@ -1,7 +1,7 @@
-<p>
+<div id="submenu">
        <a href="/cgi-bin/koha/members/members-home.pl">Search</a>
        <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A"/>Add adult</a>
        <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C"/>Add child</a>
        <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=P"/>Add prof</a>
        <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=I"/>Add org</a>
-</p>
\ No newline at end of file
+</div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
index f62d9c2..3a245f4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
@@ -1,4 +1,4 @@
-    <p>
+<div id="submenu">
         <a href="/cgi-bin/koha/serials/serials-home.pl">home</a>
         <a href="/cgi-bin/koha/serials/serial-issues.pl">Serials issues</a>
         <a href="/cgi-bin/koha/serials/acqui-search.pl">Supplier search</a>
@@ -7,4 +7,4 @@
         <a href="/cgi-bin/koha/serials/lateissues.pl">Late issue</a>
         <a href="/cgi-bin/koha/serials/subscription-add.pl">Add a subscription</a>
         <a href="/cgi-bin/koha/serials/viewalerts.pl">View alerts</a>
-    </p>
+</div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
index d1cfcb2..25e48f0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc
@@ -1,8 +1,8 @@
-<p>
+<div id="submenu">
        <a href="/cgi-bin/koha/tools/cities.pl">Cities</a>
        <a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a>
                <a href="/cgi-bin/koha/tools/marc.pl">Export</a>
        <a href="/cgi-bin/koha/import/breeding.pl">Reservoir</a>
        <a href="/cgi-bin/koha/tools/barcodes.pl">Barcodes</a>
        <a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a>
-</p>
\ No newline at end of file
+</div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
index 97ec08b..df7b37b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
@@ -4,7 +4,7 @@ function Help() {
        newin=window.open("/cgi-bin/koha/help.pl","Koha Help",'width=600,height=600,toolbar=false,scrollbars=yes');
 }
 </script>
-<p>
+<div id="mainmenu">
        <a href="/cgi-bin/koha/mainpage.pl">Koha</a>
        <a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a>
        <a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;type=intranet">Catalogue</a>
@@ -16,7 +16,7 @@ function Help() {
        <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
        <a href="/cgi-bin/koha/about.pl">About</a>
        <a href="/cgi-bin/koha/help.pl" onclick="Help(); return false;">Help</a>
-</p>
+</div>
 
 <div id="librarian_information">
 <p><!-- TMPL_VAR name="loggedinusername" -->, from <!-- TMPL_VAR name="branchname" --></p>