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

[paul poulain]

CVSROOT:	/cvsroot/koha
Module name:	koha
Branch: 	
Changes by:	paul poulain <tipaul at savannah.gnu.org>	06/04/14 09:36:51

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/includes: intranet.css 
	                                          menu-admin.inc 
	                                          menu-members.inc 
	                                          menus.inc 
Added files:
	koha-tmpl/intranet-tmpl/prog/en/includes: holidays-bottom.inc 
	                                          holidays-top.inc 
	                                          menu-tools.inc 

Log message:
	- adding some css properties (minor)
	- adding links in members menu
	
	improvements from SAN Ouest Provence :
	* introducing a category_type into categories. It can be A (adult), C (children), P (Professionnal), I (institution/organisation).
	* each category_type has it's own forms to create members.
	* the borrowers table has been heavily modified (many fields changed), to get something more logic & readable
	* reintroducing guarantor/guanrantee system that is now independant from hardcoded C/A for categories
	* updating templates to fit template rules
	
	(see mail feb, 17 on koha-devel "new features for borrowers" for more details)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-bottom.inc?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/holidays-top.inc?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-tools.inc?rev=1.1

Patches:
Index: koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css:1.2 koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css:1.3
--- koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css:1.2	Thu Apr  6 11:00:08 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css	Fri Apr 14 09:36:51 2006
@@ -1,6 +1,6 @@
 body {
 	font-family : Verdana, Geneva, Arial, sans-serif;
-	font-size : .7em;
+	font-size : .9em;
 }
 
 table {
@@ -33,6 +33,14 @@
 	text-align : right;
 }
 
+input {
+	font-size:0.9em;
+}
+
+select {
+	font-size:0.9em;
+}
+
 input[type=submit], input[type=button], input[type=reset] {
 	background-color : #6699cc;
 	color : #FFFFFF;
@@ -50,4 +58,16 @@
 
 #admin_stopwords_select UL LI {
    white-space: nowrap;
+}
+fieldset {
+	display:inline;
+	vertical-align:top;
+}
+legend {
+	font-size:120%;
+	font-weight:bold;
+}
+
+label {
+	width:10em;
 }
\ No newline at end of file
Index: koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc:1.2 koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc:1.3
--- koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc:1.2	Mon Feb 20 14:37:47 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc	Fri Apr 14 09:36:51 2006
@@ -14,8 +14,5 @@
 	<a href="/cgi-bin/koha/admin/printers.pl">Printers</a>
 	<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/export/marc.pl">Export</a>
 	<a href="/cgi-bin/koha/import/breeding.pl">Reservoir</a>
-	<a href="/cgi-bin/koha/barcodes/barcodes.pl">Barcodes</a>
-	<a href="/cgi-bin/koha/admin/viewlog.pl">Log viewer</a>
 </p>
\ No newline at end of file
Index: koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc:1.1	Mon Feb 13 16:39:33 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc	Fri Apr 14 09:36:51 2006
@@ -1,5 +1,7 @@
 <p>
  	<a href="/cgi-bin/koha/members/members-home.pl">Search</a>
-	<a href="/cgi-bin/koha/members/memberentry.pl?actionType=Add">Add member</a>
-	<a href="/cgi-bin/koha/members/memberentry.pl?categorycode=I&amp;actionType=Add">Add organisation</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
Index: koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
diff -u koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:1.1 koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:1.2
--- koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc:1.1	Mon Feb 13 16:39:33 2006
+++ koha/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc	Fri Apr 14 09:36:51 2006
@@ -12,6 +12,7 @@
 	<a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>
 	<a href="/cgi-bin/koha/reports-home.pl">Reports</a>
 	<a href="/cgi-bin/koha/admin/admin-home.pl">Parameters</a>
+	<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>
\ No newline at end of file