Attachment #62506 for bug #18346

View | Details | Raw Unified | Return to bug 18346
Collapse All | Expand All

Lines 1-4 Link Here

(-)a/installer/data/mysql/en/optional/patron_categories.sql (-1 / +1 lines)
1	INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES	1	INSERT INTO `categories` (`categorycode`, `description`, `enrolmentperiod`, `upperagelimit`, `dateofbirthrequired`, `finetype`, `bulk`, `enrolmentfee`, `overduenoticerequired`, `issuelimit`, `reservefee`, `category_type`) VALUES
2		2
3	-- Adult Patrons	3	-- Adult Patrons
4	('PT','Patron',99,999,18,NULL,NULL,'0.000000',1,NULL,'0.000000','A'),	4	('PT','Patron',99,999,18,NULL,NULL,'0.000000',1,NULL,'0.000000','A'),

Lines 1-6 Link Here

(-)a/installer/data/mysql/en/optional/patron_categories.txt (-5 / +1 lines)
1	Sample patron types and categories:	1	Sample patron types and categories. Types are currently hardcoded but you can manage categories after installation from the administration module.
2
3	Type: Categories:
4		2
5	Adult patron - default patron type	3	Adult patron - default patron type
6	PT - Patron	4	PT - Patron
Lines 21-25 Professional - a member of an organization (organization is guarantor) Link Here
21	T - Teacher	19	T - Teacher
22	S - Staff	20	S - Staff
23	B - Board	21	B - Board
24
25	Types are currently hardcoded, but you can add/edit/delete categories after installation from the administration module.

Lines 1-4 Link Here

(-)a/installer/data/mysql/en/optional/sample_holidays.txt (-4 / +1 lines)
1	Sample holidays:	1	Sample holidays: Sunday, Christmas, New Year's
2	Sundays
3	Christmas
4	New Year's

Line 1 Link Here

(-)a/installer/data/mysql/en/optional/sample_libraries.txt (-1 / +1 lines)
1	A few sample libraries.	1	Sample libraries.

Lines 1-3 Link Here

(-)a/installer/data/mysql/en/optional/sample_z3950_servers.txt (+1 lines)
		1	Allow access to the following servers to search and download record information:
1	LIBRARY OF CONGRESS	2	LIBRARY OF CONGRESS
2	LIBRARY OF CONGRESS NAMES (authority records)	3	LIBRARY OF CONGRESS NAMES (authority records)
3	LIBRARY OF CONGRESS SUBJECTS (authority records)	4	LIBRARY OF CONGRESS SUBJECTS (authority records)




#!/usr/bin/perl

# This file is part of Koha.
#
# Copyright (C) 2017  Catalyst IT
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use strict;
use warnings;
use diagnostics;

my $installer = C4::Installer->new();
my %info;
$info{'dbname'} = C4::Context->config("database");
$info{'dbms'}   = (
      C4::Context->config("db_scheme")
    ? C4::Context->config("db_scheme")
    : "mysql"
);
$info{'hostname'} = C4::Context->config("hostname");
$info{'port'}     = C4::Context->config("port");
$info{'user'}     = C4::Context->config("user");

);

