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

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Joshua Ferraro <kados>	07/03/18 02:16:23

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/installer: step3.tmpl 
	misc/sql-datas/en/optional: library.sql 
Added files:
	misc/sql-datas/en/optional: borrower_categories.sql 
	                            borrower_categories.txt 

Log message:
	improvements to the language of the installer
	moved borrower categories defaults for English into a separate sql file

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl?cvsroot=koha&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/koha/misc/sql-datas/en/optional/library.sql?cvsroot=koha&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/koha/misc/sql-datas/en/optional/borrower_categories.sql?cvsroot=koha&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/koha/misc/sql-datas/en/optional/borrower_categories.txt?cvsroot=koha&rev=1.1

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl	17 Mar 2007 23:29:33 -0000	1.4
+++ koha-tmpl/intranet-tmpl/prog/en/installer/step3.tmpl	18 Mar 2007 02:16:23 -0000	1.5
@@ -117,10 +117,10 @@
   </p>
 <!--/TMPL_IF-->
 <!--TMPL_IF Name="addframeworks"-->
-  <h2 align="center">Data added</h2>
+  <h2 align="center">Results of installation:</h2>
   <p>Language :<!--TMPL_VAR Name="fwklanguage"--></p>
   <!--TMPL_LOOP Name="list"-->
-  <h3> <!--TMPL_VAR Name="level"--></h3>
+  <h3><!--TMPL_VAR Name="level"--> data added</h3>
   <p>
   <ul>
   <!--TMPL_LOOP Name="fwklist"-->
@@ -131,7 +131,6 @@
   <!--/TMPL_LOOP-->
   <p>Installation complete.<br/>
     <p>Click on Finish to complete and load the Koha Staff Interface.
-    The installer will be disabled for security reasons.
     <form name="finish">
     <input type="hidden" name="step" value="3" />
     <input type="hidden" name="op" value="finish" />

Index: misc/sql-datas/en/optional/library.sql
===================================================================
RCS file: /sources/koha/koha/misc/sql-datas/en/optional/library.sql,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- misc/sql-datas/en/optional/library.sql	16 Mar 2007 16:56:48 -0000	1.1
+++ misc/sql-datas/en/optional/library.sql	18 Mar 2007 02:16:23 -0000	1.2
@@ -1,4 +1,10 @@
 INSERT INTO `branches` (branchcode, branchname) VALUES ('MAIN','Main Library');
+
 INSERT INTO `currency` (currency, rate) VALUES ('USD', 1.0);
-INSERT INTO `z3950servers` (`host`, `port`, `db`, `userid`, `password`, `name`, `id`, `checked`, `rank`, `syntax`) VALUES ('z3950.loc.gov',7090,'Voyager','','','LIBRARY OF CONGRESS',1,0,2,'USMARC'),('amicus.collectionscanada.ca',210,'NL','','','AMICUS',2,0,3,'USMARC'),('66.213.78.76',9999,'NPLKoha','','','NELSONVILLE PUBLIC LIBRARY',3,0,4,'USMARC');
-INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES ('PATRON','patron',20,100,10,NULL,NULL,'0.000000',0,NULL,'0.000000','A');
+
+INSERT INTO `z3950servers` (`host`, `port`, `db`, `userid`, `password`, `name`, `id`, `checked`, `rank`, `syntax`) VALUES
+('z3950.loc.gov',7090,'Voyager','','','LIBRARY OF CONGRESS',1,1,2,'USMARC'),
+('amicus.collectionscanada.ca',210,'NL','','','AMICUS',2,1,3,'USMARC'),
+('66.213.78.76',9999,'NPLKoha','','','NELSONVILLE PUBLIC LIBRARY',3,0,4,'USMARC');
+
+

Index: misc/sql-datas/en/optional/borrower_categories.sql
===================================================================
RCS file: misc/sql-datas/en/optional/borrower_categories.sql
diff -N misc/sql-datas/en/optional/borrower_categories.sql
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/sql-datas/en/optional/borrower_categories.sql	18 Mar 2007 02:16:23 -0000	1.1
@@ -0,0 +1,4 @@
+INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES ('PATRON','patron',12,100,18,NULL,NULL,'0.000000',0,NULL,'0.000000','A');
+INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES ('CHILD','child',12,18,0,NULL,NULL,'0.000000',0,NULL,'0.000000','C');
+INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES ('INST','institution',12,100,0,NULL,NULL,'0.000000',0,NULL,'0.000000','I');
+INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES ('PROF','professional',12,100,18,NULL,NULL,'0.000000',0,NULL,'0.000000','P');

Index: misc/sql-datas/en/optional/borrower_categories.txt
===================================================================
RCS file: misc/sql-datas/en/optional/borrower_categories.txt
diff -N misc/sql-datas/en/optional/borrower_categories.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ misc/sql-datas/en/optional/borrower_categories.txt	18 Mar 2007 02:16:23 -0000	1.1
@@ -0,0 +1 @@
+Default borrower categories: Adult Patron, Child, Institution, Professional. You can add additional categories after installation.