Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge remote branch 'kc/master'

Browse source
This commit is contained in:
Chris Cormack 2010-07-19 13:30:33 +12:00
commit 4d6b38c794
20 changed files with 262 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
C4/Serials.pm
View file

@ -405,14 +405,17 @@ sub PrepareSerialsData {
my $first; my $first;
my $previousnote = ""; my $previousnote = "";
foreach my $subs (@$lines) { foreach my $subs (@{$lines}) {
$subs->{'publisheddate'} = ( for my $datefield ( qw(publisheddate planneddate) ) {
$subs->{'publisheddate'} # handle both undef and undef returned as 0000-00-00
? format_date( $subs->{'publisheddate'} ) if (!defined $subs->{$datefield} or $subs->{$datefield}=~m/^00/) {
: "XXX" $subs->{$datefield} = 'XXX';
); }
else {
$subs->{$datefield} = format_date( $subs->{$datefield} );
}
}
$subs->{'branchname'} = GetBranchName( $subs->{'branchcode'} ); $subs->{'branchname'} = GetBranchName( $subs->{'branchcode'} );
$subs->{'planneddate'} = format_date( $subs->{'planneddate'} );
$subs->{ "status" . $subs->{'status'} } = 1; $subs->{ "status" . $subs->{'status'} } = 1;
$subs->{"checked"} = $subs->{'status'} =~ /1|3|4|7/; $subs->{"checked"} = $subs->{'status'} =~ /1|3|4|7/;

16
acqui/z3950_search.pl
View file

@ -2,6 +2,7 @@
# This is a completely new Z3950 clients search using async ZOOM -TG 02/11/06 # This is a completely new Z3950 clients search using async ZOOM -TG 02/11/06
# Copyright 2000-2002 Katipo Communications # Copyright 2000-2002 Katipo Communications
# Copyright 2010 Catalyst IT
# #
# This file is part of Koha. # This file is part of Koha.
# #
@ -89,12 +90,12 @@ my $DEBUG = 0; # if set to 1, many debug message are send on syslog.
my $frameworks = getframeworks; my $frameworks = getframeworks;
my @frameworkcodeloop; my @frameworkcodeloop;
foreach my $thisframeworkcode ( keys %$frameworks ) { foreach my $thisframeworkcode ( keys %$frameworks ) {
my $row = { my %row = (
value => $thisframeworkcode, value => $thisframeworkcode,
frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'}, frameworktext => $frameworks->{$thisframeworkcode}->{'frameworktext'},
}; );
if ( $row->{'value'} eq $frameworkcode){ if ( $row{'value'} eq $frameworkcode){
$row->{'active'} = 'true'; $row{'active'} = 'true';
} }
push @frameworkcodeloop, $row; push @frameworkcodeloop, $row;
} }
@ -246,8 +247,8 @@ sub displayresults {
# In rel2_2 i am not sure what encoding is so no character conversion is done here # In rel2_2 i am not sure what encoding is so no character conversion is done here
##Add necessary encoding changes to here -TG ##Add necessary encoding changes to here -TG
my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" ); my $oldbiblio = TransformMarcToKoha( $dbh, $marcrecord, "" );
$oldbiblio->{isbn} =~ s/ |-|\.//g, $oldbiblio->{isbn} =~ s/ |-|\.//g if $oldbiblio->{isbn};
$oldbiblio->{issn} =~ s/ |-|\.//g, $oldbiblio->{issn} =~ s/ |-|\.//g if $oldbiblio->{issn};
my ( my (
$notmarcrecord, $alreadyindb, $alreadyinfarm, $notmarcrecord, $alreadyindb, $alreadyinfarm,
$imported, $breedingid $imported, $breedingid
@ -283,14 +284,13 @@ sub displayresults {
server => $servername[$k], server => $servername[$k],
numberpending => $numberpending, numberpending => $numberpending,
); );
output_html_with_http_headers $input, $cookie, $template->output if $numberpending == 0; output_html_with_http_headers $input, $cookie, $template->output if $numberpending == 0;
# print $template->output if $firstresult !=1; # print $template->output if $firstresult !=1;
$firstresult++; $firstresult++;
} }
displayresults(); displayresults();
if ( --$nremaining > 0 ) { while ( --$nremaining > 0 ) {
displayresults(); displayresults();
} }
} ## if op=search } ## if op=search

121
admin/systempreferences.pl
View file

@ -52,6 +52,8 @@ use C4::Languages qw(getTranslatedLanguages);
use C4::ClassSource; use C4::ClassSource;
use C4::Log; use C4::Log;
use C4::Output; use C4::Output;
use YAML::Syck qw( Dump LoadFile );
# use Smart::Comments; # use Smart::Comments;
@ -95,8 +97,39 @@ $tabsysprefs{Intranet_includes} = "Admin";
$tabsysprefs{AutoLocation} = "Admin"; $tabsysprefs{AutoLocation} = "Admin";
$tabsysprefs{DebugLevel} = "Admin"; $tabsysprefs{DebugLevel} = "Admin";
$tabsysprefs{SessionStorage} = "Admin"; $tabsysprefs{SessionStorage} = "Admin";
# This script is depricated so all of these prefs are lumped here to avoid their being displayed in the local use prefs tab
$tabsysprefs{noItemTypeImages} = "Admin"; $tabsysprefs{noItemTypeImages} = "Admin";
$tabsysprefs{OPACBaseURL} = "Admin"; $tabsysprefs{OPACBaseURL} = "Admin";
$tabsysprefs{AnonymousPatron} = "Admin";
$tabsysprefs{casAuthentication} = "Admin";
$tabsysprefs{casLogout} = "Admin";
$tabsysprefs{casServerUrl} = "Admin";
$tabsysprefs{Disable_Dictionary} = "Admin";
$tabsysprefs{EnableOpacSearchHistory} = "Admin";
$tabsysprefs{'ILS-DI:AuthorizedIPs'} = "Admin";
$tabsysprefs{Intranetbookbag} = "Admin";
$tabsysprefs{maxitemsinSearchResults} = "Admin";
$tabsysprefs{noOPACUserLogin} = "Admin";
$tabsysprefs{'OAI-PMH:ConfFile'} = "Admin";
$tabsysprefs{OpacAddMastheadLibraryPulldown} = "Admin";
$tabsysprefs{opaclargeimage} = "Admin";
$tabsysprefs{OpacPrivacy} = "Admin";
$tabsysprefs{OPACXSLTDetailsDisplay} = "Admin";
$tabsysprefs{OPACXSLTResultsDisplay} = "Admin";
$tabsysprefs{PDFFontType} = "Admin";
$tabsysprefs{PINESISBN} = "Admin";
$tabsysprefs{PrintNoticesMaxLines} = "Admin";
$tabsysprefs{ReservesControlBranch} = "Admin";
$tabsysprefs{ResultsDisplay} = "Admin";
$tabsysprefs{NoReturnSetLost} = "Admin";
$tabsysprefs{SearchURL} = "Admin";
$tabsysprefs{ShowPictures} = "Admin";
$tabsysprefs{soundon} = "Admin";
$tabsysprefs{SpineLabelShowPrintOnBibDetails} = "Admin";
$tabsysprefs{WebBasedSelfCheckHeader} = "Admin";
$tabsysprefs{WebBasedSelfCheckTimeout} = "Admin";
# Authorities # Authorities
$tabsysprefs{authoritysep} = "Authorities"; $tabsysprefs{authoritysep} = "Authorities";
@ -427,12 +460,14 @@ sub StringSearch {
ORDER BY VARIABLE" ); ORDER BY VARIABLE" );
$sth->execute( "%$searchstring%", "%$searchstring%" ); $sth->execute( "%$searchstring%", "%$searchstring%" );
} else { } else {
my $strsth = "Select variable,value,explanation,type,options from systempreferences where variable not in ("; my $strsth = "Select variable,value,explanation,type,options from systempreferences where variable in (";
foreach my $syspref ( keys %tabsysprefs ) { my $first = 1;
$strsth .= $dbh->quote($syspref) . ","; for my $name ( get_local_prefs() ) {
$strsth .= ',' unless $first;
$strsth .= "'$name'";
$first = 0;
} }
$strsth =~ s/,$/) /; $strsth .= ") order by variable";
$strsth .= " order by variable";
$sth = $dbh->prepare($strsth); $sth = $dbh->prepare($strsth);
$sth->execute(); $sth->execute();
} }
@ -779,3 +814,79 @@ if ( $op eq 'add_form' ) {
$template->param( tab => $tab, ); $template->param( tab => $tab, );
} #---- END $OP eq DEFAULT } #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output; output_html_with_http_headers $input, $cookie, $template->output;
# Return an array containing all preferences defined in current Koha instance
# .pref files.
sub get_prefs_from_files {
my $context = C4::Context->new();
my $path_pref_en = $context->config('intrahtdocs') .
'/prog/en/modules/admin/preferences';
# Get all .pref file names
opendir ( my $fh, $path_pref_en );
my @pref_files = grep { /.pref/ } readdir($fh);
close $fh;
my @names = ();
my $append = sub {
my $prefs = shift;
for my $pref ( @$prefs ) {
for my $element ( @$pref ) {
if ( ref( $element) eq 'HASH' ) {
my $name = $element->{pref};
next unless $name;
push @names, $name;
last;
}
}
}
};
for my $file (@pref_files) {
my $pref = LoadFile( "$path_pref_en/$file" );
for my $tab ( keys %$pref ) {
my $content = $pref->{$tab};
if ( ref($content) eq 'ARRAY' ) {
$append->($content);
next;
}
for my $section ( keys %$content ) {
my $syspref = $content->{$section};
$append->($syspref);
}
}
}
return @names;
}
# Return an array containg all preferences defined in DB
sub get_prefs_from_db {
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("SELECT variable FROM systempreferences");
$sth->execute;
my @names = ();
while ( (my $name) = $sth->fetchrow_array ) {
push @names, $name if $name;
}
return @names;
}
# Return an array containing all local preferences: those which are defined in
# DB and not defined in Koha .pref files.
sub get_local_prefs {
my @prefs_file = get_prefs_from_files();
my @prefs_db = get_prefs_from_db();
my %prefs_file = map { $_ => 1 } @prefs_file;
my @names = ();
foreach my $name (@prefs_db) {
push @names, $name unless $prefs_file{$name};
}
return @names;
}

