* Added definitions of the new display sysprefs:
viewISBD - Allow display of ISBD view of bibiographic records
viewLabeledMARC - Allow display of labeled MARC view of bibiographic records
viewMARC - viewMARC Allow display of MARC view of bibiographic records
* Adjusted IntranetBiblioDefaultView
* made type choice (fixing bug 1933)
* added better description for English
* added labeled_marc option
---
installer/data/mysql/en/mandatory/sysprefs.sql | 6 ++++--
.../1-Obligatoire/unimarc_standard_systemprefs.sql | 3 +++
installer/data/mysql/updatedatabase.pl | 14 ++++++++++++++
.../prog/en/modules/catalogue/results.tmpl | 2 +-
kohaversion.pl | 2 +-
5 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql
b/installer/data/mysql/en/mandatory/sysprefs.sql
index 3d1a7a6..a0e606e 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -30,8 +30,7 @@ INSERT INTO `systempreferences`
(variable,value,explanation,options,type) VALUES
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('hide_marc',0,'If ON, disables display of MARC fields, subfield codes &
indicators (still shows data)',NULL,'YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('IndependantBranches',0,'If ON, increases security between
libraries',NULL,'YesNo');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('insecure',0,'If ON, bypasses all authentication. Be
careful!',NULL,'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('IntranetBiblioDefaultView','normal','IntranetBiblioDefaultView','','');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('IntranetBiblioDefaultView','normal','IntranetBiblioDefaultView','normal|marc|isbd|labeled_marc','Choice');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('IntranetBiblioDefaultView','normal','Choose the default detail view in
the staff interface; choose between normal, labeled_marc, marc or
isbd','normal|marc|isbd|labeled_marc','Choice');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('intranetcolorstylesheet','','Define the color stylesheet to use in the
Staff Client','50','free');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('IntranetmainUserblock','','Add a block of HTML that will display on the
intranet home page','70|10','Textarea');
INSERT INTO `systempreferences` (variable,value,explanation,options,type)
VALUES('IntranetNav','','Use HTML tabs to add navigational links to the
left-hand navigational bar in the Staff Client','70|10','Textarea');
@@ -242,3 +241,6 @@ INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('L
INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('LibraryThingForLibrariesTabbedView','0','Put
LibraryThingForLibraries Content in Tabs.','','YesNo');
INSERT INTO `systempreferences` ( `variable` , `value` , `options` ,
`explanation` , `type` ) VALUES ( 'AllowNotForLoanOverride', '0', '', 'If ON,
Koha will allow the librarian to loan a not for loan item.', 'YesNo');
INSERT INTO systempreferences (variable,value,explanation,options,type)
VALUES('RenewalPeriodBase', 'date_due', 'Set whether the renewal date should be
counted from the date_due or from the moment the Patron asks for renewal
','date_due|now','Choice');
+INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('viewISBD','1','Allow display
of ISBD view of bibiographic records','','YesNo');
+INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('viewLabeledMARC','0','Allow
display of labeled MARC view of bibiographic records','','YesNo');
+INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('viewMARC','1','Allow display
of MARC view of bibiographic records','','YesNo');
diff --git
a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
index 2d9a099..0d08e1b 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@ -243,3 +243,6 @@ INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('L
INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('LibraryThingForLibrariesTabbedView','0','Put
LibraryThingForLibraries Content in Tabs.','','YesNo');
INSERT INTO `systempreferences` ( `variable` , `value` , `options` ,
`explanation` , `type` ) VALUES ( 'AllowNotForLoanOverride', '0', '', 'If ON,
Koha will allow the librarian to loan a not for loan item.', 'YesNo');
INSERT INTO systempreferences (variable,value,explanation,options,type)
VALUES('RenewalPeriodBase', 'date_due', 'Permet de déterminer si la période de
renouvellement doit être calculée sur la date de retour ou sur le jour du
renouvellement','date_due|now','Choice');
+INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('viewISBD','1','Autoriser
l''affichage de la vue ISBD des notices bibliographiques','','YesNo');
+INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('viewLabeledMARC','0','Autoriser
l''affichage MARC labellis des notices bibliographiques','','YesNo');
+INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('viewMARC','1','Autoriser
l''affichage de la vue MARC des notices bibliographiques','','YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl
b/installer/data/mysql/updatedatabase.pl
index 7746aeb..a99bb6c 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2445,6 +2445,20 @@ if (C4::Context->preference("Version") <
TransformToNum($DBversion)) {
SetVersion ($DBversion);
}
+$DBversion = '3.01.00.036';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do("UPDATE systempreferences SET explanation = 'Choose the default
detail view in the staff interface; choose between normal, labeled_marc, marc
or isbd'
+ WHERE variable = 'IntranetBiblioDefaultView'
+ AND explanation = 'IntranetBiblioDefaultView'");
+ $dbh->do("UPDATE systempreferences SET type = 'Choice', options =
'normal|marc|isbd|labeled_marc'
+ WHERE variable = 'IntranetBiblioDefaultView'");
+ $dbh->do("INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('viewISBD','1','Allow display
of ISBD view of bibiographic records','','YesNo')");
+ $dbh->do("INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('viewLabeledMARC','0','Allow
display of labeled MARC view of bibiographic records','','YesNo')");
+ $dbh->do("INSERT INTO systempreferences
(variable,value,explanation,options,type)VALUES('viewMARC','1','Allow display
of MARC view of bibiographic records','','YesNo')");
+ print "Upgrade to $DBversion done (new viewISBD, viewLabeledMARC, viewMARC
sysprefs and tweak IntranetBiblioDefaultView)\n";
+ SetVersion ($DBversion);
+}
+
=item DropAllForeignKeys($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index e240fcb..64694c8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -144,7 +144,7 @@ function yuiZ3950button() {
<!-- TMPL_IF NAME="total" -->
<div id="searchheader">
- <form method="post" name="fz3950" class="fz3950">
+ <form method="post" name="fz3950" class="fz3950"
action="#">
<span id="z3950searchc"><input
type="button" id="z3950search" value="z39.50 Search" onclick="PopupZ3950();
return false;" /></span>
</form>
<form action="/cgi-bin/koha/catalogue/search.pl" method="get"
id="sortbyform">
diff --git a/kohaversion.pl b/kohaversion.pl
index 7c3e8cf..6918efe 100644
--- a/kohaversion.pl
+++ b/kohaversion.pl
@@ -10,7 +10,7 @@
use strict;
sub kohaversion {
- our $VERSION = '3.01.00.035';
+ our $VERSION = '3.01.00.036';
# version needs to be set this way
# so that it can be picked up by Makefile.PL
# during install
--
1.5.6.5
_______________________________________________
Koha-patches mailing list
Koha-patches@lists.koha.org
http://lists.koha.org/mailman/listinfo/koha-patches
