Bugzilla – Attachment 62427 Details for
Bug 18462
Implemented bootstrap styling on the web installer and onboarding tool
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17855 - Reverted back to original step 3 in the web installer so there is no basic and advanced setup mode and consequently no need for SQL files to be moved to a 'default' directory for all languages.
Bug-17855---Reverted-back-to-original-step-3-in-th.patch (text/plain), 147.07 KB, created by
Alex Buckley
on 2017-04-20 01:51:47 UTC
(
hide
)
Description:
Bug 17855 - Reverted back to original step 3 in the web installer so there is no basic and advanced setup mode and consequently no need for SQL files to be moved to a 'default' directory for all languages.
Filename:
MIME Type:
Creator:
Alex Buckley
Created:
2017-04-20 01:51:47 UTC
Size:
147.07 KB
patch
obsolete
>From 1f271ce9c516616dc9628fbd432ec036d7c586ed Mon Sep 17 00:00:00 2001 >From: Alex Buckley <alexbuckley@catalyst.net.nz> >Date: Sat, 18 Mar 2017 18:19:17 +0000 >Subject: [PATCH] Bug 17855 - Reverted back to original step 3 in the web > installer so there is no basic and advanced setup mode and consequently no > need for SQL files to be moved to a 'default' directory for all languages. >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Onboarding tool and the rest of the web installer still exists in this >commit > >How I tested in my VM (Current master): >- Dropped database >- Recreated database >- Went through installer >- Language en, Marc21 >- Installed mandatory data only >- Went through Onboarding tool >- After finishing, logged in as superlibrarian > that was created by onboarding tool >Everything worked fine. > >Signed-off-by: Marc Véron <veron@veron.ch> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Bug 17855 - Followup patch following requests in comments 176 and 177 > >Signed-off-by: Marc Véron <veron@veron.ch> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Bug 17855: perltidy onboarding.pl > >Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Bug 17855: Do not create a new dbh, get it from C4::Context->dbh > >Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Bug 17855: Redirect to the installer if installation process is not done yet > >Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Bug 17855: No need to resend the library list to the template > >This has been done at the beginning of the script > >Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Bug 17855: Simplify the onboarding tool > >This patch should not modify a lot the behaviours of the onboarding >tool. >Its goal is mainly to remove duplicated as well as useless (because >copy/pasted from existing script files) code. > >It assumes that the onboarding tool will be done on an empty database >and will skip steps that are not needed. For instance if a library >already exists, the first step will be skipped. > >One of the main problem was the lack of feedback messages sent to the >user when something wrong/ok happened. > >Explanation on main changes: >1. Use checkauth first, then get_template_and_user >=> As we do not know the template to use, it's better to use checkauth >first to know if the user is logged in, then retrieve the template we >need, depending on the success or the failure of the action >2. Create a @messages variables >Pushing messages to this variable and handling the messages via an >include files (onboarding_messages.inc) simplify error handling. Note >that we could remove this include file if we merge all the >onboardingstepX.tt files altogether >3. Simplify creation of the admnistrator user >This patch removes some unecessary checks done on the user's info >(passwd to short, mandatory fields > >Todo (minor): Add style to feedback messages > >Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz> > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> > >Bug 17942 - Update style of the web installer with Bootstrap 3 > >This patch makes style and markup changes to the web installer and new >onboarding tool (Bug 17855). > >- Markup has been corrected, improved, and in many places reindented. >- Some page titles have been made more specific. >- Some JavaScript and CSS have been moved to separate files. > >In the onboarding tool I have removed form validation from the markup >and JavaScript in many cases where the requirements were not matched >elsewhere in Koha. For instance, we shouldn't limit item type >descriptions to only letters because the database doesn't require such a >limit. > >To test, apply the patch and run the web installer with an empty >database. Confirm that the installation process completes correctly and >that each page looks good and works correctly. > >Signed-off-by: Josef Moravec <josef.moravec@gmail.com> >Signed-off-by: Liz Rea <liz@catalyst.net.nz> > >https://bugs.koha-community.org/show_bug.cgi?id=18462 > >Bug 17942 - Add anti-clickjack code to installer doc head close >--- > installer/install.pl | 17 +- > installer/onboarding.pl | 638 ++++++--------------- > koha-tmpl/intranet-tmpl/prog/css/installer.css | 229 ++++++++ > .../prog/en/includes/installer-doc-head-close.inc | 92 +-- > .../prog/en/includes/installer-strings.inc | 7 + > .../prog/en/includes/onboarding_messages.inc | 20 + > .../prog/en/modules/installer/auth.tt | 93 +-- > .../prog/en/modules/installer/step1.tt | 168 +++--- > .../prog/en/modules/installer/step2.tt | 129 +++-- > .../prog/en/modules/installer/step3.tt | 431 +++++++------- > .../prog/en/modules/onboarding/onboardingstep1.tt | 109 ++-- > .../prog/en/modules/onboarding/onboardingstep2.tt | 254 ++++---- > .../prog/en/modules/onboarding/onboardingstep3.tt | 270 +++------ > .../prog/en/modules/onboarding/onboardingstep4.tt | 90 +-- > .../prog/en/modules/onboarding/onboardingstep5.tt | 215 ++++--- > koha-tmpl/intranet-tmpl/prog/js/onboarding.js | 150 +++++ > 16 files changed, 1375 insertions(+), 1537 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/css/installer.css > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc > create mode 100644 koha-tmpl/intranet-tmpl/prog/js/onboarding.js > >diff --git a/installer/install.pl b/installer/install.pl >index 83eadac..ac20877 100755 >--- a/installer/install.pl >+++ b/installer/install.pl >@@ -296,9 +296,6 @@ elsif ( $step && $step == 3 ) { > $template->param( "levelloop" => $levellist ); > $template->param( "$op" => 1 ); > >- my $setup = $query->param('setup'); >- $template->param( "setup" => $setup ); >- > } > elsif ( $op && $op eq 'choosemarc' ) { > # >@@ -343,16 +340,12 @@ elsif ( $step && $step == 3 ) { > 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 >- ); >- >+ 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; >+ push @flavourlist, \%cell; > } > $template->param( "flavourloop" => \@flavourlist ); > $template->param( "$op" => 1 ); >diff --git a/installer/onboarding.pl b/installer/onboarding.pl >index 49f4e84..02d4827 100755 >--- a/installer/onboarding.pl >+++ b/installer/onboarding.pl >@@ -17,9 +17,8 @@ > # You should have received a copy of the GNU General Public License > # along with Koha; if not, see <http://www.gnu.org/licenses>. > >-#Recommended pragmas > use Modern::Perl; >-use diagnostics; >+use C4::Context; > use C4::InstallAuth; > use CGI qw ( -utf8 ); > use C4::Output; >@@ -36,160 +35,80 @@ use Koha::IssuingRules; > > #Setting variables > my $input = new CGI; >-my $step = $input->param('step'); > >-#Getting the appropriate template to display to the user >-my ( $template, $loggedinuser, $cookie ) = >- C4::InstallAuth::get_template_and_user( >- { >- template_name => "/onboarding/onboardingstep" >- . ( $step ? $step : 1 ) . ".tt", >- query => $input, >- type => "intranet", >- authnotrequired => 0, >- debug => 1, >- } >- ); >- >-#Check database connection >-my %info; >-$info{'dbname'} = C4::Context->config("database"); >-$info{'dbms'} = ( >- C4::Context->config("db_scheme") >- ? C4::Context->config("db_scheme") >- : "mysql" >-); >+unless ( C4::Context->preference('Version') ) { >+ print $input->redirect("/cgi-bin/koha/installer/install.pl"); >+ exit; >+} > >-$info{'hostname'} = C4::Context->config("hostname"); >-$info{'port'} = C4::Context->config("port"); >-$info{'user'} = C4::Context->config("user"); >-$info{'password'} = C4::Context->config("pass"); >-my $dbh = DBI->connect( >- "DBI:$info{dbms}:dbname=$info{dbname};host=$info{hostname}" >- . ( $info{port} ? ";port=$info{port}" : "" ), >- $info{'user'}, $info{'password'} >-); >+my ( $user, $cookie, $sessionID, $flags ) = >+ C4::InstallAuth::checkauth( $input, 0, undef, 'intranet' ); >+die "Not logged in" >+ unless $user >+ ; # Should not happen, we should be redirect if the user is not logged in. But do not trust authentication... > >-#Store the value of the template input name='op' in the variable $op so we can check if the user has pressed the button with the name="op" and value="finish" meaning the user has finished the onboarding tool. >-my $op = $input->param('op') || ''; >-$template->param( 'op' => $op ); >+my $step = $input->param('step') || 1; >+my $op = $input->param('op') || ''; >+ >+my $template_params = {}; >+$template_params->{op} = $op; > > my $schema = Koha::Database->new()->schema(); > >-if ( $op && $op eq 'finish' ) >-{ #If the value of $op equals 'finish' then redirect user to /cgi-bin/koha/mainpage.pl >- print $input->redirect("/cgi-bin/koha/mainpage.pl"); >- exit; >-} >+my @messages; > >-my $libraries = Koha::Libraries->search( {}, { order_by => ['branchcode'] }, ); >-$template->param( >- libraries => $libraries, >- group_types => [ >- { >- categorytype => 'searchdomain', >- categories => [ >- Koha::LibraryCategories->search( >- { categorytype => 'searchdomain' } >- ) >- ], >- }, >- { >- categorytype => 'properties', >- categories => [ >- Koha::LibraryCategories->search( >- { categorytype => 'properties' } >- ) >- ], >- }, >- ] >-); >+if ( $step == 1 ) { > >+ if ( $op eq 'add_validate_library' ) { > >-#Select all the patron category records in the categories database table and give them to the template >- my $categories = Koha::Patron::Categories->search(); >- $template->param( 'categories' => $categories, ); >- >-#Check if the $step variable equals 1 i.e. the user has clicked to create a library in the create library screen 1 >- my $itemtypes = Koha::ItemTypes->search(); >- $template->param( 'itemtypes' => $itemtypes, ); >- >-if ( $step && $step == 1 ) { >- #store inputted parameters in variables >- my $branchcode = $input->param('branchcode'); >- $branchcode = uc($branchcode); >- my $categorycode = $input->param('categorycode'); >- my $op = $input->param('op') || 'list'; >- my $message; >- my $library; >- >- #Take the text 'branchname' and store it in the @fields array >- my @fields = qw( >- branchname >- ); >- >- $template->param( 'branchcode' => $branchcode ); >- $branchcode =~ s|\s||g >- ; # Use a regular expression to check the value of the inputted branchcode >- >-#Create a new library object and store the branchcode and @fields array values in this new library object >- $library = Koha::Library->new( >- { >- branchcode => $branchcode, >- ( map { $_ => scalar $input->param($_) || undef } @fields ) >- } >- ); >+ my $branchcode = $input->param('branchcode'); >+ $branchcode = uc($branchcode); > >- eval { $library->store; }; #Use the eval{} function to store the library object >- if ($library) { >- $message = 'success_on_insert'; >- } >- else { >- $message = 'error_on_insert'; >+ $branchcode =~ s|\s||g >+ ; # Use a regular expression to check the value of the inputted branchcode >+ >+ my $library = Koha::Library->new( >+ { >+ branchcode => $branchcode, >+ branchname => scalar $input->param('branchname'), >+ } >+ ); >+ >+ eval { $library->store; }; >+ unless ($@) { >+ push @messages, >+ { type => 'message', code => 'success_on_insert_library' }; >+ } >+ else { >+ push @messages, >+ { type => 'message', code => 'error_on_insert_library' }; >+ } > } >- $template->param( 'message' => $message ); > >-#Check if the $step variable equals 2 i.e. the user has clicked to create a patron category in the create patron category screen 1 >+ $step++ if Koha::Libraries->count; > } >-elsif ( $step && $step == 2 ) { >- if ($op eq "add_validate_category"){ >- #Initialising values >- my $searchfield = $input->param('description') // q||; >+if ( $step == 2 ) { >+ if ( $op eq "add_validate_category" ) { >+ >+ my $searchfield = $input->param('description') // q||; > my $categorycode = $input->param('categorycode'); >- my $op = $input->param('op') // 'list'; >- my $message; > my $category; >- $template->param( 'categorycode' => $categorycode ); >+ $template_params->{categorycode} = $categorycode; > >- my ( $template, $loggedinuser, $cookie ) = >- C4::InstallAuth::get_template_and_user( >- { >- template_name => "/onboarding/onboardingstep2.tt", >- query => $input, >- type => "intranet", >- authnotrequired => 0, >- flagsrequired => >- { parameters => 'parameters_remaining_permissions' }, >- debug => 1, >- } >- ); >- >- #Once the user submits the page, this code validates the input and adds it >- #to the database as a new patron category > $categorycode = $input->param('categorycode'); > my $description = $input->param('description'); > my $overduenoticerequired = $input->param('overduenoticerequired'); > my $category_type = $input->param('category_type'); > my $default_privacy = $input->param('default_privacy'); > my $enrolmentperiod = $input->param('enrolmentperiod'); >- my $enrolmentperioddate = $input->param('enrolmentperioddate') || undef; >+ my $enrolmentperioddate = $input->param('enrolmentperioddate') || undef; > > #Converts the string into a date format > if ($enrolmentperioddate) { > $enrolmentperioddate = output_pref( > { > dt => dt_from_string($enrolmentperioddate), >- dateformat => 'iso', >+ dateformat => 'DateTime', > dateonly => 1, > } > ); >@@ -204,236 +123,95 @@ elsif ( $step && $step == 2 ) { > category_type => $category_type, > default_privacy => $default_privacy, > enrolmentperiod => $enrolmentperiod, >- enrolmentperioddate => $enrolmentperioddate, >+ enrolmentperioddate => $enrolmentperioddate > } > ); > > eval { $category->store; }; > >- #Error messages >- if ($category) { >- $message = 'success_on_insert'; >+ unless ($@) { >+ push @messages, >+ { type => 'message', code => 'success_on_insert_category' }; > } > else { >- $message = 'error_on_insert'; >+ push @messages, >+ { type => 'message', code => 'error_on_insert_category' }; > } >- >- $template->param( 'message' => $message ); > } >- #Create a patron >-} >-elsif ( $step && $step == 3 ) { >- my $firstpassword = $input->param('password') || ''; >- my $secondpassword = $input->param('password2') || ''; >- > >- #Find all patron records in the database and hand them to the template >- my %currentpatrons = Koha::Patrons->search(); >- my $currentpatrons = values %currentpatrons; >- $template->param( 'patrons' =>$currentpatrons); >- >- >-#Find all library records in the database and hand them to the template to display in the library dropdown box >- my $libraries = >- Koha::Libraries->search( {}, { order_by => ['branchcode'] }, ); >- $template->param( >- libraries => $libraries, >- group_types => [ >- { >- categorytype => 'searchdomain', >- categories => [ >- Koha::LibraryCategories->search( >- { categorytype => 'searchdomain' } >- ) >- ], >- }, >- { >- categorytype => 'properties', >- categories => [ >- Koha::LibraryCategories->search( >- { categorytype => 'properties' } >- ) >- ], >- }, >- ] >- ); >- >-#Find all patron categories in the database and hand them to the template to display in the patron category dropdown box >- my $categories = Koha::Patron::Categories->search(); >- $template->param( 'categories' => $categories, ); >- >-#Incrementing the highest existing patron cardnumber to prevent duplicate cardnumber entry >- >- my $existing_cardnumber = $schema->resultset('Borrower')->get_column('cardnumber')->max() // 0; >- >- my $new_cardnumber = $existing_cardnumber + 1; >- $template->param( "newcardnumber" => $new_cardnumber ); >- >- my $op = $input->param('op') // 'list'; >- my $minpw = C4::Context->preference("minPasswordLength"); >- $template->param( "minPasswordLength" => $minpw ); >- my @messages; >- my @errors; >- my $nok = $input->param('nok'); >- my $cardnumber = $input->param('cardnumber'); >- my $borrowernumber = $input->param('borrowernumber'); >- my $userid = $input->param('userid'); >- >- # function to designate mandatory fields (visually with css) >- my $check_BorrowerMandatoryField = >- C4::Context->preference("BorrowerMandatoryField"); >- my @field_check = split( /\|/, $check_BorrowerMandatoryField ); >- foreach (@field_check) { >- $template->param( "mandatory$_" => 1 ); >- $template->param( >- BorrowerMandatoryField => >- C4::Context->preference("BorrowerMandatoryField") >- , #field to test with javascript >- ); >- } >- >- #If the entered cardnumber causes an error hand this error to the @errors array >- if ( my $error_code = checkcardnumber( $cardnumber, $borrowernumber ) ) { >- push @errors, >- $error_code == 1 ? 'ERROR_cardnumber_already_exists' >- : $error_code == 2 ? 'ERROR_cardnumber_length' >- : (); >- } >- >- #If the entered password causes an error hand this error to the @errors array >- push @errors, "ERROR_password_mismatch" >- if $firstpassword ne $secondpassword; >- push @errors, "ERROR_short_password" >- if ( $firstpassword >- && $minpw >- && $firstpassword ne '****' >- && ( length($firstpassword) < $minpw ) ); >- >- #Passing errors to template >- $nok = $nok || scalar(@errors); >- >-#If errors have been generated from the users inputted cardnumber or password then display the error and do not insert the patron into the borrowers table >- if ($nok) { >- foreach my $error (@errors) { >- if ( $error eq 'ERROR_password_mismatch' ) { >- $template->param( errorpasswordmismatch => 1 ); >- } >- if ( $error eq 'ERROR_login_exist' ) { >- $template->param( errorloginexists => 1 ); >- } >- if ( $error eq 'ERROR_cardnumber_already_exists' ) { >- $template->param( errorcardnumberexists => 1 ); >- } >- if ( $error eq 'ERROR_cardnumber_length' ) { >- $template->param( errorcardnumberlength => 1 ); >+ $step++ if Koha::Patron::Categories->count; >+} >+if ( $step == 3 ) { >+ if ( $op eq 'add_validate_patron' ) { >+ >+ #Create a patron >+ my $firstpassword = $input->param('password') || ''; >+ my $secondpassword = $input->param('password2') || ''; >+ my $cardnumber = $input->param('cardnumber'); >+ my $userid = $input->param('userid'); >+ >+ if ( my $error_code = checkcardnumber($cardnumber) ) { >+ if ( $error_code == 1 ) { >+ push @messages, >+ { >+ type => 'alert', >+ code => 'ERROR_cardnumber_already_exists' >+ }; > } >- if ( $error eq 'ERROR_short_password' ) { >- $template->param( errorshortpassword => 1 ); >+ elsif ( $error_code == 2 ) { >+ push @messages, >+ { type => 'alert', code => 'ERROR_cardnumber_length' }; > } > } >- $template->param( 'nok' => 1 ); >+ elsif ( $firstpassword ne $secondpassword ) { > >-#Else if no errors have been caused by the users inputted card number or password then insert the patron into the borrowers table >- } >- else { >- my ( $template, $loggedinuser, $cookie ) = >- C4::InstallAuth::get_template_and_user( >- { >- template_name => "/onboarding/onboardingstep3.tt", >- query => $input, >- type => "intranet", >- authnotrequired => 0, >- flagsrequired => { borrowers => 1 }, >- debug => 1, >- } >- ); >- >- if ( $op eq 'add_validate' ) { >- my %newdata; >- >- #Store the template form values in the newdata hash >- $newdata{borrowernumber} = $input->param('borrowernumber'); >- $newdata{surname} = $input->param('surname'); >- $newdata{firstname} = $input->param('firstname'); >- $newdata{cardnumber} = $input->param('cardnumber'); >- $newdata{branchcode} = $input->param('libraries'); >- $newdata{categorycode} = $input->param('categorycode_entry'); >- $newdata{userid} = $input->param('userid'); >- $newdata{password} = $input->param('password'); >- $newdata{password2} = $input->param('password2'); >- $newdata{privacy} = "default"; >- $newdata{address} = ""; >- $newdata{city} = ""; >- >-#Hand tne the dateexpiry of the patron based on the patron category it is created from >- my $patron_category = Koha::Patron::Categories->find( $newdata{categorycode} ); >- $newdata{dateexpiry} = $patron_category->get_expiry_date( $newdata{dateenrolled} ); >- >-#Hand the newdata hash to the AddMember subroutine in the C4::Members module and it creates a patron and hands back a borrowernumber which is being stored >- my $borrowernumber = &AddMember(%newdata); >- >-#Create a hash named member2 and fill it with the borrowernumber of the borrower that has just been created >- my %member2; >- $member2{'borrowernumber'} = $borrowernumber; >- >-#Perform data validation on the flag that has been handed to onboarding.pl by the template >- my $flag = $input->param('flag'); >- if ( $input->param('newflags') ) { >- my $dbh = C4::Context->dbh(); >- my @perms = $input->multi_param('flag'); >- my %all_module_perms = (); >- my %sub_perms = (); >- foreach my $perm (@perms) { >- if ( $perm !~ /:/ ) { >- $all_module_perms{$perm} = 1; >- } >- else { >- my ( $module, $sub_perm ) = split /:/, $perm, 2; >- push @{ $sub_perms{$module} }, $sub_perm; >- } >- } >- >- # construct flags >- my @userflags = $schema->resultset('Userflag')->search({},{ >- order_by => { -asc =>'bit'}, >- } >- ); >- >-#Setting superlibrarian permissions for new patron >- my $flags = Koha::Patrons->find($borrowernumber)->set({flags=>1})->store; >+ push @messages, >+ { type => 'alert', code => 'ERROR_password_mismatch' }; >+ } >+ else { > >- #Error handling checking if the patron was created successfully >- if ( !$borrowernumber ) { >- push @messages, >- { type => 'error', code => 'error_on_insert' }; >- } >- else { >- push @messages, >- { type => 'message', code => 'success_on_insert' }; >- } >+ my $patron_data = { >+ surname => scalar $input->param('surname'), >+ firstname => scalar $input->param('firstname'), >+ cardnumber => scalar $input->param('cardnumber'), >+ branchcode => scalar $input->param('libraries'), >+ categorycode => scalar $input->param('categorycode_entry'), >+ userid => scalar $input->param('userid'), >+ password => scalar $input->param('password'), >+ password2 => scalar $input->param('password2'), >+ privacy => "default", >+ address => "", >+ city => "", >+ flags => 1, # Will be superlibrarian >+ }; >+ >+ my $patron_category = >+ Koha::Patron::Categories->find( $patron_data->{categorycode} ); >+ $patron_data->{dateexpiry} = >+ $patron_category->get_expiry_date( $patron_data->{dateenrolled} ); >+ >+ my $borrowernumber = C4::Members::AddMember(%$patron_data); >+ >+ #Error handling checking if the patron was created successfully >+ if ($borrowernumber) { >+ push @messages, >+ { type => 'message', code => 'success_on_insert_patron' }; >+ } >+ else { >+ push @messages, >+ { type => 'error', code => 'error_on_insert_patron' }; > } > } > } >+ >+ $step++ if Koha::Patrons->search( { flags => 1 } )->count; > } >-elsif ( $step && $step == 4 ) { >- my ( $template, $borrowernumber, $cookie ) = >- C4::InstallAuth::get_template_and_user( >- { >- template_name => "/onboarding/onboardingstep4.tt", >- query => $input, >- type => "intranet", >- authnotrequired => 0, >- flagsrequired => >- { parameters => 'parameters_remaining_permissions' }, >- debug => 1, >- } >- ); >- if ($op eq "add_validate"){ >+if ( $step == 4 ) { >+ if ( $op eq 'add_validate_itemtype' ) { > my $description = $input->param('description'); > my $itemtype_code = $input->param('itemtype'); > $itemtype_code = uc($itemtype_code); > >- #Create a new itemtype object using the user inputted itemtype and description > my $itemtype = Koha::ItemType->new( > { > itemtype => $itemtype_code, >@@ -441,93 +219,29 @@ elsif ( $step && $step == 4 ) { > } > ); > eval { $itemtype->store; }; >- my $message; > >-#Fill the $message variable with an error if the item type object was not successfully created and inserted into the itemtypes table >- if ($itemtype) { >- $message = 'success_on_insert'; >+ unless ($@) { >+ push @messages, >+ { type => 'message', code => 'success_on_insert_itemtype' }; > } > else { >- $message = 'error_on_insert'; >+ push @messages, >+ { type => 'message', code => 'error_on_insert_itemtype' }; > } >- $template->param( 'message' => $message ); > } >+ >+ $step++ if Koha::ItemTypes->count; > } >-elsif ( $step && $step == 5 ) { >- >- #Find all the existing categories to display in a dropdown box in the template >- my $categories; >- $categories = Koha::Patron::Categories->search(); >- $template->param( categories => $categories, ); >- >- #Find all the exisiting item types to display in a dropdown box in the template >- my $itemtypes; >- $itemtypes = Koha::ItemTypes->search(); >- $template->param( itemtypes => $itemtypes, ); >- >- #Find all the exisiting libraries to display in a dropdown box in the template >- my $libraries = >- Koha::Libraries->search( {}, { order_by => ['branchcode'] }, ); >- $template->param( >- libraries => $libraries, >- group_types => [ >- { >- categorytype => 'searchdomain', >- categories => [ >- Koha::LibraryCategories->search( >- { categorytype => 'searchdomain' } >- ) >- ], >- }, >- { >- categorytype => 'properties', >- categories => [ >- Koha::LibraryCategories->search( >- { categorytype => 'properties' } >- ) >- ], >- }, >- ] >- ); >- >- my $input = CGI->new; >- my $dbh = C4::Context->dbh; >- >- my ( $template, $loggedinuser, $cookie ) = >- C4::InstallAuth::get_template_and_user( >- { >- template_name => "/onboarding/onboardingstep5.tt", >- query => $input, >- type => "intranet", >- authnotrequired => 0, >- flagsrequired => { parameters => 'manage_circ_rules' }, >- debug => 1, >- } >- ); >- >- #If no libraries exist then set the $branch value to * >- my $branch = $input->param('branch'); >- unless ($branch) { >- if ( C4::Context->preference('DefaultToLoggedInLibraryCircRules') ) { >- $branch = >- Koha::Libraries->search->count() == 1 >- ? undef >- : C4::Context::mybranch(); >- } >- else { >- $branch = >- C4::Context::only_my_library() >- ? ( C4::Context::mybranch() || '*' ) >- : '*'; >- } >- } >- $branch = '*' if $branch eq 'NO_LIBRARY_SET'; >- my $op = $input->param('op') || q{}; >+if ( $step == 5 ) { >+ >+ if ( $op eq 'add_validate_circ_rule' ) { >+ >+ #If no libraries exist then set the $branch value to * >+ my $branch = $input->param('branch') || '*'; > >- if ( $op eq 'add_validate' ) { > my $type = $input->param('type'); >- my $br = $input->param('branch'); >- my $bor = $input->param('categorycode'); >+ my $branchcode = $input->param('branch'); >+ my $categorycode = $input->param('categorycode'); > my $itemtype = $input->param('itemtype'); > my $maxissueqty = $input->param('maxissueqty'); > my $issuelength = $input->param('issuelength'); >@@ -540,8 +254,8 @@ elsif ( $step && $step == 5 ) { > $issuelength = $issuelength eq q{} ? undef : $issuelength; > > my $params = { >- branchcode => $br, >- categorycode => $bor, >+ branchcode => $branchcode, >+ categorycode => $categorycode, > itemtype => $itemtype, > maxissueqty => $maxissueqty, > renewalsallowed => $renewalsallowed, >@@ -551,53 +265,65 @@ elsif ( $step && $step == 5 ) { > onshelfholds => $onshelfholds, > }; > >- my @messages; >+ my $issuingrule = Koha::IssuingRule->new($params); >+ eval { $issuingrule->store; }; > >-#Allows for the 'All' option to work when selecting all libraries for a circulation rule to apply to. >- if ( $branch eq "*" ) { >- my $search_default_rules = $schema->resultset('DefaultCircRule')->count(); >- my $insert_default_rules = $schema->resultset('Issuingrule')->new( >- { maxissueqty => $maxissueqty, onshelfholds => $onshelfholds } >- ); >+ unless ($@) { >+ push @messages, >+ { type => 'message', code => 'success_on_insert_circ_rule' }; > } >-#Allows for the 'All' option to work when selecting all patron categories for a circulation rule to apply to. >- elsif ( $bor eq "*" ) { >- >- my $search_default_rules = $schema->resultset('DefaultCircRule')->count(); >- my $insert_default_rules = $schema->resultset('Issuingrule')->new( >- { maxissueqty => $maxissueqty} >- ); >+ else { >+ push @messages, >+ { type => 'message', code => 'error_on_insert_circ_rule' }; > } >+ } > >-#Allows for the 'All' option to work when selecting all itemtypes for a circulation rule to apply to >- elsif ( $itemtype eq "*" ) { >- my $search_default_rules = $schema->resultset('DefaultCircRule')->search({},{ >- branchcode => $branch >- } >+ $step++ if Koha::IssuingRules->count; >+} > >- ); >+my $libraries = Koha::Libraries->search( {}, { order_by => ['branchcode'] }, ); >+$template_params->{libraries} = $libraries; >+$template_params->{group_types} = [ >+ { >+ categorytype => 'searchdomain', >+ categories => [ >+ Koha::LibraryCategories->search( >+ { categorytype => 'searchdomain' } >+ ) >+ ], >+ }, >+ { >+ categorytype => 'properties', >+ categories => [ >+ Koha::LibraryCategories->search( { categorytype => 'properties' } ) >+ ], >+ }, >+]; >+ >+if ( $step > 5 ) { >+ $template_params->{all_done} = 1; # If step 5 is complete, we are done! >+ $step = 5; >+} > >- my $insert_default_rules = $schema->resultset('Issuingrule')->new( >- { branchcode => $branch, onshelfholds => $onshelfholds } >- ); >- } >+#Getting the appropriate template to display to the user >+my ( $template, $loggedinuser ); >+( $template, $loggedinuser, $cookie ) = C4::InstallAuth::get_template_and_user( >+ { >+ template_name => "onboarding/onboardingstep${step}.tt", >+ query => $input, >+ type => "intranet", >+ authnotrequired => 0, >+ debug => 1, >+ } >+); > >- my $issuingrule = Koha::IssuingRules->find( >- { categorycode => $bor, itemtype => $itemtype, branchcode => $br } >- ); >- if ($issuingrule) { >- $issuingrule->set($params)->store(); >- push @messages, >- { >- type => 'error', >- code => 'error_on_insert' >- }; #Stops crash of the onboarding tool if someone makes a circulation rule with the same item type, library and patron categroy as an exisiting circulation rule. >+$template_params->{messages} = \@messages; >+my $categories = Koha::Patron::Categories->search(); >+$template_params->{categories} = $categories; > >- } >- else { >- Koha::IssuingRule->new()->set($params)->store(); >- } >- } >-} >+my $itemtypes = Koha::ItemTypes->search(); >+$template_params->{itemtypes} = $itemtypes; >+ >+$template->param(%$template_params); > > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/koha-tmpl/intranet-tmpl/prog/css/installer.css b/koha-tmpl/intranet-tmpl/prog/css/installer.css >new file mode 100644 >index 0000000..374c56d >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/css/installer.css >@@ -0,0 +1,229 @@ >+body { >+ background-color: #EEE; >+ text-align: left; >+ font-family: arial, verdana, helvetica, sans-serif; >+} >+ >+h1 { >+ font-size: 161.6%; >+ font-weight: bold; >+} >+ >+h2 { >+ background-color: #eee; >+ border-radius: 4px; >+ font-size: 146.5%; >+ font-weight: bold; >+ text-shadow: 1px 1px 0px #FFF; >+ padding: .5em; >+} >+ >+h3 { >+ color: #003366; >+ font-size: 131%; >+ font-weight: bold; >+} >+ >+hr { >+ margin-top: .5em; >+ margin-bottom: .5em; >+} >+ >+.installer-main { >+ background-color: #FFF; >+ border-radius: 5px; >+ margin-top: 3%; >+ margin-bottom: 3%; >+ padding: 1em; >+ -webkit-box-shadow: 0px 2px 2px 0px rgba(50, 50, 50, 0.5); >+ -moz-box-shadow: 0px 2px 2px 0px rgba(50, 50, 50, 0.5); >+ box-shadow: 0px 2px 2px 0px rgba(50, 50, 50, 0.5); >+} >+ >+ul, ol { padding: 5px 5px 5px 20px; } >+ >+#logo { >+ background: url(../img/koha-logo.gif) no-repeat top center; >+ margin-top: 0; >+ margin-bottom: .5em; >+} >+ >+#logo a { >+ display: block; >+ text-indent: -1000px; >+ height: 74px; >+ border-bottom: none; >+} >+ >+.bg-danger { >+ padding: .2em .4em; >+} >+ >+.step a, .step input { font-size: 2em; } >+ >+td input { font-size: 1.5em; } >+ >+.step, th { text-align: right; } >+ >+#bloc25, .bloc25 { >+ float:left; >+ border:1px solid #000000; >+ margin:0px; >+ padding:0px; >+ >+} >+ >+#footer { >+ text-align: center; >+ border-top: 1px solid #ccc; >+ padding-top: 1em; >+ font-style: italic; >+} >+ >+.update_error { >+ color: red; >+ font-weight: bold; >+} >+ >+.checkbox { >+ margin-bottom: 1em; >+} >+ >+fieldset.rows { >+ border-width: 0; >+ float: left; >+ font-size: 90%; >+ clear: left; >+ margin: .9em 0 0 0; >+ padding: 0; >+ width: 100%; >+} >+ >+fieldset.rows legend { >+ border: 0; >+ margin-left: 1em; >+ font-weight: bold; >+ font-size: 110%; >+ margin-bottom: 0; >+} >+ >+fieldset.rows label, >+fieldset.rows span.label { >+ float: left; >+ font-weight: bold; >+ width: 9em; >+ margin-right: 1em; >+ text-align: right; >+} >+ >+fieldset.rows span.label { >+ display: inline; >+ padding: .2em .6em .3em; >+ font-size: inherit; >+ font-weight: bold; >+ line-height: 1; >+ color: inherit; >+ text-align: right; >+ white-space: normal; >+ vertical-align: baseline; >+ border-radius: 0; >+} >+ >+fieldset.rows fieldset { >+ background-color: transparent; >+ border-width: 1px; >+ margin: 1em; >+ padding: .3em; >+} >+ >+fieldset.rows ol { >+ padding: 1em 1em 0 1em; >+ list-style-type: none; >+} >+ >+fieldset.rows li { >+ float: left; >+ clear: left; >+ padding-bottom: 1em; >+ list-style-type: none; >+ width: 100%; >+} >+ >+fieldset.rows .hint { >+ margin-left: 10.5em; >+ margin-right: 4em; >+ margin-top: .5em; >+ font-size: 96%; >+ color: #666; >+} >+ >+fieldset.rows label.error { >+ color: #cc0000; >+ float: none; >+ margin-left: 1em; >+ width: auto; >+} >+ >+fieldset.rows ol { >+ padding: 0 1em 0 1em; >+} >+ >+ >+label.required, >+span.required { >+ color : #C00; >+} >+ >+span.required { >+ font-style : italic; >+ margin-left : .5em; >+} >+ >+.breadcrumbs { >+ background-color: #e6f0f2; >+ margin: 1em 0; >+ padding: .4em 2em; >+} >+ >+/* Override core jQueryUI widgets */ >+.ui-widget-content { border: 1px solid #B9D8D9; background: #ffffff none; color: #222222; } >+.ui-widget-header { border: 1px solid #B9D8D9; background: #E6F0F2 none; color: #222222; font-weight: bold; } >+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #B9D8D9; background: #F4F8F9 none; font-weight: normal; color: #555555; } >+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #B9D8D9; background: #E6F0F2 none; font-weight: normal; color: #212121; } >+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff none; font-weight: normal; color: #212121; } >+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #FED22F; background: #FFF4C6; color: #363636; } >+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec; color: #cd0a0a; } >+ >+.ui-widget, >+.ui-widget input, >+.ui-widget select, >+.ui-widget textarea, >+.ui-widget button { >+ font-family : inherit; >+ font-size : inherit; >+} >+ >+/* jQuery UI Datepicker */ >+.ui-datepicker table { >+ width: 100%; >+ font-size: .9em; >+ border : 0; >+ border-collapse: collapse; >+ margin:0 0 .4em; >+} >+ >+.ui-datepicker th { >+ background : transparent none; >+ padding: .7em .3em; >+ text-align: center; >+ font-weight: bold; >+ border: 0; >+} >+ >+.ui-datepicker-trigger { >+ vertical-align: middle; >+ margin : 0 3px; >+} >+.ui-datepicker { >+ box-shadow: 1px 1px 3px 0 #666; >+} >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >index 60d0e66..ee7af5f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-doc-head-close.inc >@@ -2,92 +2,28 @@ > <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.css" /> > <link rel="stylesheet" type="text/css" href="[% interface %]/lib/bootstrap/bootstrap.min.css" /> >-<link rel="stylesheet" type="text/css" href="[% interface %]/lib/font-awesome/css/font-awesome.min.css" /> >-<link rel="stylesheet" type="text/css" media="print" href="[% interface %]/[% theme %]/css/print.css" /> >-<style type="text/css" media="screen"> >- >-[% IF ( login ) %] >- @import url([% interface %]/[% theme %]/css/login.css); >-[% END %] >- >-html { background: #eee; } >- >-body { >- background: #fff; >- color: #000; >- font-family: Georgia, "Times New Roman", Times, serif; >- margin-left: 20%; >- margin-right: 20%; >- padding: .2em 2em; >-} >- >-h1 { >- color: #006; >- font-size: 2em; >- font-weight: normal; >- vertical-align:middle; >-} >- >-h2 { font-size: 1.75em; } >- >-h3 { >- color: #006; >- font-size: 1.5em; >- font-weight: lighter; >-} >- >-p, li, dt { >- line-height: 140%; >- padding-bottom: 2px; >-} >- >-ul, ol { padding: 5px 5px 5px 20px; } >- >-#logo { margin-bottom: 2em; } >- >-.step a, .step input { font-size: 2em; } >- >-td input { font-size: 1.5em; } >- >-.step, th { text-align: right; } >- >-#bloc25, .bloc25 { >- float:left; >- border:1px solid #000000; >- margin:0px; >- padding:0px; >- >-} >- >-#footer { >- text-align: center; >- border-top: 1px solid #ccc; >- padding-top: 1em; >- font-style: italic; >-} >- >-.update_error { >- color: red; >- font-weight: bold; >-} >- >-</style> >+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/installer.css" /> > > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-2.2.3.min.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-migrate-1.3.0.min.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/jquery-ui-1.11.4.min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/shortcut/shortcut.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.cookie.min.js"></script> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.highlight-3.js"></script> > <script type="text/javascript" src="[% interface %]/lib/bootstrap/bootstrap.min.js"></script> > <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.validate.min.js"></script> >-<!-- koha core js --> >-<script type="text/javascript" src="[% interface %]/[% theme %]/js/staff-global.js"></script> >- > <script type="text/javascript"> > //<![CDATA[ > function _(s) { return s } // dummy function for gettext > //]]> > </script> >-</head> >-<body id="installer" class="installer"> >+ >+[%# Prevent XFS attacks -%] >+<script type="text/javascript"> >+$(document).ready(function() { >+ if (self === top) { >+ var antiClickjack = document.getElementById("antiClickjack"); >+ antiClickjack.parentNode.removeChild(antiClickjack); >+ } else { >+ top.location = self.location; >+ } >+}); >+</script> >+<style id="antiClickjack">body{display:none !important;}</style> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc >new file mode 100644 >index 0000000..21b8245 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-strings.inc >@@ -0,0 +1,7 @@ >+<script type="text/javascript"> >+ var MSG_LETTERS_ONLY=(_("Please only enter letters.")); >+ var MSG_PASSWORD_MISMATCH=(_("The entered passwords do not match")); >+ var MSG_ONE_ENROLLMENTPERIOD =(_("Please choose an enrollment period in months OR by date.")); >+ var MSG_ONLY_ONE_ENROLLMENTPERIOD=(_("Please only choose one enrollment period.")); >+ var MSG_LETTERS_NUMBERS_ONLY=(_("Please only enter letters or numbers.")); >+</script> >\ No newline at end of file >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc >new file mode 100644 >index 0000000..67eabef >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/onboarding_messages.inc >@@ -0,0 +1,20 @@ >+[% FOR m IN messages %] >+ <div class="dialog [% m.type %]"> >+ [% SWITCH m.code %] >+ [% CASE 'success_on_insert_library' %]<span>Library created!</span> >+ [% CASE 'error_on_insert_library' %]<span>Library already exists and cannot be modified!</span> >+ [% CASE 'success_on_insert_category' %]<span>Patron category created!</span> >+ [% CASE 'error_on_insert_category' %]<span>Patron category already exists and cannot be modified!</span> >+ [% CASE 'success_on_insert_patron' %]<span>Administrator Patron created!</span> >+ [% CASE 'error_on_insert_patron' %]<span>The patron has not been created! Cardnumber or Userid may already exist.</span> >+ [% CASE 'ERROR_cardnumber_already_exists' %]<span>Cardnumber already in use.</span> >+ [% CASE 'ERROR_cardnumber_length' %]<span>Cardnumber length is incorrect.</span> >+ [% CASE 'ERROR_password_mismatch' %]<span>Passwords do not match.</span> >+ [% CASE 'success_on_insert_itemtype' %]<span>New item type created!</span> >+ [% CASE 'error_on_insert_itemtype' %]<span>Item type already exists!</span> >+ [% CASE 'success_on_insert_circ_rule' %]<span>Circulation rule created!</span> >+ [% CASE 'error_on_insert_circ_rule' %]<span>Circulation rule not created!</span> >+ [% CASE %][% message %] >+ [% END %] >+ </div> >+[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >index c3509cd..28d95ea 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt >@@ -1,52 +1,63 @@ > [% USE Koha %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › >+<title>Koha › > [% IF ( nopermission ) %]Access denied[% END %] > [% IF ( timed_out ) %]Session timed out[% END %] > [% IF ( different_ip ) %]IP address change[% END %] > [% IF ( invalid_username_or_password ) %]Invalid username or password[% END %] >- [% IF ( loginprompt ) %]Log in to Koha[% END %] >+ [% IF ( loginprompt ) %]Log in to the Koha web installer[% END %] > </title> > > [% INCLUDE 'installer-doc-head-close.inc' %] >-<div id="login"> >-<h1><a>Koha [%- Koha.Version.release -%] installer</a></h1> >-[% IF ( nopermission ) %] >-<div id="login_error"><strong>Error: </strong>Unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div> >-[% END %] >- >-[% IF ( timed_out ) %] >-<div id="login_error"><strong>Error: </strong>Session timed out, please log in again</div> >-[% END %] >- >-[% IF ( different_ip ) %] >-<div id="login_error"><strong>Error: </strong>IP address has changed, please log in again </div> >-[% END %] >- >-[% IF ( invalid_username_or_password ) %] >-<div id="login_error"><strong>Error: </strong>Invalid username or password</div> >-[% END %] >- >-[% IF ( loginprompt ) %] >-<!-- login prompt time--> >-<form action="/cgi-bin/koha/installer/install.pl" method="post" name="mainform" id="mainform"> >-[% FOREACH INPUT IN INPUTS %] >- <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" /> >-[% END %] >-<h3>Welcome to the Koha web installer</h3> >-<p>Before we begin, please verify you have the correct credentials to continue. Please log in >-with the username and password given to you by your systems administrator and located in your >-<code>koha-conf.xml</code> configuration file.</p> >-<p>Please enter your username and password:</p> >-<p><label>Username:<br /> >-<input type="text" name="userid" id="userid" class="input" value="[% userid %]" size="20" tabindex="1" /></label> >-</p> >-<p><label>Password:<br /> >-<input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" /></label> >-</p> >-<p class="submit"><input id="submit" type="submit" value="Login" tabindex="4" /></p> >-</form> >- >-[% END %] > >+<div class="container-fluid"> >+ <div class="row"> >+ <div id="installer-login" class="installer-main col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3"> >+ >+ <h1 id="logo"><a href="#">Koha</a></h1> >+ >+ [% IF ( nopermission ) %] >+ <div id="login_error"><strong>Error: </strong>Unauthorized user <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div> >+ [% END %] >+ >+ [% IF ( timed_out ) %] >+ <div id="login_error"><strong>Error: </strong>Session timed out, please log in again</div> >+ [% END %] >+ >+ [% IF ( different_ip ) %] >+ <div id="login_error"><strong>Error: </strong>IP address has changed, please log in again </div> >+ [% END %] >+ >+ [% IF ( invalid_username_or_password ) %] >+ <div id="login_error"><strong>Error: </strong>Invalid username or password</div> >+ [% END %] >+ >+ [% IF ( loginprompt ) %] >+ <h2>Welcome to the Koha [%- Koha.Version.release -%] web installer</h2> >+ >+ <p>Before we begin, please verify you have the correct credentials to continue. Please log in with the username and password given to you by your systems administrator and located in your <code>koha-conf.xml</code> configuration file.</p> >+ >+ <form action="[% url %]" method="post" role="form" id="mainform"> >+ [% FOREACH INPUT IN INPUTS %] >+ <input type="hidden" name="[% INPUT.name |html %]" value="[% INPUT.value |html %]" /> >+ [% END %] >+ >+ <fieldset> >+ <legend>Please enter your username and password</legend> >+ >+ <div class="form-group"> >+ <label>Username:</label> >+ <input type="text" class="form-control" name="userid" id="userid" value="[% userid %]" size="20" tabindex="1" /> >+ </div> >+ <div class="form-group"> >+ <label>Password:</label> >+ <input type="password" class="form-control" name="password" id="password" value="" size="20" tabindex="2" /> >+ </div> >+ <input id="submit" type="submit" class="btn btn-primary" value="Log in" tabindex="3" /></p> >+ </fieldset> >+ </form> >+ [% END %] >+ </div> >+ </div> >+</div> > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >index 89da761..9647ae9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step1.tt >@@ -1,82 +1,98 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Web installer › Step 1</title> >-[% INCLUDE 'installer-doc-head-close.inc' %] >-<div> >-<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Web installer › Step 1</h1> >-[% UNLESS ( language ) %] >-<p>You are about to install Koha.</p> >- >-<p>Please pick your language from the following list. If your language is not >-listed, please inform your systems administrator.</p> >-<form name="language" method="post"> >-<select name="language"> >-[% IF ( installer_languages_loop ) %] >- [% FOREACH installer_languages_loo IN installer_languages_loop %] >- [% IF ( installer_languages_loo.plural ) %] >- <optgroup label="[% installer_languages_loo.language %]"> >- [% FOREACH sublanguages_loo IN installer_languages_loo.sublanguages_loop %] >- <option value="[% sublanguages_loo.rfc4646_subtag %]">[% IF ( sublanguages_loo.native_description ) %][% sublanguages_loo.native_description %][% ELSE %][% sublanguages_loo.rfc4646_subtag %][% END %]</option> >+<title>Koha › Web installer › >+ [% UNLESS ( language ) %] Choose your language [% END %] >+ [% IF ( language ) %] >+ [% UNLESS ( checkmodule ) %] >+ [% IF ( missing_modules ) %] >+ Perl modules missing > [% END %] >- </optgroup> >- [% ELSE %] >- <option value="[% installer_languages_loo.rfc4646_subtag %]">[% IF ( installer_languages_loo.native_description ) %][% installer_languages_loo.native_description %][% ELSE %][% installer_languages_loo.rfc4646_subtag %][% END %]</option> >+ [% IF ( problems ) %] >+ Perl version obsolete > [% END %] > [% END %] >-[% END %] >-</select> >-</p> >- >-<p> Click 'Next' to continue <input value="Next >>" type="submit" /></p> >-</form> >-[% END %] >-[% IF ( language ) %] >- [% IF ( checkmodule ) %] >- <p>All required Perl modules appear to be installed.<br /> >- [% ELSE %] >- [% IF ( missing_modules ) %] >- <p><b>Warning: </b>Some Perl modules are missing.<br />Modules in red must be installed before you may continue.<br /> >- <ul> >- [% FOREACH missing_module IN missing_modules %] >- [% IF ( missing_module.require ) %] >- <li style="color:#FF0000;font-weight:bold;">[% missing_module.name %] >- [% ELSE %] >- <li>[% missing_module.name %] >+ Check Perl dependencies > [% END %] >- <br /> Version: [% missing_module.version %] >- <br /> Usage: [% missing_module.usage %] >- </li> >- [% END %] >- [% END %] >- [% IF ( problems ) %] >- <p>I encountered some problems.</p> >- <ul> >- [% IF ( perlversion ) %] >- <li>Your Perl version seems to be obsolete. >- Please upgrade to a newer version of Perl (at least Version 5.10).</li> >- [% END %] >- </ul> >- [% END %] >- [% END %] >-<form name="checkmodules" action="install.pl"> >-[% IF ( checkmodule ) %] >-[% IF (op == 'noop') %] >-<input type="hidden" name="step" value="2" /> >-[% ELSE %] >-<input type="hidden" name="step" value="3" /> >-<input type="hidden" name="op" value="[% op %]" /> >-<input type="hidden" name="checkmodule" value="[% checkmodule %]"/> >-[% END %] >-<p> All dependencies installed.</p> >-<p>Please click 'Next' to continue <input value="Next >>" type="submit" /></p> >-[% ELSE %] >-[% IF (op == 'noop') %] >-<input type="hidden" name="step" value="1" /> >-[% ELSE %] >-<input type="hidden" name="step" value="1" /> >-<input type="hidden" name="op" value="[% op %]" /> >-[% END %] >-<p>Click to recheck dependencies <input value="Recheck" type="submit" /></p> >-[% END %] >-</form> >-[% END %] >+</title> >+[% INCLUDE 'installer-doc-head-close.inc' %] >+ >+<div class="container-fluid"> >+ <div class="row"> >+ <div id="installer-step1" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> >+ >+ <h1 id="logo"><a href="#">Koha</a></h1> >+ >+ [% UNLESS ( language ) %] >+ <h2>Web installer › Choose your language</h2> >+ <p>You are about to install Koha.</p> >+ >+ <p>Please pick your language from the following list. If your language is not listed, please inform your system administrator.</p> >+ >+ <form name="language" role="form" method="post" action="install.pl"> >+ <div class="form-group"> >+ <label for="language">Select a language: </label> >+ <select id="language" name="language"> >+ [% IF ( installer_languages_loop ) %] >+ [% FOREACH installer_languages_loo IN installer_languages_loop %] >+ [% IF ( installer_languages_loo.plural ) %] >+ <optgroup label="[% installer_languages_loo.language %]"> >+ [% FOREACH sublanguages_loo IN installer_languages_loo.sublanguages_loop %] >+ <option value="[% sublanguages_loo.rfc4646_subtag %]">[% IF ( sublanguages_loo.native_description ) %][% sublanguages_loo.native_description %][% ELSE %][% sublanguages_loo.rfc4646_subtag %][% END %]</option> >+ [% END %] >+ </optgroup> >+ [% ELSE %] >+ <option value="[% installer_languages_loo.rfc4646_subtag %]">[% IF ( installer_languages_loo.native_description ) %][% installer_languages_loo.native_description %][% ELSE %][% installer_languages_loo.rfc4646_subtag %][% END %]</option> >+ [% END %] >+ [% END %] >+ [% END %] >+ </select> >+ </div> >+ >+ <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p> >+ </form> >+ [% END %] >+ >+ [% IF ( language ) %] >+ [% UNLESS ( checkmodule ) %] >+ [% IF ( missing_modules ) %] >+ <h2>Web installer › Perl modules missing</h2> >+ <p>Some Perl modules are missing. <span class="label label-danger">Required</span> modules <b>must</b> be installed before you may continue.<br /> >+ <ul> >+ [% FOREACH missing_module IN missing_modules %] >+ <li><strong>[% missing_module.name %]</strong> [% IF ( missing_module.require ) %]<span class="label label-danger">Required</span>[% END %] >+ <br /> Version: [% missing_module.version %] >+ <br /> Usage: [% missing_module.usage %] >+ </li> >+ [% END %] >+ </ul> >+ [% END %] >+ >+ [% IF ( problems ) %] >+ <h2>Web installer › Perl version too old</h2> >+ <p>I encountered some problems.</p> >+ <ul> >+ [% IF ( perlversion ) %] >+ <li>Your Perl version is out of date. Please upgrade to a newer version of Perl (at least version 5.10).</li> >+ [% END %] >+ </ul> >+ [% END %] >+ >+ <form name="checkmodules" role="form" action="install.pl"> >+ <input type="hidden" name="step" value="1" /> >+ <p> <input value="Recheck dependencies" class="btn btn-primary" type="submit" /></p> >+ </form> >+ >+ [% ELSE # IF checkmodule %] >+ <h2>Web installer › Check Perl dependencies</h2> >+ <p>All required Perl modules appear to be installed.</p> >+ <p> All dependencies installed.</p> >+ >+ <form name="checkmodules" role="form" action="install.pl"> >+ <input type="hidden" name="step" value="2" /> >+ <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p> >+ </form> >+ [% END # IF checkmodule%] >+ [% END # IF language %] >+ </div> >+ </div> >+ > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt >index d7194b9..aaea508 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step2.tt >@@ -1,63 +1,70 @@ >-[% INCLUDE 'doc-head-open.inc' %]<title>Koha › Web installer › Step 2</title> >+[% INCLUDE 'doc-head-open.inc' %]<title>Koha › Web installer › Database settings</title> > [% INCLUDE 'installer-doc-head-close.inc' %] >-<div> >-<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Web installer › Step 2</h1> >-<h2 align="center">Database settings:</h2> >-<ul> >-<li><em>database type : </em>[% dbms %]</li> >-<li><em>database name : </em>[% dbname %]</li> >-<li><em>database host : </em>[% hostname %]</li> >-<li><em>database port : </em>[% port %] (probably OK if blank)</li> >-<li><em>database user : </em>[% user %]</li> >-</ul> >-<div> >-[% IF ( dbconnection ) %] >-<form name="checkdbparameters" type="post" action="install.pl"> >- [% IF ( checkdatabaseaccess ) %] >- <p>Connection established.</p> >- [% IF ( checkdatabasecreated ) %] >- <p>Database <code>[% dbname %]</code> exists.</p> >- [% IF ( checkgrantaccess ) %] >- <p>User <code>[% user %]</code> has all required privileges on database <code>[% dbname %]</code>.</p> >- [% ELSE %] >- <p class="error">user <code>[% user %]</code> doesn't have enough privilege on database <code>[% dbname %]</code></p> >- <p class="tip">Ask for or make a change in the user's privileges. Need help? See >- [% IF dbms == 'mysql' %]<a href="https://dev.mysql.com/doc/refman/5.5/en/grant.html"> >- [% ELSE %]<a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html"> >- [% END %]this page</a>. >- </p> >- <p class="tip"> >- User <code>[% user %]</code> must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on <code>[% dbname %]</code> >- </p> >- [% END %] >- [% ELSE %] >- <p class="error">No database named <code>[% dbname %]</code> detected.</p> >- <p class="tip">Please create the database before continuing.</p> >- [% END %] >- [% ELSE %] >- <div class="error">[% error %] : [% message %] >+ >+<div class="container-fluid"> >+ <div class="row"> >+ <div id="installer-step2" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> >+ >+ <h1 id="logo"><a href="#">Koha</a></h1> >+ <h2>Web installer › Database settings</h2> >+ <h3>Database settings:</h3> >+ <ul> >+ <li><em>Database type : </em> <code>[% dbms %]</code></li> >+ <li><em>Database name : </em> <code>[% dbname %]</code></li> >+ <li><em>Database host : </em> <code>[% hostname %]</code></li> >+ <li><em>Database port : </em> <code>[% port %]</code> (probably okay if blank)</li> >+ <li><em>Database user : </em> <code>[% user %]</code></li> >+ </ul> >+ >+ [% IF ( dbconnection ) %] >+ <form name="checkdbparameters" role="form" type="post" action="install.pl"> >+ [% IF ( checkdatabaseaccess ) %] >+ <div class="alert alert-success" role="alert"><p>Connection established.</p></div> >+ [% IF ( checkdatabasecreated ) %] >+ <ul> >+ <li>Database <code>[% dbname %]</code> exists.</li> >+ [% IF ( checkgrantaccess ) %] >+ <li>User <code>[% user %]</code> has all required privileges on database <code>[% dbname %]</code>.</li> >+ </ul> >+ [% ELSE %] >+ </ul> >+ <p class="error">user <code>[% user %]</code> doesn't have enough privilege on database <code>[% dbname %]</code> </p> >+ <p class="tip"> Ask for or make a change in the user's privileges. Need help? See [% IF ( mysql ) %] >+ <a href="http://dev.mysql.com/doc/refman/4.1/en/grant.html"> >+ [% ELSE %] >+ <a href="http://www.postgresql.org/docs/8.2/interactive/sql-createrole.html"> >+ [% END %] >+ this page</a>. User <code>[% user %]</code> must have USAGE, INSERT, UPDATE, DELETE, DROP and CREATE privileges on <code>[% dbname %]</code> >+ </p> >+ [% END %] >+ [% ELSE %] >+ <div class="alert alert-danger" role="alert"><p>No database named <code>[% dbname %]</code> detected.</p></div> >+ <p>Please create the database before continuing.</p> >+ [% END %] >+ [% ELSE %] >+ <div class="alert alert-warning" role="alert">[% error %] : [% message %]</div> >+ <div class="tip"> >+ <ul> >+ <li>Check that your database is running.</li> >+ <li>Check your database settings in <code>koha-conf.xml</code>. </li> >+ <li>Check the hostname setting in <code>koha-conf.xml</code>. >+ Some database servers require <code>127.0.0.1</code> rather than <code>localhost</code>.</li> >+ </ul> >+ </div> >+ <p>Please correct these errors and <a href="/cgi-bin/koha/installer/install.pl">start the installer</a> again. >+ [% END %] >+ [% UNLESS ( error ) %] >+ <input type="hidden" name="step" value="3" /> >+ <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p> >+ [% END %] >+ </form> >+ [% ELSE %] >+ <form name="checkinformation" role="form" type="post" action="install.pl"> >+ <input type="hidden" name="step" value="2" /> >+ <input type="hidden" name="checkdb" value="1" /> >+ <p> <input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p> >+ </form> >+ [% END %] >+ </div> > </div> >- <div class="tip"> >- <ul> >- <li>Check that your database is running.</li> >- <li>Check your database settings in <code>koha-conf.xml</code>. </li> >- <li>Check the hostname setting in <code>koha-conf.xml</code>. >- Some database servers require <code>127.0.0.1</code> rather than <code>localhost</code>.</li> >- </div> >- <p>Please correct these errors and <a href="/cgi-bin/koha/installer/install.pl">start the installer</a> again. >- [% END %] >- [% IF ( error ) %][% ELSE %] >-<input type="hidden" name="step" value="3" /> >-<p> Click 'Next' to continue <input value="Next >>" type="submit" /></p> >-[% END %] >-</form> >-[% ELSE %] >-<form name="checkinformation" type="post" action="install.pl"> >-<input type="hidden" name="step" value="2" /> >-<input type="hidden" name="checkdb" value="1" /> >-<p> Please click 'Next' to continue if this information is correct <input value="Next >>" type="submit" /></p> >-</form> >-[% END %] >-</div> >-</body> >-</html> >+[% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >index bb2111b..84f40e2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt >@@ -1,218 +1,179 @@ >-[% INCLUDE 'doc-head-open.inc' %]<title>Koha › Web installer › Step 3</title> >-[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/installer/onboarding.pl">[% END %] >+[% INCLUDE 'doc-head-open.inc' %] >+<title>Koha › Web installer › >+ [% IF ( proposeimport ) %] >+ Set up database >+ [% END %] >+ [% IF ( importdatastructure ) %] >+ [% IF ( error ) %] >+ Error creating database tables >+ [% ELSE %] >+ Database tables created >+ [% END %] >+ [% END %] >+ [% IF ( default ) %] >+ [% IF ( upgrading ) %] >+ Update database >+ [% ELSE %] >+ Install basic configuration settings >+ [% END %] >+ [% END %] >+ [% IF ( choosemarc ) %] >+ Select your MARC flavor >+ [% END %] >+ [% IF ( selectframeworks ) %] >+ Selecting default settings >+ [% END %] >+</title> >+[% IF ( finish ) %]<meta http-equiv="refresh" content="5; url=/cgi-bin/koha/installer/onboarding.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 › 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 ); >-} >+<div class="container-fluid"> >+ <div class="row"> >+ <div id="installer-step3" class="installer-main col-sm-8 col-sm-offset-2 col-md-8 col-md-offset-2"> > >-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; >+ <h1 id="logo"><a href="#">Koha</a></h1> > >- 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') >- { >- checkboxes[i].checked = true; >- } >- } >+ [% IF ( finish ) %] >+ <h2>Web installer › Installation complete</h2> >+ <h3>Congratulations, installation complete</h3> >+ <p> >+ If this page does not redirect in 5 seconds, <a href="/cgi-bin/koha/installer/onboarding.pl">Start onboarding process</a>. >+ </p> >+ [% END %] > >- // 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' ; >-} >+ [% IF ( choosemarc ) %] >+ <h2>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"/> >+ >+ <p> >+ <label><input type="radio" name="setup" value="Basic" checked="checked" /> Basic</label> >+ </p> >+ <p> >+ <label><input type="radio" name="setup" value="Advanced"/> Advanced</label> >+ </p> >+ >+ <h2>Select your MARC flavor</h2> >+ <p>MARC stands for Machine Readable Cataloging, containing information about a bibliographic record. MARC21 is used globally, whereas UNIMARC tends to be used in Europe. </p> >+ >+ [% FOREACH flavourloo IN flavourloop %] >+ [% IF ( flavourloo.label == "Unimarc") %] >+ <p> >+ <label><input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %]</label> >+ </p> >+ [% ELSE %] >+ <p> >+ <label><input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked="checked" /> [% flavourloo.label %]</label> >+ </p> >+ [% END %] >+ [% END %] >+ <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /> </p> >+ </form> >+ [% END # / IF choosemarc %] > >-//]]> >-</script> >-[% END %] >+ [% IF ( selectframeworks ) %] >+ <h2>Web installer › [% setup %] setup › Selecting default settings</h2> > >+ [% IF setup == "Advanced" %] >+ <p id="selectall"><a href="#">Select all sample data</a></p> >+ [% END %] > >-[% IF ( finish ) %] >- <h1>Congratulations, installation complete</h1> >- <p>If this page does not redirect in 10 seconds, click <a href="/cgi-bin/koha/installer/onboarding.pl">Start onboarding process</a>.</p> >+[% IF ( choosemarc ) %] >+ <h2 align="center">Select your MARC flavor</h2> >+ <form name="frameworkselection" method="post" action="install.pl"> >+ <input type="hidden" name="step" value="3" /> >+ <input type="hidden" name="op" value="selectframeworks" /> >+ <p> >+ [% FOREACH flavourloo IN flavourloop %] >+ <div> >+ [% IF ( flavourloo.checked ) %] >+ <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked /> [% flavourloo.label %] <br/> >+ [% ELSE %] >+ <input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %] <br/> >+ [% END %] >+ </div> >+ [% END %] >+ </p> >+ <p> Click 'Next' to continue <input value="Next >>" type="submit" /></p> >+ </form> > [% END %] > >- >-[% IF ( choosemarc ) %] >- <h2 align="center">Choose your setup</h2> >- <p>Basic setup selects recommended settings by default.</p> >+[% IF ( selectframeworks ) %] >+<h2 align="center">Selecting Default Settings</h2> >+ <script type="text/javascript"> >+ 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="selectframeworks"/> >+ <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> >- <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/> >+ <h3>[% frameworksloo.label %]</h3> >+ [% FOREACH framework IN frameworksloo.frameworks %] >+ <table style="border:1px;vertical-align:top;"> >+ <tr> >+ <td style="vertical-align:top;"> >+ [% IF ( framework.checked ) %] >+ <input type="checkbox" name="framework" value="[% framework.fwkfile %]" checked="checked" id="[% framework.fwkname %]" /> >+ [% ELSE %] >+ <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" /> >+ [% END %] >+ </td> >+ <td> >+ <label for="[% framework.fwkname %]"> >+ [% framework.fwkdescription %] >+ <em>([% framework.fwkname %])</em> >+ </label> >+ </td> >+ </table> >+ [% END %] >+ </div> >+ [% END %] >+ <h2>Other data</h2> >+ [% END %] >+ [% IF ( en_sample_data ) %] >+ <h4><span class="error">No sample data and settings are available for your language. >+ Defaulting to the samples supplied for English (en)<span></h4> >+ [% END %] >+ [% FOREACH levelloo IN levelloop %] >+ <div> >+ <h3>[% levelloo.label %]</h3> >+ [% FOREACH framework IN levelloo.frameworks %] >+ <table style="border:1px;vertical-align:top;"> >+ <tr> >+ <td style="vertical-align:top;"> >+ [% IF ( framework.checked ) %] >+ <input type="checkbox" name="framework" value="[% framework.fwkfile %]" checked="checked" id="[% framework.fwkname %]" /> > [% ELSE %] >- <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked="checked" /> [% flavourloo.label %] <br/> >+ <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" /> > [% END %] >- </div> >- [% END %] >- >- <p>Click 'Next' to continue <input value="Next >>" type="submit" /></p> >- >- </form> >- >-[% END %] >- >-[% IF ( selectframeworks ) %] >- <h2 align= "center"> [% setup %] setup</h2> >- <h2 align="center">Selecting Default Settings</h2> >- >- [% 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 ) %] >- <h4><span class="error">No sample data and settings are available for your language. >- 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> >- <p><input type="submit" value="Import >>" /> >- </p> >- </form> >+ </td> >+ <td> >+ <label for="[% framework.fwkname %]"> >+ [% framework.fwkdescription %] >+ <em>([% framework.fwkname %])</em> >+ </label> >+ </td> >+ </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> >+ <p><input type="submit" value="Import >>" /> >+ </p> >+ </form> > [% END %] > > >@@ -241,49 +202,59 @@ function Hide(link) > </p> > [% END %] > >+ [% IF ( proposeimport ) %] >+ <h2>Web installer › Set up database</h2> >+ <p>Now we're ready to create the database tables and fill them with some default data.</p> >+ <form action="install.pl" method="post"> >+ <input type="hidden" name="step" value="3" /> >+ <input type="hidden" name="op" value="importdatastructure" /> >+ <p><input value="Continue to the next step" class="btn btn-primary" type="submit" /></p> >+ </form> >+ [% END %] > >-[% IF ( importdatastructure ) %] >- [% IF ( error ) %] >- <p>The following error occurred while importing the database structure:</p> >- <p class="error">[% error %] </p> >- <p>Please contact your system administrator</p> >- [% ELSE %] >- <h2 align="center">Success</h2> >- <ul> >- <li>Database tables created</li> >- </ul> >- <form action="install.pl"> >- <input type="hidden" name="step" value="3" /> >- <p> Click 'Next' to continue <input value="Next >>" type="submit" /></p> >- </form> >- [% END %] >-[% END %] >- >+ [% IF ( default ) %] >+ [% IF ( upgrading ) %] >+ <h2>Web installer › Update database</h2> >+ <p>We are upgrading from Koha [% dbversion %] to [% kohaversion %]</p> >+ <p><a href="install.pl?step=3&op=updatestructure" class="btn btn-primary">Update your database</a></p> >+ [% ELSE %] >+ <h2>Web installer › Install basic configuration settings</h2> >+ <p>We are ready to do some basic configuration.</p> >+ <p> <a href="install.pl?step=3&op=choosemarc" class="btn btn-primary">Continue to the next step</a> </p> >+ [% END %] >+ [% END %] > >-[% IF ( proposeimport ) %] >- <p>Now we're ready to create the database tables and fill them with some default data.</p> >- <form action="install.pl"> >- <input type="hidden" name="step" value="3" /> >- <input type="hidden" name="op" value="importdatastructure" /> >- <p> Click 'Next' to continue <input value="Next >>" type="submit" /></p> >- </form> >-[% END %] >+ [% IF ( updatestructure ) %] >+ <h2>Updating database structure</h2> >+ [% IF ( has_update_succeeds ) %] >+ <p>Update report :</p> >+ <ul> >+ [% FOREACH update_repor IN update_report %] >+ <li>[% update_repor.line |html %]</li> >+ [% END %] >+ </ul> >+ [% 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&op=updatestructure" class="button"><button>Update Database</button></a> >+ <a href="install.pl?step=3&op=updatestructure" class="button">Update your database</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&op=choosemarc" class="button"><button>Install Basic Configuration Settings</button></a> >+ <a href="install.pl?step=3&op=choosemarc" class="button">Install basic configuration settings</a> > >- [% END %] >-[% END %] >+ [% UNLESS ( has_update_errors ) %] >+ <p>Everything went okay. Update done.</p> >+ [% END %] >+ <p><a href="install.pl?step=3&op=finished" class="btn btn-primary">Continue to log in to Koha</a></p> >+ [% END # / IF updatestructure %] >+ </div> >+</div> > > [% IF ( updatestructure ) %] > <div><h2 align="center">Updating database structure</h2> >@@ -306,10 +277,8 @@ function Hide(link) > [% UNLESS ( has_update_errors ) %] > <p>Everything went OK, update done.</p> > [% END %] >-<a href="install.pl?step=3&op=choosemarc" class="button"><button>Back to Installation</button></a> >+<a href="install.pl?step=3&op=finished" class="button">Continue to log in to Koha</a> > </div> > [% END %] > >-</div> >-</body> >-</html> >+[% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >index b295fc9..9754f74 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep1.tt >@@ -1,81 +1,38 @@ >-<!--Includes for creating library--> > [% INCLUDE 'doc-head-open.inc' %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> > [% INCLUDE 'installer-doc-head-close.inc' %] > [% INCLUDE 'datatables.inc' %] > >-[% IF (libraries && libraries.count > 1) %] >- <meta http-equiv="refresh" content="0; url=/cgi-bin/koha/installer/onboarding.pl?step=2"> >- >-[% ELSIF (op == "add_validate_library") %] >- <head> >- <title>Welcome › to › Koha</title> >- </head> >- >- <!--Header for the koha onboarding tool--> >- <div> >- <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1> >- </div> >- >-<!--New Library created--> >- [% IF message == "success_on_insert" %] >- <form name="createlibrary" method="post" action="onboarding.pl" > >- <input type="hidden" name="step" value="2"/> >- <h1 align="left"> New library</h1> >- <div> >- <p> Success: library created! >- </p> >- <p> To add another library and for more settings, <br> >- go to:<br> >- More -> Administration -> Libraries and groups<br> >- </p> >- </div> >- Next up: >- <input type="submit" name="start" value="Minimal patron category setup"/> >- </form> >- >- [%ELSE %] >- <form name="retrylibrary" method="post" action="onboarding.pl"> >- <input type="hidden" name="step" value="1"/> >- <h1 align="left">Failed </h1> >- <div> >- <p> Library was not successfully created</br> >- Please try again or contact your system administrator. </p> >- </div> >- <input type="submit" value="Try again"/> >- </form> >- [%END%] >- >-[% ELSE %] >- <head> >- <title>Welcome › to › Koha</title> >- </head> >- >- <!--Header for the koha onboarding tool--> >- <div> >- <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1> >- </div> >- >-<!--Create a library screen 1--> >- <form name="LibraryCreation" method="post" action="onboarding.pl"> >- <fieldset class="rows" > >- <h2>Create a library</h2> >- <input type="hidden" name="step" value="1"/> >- <input type="hidden" name="op" value="add_validate_library"/> >- <ol> >- <li> >- <label for="branchcode" class="required">Library code: </label> >- <input type="text" pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% library.branchcode |html %]" class="required" required="required" /> >- <span class="required">Required</span> >- </li> >- <li> >- <label for="branchname" class="required">Name: </label> >- <input type="text" name="branchname" id="branchname" title="Please enter the name of your institution" size="42" value="[% library.branchname |html %]" class=" required" required="required" style="width:200px;"> >- <span class="required">Required</span> >- </li> >- </ol> >- <br> >- <input type="submit" class="action" value="Submit"/> >- </fieldset> >- </form> >-[% END %] >+<head><title>Welcome › to › Koha</title></head> >+ >+<div> >+ <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1> >+</div> >+ >+[% INCLUDE 'onboarding_messages.inc' %] >+ >+<form name="LibraryCreation" method="post" action="onboarding.pl"> >+ <fieldset class="rows" > >+ <h2>Create a library</h2> >+ <input type="hidden" name="step" value="1"/> >+ <input type="hidden" name="op" value="add_validate_library"/> >+ <ol> >+ <li> >+ <label for="branchcode" class="required">Library code: </label> >+ <input type="text" pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" name="branchcode" id="branchcode" size="10" maxlength="10" value="" class="required" required="required" /> >+ <span class="required">Required</span> >+ </li> >+ <li> >+ <label for="branchname" class="required">Name: </label> >+ <input type="text" name="branchname" id="branchname" title="Please enter the name of your institution" size="42" value="" class="required" required="required" style="width:200px;"> >+ <span class="required">Required</span> >+ </li> >+ </ol> >+ <p> >+ To add another library and for more settings, <br> >+ go to:<br> >+ More -> Administration -> Libraries and groups<br> >+ </p> >+ <input type="submit" class="action" value="Submit"/> >+ </fieldset> >+</form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >index f0e90aa..673cbb9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep2.tt >@@ -2,163 +2,113 @@ > [% USE KohaDates %] > [% USE Price %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> Add a patron category</title> >+<title>Koha › Web installer › Add a patron category</title> >+[% IF (categories && categories.count > 1 ) >+ # This if statement checks if the categories variable handed to this template >+ # by onboarding.pl has data in it. If the categories variable does have data >+ # in it this means that the user has previously imported sample patron category >+ # data and so we do not need to show them the create patron category screen 1, >+ #instead we can display a screen with ubtton redirecting the user to step 3 %] >+ <meta http-equiv="refresh" content="0; url=/cgi-bin/koha/installer/onboarding.pl?step=3"> >+[% END %] > [% INCLUDE 'installer-doc-head-close.inc' %] >-[% INCLUDE 'calendar.inc' %] > [% INCLUDE 'js_includes.inc' %] >-[% INCLUDE 'datatables.inc' %] >-<script type="text/javascript"> >- var MSG_CATEGORYCODE_CHARS=(_("Please only enter letters into this field.")); >- var MSG_ONE_ENROLLMENTPERIOD =(_("Please choose an enrollment period in months OR by date.")); >- var MSG_ONLY_ONE_ENROLLMENTPERIOD=(_("Please only choose one enrolment period.")); >- >-jQuery.validator.addMethod( "enrollment_period", function(){ >- enrolmentperiod = $("#enrolmentperiod").val(); >- enrolmentperioddate = $("#enrolmentperioddate").val(); >- if (( $("#enrolmentperiod").val() == "" && $("#enrolmentperioddate").val() == "") || ($("#enrolmentperiod").val() !== "" && $("#enrolmentperioddate").val() !== "")) { >- return false; >- } else { >- return true; >- } >- }, MSG_ONE_ENROLLMENTPERIOD >-); >-</script> >-<script type="text/javascript" src="[% themelang %]/js/categories.js"></script> >+[% INCLUDE 'validator-strings.inc' %] >+[% INCLUDE 'installer-strings.inc' %] >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/onboarding.js"></script> > </head> > >-[% IF (categories && categories.count > 1 ) %] <!--This if statement checks if the categories variable handed to this template by onboarding.pl has data in it. If the categories variable does have data in it this means that the user has previously imported sample patron category data and so we do not need to show them the create patron category screen 1, instead we can display a screen with ubtton redirecting the user to step 3--> >+<div> >+ <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1> >+</div> > >- >- <meta http-equiv="refresh" content="0; url=/cgi-bin/koha/installer/onboarding.pl?step=3"> >- >-[% ELSIF (op == "add_validate_category") %] >-<!--else if the user has not previously imported sample patron categories check if the user has pressed the button name="add_validate" in the create patron category screen 1, and if they have pressed that button then display the below screen with a button to redirect the user to step 3--> >- >- <div> <!-- Header that appears at the top of every screen in the koha onboarding tool--> >- <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1> >- </div> >- >- [% IF message != "error_on_insert" %] >- <form name="createcat" method="post" action="onboarding.pl"> >- <input type="hidden" name="step" value="3"/> >- <h1 align="left"> New patron category</h1> >- <div> >- <p> Success: patron category created! </p> >- <p> To add another patron category and for more settings<br> >- go to:<br> >- More -> Administration -> Patron categories<br> >- </div> >- Next up:<br> >- <input type="submit" name="start" value="Add a patron"><!-- When the user clicks on this button then redirect them to step 3 of the onboarding tool--> >- </form> >- [% ELSE %] >- <form name="retrypatcat" method="post" action="onboarding.pl"> >- Message is [% message %] >+[% INCLUDE 'onboarding_messages.inc' %] >+<h1 align="left"> Create a new patron category</h1> >+<p> The patron category you create in this form is going to be the one which the new administrator patron account will have.</p> >+ <form id="category_form" method="post" action="onboarding.pl"> >+ <fieldset class="rows"> > <input type="hidden" name="step" value="2"/> >- <h1 align="left">Failed</h1> >- <div>Patron category was not successfully created.</br> >- Please try again or contact your system administrator.</p> >- </div> >- <input type="submit" value="Try again"/> >- </form> >- [% END %] >- >- >-[% ELSE %] <!--Else display create patron category screen 1 where the user can input values to create their first patron category--> >- <div> <!-- Header that appears at the top of every screen in the koha onboarding tool--> >- <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1> >- </div> >- >- <h1 align="left"> Create a new patron category</h1> >- <p> The patron category you create in this form is going to be the one which the new administrator patron account will have.</p> >- <form id="category_form" method="post" action="onboarding.pl"> >- <fieldset class="rows"> >- <input type="hidden" name="step" value="2"/> >- <input type="hidden" name="op" value="add_validate_category" /> >- <ol> >- <li> >- <label for="categorycode" class="required">Category code: </label> >- <input type="text" pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" id="categorycode" name="categorycode" value="[% category.categorycode |html %]" size="10" maxlength="10" class="required" required="required" /> >- <span class="required">Required</span> >- </li> >- >- <li> >- <label for="description" class="required">Description: </label> >- <input type="text" name="description" title="Please enter a description of the category" size="40" maxlength="80" class="required" required="required" value="[% category.description |html%]" /> >- <span class="required">Required</span> >- </li> >- >- <li> >- <label for="overduenoticerequired">Overdue notice required: </label> >- <select name="overduenoticerequired" value="overduenoticerequired"> >- [% IF category.overduenoticerequired %] >- <option value="0">No</option> >- <option value="1" selected="selected">Yes</option> >- [% ELSE %] >- <option value="0" selected="selected">No</option> >- <option value="1">Yes</option> >- [% END %] >- </select> >- </li> >- >- <li> >- <label for="category_type" class="required">Category type: </label> >- <select name="category_type" value="category_type" class='required' required='required'> >- [% IF category and category.category_type == 'S' %] >- <option value="S" selected="selected">Staff</option> >- [% ELSE %] >- <option value="S">Staff</option> >- [% END %] >- </select> >- <span class="required">Required</span> >- </li> >- >- <li> >- <label for="default_privacy">Default privacy: </label> >- <select value="default_privacy" name="default_privacy" required="required"> >- [% SET default_privacy = 'default' %] >- >- [% IF category %] >- [% SET default_privacy = category.default_privacy %] >- [% END %] >- >- [% SWITCH default_privacy %] >- [% CASE 'forever' %] >- <option value="default">Default</option> >- <option value="never">Never</option> >- <option value="forever" selected="selected">Forever</option> >- [% CASE 'never' %] >- <option value="default">Default</option> >- <option value="never" selected="selected">Never</option> >- <option value="forever">Forever</option> >- [% CASE %] >- <option value="default" selected="selected">Default</option> >- <option value="never">Never</option> >- <option value="forever">Forever</option> >- [% END %] >- </select> >- <p>Controls how long a patrons checkout history is kept for new patrons of this category. "Never" anonymizes checkouts on return, and "Forever" keeps a patron's checkout history indefinitely. When set to "Default", the amount of history kept is controlled by the cronjob <i>batch_anonymise.pl</i> which should be set up by your system administrator.</p> >- </li> >- </ol> >- <span class="label">Enrolment period: </span> >- </br> >- <fieldset> >- <legend>Choose one</legend> >- <ol> >- <li> >- <label for="enrolmentperiod" style="width:6em;">In months: </label> >- <input type="number" class="enrolmentperiod" name="enrolmentperiod" id="enrolmentperiod" size="3" maxlength="3" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" /> months >- </li> >- <li> >- <label for="enrolmentperioddate" style="width:6em;">Until date: </label> >- <input type="text" class="enrolmentperioddate datepicker" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" /> >- </li> >- </ol> >- </fieldset> >- <br> >- <input type="submit" class="action" value="Submit" /> >- </fieldset> >- </form> >-[% END %] >+ <input type="hidden" name="op" value="add_validate_category" /> >+ <ol> >+ <li> >+ <label for="categorycode" class="required">Category code: </label> >+ <input type="text" pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" id="categorycode" name="categorycode" value="[% category.categorycode |html %]" size="10" maxlength="10" class="required" required="required" /> >+ <span class="required">Required</span> >+ </li> >+ >+ <li> >+ <label for="description" class="required">Description: </label> >+ <input type="text" name="description" title="Please enter a description of the category" size="40" maxlength="80" class="required" required="required" value="[% category.description |html%]" /> >+ <span class="required">Required</span> >+ </li> >+ >+ <li> >+ <label for="overduenoticerequired">Overdue notice required: </label> >+ <select name="overduenoticerequired" value="overduenoticerequired"> >+ [% IF category.overduenoticerequired %] >+ <option value="0">No</option> >+ <option value="1" selected="selected">Yes</option> >+ [% ELSE %] >+ <option value="0" selected="selected">No</option> >+ <option value="1">Yes</option> >+ [% END %] >+ </select> >+ </li> >+ >+ <li> >+ <label for="category_type" class="required">Category type: </label> >+ Staff >+ </li> >+ >+ <li> >+ <label for="default_privacy">Default privacy: </label> >+ <select value="default_privacy" name="default_privacy" required="required"> >+ [% SET default_privacy = 'default' %] >+ >+ [% IF category %] >+ [% SET default_privacy = category.default_privacy %] >+ [% END %] >+ >+ [% SWITCH default_privacy %] >+ [% CASE 'forever' %] >+ <option value="default">Default</option> >+ <option value="never">Never</option> >+ <option value="forever" selected="selected">Forever</option> >+ [% CASE 'never' %] >+ <option value="default">Default</option> >+ <option value="never" selected="selected">Never</option> >+ <option value="forever">Forever</option> >+ [% CASE %] >+ <option value="default" selected="selected">Default</option> >+ <option value="never">Never</option> >+ <option value="forever">Forever</option> >+ [% END %] >+ </select> >+ <p>Controls how long a patrons checkout history is kept for new patrons of this category. "Never" anonymizes checkouts on return, and "Forever" keeps a patron's checkout history indefinitely. When set to "Default", the amount of history kept is controlled by the cronjob <i>batch_anonymise.pl</i> which should be set up by your system administrator.</p> >+ </li> >+ </ol> >+ <span class="label">Enrolment period: </span> >+ </br> >+ <fieldset> >+ <legend>Choose one</legend> >+ <ol> >+ <li> >+ <label for="enrolmentperiod" style="width:6em;">In months: </label> >+ <input type="number" class="enrolmentperiod" name="enrolmentperiod" id="enrolmentperiod" min="0" size="3" maxlength="3" value="[% IF category.enrolmentperiod %][% category.enrolmentperiod %][% END %]" /> months >+ </li> >+ <li> >+ <label for="enrolmentperioddate" style="width:6em;">Until date: </label> >+ <input type="text" class="enrolmentperioddate datepicker" name="enrolmentperioddate" id="enrolmentperioddate" value="[% category.enrolmentperioddate | $KohaDates %]" /> >+ </li> >+ </ol> >+ </fieldset> >+ <p> Success: patron category created! </p> >+ <p> To add another patron category and for more settings<br> >+ go to:<br> >+ More -> Administration -> Patron categories<br> >+ >+ <input type="submit" class="action" value="Submit" /> >+</fieldset> >+</form> > > [% INCLUDE 'intranet-bottom.inc' %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >index de2e595..1f04a98 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep3.tt >@@ -1,196 +1,102 @@ > <!--Includes for creating patron--> >-[% USE Koha %] >-[% USE KohaDates %] >-[% USE Price %] > [% INCLUDE 'doc-head-open.inc' %] >-[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END%] > [% INCLUDE 'installer-doc-head-close.inc' %] >-[% INCLUDE 'calendar.inc' %] >-[% INCLUDE 'datatables.inc' %] > [% INCLUDE 'js_includes.inc' %] >+[% INCLUDE 'validator-strings.inc' %] >+[% INCLUDE 'installer-strings.inc' %] > >-<head> >-<title>Create Koha administrator patron</title> >-<!--jQuery scripts for creating patron--> >-<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script> >-<script type="text/javascript"> >- var MSG_PASSWORD_MISMATCH=(_("The entered passwords do not match, please rewrite them")); >- jQuery.validator.addMethod( "password_match", function(value,element){ >- var password = document.getElementById('password').value >- var confirmpassword = document.getElementById('password2').value >- if ( password != confirmpassword ){ >- return false; >- } >- else{ >- return true >- } >- }, MSG_PASSWORD_MISMATCH >-); >- >-$(document).ready(function(){ >- $("#Submit").click(function(){ >- $("#createpatron").validate({ >- rules: { >- surname: { >- required: true, >- }, >- firstname: { >- required: true, >- }, >- cardnumber: { >- required: true, >- }, >- password: { >- password_match:true >- } >- }, >- messages: { >- password: { >- required: MSG_PASSWORD_MISMATCH >- }, >- } >- }); >- }); >-}); >-</script> > </head> > >-<div> >- <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1> >-</div> >+<body id="installer" class="installer"> >+[% INCLUDE 'onboarding_messages.inc' %] >+ >+<h1 align="left"> Create koha administrator patron</h1> >+<p> >+Now we will create a patron with superlibrarian permissions. Login with this to access Koha as a staff member will all permissions. >+</p> >+<form name="createpatron" id="createpatron" method="post" action="onboarding.pl"> >+ <fieldset class="rows"> >+ <input type="hidden" name="step" value="3"/> >+ <input type="hidden" name="op" value="add_validate_patron" /> >+ <legend id="library_management_lgd">Library management</legend> >+ <ol> >+ <h3>Patron identity</h3> >+ <li> >+ <label for="surname" class="required">Surname: </label> >+ <input type="text" id="surname" name="surname" title="Please only enter letters in the surname field" value="[% surname |html %]" class="required" required="required" /> >+ <span class="required">Required</span> >+ </li> >+ <li> >+ <label for="firstname" class="required">First name: </label> >+ <input type="text" name="firstname" title="Please only enter letters in the first name field" id="firstname" size="20" value="[% firstname |html %]" class="required" required="required"> >+ <span class="required">Required</span> >+ </li> >+ </ol> > >+ <ol> >+ <li> >+ <label for="cardnumber" class="required">Card number: </label> >+ [% IF patrons && patrons > 1 %] >+ <input type="text" id="cardnumber" title="Please enter a cardnumber" class="noEnterSubmit valid" name="cardnumber" value="[% newcardnumber | html %]" class="required" required="required"> >+ [% ELSE %] >+ <input type="text" id="cardnumber" title="Please enter a cardnumber" name="cardnumber" value="[% cardnumber | html %]" class="required" required="required"> >+ [% END %] >+ <span class="required">Required</span> >+ </li> >+ <li> > >-[% IF (nok) %] >- <form name="errors" method="post" action="onboarding.pl"> >- <input type="hidden" name="step" value="3"/> >- <h1 align="left">There was an error</h1> >- <p>Try again </p> >- <div> >- <ul> >- [% IF errorloginexists %] >- <li id="ERROR_login_exist">Username/password already exists.</li> >- [% END %] >- [% IF errorcardnumberexists %] >- <li id="ERROR_cardnumber">Cardnumber already in use.</li> >- [% END %] >- [% IF errorcardnumberlength %] >- <li id="ERROR_cardnumber">Cardnumber length is incorrect</li> >- [% END %] >- [% IF errorshortpassword %] >- <li id="ERROR_short_password">Password length is incorrect, must be at least [% minPasswordLength %] characters long.</li> >- [% END %] >- [% IF errorpasswordmismatch %] >- <li id="ERROR_password_mismatch">Passwords do not match.</li> >- [% END %] >- </ul> >+ <!--require a foreach loop to get all the values for the library that the user has either imported (in web installer) or created in the first step of this onboarding tool--> >+ <label for="libraries" class="required"> Library: </label> >+ <select name="libraries" size="1" id="libraries"> > >- </div> >- <input type="submit" name="step" value="Try again"/> >- </form> >+ [% FOREACH library IN libraries %] >+ <option name="libraries" value="[% library.branchcode %]"> [% library.branchname %] >+ [% END %] > >+ </select> >+ <span class="required"> Required</span> >+ </li> >+ <li> >+ <label for="categorycode_entry" class="required"> Patron category</label> >+ <select id="categorycode_entry" name="categorycode_entry" onchange="update_category_code(this);"> >+ [% FOREACH category IN categories %] >+ <option name="categorycode_entry" value = "[% category.categorycode %]">[%category.description %]</option> >+ [% END %] >+ </select> >+ <span class="required">Required</span><br><br> >+ <b>Note:</b> If you installed sample patron categories please select the "Staff" option in the patron categories dropdown box. >+ </li> >+ </ol> > >-<!--Create a patron screen 2--> >-[% ELSIF op == 'add_validate' %] >- <!--New patron created--> >- <form name="patrondone" method="post" action="onboarding.pl"> >- <input type="hidden" name="step" value="4"/> >- <h1 align="left"> Koha administrator patron </h1> >- <div> >- <p> Success: administrator patron created!</p> >- <p> To create another patron, go to Patrons -> New Patron. <br> >- More -> Set Permissions in a user page to gain superlibrarian permissions. >- </div> >- Next up: >- <input type="submit" name="start" value="Minimal item type setup"/> >- </form> >-[% ELSE %] >-<!--Create a patron screen 1--> >- <h1 align="left"> Create koha administrator patron</h1> >+ <ol> >+ <h3> Koha administrator patron permissions</h3> >+ <li> >+ <label> superlibrarian</label> >+ </li> >+ </ol> >+ <ol> >+ <h3>OPAC/Staff Login</h3> >+ <li> >+ <label for="userid" class="required">Username: </label> >+ <input type="text" name="userid" id ="userid" size="20" title="Please only enter a username of letters and numbers" value="[% userid |html %]" class="required" required="required" /> >+ <span class="required">Required</span> >+ </li> >+ <li> >+ <label for="passwordlabel" class="required">Password: </label> >+ <input type="password" name="password" id="password" size="20" value="[% member.password |html %]" class="required" required="required"> >+ <span class="required">Required</span> >+ </li> >+ <li> >+ <label for="password2" class="required">Confirm password: </label> >+ <input type="password" id="password2" name="password2" size="20" value="" class="required" required="required"> >+ <span class="required">Required</span> >+ </li> >+ </ol> > <p> >- Now we will create a patron with superlibrarian permissions. Login with this to access Koha as a staff member will all permissions. >+ To create another patron, go to Patrons -> New Patron. <br> >+ More -> Set Permissions in a user page to gain superlibrarian permissions. > </p> >- <form name="createpatron" id="createpatron" method="post" action="onboarding.pl"> >- <fieldset class="rows"> >- <input type="hidden" name="step" value="3"/> >- <input type="hidden" name="op" value="add_validate" /> >- <legend id="library_management_lgd">Library management</legend> >- <ol> >- <h3>Patron identity</h3> >- <li> >- <label for="surname" class="required">Surname: </label> >- <input type="text" id="surname" name="surname" title="Please only enter letters in the surname field" value="[% surname |html %]" class="required" required="required" /> >- <span class="required">Required</span> >- </li> >- <li> >- <label for="firstname" class="required">First name: </label> >- <input type="text" name="firstname" title="Please only enter letters in the first name field" id="firstname" size="20" value="[% firstname |html %]" class="required" required="required"> >- <span class="required">Required</span> >- </li> >- </ol> >- >- <ol> >- <li> >- <label for="cardnumber" class="required">Card number: </label> >- [% IF patrons && patrons > 1 %] >- <input type="text" id="cardnumber" title="Please enter a cardnumber" class="noEnterSubmit valid" name="cardnumber" value="[% newcardnumber | html %]" class="required" required="required"> >- [% ELSE %] >- <input type="text" id="cardnumber" title="Please enter a cardnumber" name="cardnumber" value="[% cardnumber | html %]" class="required" required="required"> >- [% END %] >- <span class="required">Required</span> >- </li> >- <li> >- >- <!--require a foreach loop to get all the values for the library that the user has either imported (in web installer) or created in the first step of this onboarding tool--> >- <label for="libraries" class="required"> Library: </label> >- <select name="libraries" size="1" id="libraries"> >- >- [% FOREACH library IN libraries %] >- <option name="libraries" value="[% library.branchcode %]"> [% library.branchname %] >- [% END %] >- >- </select> >- <span class="required"> Required</span> >- </li> >- <li> >- <label for="categorycode_entry" class="required"> Patron category</label> >- <select id="categorycode_entry" name="categorycode_entry" onchange="update_category_code(this);"> >- [% FOREACH category IN categories %] >- <option name="categorycode_entry" value = "[% category.categorycode %]">[%category.description %]</option> >- [% END %] >- </select> >- <span class="required">Required</span><br><br> >- <b>Note:</b> If you installed sample patron categories please select the "Staff" option in the patron categories dropdown box. >- </li> >- </ol> >- >- <ol> >- <h3> Koha administrator patron permissions</h3> >- <input type="hidden" name="newflags" value="1"/> >- <li> >- <input type="hidden" class="flag parent" id="flag-0" name="flag" value="superlibrarian"/> >- <label name="permissioncode" for="flag-0"> superlibrarian</label> >- </li> >- </ol> >- <ol> >- <h3>OPAC/Staff Login</h3> >- <li> >- <input type="hidden" name="BorrowerMandatoryField" value = "[% BorrowerMandatoryField %]" /> >- <label for="userid" class="required">Username: </label> >- <input type="text" name="userid" id ="userid" size="20" title="Please only enter a username of letters and numbers" value="[% userid |html %]" class="required" required="required" /> >- <span class="required">Required</span> >- </li> >- <li> >- <label for="passwordlabel" class="required">Password: </label> >- <input type="password" name="password" id="password" size="20" value="[% member.password |html %]" class="required" required="required"> >- <span class="required">Required</span> >- </li> >- <li> >- <label for="password2" class="required">Confirm password: </label> >- <input type="password" id="password2" name="password2" size="20" value="" class="required" required="required"> >- <span class="required">Required</span> >- </li> >- </ol> >- </fieldset><br> >- <input type="submit" id="Submit" class="action" value="Submit"/> >- </form> >-[% END %] >+ </fieldset> >+ <br> >+ <input type="submit" id="Submit" class="action" value="Submit"/> >+</form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >index 6176fb4..4a32f9d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep4.tt >@@ -1,67 +1,39 @@ > <!-- includes for creating item type--> > [% INCLUDE 'doc-head-open.inc' %] >-[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END%] > [% INCLUDE 'installer-doc-head-close.inc' %] >-<head> >- <title>Create item type</title> >+[% INCLUDE 'validator-strings.inc' %] >+[% INCLUDE 'installer-strings.inc' %] >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/onboarding.js"></script> > </head> >-<div> >- <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1> >-</div> > >-[% IF (itemtypes && itemtypes.count >1) %] >+[% INCLUDE 'onboarding_messages.inc' %] > >- <meta http-equiv="refresh" content="0; url=/cgi-bin/koha/installer/onboarding.pl?step=5"> >+<!--Create a item type screen 1--> >+<h1 align="center"> Create a new Item type </h1> >+<p> Item types are used to group related items. Examples of item types are books, cds, and DVDs. <br><br> When adding to your institutions catalogue you will create an item of a particular item type. <br><br> Importantly item types are what you apply circulation rules to. Circulation rules govern how your institution will lend its items, for example a circulation rule applied to the DVD item type may enforce a payment of $1.00 for borrowing any DVD.</p> >+<form name="createitemform" method="post" action="onboarding.pl"> >+ <fieldset class="rows"> >+ <input type="hidden" name="step" value="4"/> >+ <input type="hidden" name="op" value="add_validate_itemtype" /> >+ <ol> >+ <li> >+ <label for="itemtype" class="required">Item type code: </label> >+ <input type="text" name="itemtype" pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" id="itemtype" size="10" maxlength="10" class="required" required="required" value="[% itemtype.itemtype |html %]" /> >+ <span class="required">Required</span> >+ </li> > >-[% ELSIF op == "add_validate" %] >- [% IF message != "error_on_insert" %] >- <form name="createitemtype" method="post" action="onboarding.pl"> >- <input type="hidden" name="step" value="5"/> >- <h1 align="left"> New Item type </h1> >- <div> >- <p> Success: New item type created!</p> >- <p> To create another item type later and for more settings <br> >- go to: <br> >- More -> Administration -> Item types <br> >- </div> >- Next up: >- <input type="submit" value="Add a circulation rule"/> >- </form> >- [% ELSE %] >- <form name="retryitem" method="post" action="onboarding.pl"> >- <input type="hidden" name="step" value="4"/> >- <h1 align="left">Failed </h1> >- <div> >- <p>Item type was not successfully created. </br> >- Please try again or contact your system administrator. >- </p> >- </div> >- </form> >- <!--Implement a if statement to check if the item type was successfully created or not --> >- [% END %] >-[% ELSE %] >- <!--Create a item type screen 1--> >- <h1 align="center"> Create a new Item type </h1> >- <p> Item types are used to group related items. Examples of item types are books, cds, and DVDs. <br><br> When adding to your institutions catalogue you will create an item of a particular item type. <br><br> Importantly item types are what you apply circulation rules to. Circulation rules govern how your institution will lend its items, for example a circulation rule applied to the DVD item type may enforce a payment of $1.00 for borrowing any DVD.</p> >- <form name="createitemform" method="post" action="onboarding.pl"> >- <fieldset class="rows"> >- <input type="hidden" name="step" value="4"/> >- <input type="hidden" name="op" value="add_validate" /> >- <ol> >- <li> >- <label for="itemtype" class="required">Item type code: </label> >- <input type="text" name="itemtype" pattern="[0-9A-Za-z]{1,10}" title="Please enter up to 10 letters and/or numbers" id="itemtype" size="10" maxlength="10" class="required" required="required" value="[% itemtype.itemtype |html %]" /> >- <span class="required">Required</span> >- </li> >+ <li> >+ <label for="description" class="required">Description: </label> >+ <input type="text" name="description" id="description" title="Please only enter letters and/or numbers into this item type description" size="42" value="[% itemtype.description |html %]" class="required" required="required"> >+ <span class="required">Required</span> >+ </li> >+ </ol> >+ <br> >+ <p> To create another item type later and for more settings <br> >+ go to: <br> >+ More -> Administration -> Item types <br> >+ </p> > >- <li> >- <label for="description" class="required">Description: </label> >- <input type="text" name="description" id="description" title="Please only enter letters and/or numbers into this item type description" size="42" value="[% itemtype.description |html %]" class="required" required="required"> >- <span class="required">Required</span> >- </li> >- </ol> >- <br> >- <input type="submit" class="action" value="Submit"/> >- </fieldset> >- </form> >-[% END %] >+ <input type="submit" class="action" value="Submit"/> >+</fieldset> >+</form> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >index 81ba89c..8e3519b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt >@@ -1,127 +1,116 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Create Circulation rule</title> >-[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END %] > [% INCLUDE 'installer-doc-head-close.inc' %] >+[% INCLUDE 'validator-strings.inc' %] >+[% INCLUDE 'installer-strings.inc' %] >+<script type="text/javascript" src="[% interface %]/[% theme %]/js/onboarding.js"></script> >+</head> > >-<div> >- <h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif"/> Welcome to Koha</h1> >-</div> >+<body id="installer" class="installer"> > >-[% IF (finish) %] >+[% INCLUDE 'onboarding_messages.inc' %] >+ >+[% IF all_done %] > <h1>Congratulations you have finished and ready to use Koha</h1> > <a href="/cgi-bin/koha/mainpage.pl">Start using Koha</a> >- >-[% END %] >- >-<!--Create a circulation rule screen 2--> >-[% IF op == "add_validate" %] >- <!--New circulation rule created--> >- <form name="finish" method="post" action="onboarding.pl"> >- <input type="hidden" name="op" value="finish" /> >- <h1 align="left"> New circulation rule </h1> >- <div> >- <p> Success: circulation rule created!</p> >- <p> To create circulation rule, go to <br> >- More -> Administration -> Circulation and Fine Rules >- </div> >- Next up: >- <input type="submit" name="op" value="Finish"/> >- </form> > [% ELSE %] >-<!--Create a circulation rule screen 1--> >- <h1 align="left"> Create a new circulation rule </h1> >- <form name="createcirculationrule" method="post" action="onboarding.pl"> >- <fieldset class="rows"> >- <input type="hidden" name="step" value="5"/> >- <input type="hidden" name="op" value="add_validate" /> >- <ol> >- <li> >- <label for="branch" class="required"> Library branch</label> >- <select name="branch" id="branchname" required="required"> >- <option value""> Choose</option> >- <option value="*" selected="selected">All</option> >- [% FOREACH library IN libraries %] >- <option id="branch" value="[% library.branchcode %]"> [% library.branchname %]</option> >- [% END %] >- </select> >- <span class="required">Required</span> >- </li> >- <li> >- <label for="categorycode" class="required">Patron category: </label> >- <select name="categorycode" id="categorycodeselection" required="required" onchange = "update_categorycode(this);"> >- <option value=""> Choose</option> >- <option value="*" selected="selected">All</option> >- [% FOREACH category IN categories %] >- <option id="categorycode" value = "[% category.categorycode %]"> [%category.description %]</option> >- [%END%] >- </select> >- <span class="required">Required</span> >- </li> >+ <h1 align="left"> Create a new circulation rule </h1> >+ <form name="createcirculationrule" method="post" action="onboarding.pl"> >+ <fieldset class="rows"> >+ <input type="hidden" name="step" value="5"/> >+ <input type="hidden" name="op" value="add_validate_circ_rule" /> >+ <ol> >+ <li> >+ <label for="branch" class="required"> Library branch</label> >+ <select name="branch" id="branchname" required="required"> >+ <option value""> Choose</option> >+ <option value="*" selected="selected">All</option> >+ [% FOREACH library IN libraries %] >+ <option id="branch" value="[% library.branchcode %]"> [% library.branchname %]</option> >+ [% END %] >+ </select> >+ <span class="required">Required</span> >+ </li> >+ <li> >+ <label for="categorycode" class="required">Patron category: </label> >+ <select name="categorycode" id="categorycodeselection" required="required" onchange = "update_categorycode(this);"> >+ <option value=""> Choose</option> >+ <option value="*" selected="selected">All</option> >+ [% FOREACH category IN categories %] >+ <option id="categorycode" value = "[% category.categorycode %]"> [%category.description %]</option> >+ [%END%] >+ </select> >+ <span class="required">Required</span> >+ </li> >+ >+ <li> >+ <label for="itemtype"> Item type: </label> >+ <select id="itemtype" name="itemtype" required="required"> >+ <option value""> Choose </option> >+ <option value="*" selected="selected">All</option> >+ [% FOREACH item IN itemtypes %] >+ <option name="itemtype" value = "[% item.itemtype %]"> [% item.itemtype %] >+ [%END%] >+ </select> >+ <span class="required"> Required</span> >+ </li> >+ <li> >+ <label for="maxissueqty" class="required">Current checkouts allowed: </label> >+ <input type="number" min="0" name="maxissueqty" title="Please only enter numbers" id="maxissueqty" size="10" value="50" class="required" required="required" /> >+ <span class="required">Required</span> >+ </li> > >- <li> >- <label for="itemtype"> Item type: </label> >- <select id="itemtype" name="itemtype" required="required"> >- <option value""> Choose </option> >- <option value="*" selected="selected">All</option> >- [% FOREACH item IN itemtypes %] >- <option name="itemtype" value = "[% item.itemtype %]"> [% item.itemtype %] >- [%END%] >- </select> >- <span class="required"> Required</span> >- </li> >- <li> >- <label for="maxissueqty" class="required">Current checkouts allowed: </label> >- <input type="number" min="0" name="maxissueqty" title="Please only enter numbers" id="maxissueqty" size="10" max="10" value="" class="required" required="required" /> >- <span class="required">Required</span> >- </li> >+ <li> >+ <label for="issuelength" class="required">Loan period: </label> >+ <input type="number" min="0" name="issuelength" title="Please only enter numbers" id="issuelength" size="10" value="14" class="required" required="required" /> >+ <span class="required">Required</span> >+ </li> >+ <li> >+ <label for="lengthunit">Units: </label> >+ <select name="lengthunit" id="lengthunit" required="required"> >+ <option value=""> Choose </option> >+ [% SET units = 'days' %] >+ [% IF category %] >+ [% SET default_privacy = category.default_privacy %] >+ [% END %] > >- <li> >- <label for="issuelength" class="required">Loan period: </label> >- <input type="number" min="0" name="issuelength" title="Please only enter numbers" id="issuelength" size="10" max="10" value="" class="required" required="required" /> >- <span class="required">Required</span> >- </li> >- <li> >- <label for="lengthunit">Units: </label> >- <select name="lengthunit" id="lengthunit" required="required"> >- <option value=""> Choose </option> >- [% SET units = 'days' %] >- [% IF category %] >- [% SET default_privacy = category.default_privacy %] >- [% END %] >+ [% SWITCH units %] >+ [% CASE 'days' %] >+ <option value="days" selected="selected">Days</option> >+ <option value="hours">Hours</option> >+ [% CASE 'hours' %] >+ <option value="days">Days</option> >+ <option value="hours" selected="selected">Hours</option> >+ [% END %] >+ </select> >+ </li> >+ <li> >+ <label for="renewalsallowed" class="required">Renewals allowed: </label> >+ <input type="number" min="0" name="renewalsallowed" title="Please only enter numbers" id="renewalsallowed" size="10" max="10" value="10" class="required" required="required" /> >+ <span class="required">Required</span> >+ </li> > >- [% SWITCH units %] >- [% CASE 'days' %] >- <option value="days" selected="selected">Days</option> >- <option value="hours">Hours</option> >- [% CASE 'hours' %] >- <option value="days">Days</option> >- <option value="hours" selected="selected">Hours</option> >- [% END %] >- </select> >- </li> >- <li> >- <label for="renewalsallowed" class="required">Renewals allowed: </label> >- <input type="number" min="0" name="renewalsallowed" title="Please only enter numbers" id="renewalsallowed" size="10" max="10" value="" class="required" required="required" /> >- <span class="required">Required</span> >- </li> >+ <li> >+ <label for="renewalperiod" class="required">Renewals period: </label> >+ <input type="number" min="0" name="renewalperiod" title="Please only enter numbers" id="renewalperiod" size="10" value="14" class="required" required="required" /> >+ <span class="required">Required</span> >+ </li> > >- <li> >- <label for="renewalperiod" class="required">Renewals period: </label> >- <input type="number" min="0" name="renewalperiod" title="Please only enter numbers" id="renewalperiod" size="10" max="10" value="" class="required" required="required" /> >- <span class="required">Required</span> >- </li> >+ <li> >+ <label for="onshelfholds">On shelf holds allowed: </label> >+ <select name="onshelfholds" id="onshelfholds" required="required"> >+ <option value="">Choose</option> >+ <option value="1" selected="selected">Yes</option> >+ <option value="0">If any unavailable</option> >+ <option value="2">If all unavailable</option> >+ </select> >+ </li> >+ </ol> >+ <p> To create circulation rule, go to <br> >+ More -> Administration -> Circulation and Fine Rules >+ </p> > >- <li> >- <label for="onshelfholds">On shelf holds allowed: </label> >- <select name="onshelfholds" id="onshelfholds" required="required"> >- <option value="">Choose</option> >- <option value="1" selected="selected">Yes</option> >- <option value="0">If any unavailable</option> >- <option value="2">If all unavailable</option> >- </select> >- </li> >- </ol> >- </fieldset><br> >- <input type="submit" class="action" value="Submit"/> >- </form> >+ </fieldset><br> >+ <input type="submit" class="action" value="Submit"/> >+ </form> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/js/onboarding.js b/koha-tmpl/intranet-tmpl/prog/js/onboarding.js >new file mode 100644 >index 0000000..9b1d13d >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/js/onboarding.js >@@ -0,0 +1,150 @@ >+function _(s) { return s; } // dummy function for gettext >+ >+jQuery.validator.addMethod( "category_code_check", function(value,element){ >+ var patt = /^[A-Za-z]{0,10}$/g; >+ if (patt.test(element.value)) { >+ return true; >+ } else { >+ return false; >+ } >+ }, MSG_LETTERS_ONLY >+); >+ >+jQuery.validator.addMethod( "letters_only", function(value,element){ >+ var patt =/^[A-Za-z ]{0,30}$/g; >+ if (patt.test(element.value)){ >+ return true; >+ } else { >+ return false; >+ } >+ }, MSG_LETTERS_ONLY >+); >+ >+jQuery.validator.addMethod( "enrollment_period", function(){ >+ enrolmentperiod = $("#enrolmentperiod").val(); >+ enrolmentperioddate = $("#enrolmentperioddate").val(); >+ if (( $("#enrolmentperiod").val() === "" && $("#enrolmentperioddate").val() === "") || ($("#enrolmentperiod").val() !== "" && $("#enrolmentperioddate").val() !== "")) { >+ return false; >+ } else { >+ return true; >+ } >+ }, MSG_ONLY_ONE_ENROLLMENTPERIOD >+); >+ >+jQuery.validator.addMethod( "password_match", function(value,element){ >+ var MSG_PASSWORD_MISMATCH = ( MSG_PASSWORD_MISMATCH ); >+ var password = document.getElementById('password').value; >+ var confirmpassword = document.getElementById('password2').value; >+ >+ if ( password != confirmpassword ){ >+ return false; >+ } >+ else{ >+ return true; >+ } >+ }, MSG_PASSWORD_MISMATCH >+); >+ >+jQuery.validator.addMethod( "cardnumber_check", function(value,element){ >+ var patt =/[A-Za-z1-9 ]+$/g; >+ if (patt.test(element.value)){ >+ return true; >+ } else { >+ return false; >+ } >+ }, MSG_LETTERS_NUMBERS_ONLY >+); >+ >+function toUC(f) { >+ var x=f.value.toUpperCase(); >+ f.value=x; >+ return true; >+} >+ >+$(document).ready(function() { >+ if ($("#branches option:selected").length < 1) { >+ $("#branches option:first").attr("selected", "selected"); >+ } >+ $("#categorycode").on("blur",function(){ >+ toUC(this); >+ }); >+ >+ $("#enrolmentperioddate").datepicker({ >+ minDate: 1 >+ }); // Require that "until date" be in the future >+ >+ $("#category_form").validate({ >+ rules: { >+ categorycode: { >+ required: true, >+ category_code_check: true >+ }, >+ description: { >+ required:true >+ }, >+ enrolmentperiod: { >+ required: function(element){ >+ return $("#enrolmentperioddate").val() === ""; >+ }, >+ digits: true, >+ enrollment_period: true, >+ }, >+ enrolmentperioddate: { >+ required: function(element){ >+ return $("#enrolmentperiod").val() === ""; >+ }, >+ enrollment_period: true, >+ // is_valid_date ($(#"enrolementperioddate").val()); >+ }, >+ dateofbirthrequired: { >+ digits: true >+ }, >+ upperagelimit: { >+ digits: true >+ }, >+ enrolmentfee: { >+ number: true >+ }, >+ reservefee: { >+ number: true >+ }, >+ category_type: { >+ required: true >+ } >+ }, >+ messages: { >+ enrolmentperiod: { >+ required: MSG_ONE_ENROLLMENTPERIOD >+ }, >+ enrolmentperioddate: { >+ required: MSG_ONE_ENROLLMENTPERIOD >+ } >+ } >+ }); >+ >+ $("#createpatron").validate({ >+ rules: { >+ surname: { >+ required: true >+ }, >+ firstname: { >+ required: true >+ }, >+ cardnumber: { >+ required: true >+ }, >+ password: { >+ password_match: true >+ } >+ }, >+ messages: { >+ password: { >+ required: MSG_PASSWORD_MISMATCH >+ }, >+ } >+ >+ }); >+ >+ $("#createitemform").validate(); >+ $("#createcirculationrule").validate(); >+}); >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18462
:
62424
|
62425
|
62426
|
62427
|
62428
|
62429
|
62430
|
62513
|
62683
|
62684
|
62685
|
62686
|
62687
|
62688
|
62711
|
62712
|
62713
|
62714
|
62715
|
62716
|
62737