2
install_misc/apt-get-debian-lenny.sh
View file

@ -52,7 +52,7 @@ libidzebra-2.0-mod-grs-regx \
libidzebra-2.0-mod-grs-xml \ libidzebra-2.0-mod-grs-xml \
libidzebra-2.0-mod-text \ libidzebra-2.0-mod-text \
libidzebra-2.0-modules \ libidzebra-2.0-modules \
libimage-magick-perl \ libgraphics-magick-perl \
libjson-perl \ libjson-perl \
libjson-xs-perl \ libjson-xs-perl \
liblingua-ispell-perl \ liblingua-ispell-perl \

2
install_misc/debian.packages
View file

@ -38,7 +38,7 @@ libidzebra-2.0-mod-grs-regx install
libidzebra-2.0-mod-grs-xml install libidzebra-2.0-mod-grs-xml install
libidzebra-2.0-mod-text install libidzebra-2.0-mod-text install
libidzebra-2.0-modules install libidzebra-2.0-modules install
libimage-magick-perl install libgraphics-magick-perl install
libjson-perl install libjson-perl install
liblingua-ispell-perl install liblingua-ispell-perl install
liblingua-stem-perl install liblingua-stem-perl install

2
install_misc/install_koha_on_fresh_debian
View file

@ -467,7 +467,7 @@ libxslt1-dev
libyaml-syck-perl libyaml-syck-perl
libhtml-template-pro-perl libhtml-template-pro-perl
libdbd-mysql-perl/testing libdbd-mysql-perl/testing
libimage-magick-perl libgraphics-magick-perl
liblist-moreutils-perl liblist-moreutils-perl
libtext-iconv-perl/testing libtext-iconv-perl/testing
libalgorithm-checkdigits-perl libalgorithm-checkdigits-perl