if ( $step && $step == 1 ) {

    #First Step (for both fresh installations and upgrades)
    #Checking ALL perl Modules and services needed are installed.
    #Whenever there is an error, adding a report to the page
    my $op = $query->param('op') || 'noop';
    $template->param( language      => 1 );
    $template->param( 'checkmodule' => 1 )
      ; # we start with the assumption that there are no problems and set this to 0 if there are

    unless ( $] >= 5.010000 ) {    # Bug 7375
        $template->param( problems => 1, perlversion => 1, checkmodule => 0 );

    $perl_modules->versions_info;

    my $modules = $perl_modules->get_attr('missing_pm');
    if ( scalar(@$modules) ) {
        my @components  = ();
        my $checkmodule = 1;
        foreach (@$modules) {
            my ( $module, $stats ) = each %$_;
            $checkmodule = 0 if $stats->{'required'};
            push(
                @components,

                }
            );
        }
        @components = sort { $a->{'name'} cmp $b->{'name'} } @components;
        $template->param(
            missing_modules => \@components,
            checkmodule     => $checkmodule,
            op              => $op
        );
    }
}
elsif ( $step && $step == 2 ) {

    #STEP 2 Check Database connection and access

    $template->param(%info);
    my $checkdb = $query->param("checkdb");
    $template->param( 'dbconnection' => $checkdb );

                my $grantaccess;
                while ( my ($line) = $rq->fetchrow ) {
                    my $dbname = $info{dbname};
                    if ( $line =~ m/^GRANT (.*?) ON `$dbname`\.\*/
                        || index( $line, '*.*' ) > 0 )
                    {
                        $grantaccess = 1
                          if (
                            index( $line, 'ALL PRIVILEGES' ) > 0

                    }
                }
                $template->param( "checkgrantaccess" => $grantaccess );
            }    # End mysql connect check...

            elsif ( $info{dbms} eq "Pg" ) {

                # Check if database has been created...
                my $rv = $dbh->do(
"SELECT * FROM pg_catalog.pg_database WHERE datname = \'$info{dbname}\';"
                );
                if ( $rv == 1 ) {
                    $template->param( 'checkdatabasecreated' => 1 );
                }

                # Check if user has all necessary grants on this database...
                my $rq = $dbh->do(
                    "SELECT u.usesuper
            FROM pg_catalog.pg_user as u
            WHERE u.usename = \'$info{user}\';"
                );
                if ( $rq == 1 ) {
                    $template->param( "checkgrantaccess" => 1 );
                }
            }    # End Pg connect check...
        }
        else {
            $template->param( "error" => DBI::err, "message" => DBI::errstr );

    }
}
elsif ( $step && $step == 3 ) {

    # STEP 3 : database setup

#
#
    my $op = $query->param('op');
    if ( $op && $op eq 'finished' ) {
        #

    elsif ( $op && $op eq 'finish' ) {
        $installer->set_version_syspref();

# Installation is finished.
# We just deny anybody access to install
# And we redirect people to mainpage.
# The installer will have to relogin since we do not pass cookie to redirection.
        $template->param( "$op" => 1 );
    }

    elsif ( $op && $op eq 'addframeworks' ) {
    #
    # 1ST install, 3rd sub-step : insert the SQL files the user has selected
    #

        # 1ST install, 3rd sub-step : insert the SQL files the user has selected

        my ( $fwk_language, $list ) =
          $installer->load_sql_in_order( $all_languages,
            $query->param('framework') );
        $template->param(
            "fwklanguage" => $fwk_language,
            "list"        => $list

        $template->param( "$op" => 1 );
    }
    elsif ( $op && $op eq 'selectframeworks' ) {
#
#
# 1ST install, 2nd sub-step : show the user the sql datas he can insert in the database.
#
#
# (note that the term "selectframeworks is not correct. The user can select various files, not only frameworks)

#Framework Selection
#sql data for import are supposed to be located in installer/data/<language>/<level>
# Where <language> is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.)
# Where <level> is a category of requirement : required, recommended optional
# level should contain :
#   SQL File for import With a readable name.
#   txt File that explains what this SQL File is meant for.
# Could be VERY useful to have A Big file for a kind of library.
# But could also be useful to have some Authorised values data set prepared here.
# Framework Selection is achieved through checking boxes.
        my $langchoice = $query->param('fwklanguage');
        $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice);
        $langchoice =~ s/[^a-zA-Z_-]*//g;
        my $marcflavour = $query->param('marcflavour');
        if ($marcflavour) {
            $installer->set_marcflavour_syspref($marcflavour);
        }
        $marcflavour = C4::Context->preference('marcflavour')
          unless ($marcflavour);

        #Insert into database the selected marcflavour
        undef $/;
        my ( $marc_defaulted_to_en, $fwklist ) =
          $installer->marc_framework_sql_list( $langchoice, $marcflavour );
        $template->param( 'en_marc_frameworks' => $marc_defaulted_to_en );
        $template->param( "frameworksloop"     => $fwklist );
        $template->param( "marcflavour"        => ucfirst($marcflavour) );

        my ( $sample_defaulted_to_en, $levellist ) =
          $installer->sample_data_sql_list($langchoice);
        $template->param( "en_sample_data" => $sample_defaulted_to_en );
        $template->param( "levelloop"      => $levellist );
        $template->param( "$op"            => 1 );

        my $setup = $query->param('setup');
        $template->param( "setup" => $setup );

    }
    elsif ( $op && $op eq 'choosemarc' ) {
        #

        #
        #

#Choose Marc Flavour
#sql data are supposed to be located in installer/data/<dbms>/<language>/marcflavour/marcflavourname
# Where <dbms> is database type according to DBD syntax
# Where <language> is en|fr or any international abbreviation (provided language hash is updated... This will be a problem with internationlisation.)
# Where <level> is a category of requirement : required, recommended optional
# level should contain :
#   SQL File for import With a readable name.
#   txt File taht explains what this SQL File is meant for.
# Could be VERY useful to have A Big file for a kind of library.
# But could also be useful to have some Authorised values data set prepared here.
# Marcflavour Selection is achieved through radiobuttons.
        my $langchoice = $query->param('fwklanguage');

        $langchoice = $query->cookie('KohaOpacLanguage') unless ($langchoice);
        $langchoice =~ s/[^a-zA-Z_-]*//g;
        my $dir =
          C4::Context->config('intranetdir')
          . "/installer/data/$info{dbms}/$langchoice/marcflavour";
        unless ( opendir( MYDIR, $dir ) ) {
            if ( $langchoice eq 'en' ) {
                warn "cannot open MARC frameworks directory $dir";
            }
            else {
                # if no translated MARC framework is available,
                # default to English
                $dir = C4::Context->config('intranetdir')
                  . "/installer/data/$info{dbms}/en/marcflavour";
                opendir( MYDIR, $dir )
                  or warn "cannot open English MARC frameworks directory $dir";
            }
        }
        my @listdir = grep { !/^\./ && -d "$dir/$_" } readdir(MYDIR);
        closedir MYDIR;
        my $marcflavour = C4::Context->preference("marcflavour");
        my @flavourlist;
        foreach my $marc (@listdir) {
            my %cell = (
                "label"   => ucfirst($marc),
                "code"    => uc($marc),
                "checked" => defined($marcflavour)
                ? uc($marc) eq $marcflavour
                : 0
            );

#             $cell{"description"}= do { local $/ = undef; open INPUT "<$dir/$marc.txt"||"";<INPUT> };
            push @flavourlist, \%cell;
        }
        $template->param( "flavourloop" => \@flavourlist );
        $template->param( "$op"         => 1 );
    }
    elsif ( $op && $op eq 'importdatastructure' ) {
        #

        #
        #Do updatedatabase And report

        if ( !defined $ENV{PERL5LIB} ) {
            my $find = "C4/Context.pm";
            my $path = $INC{$find};
            $path =~ s/\Q$find\E//;

            warn "# plack? inserted PERL5LIB $ENV{PERL5LIB}\n";
        }

        my $now         = POSIX::strftime( "%Y-%m-%dT%H:%M:%S", localtime() );
        my $logdir      = C4::Context->config('logdir');
        my $dbversion   = C4::Context->preference('Version');
        my $kohaversion = Koha::version;
        $kohaversion =~ s/(.*\..*)\.(.*)\.(.*)/$1$2$3/;

        my $filename_suffix = join '_', $now, $dbversion, $kohaversion;
        my ( $logfilepath, $logfilepath_errors ) = (
            chk_log( $logdir, "updatedatabase_$filename_suffix" ),
            chk_log( $logdir, "updatedatabase-error_$filename_suffix" )
        );

        my $cmd = C4::Context->config("intranetdir")
          . "/installer/data/$info{dbms}/updatedatabase.pl >> $logfilepath 2>> $logfilepath_errors";

        system($cmd );

        my $fh;
        open( $fh, "<", $logfilepath )
          or die "Cannot open log file $logfilepath: $!";
        my @report = <$fh>;
        close $fh;
        if (@report) {
            $template->param( update_report =>
                  [ map { { line => $_ } } split( /\n/, join( '', @report ) ) ]
            );
            $template->param( has_update_succeeds => 1 );
        } else {
            eval{ `rm $logfilepath` };
        }
        else {
            eval { `rm $logfilepath` };
        }
        open( $fh, "<", $logfilepath_errors )
          or die "Cannot open log file $logfilepath_errors: $!";
        @report = <$fh>;
        close $fh;
        if (@report) {
            $template->param( update_errors =>
                  [ map { { line => $_ } } split( /\n/, join( '', @report ) ) ]
            );
            $template->param( has_update_errors => 1 );
            warn
"The following errors were returned while attempting to run the updatedatabase.pl script:\n";
            foreach my $line (@report) { warn "$line\n"; }
        }
        else {
            eval { `rm $logfilepath_errors` };
        }
        $template->param( $op => 1 );
    }
    else {
#
# check whether it's a 1st install or an update
#
#Check if there are enough tables.
# Paul has cleaned up tables so reduced the count
#I put it there because it implied a data import if condition was not satisfied.
        my $dbh = DBI->connect(
    		"DBI:$info{dbms}:dbname=$info{dbname};host=$info{hostname}"
		. ( $info{port} ? ";port=$info{port}" : "" )
                . ( $info{tlsoptions} ? $info{tlsoptions} : "" ),
            	$info{'user'}, $info{'password'}
        );
        my $rq;
        if ( $info{dbms} eq 'mysql' ) { $rq = $dbh->prepare("SHOW TABLES"); }
        elsif ( $info{dbms} eq 'Pg' ) {
            $rq = $dbh->prepare(
                "SELECT *
                FROM information_schema.tables
                WHERE table_schema='public' and table_type='BASE TABLE';"
            );
        }
        $rq->execute;
        my $data = $rq->fetchall_arrayref( {} );
        my $count = scalar(@$data);

            $template->param( "count" => $count, "proposeimport" => 1 );
        }
        else {
           #
           # we have tables, propose to select files to upload or updatedatabase
           #
            $template->param( "count" => $count, "default" => 1 );
     #
     # 1st part of step 3 : check if there is a databaseversion systempreference
     # if there is, then we just need to upgrade
     # if there is none, then we need to install the database
     #
            if ( C4::Context->preference('Version') ) {
                my $dbversion = C4::Context->preference('Version');
                $dbversion =~ /(.*)\.(..)(..)(...)/;
                $dbversion = "$1.$2.$3.$4";
                $template->param(
                    "upgrading"   => 1,
                    "dbversion"   => $dbversion,
                    "kohaversion" => Koha::version(),
                );
            }
        }
    }

        if ( $rq->execute ) {
            my ($version) = $rq->fetchrow;
            if ($version) {
                print $query->redirect(
                    "/cgi-bin/koha/installer/install.pl?step=3");
                exit;
            }
        }

}
output_html_with_http_headers $query, $cookie, $template->output;

