[Koha-cvs] koha/koha-tmpl/intranet-tmpl/prog/en/includes i...

paul poulain paul at koha-fr.org
Fri Aug 11 11:51:45 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Changes by:	paul poulain <tipaul>	06/08/11 09:51:45

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/includes: intranet.css 
	                                          menu-acqui.inc 
	                                          menu-admin.inc 
	                                          menu-catalogue.inc 
	                                          menu-circ.inc 
	                                          menu-members.inc 
	                                          menu-serials.inc 
	                                          menus.inc 
	                                          menu-tools.inc 

Log message:
	updating a little the templates (main menu on the left). Another commit will come very soon to validate the proof of concept of "includes" directory as having an easy personalized librarian (or OPAC) interface.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css?cvsroot=koha&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc?cvsroot=koha&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc?cvsroot=koha&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc?cvsroot=koha&r1=1.1&r2=1.2

Patches:
Index: intranet.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- intranet.css	6 Jun 2006 12:30:43 -0000	1.6
+++ intranet.css	11 Aug 2006 09:51:45 -0000	1.7
@@ -93,3 +93,46 @@
 
 /* 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;
+}
+

Index: menu-acqui.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- menu-acqui.inc	21 Jul 2006 14:01:10 -0000	1.2
+++ menu-acqui.inc	11 Aug 2006 09:51:45 -0000	1.3
@@ -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>

Index: menu-admin.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- menu-admin.inc	14 Apr 2006 09:36:51 -0000	1.3
+++ menu-admin.inc	11 Aug 2006 09:51:45 -0000	1.4
@@ -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

Index: menu-catalogue.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- menu-catalogue.inc	12 Jul 2006 12:20:51 -0000	1.2
+++ menu-catalogue.inc	11 Aug 2006 09:51:45 -0000	1.3
@@ -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

Index: menu-circ.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- menu-circ.inc	19 May 2006 17:01:03 -0000	1.1
+++ menu-circ.inc	11 Aug 2006 09:51:45 -0000	1.2
@@ -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

Index: menu-members.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- menu-members.inc	14 Apr 2006 09:36:51 -0000	1.2
+++ menu-members.inc	11 Aug 2006 09:51:45 -0000	1.3
@@ -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

Index: menu-serials.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- menu-serials.inc	12 Jul 2006 12:20:23 -0000	1.2
+++ menu-serials.inc	11 Aug 2006 09:51:45 -0000	1.3
@@ -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>

Index: menus.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- menus.inc	7 Jul 2006 08:52:52 -0000	1.5
+++ menus.inc	11 Aug 2006 09:51:45 -0000	1.6
@@ -4,7 +4,7 @@
 	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 @@
 	<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>

Index: menu-tools.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- menu-tools.inc	14 Apr 2006 09:36:51 -0000	1.1
+++ menu-tools.inc	11 Aug 2006 09:51:45 -0000	1.2
@@ -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





More information about the Koha-cvs mailing list