2
install_misc/ubuntu.packages
View file

@ -14,7 +14,7 @@ libdate-calc-perl install
libdate-manip-perl install libdate-manip-perl install
libdate-ical-perl install libdate-ical-perl install
libdatetime-format-mail-perl install libdatetime-format-mail-perl install
libimage-magick-perl install libgraphics-magick-perl install
libmail-sendmail-perl install libmail-sendmail-perl install
liblingua-ispell-perl install liblingua-ispell-perl install
liblingua-stem-perl install liblingua-stem-perl install

2
koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc
View file

@ -23,7 +23,7 @@
var newmenu = [ var newmenu = [
<!--TMPL_IF Name="AddPatronLists_categorycode"--> <!--TMPL_IF Name="AddPatronLists_categorycode"-->
<!--TMPL_LOOP Name="categoryloop"--> <!--TMPL_LOOP Name="categories"-->
{ text: "<!--TMPL_VAR Name="description"-->", url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=<!--TMPL_VAR Name="categorycode"-->" }, { text: "<!--TMPL_VAR Name="description"-->", url: "/cgi-bin/koha/members/memberentry.pl?op=add&amp;categorycode=<!--TMPL_VAR Name="categorycode"-->" },
<!--/TMPL_LOOP--> <!--/TMPL_LOOP-->
<!--TMPL_ELSE--> <!--TMPL_ELSE-->

2
koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
View file

@ -8,7 +8,7 @@
<!-- TMPL_IF NAME="Creators" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Creators" href="/cgi-bin/koha/admin/preferences.pl?tab=creators">Creators</a></li> <!-- TMPL_IF NAME="Creators" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Creators" href="/cgi-bin/koha/admin/preferences.pl?tab=creators">Creators</a></li>
<!-- TMPL_IF NAME="enhanced-content" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced Content Settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced-content">Enhanced Content</a></li> <!-- TMPL_IF NAME="enhanced-content" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced Content Settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced-content">Enhanced Content</a></li>
<!-- TMPL_IF NAME="i18n-l10n" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n-l10n">I18N/L10N</a></li> <!-- TMPL_IF NAME="i18n-l10n" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n-l10n">I18N/L10N</a></li>
<!-- TMPL_IF NAME="local-use" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/preferences.pl">Local Use</a></li> <!-- TMPL_IF NAME="local-use" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
<!-- TMPL_IF NAME="logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li> <!-- TMPL_IF NAME="logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
<!-- TMPL_IF NAME="opac" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li> <!-- TMPL_IF NAME="opac" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
<!-- TMPL_IF NAME="patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li> <!-- TMPL_IF NAME="patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li>

30
koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc
View file

@ -1,20 +1,20 @@
<div id="menu"> <div id="menu">
<ul> <ul>
<!-- TMPL_IF NAME="Admin" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Administration" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin</a></li> <!-- TMPL_IF NAME="Acquisitions" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Acquisitions" href="/cgi-bin/koha/admin/preferences.pl?tab=acquisitions">Acquisitions</a></li>
<!-- TMPL_IF NAME="Acquisitions" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Acquisitions" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions</a></li> <!-- TMPL_IF NAME="Admin" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Administration" href="/cgi-bin/koha/admin/preferences.pl?tab=admin">Administration</a></li>
<!-- TMPL_IF NAME="Authorities" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Authority Control" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities</a></li> <!-- TMPL_IF NAME="Authorities" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Authority Control" href="/cgi-bin/koha/admin/preferences.pl?tab=authorities">Authorities</a></li>
<!-- TMPL_IF NAME="Cataloging" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Cataloging" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Cataloging">Cataloging</a></li> <!-- TMPL_IF NAME="Cataloging" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Cataloging" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloging">Cataloging</a></li>
<!-- TMPL_IF NAME="Circulation" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Circulation" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation</a></li> <!-- TMPL_IF NAME="Circulation" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Circulation" href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">Circulation</a></li>
<!-- TMPL_IF NAME="Creators" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Creators" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Creators">Creators</a></li> <!-- TMPL_IF NAME="Creators" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Creators" href="/cgi-bin/koha/admin/preferences.pl?tab=creators">Creators</a></li>
<!-- TMPL_IF NAME="EnhancedContent" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced content settings" href="/cgi-bin/koha/admin/systempreferences.pl?tab=EnhancedContent">Enhanced Content</a></li> <!-- TMPL_IF NAME="EnhancedContent" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced content settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced-content">Enhanced Content</a></li>
<!-- TMPL_IF NAME="I18N/L10N" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/systempreferences.pl?tab=I18N/L10N">I18N/L10N</a></li> <!-- TMPL_IF NAME="I18N/L10N" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n-l10n">I18N/L10N</a></li>
<!-- TMPL_IF NAME="Logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Logs">Logs</a></li>
<!-- TMPL_IF NAME="OAI-PMH" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="OAI-PMH" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OAI-PMH">OAI-PMH</a></li>
<!-- TMPL_IF NAME="OPAC" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC</a></li>
<!-- TMPL_IF NAME="Patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Patrons">Patrons</a></li>
<!-- TMPL_IF NAME="Searching" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Searching" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Searching">Searching</a></li>
<!-- TMPL_IF NAME="Serials" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Serials" href="/cgi-bin/koha/admin/systempreferences.pl?tab=Serials">Serials</a></li>
<!-- TMPL_IF NAME="StaffClient" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/systempreferences.pl?tab=StaffClient">Staff Client</a></li>
<!-- TMPL_IF NAME="" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li> <!-- TMPL_IF NAME="" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
<!-- TMPL_IF NAME="Logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
<!-- TMPL_IF NAME="OPAC" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
<!-- TMPL_IF NAME="Patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li>
<!-- TMPL_IF NAME="Searching" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Searching" href="/cgi-bin/koha/admin/preferences.pl?tab=searching">Searching</a></li>
<!-- TMPL_IF NAME="Serials" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Serials" href="/cgi-bin/koha/admin/preferences.pl?tab=serials">Serials</a></li>
<!-- TMPL_IF NAME="StaffClient" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff-client">Staff Client</a></li>
<!-- TMPL_IF NAME="OAI-PMH" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Web Services" href="/cgi-bin/koha/admin/preferences.pl?tab=web-services">Web Services</a></li>
</ul> </ul>
</div> </div>

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tmpl
View file

@ -18,7 +18,7 @@
<div class="yui-u first"> <div class="yui-u first">
<form action="/cgi-bin/koha/admin/preferences.pl" method="post"> <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
<fieldset> <fieldset>
<h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4> <h4><a href="/cgi-bin/koha/admin/systempreferences.pl">Global system preferences</a></h4>
<p>Manage global system preferences like MARC flavor, date format, administrator email, and templates.</p> <p>Manage global system preferences like MARC flavor, date format, administrator email, and templates.</p>
<input type="hidden" name="op" value="search" /> <input type="hidden" name="op" value="search" />
<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /> <input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />

14
koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
View file

@ -225,7 +225,7 @@ $(document).ready(function() {
remove it from all classification source definitions before trying again. remove it from all classification source definitions before trying again.
</p> </p>
<form action="<!-- TMPL_VAR name="script_name" -->" method="get"> <form action="<!-- TMPL_VAR name="script_name" -->" method="get">
<input type="button" value="OK" class="approve" /> <input type="submit" value="OK" class="approve" />
</form> </form>
</div> </div>
<!-- /TMPL_IF --> <!-- /TMPL_IF -->
@ -240,13 +240,13 @@ $(document).ready(function() {
<h2>Classification Sources</h2> <h2>Classification Sources</h2>
<!-- TMPL_IF name="added_source" --> <!-- TMPL_IF name="added_source" -->
<span class="problem">Added classification source <!-- TMPL_VAR name="added_source" --></span> <div class="dialog message">Added classification source <!-- TMPL_VAR name="added_source" --></div>
<!-- /TMPL_IF --> <!-- /TMPL_IF -->
<!-- TMPL_IF name="edited_source" --> <!-- TMPL_IF name="edited_source" -->
<span class="problem">Modified classification source <!-- TMPL_VAR name="edited_source" --></span> <div class="dialog message">Modified classification source <!-- TMPL_VAR name="edited_source" --></div>
<!-- /TMPL_IF --> <!-- /TMPL_IF -->
<!-- TMPL_IF name="deleted_source" --> <!-- TMPL_IF name="deleted_source" -->
<span class="problem">Deleted classification source <!-- TMPL_VAR name="deleted_source" --></span> <div class="dialog message">Deleted classification source <!-- TMPL_VAR name="deleted_source" --></div>
<!-- /TMPL_IF --> <!-- /TMPL_IF -->
<table> <table>
<tr> <tr>
@ -279,13 +279,13 @@ $(document).ready(function() {
<div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div> <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
<h2>Classification Filing Rules</h2> <h2>Classification Filing Rules</h2>
<!-- TMPL_IF name="added_rule" --> <!-- TMPL_IF name="added_rule" -->
<span class="problem">Added filing rule <!-- TMPL_VAR name="added_rule" --></span> <div class="dialog message">Added filing rule <!-- TMPL_VAR name="added_rule" --></div>
<!-- /TMPL_IF --> <!-- /TMPL_IF -->
<!-- TMPL_IF name="edited_rule" --> <!-- TMPL_IF name="edited_rule" -->
<span class="problem">Modified filing rule <!-- TMPL_VAR name="edited_rule" --></span> <div class="dialog message">Modified filing rule <!-- TMPL_VAR name="edited_rule" --></div>
<!-- /TMPL_IF --> <!-- /TMPL_IF -->
<!-- TMPL_IF name="deleted_rule" --> <!-- TMPL_IF name="deleted_rule" -->
<span class="problem">Deleted filing rule <!-- TMPL_VAR name="deleted_rule" --></span> <div class="dialog message">Deleted filing rule <!-- TMPL_VAR name="deleted_rule" --></div>
<!-- /TMPL_IF --> <!-- /TMPL_IF -->
<table> <table>
<tr> <tr>

3
koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tmpl
View file

@ -1,4 +1,5 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Sending Your Cart <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Sending Your Cart</title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head> </head>
<body style="padding: 1em;" id="sendbasket"> <body style="padding: 1em;" id="sendbasket">

23
koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tmpl
View file

@ -1,14 +1,14 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head> </head>
<body> <body id="error400">
<!--TMPL_INCLUDE NAME="masthead.inc" --> <!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
<div id="doc3" class="yui-t1">
<div id="bd"> <div id="bd">
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<div id="yui-main"> <div id="yui-main">
<div class="yui-b"><div class="yui-g"> <div class="yui-b">
<div class="yui-g">
<h3>An Error has Occurred</h3> <h3>An Error has Occurred</h3>
<h4>Error 400</h4> <h4>Error 400</h4>
<ul> <ul>
@ -20,10 +20,11 @@
</div> </div>
</div> </div>
</div> </div>
<!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
</div> </div>
</div><!-- /TMPL_IF -->
</div> </div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
<!-- <div id="main"> -->
<!-- </div> -->
</body>
</html>

23
koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tmpl
View file

@ -1,14 +1,14 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head> </head>
<body> <body id="error401">
<!--TMPL_INCLUDE NAME="masthead.inc" --> <!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
<div id="doc3" class="yui-t1">
<div id="bd"> <div id="bd">
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<div id="yui-main"> <div id="yui-main">
<div class="yui-b"><div class="yui-g"> <div class="yui-b">
<div class="yui-g">
<h3>An Error has Occurred</h3> <h3>An Error has Occurred</h3>
<h4>Error 401</h4> <h4>Error 401</h4>
<ul> <ul>
@ -21,10 +21,11 @@
</div> </div>
</div> </div>
</div> </div>
<!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
</div> </div>
</div><!-- /TMPL_IF -->
</div> </div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
<!-- <div id="main"> -->
<!-- </div> -->
</body>
</html>

23
koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl
View file

@ -1,14 +1,14 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head> </head>
<body> <body id="error402">
<!--TMPL_INCLUDE NAME="masthead.inc" --> <!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
<div id="doc3" class="yui-t1">
<div id="bd"> <div id="bd">
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<div id="yui-main"> <div id="yui-main">
<div class="yui-b"><div class="yui-g"> <div class="yui-b">
<div class="yui-g">
<h3>An Error has Occurred</h3> <h3>An Error has Occurred</h3>
<h4>Error 402</h4> <h4>Error 402</h4>
<ul> <ul>
@ -20,10 +20,11 @@
</div> </div>
</div> </div>
</div> </div>
<!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
</div> </div>
</div><!-- /TMPL_IF -->
</div> </div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
<!-- <div id="main"> -->
<!-- </div> -->
</body>
</html>

23
koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl
View file

@ -1,14 +1,14 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head> </head>
<body> <body id="error403">
<!--TMPL_INCLUDE NAME="masthead.inc" --> <!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
<div id="doc3" class="yui-t1">
<div id="bd"> <div id="bd">
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<div id="yui-main"> <div id="yui-main">
<div class="yui-b"><div class="yui-g"> <div class="yui-b">
<div class="yui-g">
<h3>An Error has Occurred</h3> <h3>An Error has Occurred</h3>
<h4>Error 403</h4> <h4>Error 403</h4>
<ul> <ul>
@ -20,10 +20,11 @@
</div> </div>
</div> </div>
</div> </div>
<!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
</div> </div>
</div><!-- /TMPL_IF -->
</div> </div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
<!-- <div id="main"> -->
<!-- </div> -->
</body>
</html>

23
koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tmpl
View file

@ -1,14 +1,14 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head> </head>
<body> <body id="error404">
<!--TMPL_INCLUDE NAME="masthead.inc" --> <!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
<div id="doc3" class="yui-t1">
<div id="bd"> <div id="bd">
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<div id="yui-main"> <div id="yui-main">
<div class="yui-b"><div class="yui-g"> <div class="yui-b">
<div class="yui-g">
<h3>An Error has Occurred</h3> <h3>An Error has Occurred</h3>
<h4>Error 404</h4> <h4>Error 404</h4>
<ul> <ul>
@ -20,10 +20,11 @@
</div> </div>
</div> </div>
</div> </div>
<!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
</div> </div>
</div><!-- /TMPL_IF -->
</div> </div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
<!-- <div id="main"> -->
<!-- </div> -->
</body>
</html>

23
koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl
View file

@ -1,14 +1,14 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; An Error Has Occurred
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head> </head>
<body> <body id="error500">
<!--TMPL_INCLUDE NAME="masthead.inc" --> <!-- TMPL_IF NAME="OpacNav" --><div id="doc3" class="yui-t1"><!-- TMPL_ELSE --><div id="doc3" class="yui-t7"><!-- /TMPL_IF -->
<!--TMPL_INCLUDE NAME="navigation.inc" -->
<div id="doc3" class="yui-t1">
<div id="bd"> <div id="bd">
<!--TMPL_INCLUDE NAME="masthead.inc" -->
<div id="yui-main"> <div id="yui-main">
<div class="yui-b"><div class="yui-g"> <div class="yui-b">
<div class="yui-g">
<h3>An Error has Occurred</h3> <h3>An Error has Occurred</h3>
<h4>Error 500</h4> <h4>Error 500</h4>
<ul> <ul>
@ -20,10 +20,11 @@
</div> </div>
</div> </div>
</div> </div>
<!-- TMPL_IF NAME="OpacNav" -->
<div class="yui-b">
<div class="container">
<!--TMPL_INCLUDE NAME="navigation.inc" -->
</div> </div>
</div><!-- /TMPL_IF -->
</div> </div>
<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
<!-- <div id="main"> -->
<!-- </div> -->
</body>
</html>

2
members/members-home.pl
View file

@ -54,7 +54,7 @@ if($quicksearch){
my @categories=C4::Category->all; my @categories=C4::Category->all;
$template->param( $template->param(
branchloop=>(defined $branch?GetBranchesLoop($branch):GetBranchesLoop()), branchloop=>(defined $branch?GetBranchesLoop($branch):GetBranchesLoop()),
categoryloop=>\@categories, categories=>\@categories,
); );
$template->param( $template->param(
"AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1", "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",