sub chk_log {    #returns a logfile in $dir or - if that failed - in temp dir
    my ( $dir, $name ) = @_;
    my $fn = $dir . '/' . $name . '.log';
    if ( !open my $fh, '>', $fn ) {
        $name .= '_XXXX';
        require File::Temp;
        ( $fh, $fn ) =
          File::Temp::tempfile( $name, TMPDIR => 1, SUFFIX => '.log' );

        #if this should not work, let croak take over
    }
    return $fn;

Lines 6-12 var debug = "[% debug %]"; Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc (-1 / +1 lines)
6	var dformat = "[% dateformat %]";	6	var dformat = "[% dateformat %]";
7	var sentmsg = 0;	7	var sentmsg = 0;
8	if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");}	8	if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");}
9	var MSG_PLEASE_ENTER_A_VALID_DATE = _("Please enter a valid date (should match %s).");	9	var MSG_PLEASE_ENTER_A_VALID_DATE = (_("Please enter a valid date (should match %s)."));
10		10
11	function is_valid_date(date) {	11	function is_valid_date(date) {
12	// An empty string is considered as a valid date for convenient reasons.	12	// An empty string is considered as a valid date for convenient reasons.

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc (+15 lines)
1	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />	1	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
2	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />	2	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
		3	<link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.css" />
		4	<link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min.css" />
		5	<link rel="stylesheet" type="text/css" href="[% interface %]/lib/font-awesome/css/font-awesome.min.css" />
		6	<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print.css" />
3	<style type="text/css" media="screen">	7	<style type="text/css" media="screen">
4		8
5	[% IF ( login ) %]	9	[% IF ( login ) %]
Lines 69-74 td input { font-size: 1.5em; } Link Here
69		73
70	</style>	74	</style>
71		75
		76	<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script>
		77	<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script>
		78	<script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.js"></script>
		79	<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut.js"></script>
		80	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script>
		81	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.highlight-3.js"></script>
		82	<script type="text/javascript" src="[% interface %]/lib/bootstrap/bootstrap.min.js"></script>
		83	<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.validate.min.js"></script>
		84	<!-- koha core js -->
		85	<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script>
		86
72	<script type="text/javascript">	87	<script type="text/javascript">
73	//<![CDATA[	88	//<![CDATA[
74	function _(s) { return s } // dummy function for gettext	89	function _(s) { return s } // dummy function for gettext

Lines 93-99 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt (-1 / +1 lines)
93	</li>	93	</li>
94	<li>	94	<li>
95	<label for="enrolmentperioddate" style="width:6em;">Until date: </label>	95	<label for="enrolmentperioddate" style="width:6em;">Until date: </label>
96	<input type="text" class="enrollmentperiod" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate \| $KohaDates %]" />	96	<input type="text" class="enrollmentperiod datepicker" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate \| $KohaDates %]" />
97	</li>	97	</li>
98	</ol>	98	</ol>
99	</fieldset>	99	</fieldset>




[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END %]
[% INCLUDE 'installer-doc-head-close.inc' %]
<div>
<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Koha web  installer &rsaquo; Step 3</h1>

[% IF ( selectframeworks ) %]
    <script type="text/javascript">
//<![CDATA[

var surl = unescape(window.location.pathname);

function doLoad()
{
    // the timeout value should be the same as in the "refresh" meta-tag
    setTimeout( "refresh()", 2*1000 );
}

function refresh(value)
{
    //  The argument to the location.reload function determines
    //  if the browser should retrieve the document from the
    //  web-server.  In our example all we need to do is cause
    //  the JavaScript block in the document body to be
    //  re-evaluated.  If we needed to pull the document from
    //  the web-server again (such as where the document contents
    //  change dynamically) we would pass the argument as 'true'.
    //
    surl=surl+'?step=3&op=selectframeworks&fwklanguage='+value;

    window.location.replace( surl );
}

function selectAllFrameworks()
{
    //  A handy short link that selects all available checkboxes
    //  on the page.
    //
    var checkboxes = document.getElementsByTagName("input");
    for (var i = 0; i < checkboxes.length; i++)
    {
        if (checkboxes[i].type == 'checkbox')
        //  on the page.
        //
        var checkboxes = document.getElementsByTagName("input");
        for (var i = 0; i < checkboxes.length; i++)
        {
            checkboxes[i].checked = true;
            {
                checkboxes[i].checked = true;
            }
        }

        //  Prevent event propergation.
        return false;
    }

    //  Prevent event propergation.
    return false;
}

function Hide(link)
{
    //  Toggle the display of a given element on the page.
    //
    subfield = document.getElementById('bloc'+link);
    var initstyle = subfield.style.display;
    if (initstyle == 'block') subfield.style.display = 'none' ;
    if (initstyle == 'none') subfield.style.display = 'block' ;
}

//]]>
</script>
[% END %]


[% IF ( finish ) %]
    <h1>Congratulations, installation complete</h1>
    <p>If this page does not redirect in 10 seconds, click <a href="/">here</a>.</p>
[% END %]


[% IF ( choosemarc ) %]
    <h2 align="center">Choose your setup</h2>
    <p>Basic setup selects recommended settings by default.</p>
    <form name="frameworkselection" method="post" action="install.pl">
    <input type="hidden" name="step" value="3" />
    <input type="hidden" name="op" value="selectframeworks"/>

    <div>
        <input type="radio" name="setup" value="Basic" checked="checked">Basic<br/>
        <input type="radio" name="setup" value="Advanced"/>Advanced<br/>
    </div>

    <h2 align="center">Select your MARC flavor</h2>
    <p>MARC stands for Machine Readable Cataloging, containing information about a bibliographic record. MARC21 is more commonly used globally, whereas UNIMARC tends to be used in Europe. </p>

    [% FOREACH flavourloo IN flavourloop %]
    <div>
            [% IF ( flavourloo.label == "Unimarc") %]
                 <input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %]<br/>
            [% ELSE %]
                 <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked="checked" /> [% flavourloo.label %] <br/>
            [% END %]
    </div>
    [% END %]

        <p>Click 'Next' to continue <input value="Next &gt;&gt;" type="submit" /></p>

    </form>

