gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug_2832' into 3.12-master 

Conflicts:
	installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
	installer/data/mysql/updatedatabase.pl

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This commit is contained in:
Jared Camins-Esakov 2012-11-23 11:41:48 -05:00
parent 6a265eb793 5511dad702
commit e93cc44941
6 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
View File

@ -27,3 +27,4 @@ UPDATE systempreferences SET value = '<p>Velkommen til Koha...</p><hr />' WHERE
UPDATE systempreferences SET value = '<p>Viktige lenker kan plasseres her</p>' WHERE variable = 'OpacNav';
UPDATE systempreferences SET value = '<li><a href="http://worldcat.org/search?q={TITLE}" target="_blank">Andre bibliotek (WorldCat)</a></li><li><a href="http://www.scholar.google.com/scholar?q={TITLE}" target="_blank">Andre databaser (Google Scholar)</a></li><li><a href="http://www.bookfinder.com/search/?author={AUTHOR}&amp;title={TITLE}&amp;st=xl&amp;ac=qr" target="_blank">Nettbutikker (Bookfinder.com)</a></li>' WHERE variable = 'OPACSearchForTitleIn';
UPDATE systempreferences SET value = 'Monday' WHERE variable = 'CalendarFirstDayOfWeek';
UPDATE systempreferences SET value = 'A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Æ Ø Å' WHERE variable = 'alphabet';

1
installer/data/mysql/sysprefs.sql
View File

@ -386,3 +386,4 @@ INSERT INTO systempreferences (variable,value,explanation,type) VALUES('OPACdidy
INSERT INTO systempreferences (variable,value,explanation,type) VALUES('INTRAdidyoumean',NULL,'Did you mean? configuration for the Intranet. Do not change, as this is controlled by /cgi-bin/koha/admin/didyoumean.pl.','Free');
INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('BlockReturnOfWithdrawnItems', '1', '0', 'If enabled, items that are marked as withdrawn cannot be returned.', 'YesNo');
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer');
INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('alphabet','A B C D E F G H I J K L M N O P Q R S T U V W X Y Z','Alphabet than can be expanded into browse links, e.g. on Home > Patrons',NULL,'free');

8
installer/data/mysql/updatedatabase.pl
View File

@ -6012,6 +6012,7 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
SetVersion ($DBversion);
}
$DBversion = "3.09.00.062";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$dbh->do("UPDATE systempreferences SET value=0 WHERE variable='NoZebra'");
@ -6075,6 +6076,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
SetVersion ($DBversion);
}
$DBversion = "3.11.00.001";
if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
$dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('alphabet','A B C D E F G H I J K L M N O P Q R S T U V W X Y Z','Alphabet that can be expanded into browse links, e.g. on Home > Patrons',NULL,'free')");
print "Upgrade to $DBversion done (Bug 2832 - Add alphabet syspref)\n";
SetVersion($DBversion);
}
=head1 FUNCTIONS
=head2 TableExists($table)

5
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
View File

@ -31,3 +31,8 @@ I18N/L10N:
- "Enable the following languages on the OPAC:"
- pref: opaclanguages
type: opac-languages
-
- "Use the alphabet"
- pref: alphabet
class: long
- for lists of browsable letters. This should be a space separated list of uppercase letters.

4
koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt
View File

@ -24,8 +24,8 @@
<div class="browse">
Browse by last name:
[% FOREACH letter IN letters %]
<a href="/cgi-bin/koha/members/member.pl?quicksearch=1&amp;surname=[% letter.letter %]">[% letter.letter %]</a>
[% FOREACH letter IN alphabet.split(' ') %]
<a href="/cgi-bin/koha/members/member.pl?quicksearch=1&amp;surname=[% letter %]">[% letter %]</a>
[% END %]
</div>

3
members/members-home.pl
View File

@ -80,7 +80,6 @@ $template->param(
"AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
no_add => $no_add,
);
my @letters = map { {letter => $_} } ( 'A' .. 'Z');
$template->param( letters => \@letters );
$template->param( 'alphabet' => C4::Context->preference('alphabet') );
output_html_with_http_headers $query, $cookie, $template->output;