[% END %]

[% IF ( selectframeworks ) %]
        <h2 align= "center"> [% setup %] setup</h2>
        <h2 align="center">Selecting Default Settings</h2>
        var linklabel = _("Select all sample data");
        document.write('<p><a href="#" onclick="return selectAllFrameworks();">'+linklabel+'</a></p>');
    </script>
    <form name="frameworkselection" method="post" action="install.pl">
    <input type="hidden" name="step" value="3" />
    <input type="hidden" name="op" value="addframeworks" />

        [% IF setup == "Advanced" %]
            <script type="text/javascript">
                var linklabel = _("Select all options");
                document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
            </script>
        [% END %]
        <form name="frameworkselection" method="post" action="install.pl">
            <input type="hidden" name="step" value="3" />
            <input type="hidden" name="op" value="addframeworks" />
    [% IF ( frameworksloop ) %]
        <h2>MARC frameworks: [% marcflavour %]</h2>
        [% IF ( en_marc_frameworks ) %]
            <h4><span class="error">No MARC frameworks are available for your language.
                    Defaulting to the frameworks supplied for English (en)<span></h4>
        [% END %]
        [% FOREACH frameworksloo IN frameworksloop %]
           <div>
           <h3>[% frameworksloo.label %]</h3>
           [% FOREACH framework IN frameworksloo.frameworks %]
                <table style="border:1px;vertical-align:top;">
                <tr>
                    <td style = "border:1px; vertical-align:top;">
                        [% IF (frameworksloo.label == "Default") && (setup=="Basic") %]
                            <input type="hidden" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
                        [% ELSE %]
                            <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
                        [% END %]
                    </td>
                    <td>
                    [% IF (frameworksloo.label == "Default") && (setup=="Basic") %]
                        <ul>
                            <li>
                                <label for="[% framework.fwkname %]">
                                    [% framework.fwkdescription %]
                                    <em>([% framework.fwkname %])</em>
                                </label>
                            </li>
                        </ul>
                    </td>
                    [% ELSE %]
                    <td>
                        <label for= "[% framework.fwkname %]">
                            [% framework.fwkdescription %]
                            <em>([% framework.fwkname %])</em>
                        </label>
                    </td>
                    [% END %]
                </tr>
                </table>
           [% END %]
           </div>
        [% END %]
    <h2>Other data</h2>
    [% END %]
    [% IF ( en_sample_data ) %]

                Defaulting to the samples supplied for English (en)<span></h4>
    [% END %]
    [% FOREACH levelloo IN levelloop %]
        <div>
        <h3>[% levelloo.label %]</h3>

        [% IF (setup == "Basic" && levelloo.label == "Optional") %]
            <script type="text/javascript">
                var linklabel = _("Select all options");
                document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
            </script>
        [% END %]

        [% FOREACH framework IN levelloo.frameworks %]
            <table style="border:1px;vertical-align:top;">
            <tr>
                <td style="vertical-align:top;">
                [% IF (levelloo.label == "Default" ) && (setup=="Basic")%]
                     <input type="hidden" name="framework" value="[% framework.fwkfile %]" id="[%framework.fwkname %]" />
                [% ELSE %]
                     <input type="checkbox" name="framework" value="[%framework.fwkfile %]" id="[%framework.fwkname%]"/>
                [% END %]
                </td>
                <td>
                [% IF (levelloo.label == "Default") && (setup=="Basic")%]
                <ul>
                    <li>
                        <label for="[% framework.fwkname %]">
                            [% framework.fwkdescription %]
                            <em>([% framework.fwkname %])</em>
                        </label>
                    </li>
                </ul>
                </td>
                [% ELSE %]
                <td>
                    <label for= "[% framework.fwkname %]">
                        [% framework.fwkdescription %]
                        <em>([% framework.fwkname %])</em>
                    </label>
                </td>
                [% END %]
            </tr>
            </table>
        [% END %]
        </div>
    [% END %]
    <p>When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete,
    please be patient.</p>

        <form name="finish">
        <input type="hidden" name="step" value="3" />
        <input type="hidden" name="op" value="finish" />
        <input type="submit" value="Set up Koha with the onboarding tool"/>
        </form>
        </p>
    </p>
[% END %]

    </form>
[% END %]


[% IF ( default ) %]
    [% IF ( upgrading ) %]
        <p>
            We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database.
        <br>
        <a href="install.pl?step=3&amp;op=updatestructure" class="button"><button>Update Database</button></a>
        </p>
    [% ELSE %]
        <p>We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation:
        <br>
        <br>
            <a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Install Basic Configuration Settings</button></a>

    [% END %]
[% END %]



[% IF ( updatestructure ) %]
  <div><h2 align="center">Updating database structure</h2>
  [% IF ( has_update_succeeds ) %]

 [% UNLESS ( has_update_errors ) %]
    <p>Everything went OK, update done.</p>
  [% END %]
<a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Back to Installation</button></a>
  </div>
[% END %]


Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-2 lines)
1	[% USE Koha %]
2	[% SET footerjs = 1 %]
3	[% INCLUDE 'doc-head-open.inc' %]	1	[% INCLUDE 'doc-head-open.inc' %]
4	<title>Koha staff client</title>	2	<title>Koha staff client</title>
5	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/mainpage.css" />	3	<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/mainpage.css" />

Lines 22-28 use Test::More qw(no_plan); Link Here

(-)a/xt/sample_notices.t (-2 / +1 lines)
22		22
23		23
24	my $root_dir = 'installer/data/mysql';	24	my $root_dir = 'installer/data/mysql';
25	my $base_notices_file = "en/mandatory/sample_notices.sql";	25	my $base_notices_file = "en/default/sample_notices.sql";
26	my @trans_notices_files = qw(	26	my @trans_notices_files = qw(
27	fr-FR/1-Obligatoire/sample_notices.sql	27	fr-FR/1-Obligatoire/sample_notices.sql
28	fr-CA/obligatoire/sample_notices.sql	28	fr-CA/obligatoire/sample_notices.sql
29	-

Return to bug 18346

Lines 2-130 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt (-122 / +177 lines)
2	[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END %]	2	[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END %]
3	[% INCLUDE 'installer-doc-head-close.inc' %]	3	[% INCLUDE 'installer-doc-head-close.inc' %]
4	<div>	4	<div>
5	<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Web installer &rsaquo; Step 3</h1>	5	<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Koha web installer &rsaquo; Step 3</h1>
6		6
7	[% IF ( selectframeworks ) %]	7	[% IF ( selectframeworks ) %]
8	<script type="text/javascript">	8	<script type="text/javascript">
9	//<![CDATA[	9	//<![CDATA[
10		10
11	var surl = unescape(window.location.pathname);	11	var surl = unescape(window.location.pathname);
12		12
13	function doLoad()	13	function doLoad()
14	{	14	{
15	// the timeout value should be the same as in the "refresh" meta-tag	15	// the timeout value should be the same as in the "refresh" meta-tag
16	setTimeout( "refresh()", 2*1000 );	16	setTimeout( "refresh()", 2*1000 );
17	}	17	}
18		18
19	function refresh(value)	19	function refresh(value)
20	{	20	{
21	// The argument to the location.reload function determines	21	// The argument to the location.reload function determines
22	// if the browser should retrieve the document from the	22	// if the browser should retrieve the document from the
23	// web-server. In our example all we need to do is cause	23	// web-server. In our example all we need to do is cause
24	// the JavaScript block in the document body to be	24	// the JavaScript block in the document body to be
25	// re-evaluated. If we needed to pull the document from	25	// re-evaluated. If we needed to pull the document from
26	// the web-server again (such as where the document contents	26	// the web-server again (such as where the document contents
27	// change dynamically) we would pass the argument as 'true'.	27	// change dynamically) we would pass the argument as 'true'.
28	//	28	//
29	surl=surl+'?step=3&op=selectframeworks&fwklanguage='+value;	29	surl=surl+'?step=3&op=selectframeworks&fwklanguage='+value;
30		30
31	window.location.replace( surl );	31	window.location.replace( surl );
32	}	32	}
33		33
34	function selectAllFrameworks()	34	function selectAllFrameworks()
		35	{
		36	// A handy short link that selects all available checkboxes
		37	// on the page.
		38	//
		39	var checkboxes = document.getElementsByTagName("input");
		40	for (var i = 0; i < checkboxes.length; i++)
35	{	41	{
36	// A handy short link that selects all available checkboxes	42	if (checkboxes[i].type == 'checkbox')
37	// on the page.
38	//
39	var checkboxes = document.getElementsByTagName("input");
40	for (var i = 0; i < checkboxes.length; i++)
41	{	43	{
42	if (checkboxes[i].type == 'checkbox')	44	checkboxes[i].checked = true;
43	{
44	checkboxes[i].checked = true;
45	}
46	}	45	}
47
48	// Prevent event propergation.
49	return false;
50	}	46	}
51		47
52	function Hide(link)	48	// Prevent event propergation.
53	{	49	return false;
54	// Toggle the display of a given element on the page.	50	}
55	//	51
56	subfield = document.getElementById('bloc'+link);	52	function Hide(link)
57	var initstyle = subfield.style.display;	53	{
58	if (initstyle == 'block') subfield.style.display = 'none' ;	54	// Toggle the display of a given element on the page.
59	if (initstyle == 'none') subfield.style.display = 'block' ;	55	//
60	}	56	subfield = document.getElementById('bloc'+link);
		57	var initstyle = subfield.style.display;
		58	if (initstyle == 'block') subfield.style.display = 'none' ;
		59	if (initstyle == 'none') subfield.style.display = 'block' ;
		60	}
61		61
62	//]]>	62	//]]>
63	</script>	63	</script>
64	[% END %]	64	[% END %]
		65
		66
65	[% IF ( finish ) %]	67	[% IF ( finish ) %]
66	<h1>Congratulations, installation complete</h1>	68	<h1>Congratulations, installation complete</h1>
67	<p>If this page does not redirect in 5 seconds, click <a href="/">here</a>.</p>	69	<p>If this page does not redirect in 10 seconds, click <a href="/">here</a>.</p>
68	[% END %]	70	[% END %]
		71
		72
69	[% IF ( choosemarc ) %]	73	[% IF ( choosemarc ) %]
70	<h2 align="center">Select your MARC flavor</h2>	74	<h2 align="center">Choose your setup</h2>
		75	<p>Basic setup selects recommended settings by default.</p>
71	<form name="frameworkselection" method="post" action="install.pl">	76	<form name="frameworkselection" method="post" action="install.pl">
72	<input type="hidden" name="step" value="3" />	77	<input type="hidden" name="step" value="3" />
73	<input type="hidden" name="op" value="selectframeworks" />	78	<input type="hidden" name="op" value="selectframeworks"/>
74	<p>	79
		80	<div>
		81	<input type="radio" name="setup" value="Basic" checked="checked">Basic<br/>
		82	<input type="radio" name="setup" value="Advanced"/>Advanced<br/>
		83	</div>
		84
		85	<h2 align="center">Select your MARC flavor</h2>
		86	<p>MARC stands for Machine Readable Cataloging, containing information about a bibliographic record. MARC21 is more commonly used globally, whereas UNIMARC tends to be used in Europe. </p>
		87
75	[% FOREACH flavourloo IN flavourloop %]	88	[% FOREACH flavourloo IN flavourloop %]
76	<div>	89	<div>
77	[% IF ( flavourloo.checked ) %]	90	[% IF ( flavourloo.label == "Unimarc") %]
78	<input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked /> [% flavourloo.label %] <br/>	91	<input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %]<br/>
79	[% ELSE %]	92	[% ELSE %]
80	<input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %] <br/>	93	<input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked="checked" /> [% flavourloo.label %] <br/>
81	[% END %]	94	[% END %]
82	</div>	95	</div>
83	[% END %]	96	[% END %]
84	</p>	97
85	<p> Click 'Next' to continue <input value="Next >>" type="submit" /></p>	98	<p>Click 'Next' to continue <input value="Next >>" type="submit" /></p>
		99
86	</form>	100	</form>
		101
87	[% END %]	102	[% END %]
88		103
89	[% IF ( selectframeworks ) %]	104	[% IF ( selectframeworks ) %]
90	<h2 align="center">Selecting Default Settings</h2>	105	<h2 align= "center"> [% setup %] setup</h2>
91	<script type="text/javascript">	106	<h2 align="center">Selecting Default Settings</h2>
92	var linklabel = _("Select all sample data");
93	document.write('<p><a href="#" onclick="return selectAllFrameworks();">'+linklabel+'</a></p>');
94	</script>
95	<form name="frameworkselection" method="post" action="install.pl">
96	<input type="hidden" name="step" value="3" />
97	<input type="hidden" name="op" value="addframeworks" />
98		107
		108	[% IF setup == "Advanced" %]
		109	<script type="text/javascript">
		110	var linklabel = _("Select all options");
		111	document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
		112	</script>
		113	[% END %]
		114	<form name="frameworkselection" method="post" action="install.pl">
		115	<input type="hidden" name="step" value="3" />
		116	<input type="hidden" name="op" value="addframeworks" />
99	[% IF ( frameworksloop ) %]	117	[% IF ( frameworksloop ) %]
100	<h2>MARC frameworks: [% marcflavour %]</h2>	118	<h2>MARC frameworks: [% marcflavour %]</h2>
101	[% IF ( en_marc_frameworks ) %]	119	[% IF ( en_marc_frameworks ) %]
102	<h4><span class="error">No MARC frameworks are available for your language.	120	<h4><span class="error">No MARC frameworks are available for your language.
103	Defaulting to the frameworks supplied for English (en)<span></h4>	121	Defaulting to the frameworks supplied for English (en)<span></h4>
104	[% END %]	122	[% END %]
105	[% FOREACH frameworksloo IN frameworksloop %]	123	[% FOREACH frameworksloo IN frameworksloop %]
106	<div>	124	<div>
107	<h3>[% frameworksloo.label %]</h3>	125	<h3>[% frameworksloo.label %]</h3>
108	[% FOREACH framework IN frameworksloo.frameworks %]	126	[% FOREACH framework IN frameworksloo.frameworks %]
109	<table style="border:1px;vertical-align:top;">	127	<table style="border:1px;vertical-align:top;">
110	<tr>	128	<tr>
111	<td style="vertical-align:top;">	129	<td style = "border:1px; vertical-align:top;">
112	[% IF ( framework.checked ) %]	130	[% IF (frameworksloo.label == "Default") && (setup=="Basic") %]
113	<input type="checkbox" name="framework" value="[% framework.fwkfile %]" checked="checked" id="[% framework.fwkname %]" />	131	<input type="hidden" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
114	[% ELSE %]	132	[% ELSE %]
115	<input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" />	133	<input type="checkbox" name="framework" value="[% framework.fwkfile %]" id ="[%framework.fwkname%]" />
116	[% END %]	134	[% END %]
117	</td>	135	</td>
118	<td>	136	<td>
119	<label for="[% framework.fwkname %]">	137	[% IF (frameworksloo.label == "Default") && (setup=="Basic") %]
120	[% framework.fwkdescription %]	138	<ul>
121	<em>([% framework.fwkname %])</em>	139	<li>
122	</label>	140	<label for="[% framework.fwkname %]">
123	</td>	141	[% framework.fwkdescription %]
124	</table>	142	<em>([% framework.fwkname %])</em>
125	[% END %]	143	</label>
126	</div>	144	</li>
127	[% END %]	145	</ul>
		146	</td>
		147	[% ELSE %]
		148	<td>
		149	<label for= "[% framework.fwkname %]">
		150	[% framework.fwkdescription %]
		151	<em>([% framework.fwkname %])</em>
		152	</label>
		153	</td>
		154	[% END %]
		155	</tr>
		156	</table>
		157	[% END %]
		158	</div>
		159	[% END %]
128	<h2>Other data</h2>	160	<h2>Other data</h2>
129	[% END %]	161	[% END %]
130	[% IF ( en_sample_data ) %]	162	[% IF ( en_sample_data ) %]
Lines 132-158 Link Here
132	Defaulting to the samples supplied for English (en)<span></h4>	164	Defaulting to the samples supplied for English (en)<span></h4>
133	[% END %]	165	[% END %]
134	[% FOREACH levelloo IN levelloop %]	166	[% FOREACH levelloo IN levelloop %]
135	<div>	167	<div>
136	<h3>[% levelloo.label %]</h3>	168	<h3>[% levelloo.label %]</h3>
137	[% FOREACH framework IN levelloo.frameworks %]	169
138	<table style="border:1px;vertical-align:top;">	170	[% IF (setup == "Basic" && levelloo.label == "Optional") %]
139	<tr>	171	<script type="text/javascript">
140	<td style="vertical-align:top;">	172	var linklabel = _("Select all options");
141	[% IF ( framework.checked ) %]	173	document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
142	<input type="checkbox" name="framework" value="[% framework.fwkfile %]" checked="checked" id="[% framework.fwkname %]" />	174	</script>
143	[% ELSE %]	175	[% END %]
144	<input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" />	176
145	[% END %]	177	[% FOREACH framework IN levelloo.frameworks %]
146	</td>	178	<table style="border:1px;vertical-align:top;">
147	<td>	179	<tr>
148	<label for="[% framework.fwkname %]">	180	<td style="vertical-align:top;">
149	[% framework.fwkdescription %]	181	[% IF (levelloo.label == "Default" ) && (setup=="Basic")%]
150	<em>([% framework.fwkname %])</em>	182	<input type="hidden" name="framework" value="[% framework.fwkfile %]" id="[%framework.fwkname %]" />
151	</label>	183	[% ELSE %]
152	</td>	184	<input type="checkbox" name="framework" value="[%framework.fwkfile %]" id="[%framework.fwkname%]"/>
153	</table>	185	[% END %]
154	[% END %]	186	</td>
155	</div>	187	<td>
		188	[% IF (levelloo.label == "Default") && (setup=="Basic")%]
		189	<ul>
		190	<li>
		191	<label for="[% framework.fwkname %]">
		192	[% framework.fwkdescription %]
		193	<em>([% framework.fwkname %])</em>
		194	</label>
		195	</li>
		196	</ul>
		197	</td>
		198	[% ELSE %]
		199	<td>
		200	<label for= "[% framework.fwkname %]">
		201	[% framework.fwkdescription %]
		202	<em>([% framework.fwkname %])</em>
		203	</label>
		204	</td>
		205	[% END %]
		206	</tr>
		207	</table>
		208	[% END %]
		209	</div>
156	[% END %]	210	[% END %]
157	<p>When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete,	211	<p>When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete,
158	please be patient.</p>	212	please be patient.</p>
Lines 181-187 Link Here
181	<form name="finish">	235	<form name="finish">
182	<input type="hidden" name="step" value="3" />	236	<input type="hidden" name="step" value="3" />
183	<input type="hidden" name="op" value="finish" />	237	<input type="hidden" name="op" value="finish" />
184	<input type="submit" value="Finish" /></form>	238	<input type="submit" value="Set up Koha with the onboarding tool"/>
		239	</form>
185	</p>	240	</p>
186	</p>	241	</p>
187	[% END %]	242	[% END %]
Lines 214-235 Link Here
214	</form>	269	</form>
215	[% END %]	270	[% END %]
216		271
217
218	[% IF ( default ) %]	272	[% IF ( default ) %]
219	[% IF ( upgrading ) %]	273	[% IF ( upgrading ) %]
220	<p>	274	<p>
221	We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must <a href="install.pl?step=3&op=updatestructure" class="button">update your database</a>	275	We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database.
		276	<br>
		277	<a href="install.pl?step=3&op=updatestructure" class="button"><button>Update Database</button></a>
222	</p>	278	</p>
223	[% ELSE %]	279	[% ELSE %]
224	<p>We are ready to do some basic configuration. Please	280	<p>We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation:
225	<a href="install.pl?step=3&op=choosemarc" class="button">install basic configuration settings</a>	281	<br>
226	to continue the installation.	282	<br>
227	</p>	283	<a href="install.pl?step=3&op=choosemarc" class="button"><button>Install Basic Configuration Settings</button></a>
		284
228	[% END %]	285	[% END %]
229	[% END %]	286	[% END %]
230		287
231
232
233	[% IF ( updatestructure ) %]	288	[% IF ( updatestructure ) %]
234	<div><h2 align="center">Updating database structure</h2>	289	<div><h2 align="center">Updating database structure</h2>
235	[% IF ( has_update_succeeds ) %]	290	[% IF ( has_update_succeeds ) %]
Lines 251-257 Link Here
251	[% UNLESS ( has_update_errors ) %]	306	[% UNLESS ( has_update_errors ) %]
252	<p>Everything went OK, update done.</p>	307	<p>Everything went OK, update done.</p>
253	[% END %]	308	[% END %]
254	<a href="install.pl?step=3&op=finished" class="button">Continue to log in to Koha</a>	309	<a href="install.pl?step=3&op=choosemarc" class="button"><button>Back to Installation</button></a>
255	</div>	310	</div>
256	[% END %]	311	[% END %]
257		312