Attachment 58781 Details for Bug 17855 – Bug 17855 - Finished updated web installer (basic and advanced setup modes have not yet been implemented). Bulletpoints are now being displayed for all default data values in both the UNIMARC and MARC21 setups.

[patch] Bug 17855 - Finished updated web installer (basic and advanced setup modes have not yet been implemented). Bulletpoints are now being displayed for all default data values in both the UNIMARC and MARC21 setups.

Bug-17855---Finished-updated-web-installer-basic-a.patch (text/plain), 44.17 KB, created by Alex Buckley on 2017-01-10 21:46:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Buckley

Created: 2017-01-10 21:46:23 UTC

Size: 44.17 KB

patch

obsolete

>From b7ac1e17e6b895f4cfab854dd7af001827b41583 Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>Date: Wed, 7 Dec 2016 23:20:59 +0000
>Subject: [PATCH] Bug 17855 - Finished updated web installer (basic and
> advanced setup modes have not yet been implemented). Bulletpoints are now
> being displayed for all default data values in both the UNIMARC and MARC21
> setups.
>
>Test plan:
>1. Go through the web installer as outlined in this
>guide:
>https://koha-community.org/manual/installation/html/
>
>Note: The basic and advanced setup modes on the MARC falvour selection
>page have not yet been implemented.
>
>Notice during your testing: The default data values for both the UNIMARC
>and MARC21 are displayed with bulletpoints whilst the optional data
>values are displayed with checkboxes.
>
>Bug 17855 - Initial updated web installer
>implemented with mandatory data values moved to
>the default folder and changed the checkbox display to
>bulletpoints for the default data values.
>
>Test plan:
>1. Go through the web installer up to step 3, as outlined
>in this guide:
>https://koha-community.org/manual/installation/html/
>
>Notice in web installer step  that the header "mandatory"
>has been replaced with "default". These default data values
>are displayed with bulletpoints rather than checkboxes.
>
>Changed a few file name descriptions to reduce
>spacing in installer step 3 screen.
>
>removed = sign:wq
>
>Fixed bug in installer where a loop was created if
>you're database structure needed to be updated.
>Redirected this to the marcflavour screen instead
>of logging straight into Koha and skipping over
>the basic configuration steps.
>
>Changed the bulletpoints to disabled checkboxes
>which are checked by default
>
>Backup of step3.tt
>
>Successfully working insertion of the default
>options which are shown as bulletpoints
>
>Working insertion of default and optional options
>---
> .../mysql/en/{optional => default}/auth_val.sql    |   0
> .../mysql/en/{optional => default}/auth_val.txt    |   0
> .../en/{mandatory => default}/auth_values.sql      |   0
> .../en/{mandatory => default}/auth_values.txt      |   0
> .../en/{mandatory => default}/class_sources.sql    |   0
> .../en/{mandatory => default}/class_sources.txt    |   0
> .../en/{optional => default}/csv_profiles.sql      |   0
> .../en/{optional => default}/csv_profiles.txt      |   2 -
> .../message_transport_types.sql                    |   0
> .../message_transport_types.txt                    |   1 -
> .../mysql/en/{optional => default}/parameters.sql  |   0
> .../mysql/en/{optional => default}/parameters.txt  |   0
> .../{mandatory => default}/patron_attributes.sql   |   0
> .../data/mysql/en/default/patron_attributes.txt    |   1 +
> .../en/{optional => default}/patron_categories.sql |   0
> .../en/{optional => default}/patron_categories.txt |   6 +-
> .../{mandatory => default}/sample_frequencies.sql  |   0
> .../{mandatory => default}/sample_frequencies.txt  |   0
> .../en/{optional => default}/sample_itemtypes.sql  |   0
> .../en/{optional => default}/sample_itemtypes.txt  |   0
> .../en/{mandatory => default}/sample_notices.sql   |   0
> .../en/{mandatory => default}/sample_notices.txt   |   0
> .../sample_notices_message_attributes.sql          |   0
> .../sample_notices_message_attributes.txt          |   0
> .../sample_notices_message_transports.sql          |   0
> .../sample_notices_message_transports.txt          |   0
> .../sample_numberpatterns.sql                      |   0
> .../sample_numberpatterns.txt                      |   0
> .../data/mysql/en/mandatory/patron_attributes.txt  |   0
> .../authorities_normal_marc21.sql                  |   0
> .../authorities_normal_marc21.txt                  |   2 -
> .../marc21_default_matching_rules.sql              |   0
> .../marc21_default_matching_rules.txt              |   5 +-
> .../marc21_framework_DEFAULT.sql                   |   0
> .../marc21_framework_DEFAULT.txt                   |   0
> .../marc21_sample_fastadd_framework.sql            |   0
> .../marc21_sample_fastadd_framework.txt            |   0
> .../marc21_simple_bib_frameworks.sql               |   0
> .../marc21_simple_bib_frameworks.txt               |   1 -
> .../authorities_normal_unimarc.sql                 |   0
> .../unimarc/default/authorities_normal_unimarc.txt |   1 +
> .../unimarc_framework_DEFAULT.sql                  |   0
> .../unimarc_framework_DEFAULT.txt                  |   0
> .../mandatory/authorities_normal_unimarc.txt       |   1 -
> .../data/mysql/en/optional/sample_holidays.txt     |   5 +-
> .../data/mysql/en/optional/sample_libraries.txt    |   2 +-
> .../mysql/en/optional/sample_z3950_servers.txt     |   1 +
> .../prog/en/modules/installer/Backupstep3.tt       | 257 +++++++++++++++++++++
> .../prog/en/modules/installer/step3.tt             | 124 ++++++----
> 49 files changed, 339 insertions(+), 70 deletions(-)
> rename installer/data/mysql/en/{optional => default}/auth_val.sql (100%)
> rename installer/data/mysql/en/{optional => default}/auth_val.txt (100%)
> rename installer/data/mysql/en/{mandatory => default}/auth_values.sql (100%)
> rename installer/data/mysql/en/{mandatory => default}/auth_values.txt (100%)
> rename installer/data/mysql/en/{mandatory => default}/class_sources.sql (100%)
> rename installer/data/mysql/en/{mandatory => default}/class_sources.txt (100%)
> rename installer/data/mysql/en/{optional => default}/csv_profiles.sql (100%)
> rename installer/data/mysql/en/{optional => default}/csv_profiles.txt (83%)
> rename installer/data/mysql/en/{mandatory => default}/message_transport_types.sql (100%)
> rename installer/data/mysql/en/{mandatory => default}/message_transport_types.txt (98%)
> rename installer/data/mysql/en/{optional => default}/parameters.sql (100%)
> rename installer/data/mysql/en/{optional => default}/parameters.txt (100%)
> rename installer/data/mysql/en/{mandatory => default}/patron_attributes.sql (100%)
> create mode 100644 installer/data/mysql/en/default/patron_attributes.txt
> rename installer/data/mysql/en/{optional => default}/patron_categories.sql (100%)
> rename installer/data/mysql/en/{optional => default}/patron_categories.txt (75%)
> rename installer/data/mysql/en/{mandatory => default}/sample_frequencies.sql (100%)
> rename installer/data/mysql/en/{mandatory => default}/sample_frequencies.txt (100%)
> rename installer/data/mysql/en/{optional => default}/sample_itemtypes.sql (100%)
> rename installer/data/mysql/en/{optional => default}/sample_itemtypes.txt (100%)
> rename installer/data/mysql/en/{mandatory => default}/sample_notices.sql (100%)
> rename installer/data/mysql/en/{mandatory => default}/sample_notices.txt (100%)
> rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_attributes.sql (100%)
> rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_attributes.txt (100%)
> rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_transports.sql (100%)
> rename installer/data/mysql/en/{mandatory => default}/sample_notices_message_transports.txt (100%)
> rename installer/data/mysql/en/{mandatory => default}/sample_numberpatterns.sql (100%)
> rename installer/data/mysql/en/{mandatory => default}/sample_numberpatterns.txt (100%)
> delete mode 100644 installer/data/mysql/en/mandatory/patron_attributes.txt
> rename installer/data/mysql/en/marcflavour/marc21/{mandatory => default}/authorities_normal_marc21.sql (100%)
> rename installer/data/mysql/en/marcflavour/marc21/{mandatory => default}/authorities_normal_marc21.txt (98%)
> rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_default_matching_rules.sql (100%)
> rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_default_matching_rules.txt (61%)
> rename installer/data/mysql/en/marcflavour/marc21/{mandatory => default}/marc21_framework_DEFAULT.sql (100%)
> rename installer/data/mysql/en/marcflavour/marc21/{mandatory => default}/marc21_framework_DEFAULT.txt (100%)
> rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_sample_fastadd_framework.sql (100%)
> rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_sample_fastadd_framework.txt (100%)
> rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_simple_bib_frameworks.sql (100%)
> rename installer/data/mysql/en/marcflavour/marc21/{optional => default}/marc21_simple_bib_frameworks.txt (99%)
> rename installer/data/mysql/en/marcflavour/unimarc/{mandatory => default}/authorities_normal_unimarc.sql (100%)
> create mode 100644 installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt
> rename installer/data/mysql/en/marcflavour/unimarc/{mandatory => default}/unimarc_framework_DEFAULT.sql (100%)
> rename installer/data/mysql/en/marcflavour/unimarc/{mandatory => default}/unimarc_framework_DEFAULT.txt (100%)
> delete mode 100644 installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt
> create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/installer/Backupstep3.tt
>
>diff --git a/installer/data/mysql/en/optional/auth_val.sql b/installer/data/mysql/en/default/auth_val.sql
>similarity index 100%
>rename from installer/data/mysql/en/optional/auth_val.sql
>rename to installer/data/mysql/en/default/auth_val.sql
>diff --git a/installer/data/mysql/en/optional/auth_val.txt b/installer/data/mysql/en/default/auth_val.txt
>similarity index 100%
>rename from installer/data/mysql/en/optional/auth_val.txt
>rename to installer/data/mysql/en/default/auth_val.txt
>diff --git a/installer/data/mysql/en/mandatory/auth_values.sql b/installer/data/mysql/en/default/auth_values.sql
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/auth_values.sql
>rename to installer/data/mysql/en/default/auth_values.sql
>diff --git a/installer/data/mysql/en/mandatory/auth_values.txt b/installer/data/mysql/en/default/auth_values.txt
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/auth_values.txt
>rename to installer/data/mysql/en/default/auth_values.txt
>diff --git a/installer/data/mysql/en/mandatory/class_sources.sql b/installer/data/mysql/en/default/class_sources.sql
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/class_sources.sql
>rename to installer/data/mysql/en/default/class_sources.sql
>diff --git a/installer/data/mysql/en/mandatory/class_sources.txt b/installer/data/mysql/en/default/class_sources.txt
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/class_sources.txt
>rename to installer/data/mysql/en/default/class_sources.txt
>diff --git a/installer/data/mysql/en/optional/csv_profiles.sql b/installer/data/mysql/en/default/csv_profiles.sql
>similarity index 100%
>rename from installer/data/mysql/en/optional/csv_profiles.sql
>rename to installer/data/mysql/en/default/csv_profiles.sql
>diff --git a/installer/data/mysql/en/optional/csv_profiles.txt b/installer/data/mysql/en/default/csv_profiles.txt
>similarity index 83%
>rename from installer/data/mysql/en/optional/csv_profiles.txt
>rename to installer/data/mysql/en/default/csv_profiles.txt
>index 9dcff5d..2bca64f 100644
>--- a/installer/data/mysql/en/optional/csv_profiles.txt
>+++ b/installer/data/mysql/en/default/csv_profiles.txt
>@@ -1,3 +1 @@
>-CSV profiles
>-
> Default CSV export profiles; including one for exporting serial claims.
>diff --git a/installer/data/mysql/en/mandatory/message_transport_types.sql b/installer/data/mysql/en/default/message_transport_types.sql
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/message_transport_types.sql
>rename to installer/data/mysql/en/default/message_transport_types.sql
>diff --git a/installer/data/mysql/en/mandatory/message_transport_types.txt b/installer/data/mysql/en/default/message_transport_types.txt
>similarity index 98%
>rename from installer/data/mysql/en/mandatory/message_transport_types.txt
>rename to installer/data/mysql/en/default/message_transport_types.txt
>index 054d914..9665f67 100644
>--- a/installer/data/mysql/en/mandatory/message_transport_types.txt
>+++ b/installer/data/mysql/en/default/message_transport_types.txt
>@@ -1,2 +1 @@
> Defines default message transports for email and sms.
>-
>diff --git a/installer/data/mysql/en/optional/parameters.sql b/installer/data/mysql/en/default/parameters.sql
>similarity index 100%
>rename from installer/data/mysql/en/optional/parameters.sql
>rename to installer/data/mysql/en/default/parameters.sql
>diff --git a/installer/data/mysql/en/optional/parameters.txt b/installer/data/mysql/en/default/parameters.txt
>similarity index 100%
>rename from installer/data/mysql/en/optional/parameters.txt
>rename to installer/data/mysql/en/default/parameters.txt
>diff --git a/installer/data/mysql/en/mandatory/patron_attributes.sql b/installer/data/mysql/en/default/patron_attributes.sql
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/patron_attributes.sql
>rename to installer/data/mysql/en/default/patron_attributes.sql
>diff --git a/installer/data/mysql/en/default/patron_attributes.txt b/installer/data/mysql/en/default/patron_attributes.txt
>new file mode 100644
>index 0000000..fa912e3
>--- /dev/null
>+++ b/installer/data/mysql/en/default/patron_attributes.txt
>@@ -0,0 +1 @@
>+Patron attributes
>diff --git a/installer/data/mysql/en/optional/patron_categories.sql b/installer/data/mysql/en/default/patron_categories.sql
>similarity index 100%
>rename from installer/data/mysql/en/optional/patron_categories.sql
>rename to installer/data/mysql/en/default/patron_categories.sql
>diff --git a/installer/data/mysql/en/optional/patron_categories.txt b/installer/data/mysql/en/default/patron_categories.txt
>similarity index 75%
>rename from installer/data/mysql/en/optional/patron_categories.txt
>rename to installer/data/mysql/en/default/patron_categories.txt
>index b94941a..a4a4189 100644
>--- a/installer/data/mysql/en/optional/patron_categories.txt
>+++ b/installer/data/mysql/en/default/patron_categories.txt
>@@ -1,6 +1,4 @@
>-Sample patron types and categories: 
>-
>-Type:           Categories:
>+Sample patron types and categories. Types are currently hardcoded but you can manage categories after installation from the administration module. 
> 
> Adult patron - default patron type
>                 PT  - Patron
>@@ -21,5 +19,3 @@ Professional - a member of an organization (organization is guarantor)
>                 T   - Teacher
>                 S   - Staff
>                 B   - Board
>-
>-Types are currently hardcoded, but you can add/edit/delete categories after installation from the administration module.
>diff --git a/installer/data/mysql/en/mandatory/sample_frequencies.sql b/installer/data/mysql/en/default/sample_frequencies.sql
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/sample_frequencies.sql
>rename to installer/data/mysql/en/default/sample_frequencies.sql
>diff --git a/installer/data/mysql/en/mandatory/sample_frequencies.txt b/installer/data/mysql/en/default/sample_frequencies.txt
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/sample_frequencies.txt
>rename to installer/data/mysql/en/default/sample_frequencies.txt
>diff --git a/installer/data/mysql/en/optional/sample_itemtypes.sql b/installer/data/mysql/en/default/sample_itemtypes.sql
>similarity index 100%
>rename from installer/data/mysql/en/optional/sample_itemtypes.sql
>rename to installer/data/mysql/en/default/sample_itemtypes.sql
>diff --git a/installer/data/mysql/en/optional/sample_itemtypes.txt b/installer/data/mysql/en/default/sample_itemtypes.txt
>similarity index 100%
>rename from installer/data/mysql/en/optional/sample_itemtypes.txt
>rename to installer/data/mysql/en/default/sample_itemtypes.txt
>diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/default/sample_notices.sql
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/sample_notices.sql
>rename to installer/data/mysql/en/default/sample_notices.sql
>diff --git a/installer/data/mysql/en/mandatory/sample_notices.txt b/installer/data/mysql/en/default/sample_notices.txt
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/sample_notices.txt
>rename to installer/data/mysql/en/default/sample_notices.txt
>diff --git a/installer/data/mysql/en/mandatory/sample_notices_message_attributes.sql b/installer/data/mysql/en/default/sample_notices_message_attributes.sql
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/sample_notices_message_attributes.sql
>rename to installer/data/mysql/en/default/sample_notices_message_attributes.sql
>diff --git a/installer/data/mysql/en/mandatory/sample_notices_message_attributes.txt b/installer/data/mysql/en/default/sample_notices_message_attributes.txt
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/sample_notices_message_attributes.txt
>rename to installer/data/mysql/en/default/sample_notices_message_attributes.txt
>diff --git a/installer/data/mysql/en/mandatory/sample_notices_message_transports.sql b/installer/data/mysql/en/default/sample_notices_message_transports.sql
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/sample_notices_message_transports.sql
>rename to installer/data/mysql/en/default/sample_notices_message_transports.sql
>diff --git a/installer/data/mysql/en/mandatory/sample_notices_message_transports.txt b/installer/data/mysql/en/default/sample_notices_message_transports.txt
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/sample_notices_message_transports.txt
>rename to installer/data/mysql/en/default/sample_notices_message_transports.txt
>diff --git a/installer/data/mysql/en/mandatory/sample_numberpatterns.sql b/installer/data/mysql/en/default/sample_numberpatterns.sql
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/sample_numberpatterns.sql
>rename to installer/data/mysql/en/default/sample_numberpatterns.sql
>diff --git a/installer/data/mysql/en/mandatory/sample_numberpatterns.txt b/installer/data/mysql/en/default/sample_numberpatterns.txt
>similarity index 100%
>rename from installer/data/mysql/en/mandatory/sample_numberpatterns.txt
>rename to installer/data/mysql/en/default/sample_numberpatterns.txt
>diff --git a/installer/data/mysql/en/mandatory/patron_attributes.txt b/installer/data/mysql/en/mandatory/patron_attributes.txt
>deleted file mode 100644
>index e69de29..0000000
>diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql b/installer/data/mysql/en/marcflavour/marc21/default/authorities_normal_marc21.sql
>similarity index 100%
>rename from installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.sql
>rename to installer/data/mysql/en/marcflavour/marc21/default/authorities_normal_marc21.sql
>diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.txt b/installer/data/mysql/en/marcflavour/marc21/default/authorities_normal_marc21.txt
>similarity index 98%
>rename from installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.txt
>rename to installer/data/mysql/en/marcflavour/marc21/default/authorities_normal_marc21.txt
>index b14f98b..dfe0658 100644
>--- a/installer/data/mysql/en/marcflavour/marc21/mandatory/authorities_normal_marc21.txt
>+++ b/installer/data/mysql/en/marcflavour/marc21/default/authorities_normal_marc21.txt
>@@ -1,5 +1,4 @@
> Default MARC21 Standard Authority types:
>-
> 	Personal Name 
> 	Corporate Name 
> 	Meeting Name 
>@@ -8,4 +7,3 @@ Default MARC21 Standard Authority types:
> 	Topical Term 
> 	Geographic Name 
> 	Genre/Form Term 
>-
>diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.sql b/installer/data/mysql/en/marcflavour/marc21/default/marc21_default_matching_rules.sql
>similarity index 100%
>rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.sql
>rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_default_matching_rules.sql
>diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.txt b/installer/data/mysql/en/marcflavour/marc21/default/marc21_default_matching_rules.txt
>similarity index 61%
>rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.txt
>rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_default_matching_rules.txt
>index 471db24..7cbd6f4 100644
>--- a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_default_matching_rules.txt
>+++ b/installer/data/mysql/en/marcflavour/marc21/default/marc21_default_matching_rules.txt
>@@ -1,5 +1,2 @@
> Selected matching rules for MARC 21 bibliographic
>-records, including:
>-
>-ISBN
>-ISSN
>+records, including: ISBN, ISSN
>diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/marc21/default/marc21_framework_DEFAULT.sql
>similarity index 100%
>rename from installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
>rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_framework_DEFAULT.sql
>diff --git a/installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.txt b/installer/data/mysql/en/marcflavour/marc21/default/marc21_framework_DEFAULT.txt
>similarity index 100%
>rename from installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.txt
>rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_framework_DEFAULT.txt
>diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_sample_fastadd_framework.sql b/installer/data/mysql/en/marcflavour/marc21/default/marc21_sample_fastadd_framework.sql
>similarity index 100%
>rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_sample_fastadd_framework.sql
>rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_sample_fastadd_framework.sql
>diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_sample_fastadd_framework.txt b/installer/data/mysql/en/marcflavour/marc21/default/marc21_sample_fastadd_framework.txt
>similarity index 100%
>rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_sample_fastadd_framework.txt
>rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_sample_fastadd_framework.txt
>diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql b/installer/data/mysql/en/marcflavour/marc21/default/marc21_simple_bib_frameworks.sql
>similarity index 100%
>rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
>rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_simple_bib_frameworks.sql
>diff --git a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.txt b/installer/data/mysql/en/marcflavour/marc21/default/marc21_simple_bib_frameworks.txt
>similarity index 99%
>rename from installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.txt
>rename to installer/data/mysql/en/marcflavour/marc21/default/marc21_simple_bib_frameworks.txt
>index cf49dc3..7bfd5d6 100644
>--- a/installer/data/mysql/en/marcflavour/marc21/optional/marc21_simple_bib_frameworks.txt
>+++ b/installer/data/mysql/en/marcflavour/marc21/default/marc21_simple_bib_frameworks.txt
>@@ -1,5 +1,4 @@
> Simple MARC 21 bibliographic frameworks for some common types of bibliographic material.  Frameworks are used to define the structure of your MARC records and the behavior of the integrated MARC editor. You can change these at any time after installation. The frameworks in this optional default setting include:
>-
> BKS	Books, Booklets, Workbooks
> CF	CD-ROMs, DVD-ROMs, General Online Resources
> SR	Audio Cassettes, CDs
>diff --git a/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.sql b/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.sql
>similarity index 100%
>rename from installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.sql
>rename to installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.sql
>diff --git a/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt b/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt
>new file mode 100644
>index 0000000..202a9cc
>--- /dev/null
>+++ b/installer/data/mysql/en/marcflavour/unimarc/default/authorities_normal_unimarc.txt
>@@ -0,0 +1 @@
>+ Authority structure for UNIMARC in English.
>diff --git a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql b/installer/data/mysql/en/marcflavour/unimarc/default/unimarc_framework_DEFAULT.sql
>similarity index 100%
>rename from installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql
>rename to installer/data/mysql/en/marcflavour/unimarc/default/unimarc_framework_DEFAULT.sql
>diff --git a/installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.txt b/installer/data/mysql/en/marcflavour/unimarc/default/unimarc_framework_DEFAULT.txt
>similarity index 100%
>rename from installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.txt
>rename to installer/data/mysql/en/marcflavour/unimarc/default/unimarc_framework_DEFAULT.txt
>diff --git a/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt b/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt
>deleted file mode 100644
>index 6fba0ac..0000000
>--- a/installer/data/mysql/en/marcflavour/unimarc/mandatory/authorities_normal_unimarc.txt
>+++ /dev/null
>@@ -1 +0,0 @@
>-Authority structure for UNIMARC in English.
>diff --git a/installer/data/mysql/en/optional/sample_holidays.txt b/installer/data/mysql/en/optional/sample_holidays.txt
>index a2d2de9..2f478e1 100644
>--- a/installer/data/mysql/en/optional/sample_holidays.txt
>+++ b/installer/data/mysql/en/optional/sample_holidays.txt
>@@ -1,4 +1 @@
>-Sample holidays:
>-	Sundays
>-	Christmas
>-	New Year's
>+Sample holidays: Sunday, Christmas, New Year's
>diff --git a/installer/data/mysql/en/optional/sample_libraries.txt b/installer/data/mysql/en/optional/sample_libraries.txt
>index cbaf05c..2a1bd9a 100644
>--- a/installer/data/mysql/en/optional/sample_libraries.txt
>+++ b/installer/data/mysql/en/optional/sample_libraries.txt
>@@ -1 +1 @@
>-A few sample libraries.
>+Sample libraries.
>diff --git a/installer/data/mysql/en/optional/sample_z3950_servers.txt b/installer/data/mysql/en/optional/sample_z3950_servers.txt
>index a0bab98..b7a48c0 100644
>--- a/installer/data/mysql/en/optional/sample_z3950_servers.txt
>+++ b/installer/data/mysql/en/optional/sample_z3950_servers.txt
>@@ -1,3 +1,4 @@
>+Allow access to the following servers to search and download record information:
> LIBRARY OF CONGRESS
> LIBRARY OF CONGRESS NAMES (authority records)
> LIBRARY OF CONGRESS SUBJECTS (authority records)
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/Backupstep3.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/Backupstep3.tt
>new file mode 100644
>index 0000000..3b08fb2
>--- /dev/null
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/Backupstep3.tt
>@@ -0,0 +1,257 @@
>+[% INCLUDE 'doc-head-open.inc' %]<title>Koha &rsaquo; Web installer &rsaquo; Step 3</title>
>+[% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END %]
>+[% INCLUDE 'installer-doc-head-close.inc' %]
>+<div>
>+<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Koha web  installer &rsaquo; Step 3</h1>
>+
>+[% IF ( selectframeworks ) %]
>+    <script type="text/javascript">
>+    //<![CDATA[
>+
>+    var surl = unescape(window.location.pathname);
>+
>+    function doLoad()
>+    {
>+        // the timeout value should be the same as in the "refresh" meta-tag
>+        setTimeout( "refresh()", 2*1000 );
>+    }
>+
>+    function refresh(value)
>+    {
>+        //  The argument to the location.reload function determines
>+        //  if the browser should retrieve the document from the
>+        //  web-server.  In our example all we need to do is cause
>+        //  the JavaScript block in the document body to be
>+        //  re-evaluated.  If we needed to pull the document from
>+        //  the web-server again (such as where the document contents
>+        //  change dynamically) we would pass the argument as 'true'.
>+        //
>+        surl=surl+'?step=3&op=selectframeworks&fwklanguage='+value;
>+
>+        window.location.replace( surl );
>+    }
>+
>+    function selectAllFrameworks()
>+    {
>+        //  A handy short link that selects all available checkboxes
>+        //  on the page.
>+        //
>+        var checkboxes = document.getElementsByTagName("input");
>+        for (var i = 0; i < checkboxes.length; i++)
>+        {
>+            if (checkboxes[i].type == 'checkbox')
>+            {
>+                checkboxes[i].checked = true;
>+            }
>+        }
>+
>+        //  Prevent event propergation.
>+        return false;
>+    }
>+
>+    function Hide(link)
>+    {
>+        //  Toggle the display of a given element on the page.
>+        //
>+        subfield = document.getElementById('bloc'+link);
>+        var initstyle = subfield.style.display;
>+        if (initstyle == 'block') subfield.style.display = 'none' ;
>+        if (initstyle == 'none') subfield.style.display = 'block' ;
>+    }
>+
>+    //]]>
>+    </script>
>+[% END %]
>+[% IF ( finish ) %]
>+    <h1>Congratulations, installation complete</h1>
>+    <p>If this page does not redirect in 5 seconds, click <a href="/">here</a>.</p>
>+[% END %]
>+[% 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="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 &gt;&gt;" type="submit" /></p>
>+    </form>
>+[% END %]
>+
>+[% 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="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="vertical-align:top;">
>+         [% IF ( framework.checked ) %]
>+         <input type="checkbox" name="framework" value="[% framework.fwkfile %]" id="[% framework.fwkname %]" checked="checked" />
>+         [% 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 %]"  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 %]
>+    <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 &gt;&gt;" />
>+    </p>
>+    </form>
>+[% END %]
>+
>+
>+[% IF ( addframeworks ) %]
>+    [% FOREACH lis IN list %]
>+    <h3>[% lis.level %] data added</h3>
>+    <ul>
>+    [% FOREACH fwklis IN lis.fwklist %]
>+        <li>[% fwklis.fwkname %][% IF ( fwklis.error ) %]<br /><span class="error">[% fwklis.error %]</span>[% END %] </li>
>+    [% END %]
>+    </ul>
>+    [% END %]
>+    <h3>All done!</h3>
>+    <p>Installation complete.<br />
>+        <p>Click on 'Finish' to complete and load the Koha Staff Interface.
>+        <form name="finish">
>+        <input type="hidden" name="step" value="3" />
>+        <input type="hidden" name="op" value="finish" />
>+        <input type="submit" value="Finish" /></form>
>+        </p>
>+    </p>
>+[% 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 &gt;&gt;" type="submit" /></p>
>+        </form>
>+    [% 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 &gt;&gt;" type="submit" /></p>
>+    </form>
>+[% END %]
>+
>+
>+[% IF ( default ) %]
>+    [% IF ( upgrading ) %]
>+        <p>
>+            We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must <a href="install.pl?step=3&amp;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&amp;op=choosemarc" class="button"><button>Install basic configuration settings</button></a>
>+        </p>
>+    [% END %]
>+[% END %]
>+
>+
>+
>+[% IF ( updatestructure ) %]
>+  <div><h2 align="center">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 ( has_update_errors ) %]
>+  <p>Update errors :</p>
>+    <ul>
>+      [% FOREACH update_error IN update_errors %]
>+          <li class="update_error">[% update_error.line |html %]</li>
>+      [% END %]
>+    </ul>
>+  [% END %]
>+ [% UNLESS ( has_update_errors ) %]
>+    <p>Everything went OK, update done.</p>
>+  [% END %]
>+<a href="install.pl?step=3&amp;op=finished" class="button">Continue to log in to Koha</a>
>+  </div>
>+[% END %]
>+
>+</div>
>+</body>
>+</html>
>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 3ae276f..d4a4832 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt
>@@ -2,7 +2,7 @@
> [% IF ( finish ) %]<meta http-equiv="refresh" content="10; url=/cgi-bin/koha/mainpage.pl">[% END %]
> [% INCLUDE 'installer-doc-head-close.inc' %]
> <div>
>-<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Web installer &rsaquo; Step 3</h1>
>+<h1 id="logo"><img alt="Koha" src="[% interface %]/[% theme %]/img/koha.org-logo.gif" /> Koha web  installer &rsaquo; Step 3</h1>
> 
> [% IF ( selectframeworks ) %]
>     <script type="text/javascript">
>@@ -68,14 +68,15 @@
> [% END %]
> [% IF ( choosemarc ) %]
>     <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>
>     <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="selectframeworks"/>
>     <p>
>     [% FOREACH flavourloo IN flavourloop %]
>     <div>
>             [% IF ( flavourloo.checked ) %]
>-                <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked /> [% flavourloo.label %] <br/>
>+                <input type="radio" name="marcflavour" value="[% flavourloo.code %]" checked="checked" /> [% flavourloo.label %] <br/>
>             [% ELSE %]
>                 <input type="radio" name="marcflavour" value="[% flavourloo.code %]" /> [% flavourloo.label %] <br/>
>             [% END %]
>@@ -89,48 +90,58 @@
> [% 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>');
>+        var linklabel = _("Select all options");
>+        document.write('<p><a href="#" onclick="return selectAllFrameworks();"><button>'+linklabel+'</button></a></p>');
>     </script>
>     <form name="frameworkselection" method="post" action="install.pl">
>     <input type="hidden" name="step" value="3" />
>     <input type="hidden" name="op" value="addframeworks" />
> 
>-    [% IF ( 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="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>
>+      [% 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" ) %]   
>+        <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" ) %]
>+        <ul>
>+        <label for="[% framework.fwkname %]">
>+            <li>[% framework.fwkdescription %]</li>
>+            <em>([% framework.fwkname %])</em>
>+        </label>
>+        </ul>
>+      </td>
>+      [% ELSE %]
>+      <td>
>+         <label for= "[% framework.fwkname %]">
>+            [% framework.fwkdescription %]
>+            <em>([% framework.fwkname %])</em>
>+         </label>
>+      </td>
>+      [% END %]
>+      </tr>
>         </table>
>-    [% END %]
>-    </div>
>-    [% END %]
>+      [% 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 %]
>+                  [% END %]
>+                  [% IF ( en_sample_data ) %]
>+                      <h4><span class="error">No sample data and settings ar    e available for your language.
>+             132                 Defaulting to the samples supplied for English     (en)<span></h4>
>+                 [% END %]
>     [% FOREACH levelloo IN levelloop %]
>     <div>
>     <h3>[% levelloo.label %]</h3>
>@@ -138,18 +149,30 @@
>         <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 %]
>+        [% IF (levelloo.label == "Default" ) %]
>+             <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") %]
>+           <ul>
>             <label for="[% framework.fwkname %]">
>-                [% framework.fwkdescription %]
>+               <li> [% framework.fwkdescription %]</li>
>                 <em>([% framework.fwkname %])</em>
>             </label>
>+           </ul>
>+        </td>
>+        [% ELSE %]
>+        <td>
>+            <label for= "[% framework.fwkname %]">
>+            [% framework.fwkdescription %]
>+            <em>([% framework.fwkname %])</em>
>+            </label>
>         </td>
>+        [% END %]
>+        </tr>
>         </table>
>     [% END %]
>     </div>
>@@ -214,12 +237,15 @@
> [% IF ( default ) %]
>     [% IF ( upgrading ) %]
>         <p>
>-            We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must <a href="install.pl?step=3&amp;op=updatestructure" class="button">update your database</a>
>+            We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database. 
>+        <br>
>+        <a href="install.pl?step=3&amp;op=updatestructure" class="button"><button>Update Database</button></a>        
>         </p>
>     [% ELSE %]
>-        <p>We are ready to do some basic configuration. Please
>-            <a href="install.pl?step=3&amp;op=choosemarc" class="button">install basic configuration settings</a>
>-            to continue the installation.
>+        <p>We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation:
>+        <br>
>+        <br>
>+            <a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Install Basic Configuration Settings</button></a>
>         </p>
>     [% END %]
> [% END %]
>@@ -247,7 +273,7 @@
>  [% UNLESS ( has_update_errors ) %]
>     <p>Everything went OK, update done.</p>
>   [% END %]
>-<a href="install.pl?step=3&amp;op=finished" class="button">Continue to log in to Koha</a>
>+<a href="install.pl?step=3&amp;op=choosemarc" class="button"><button>Back to Installation</button></a>
>   </div>
> [% END %]
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 17855: 58657 | 58658 | 58659 | 58660 | 58661 | 58662 | 58663 | 58664 | 58665 | 58666 | 58667 | 58668 | 58669 | 58781 | 58782 | 58783 | 58784 | 58785 | 58792 | 58793 | 58794 | 58846 | 58860 | 58861 | 58862 | 58886 | 58892 | 58893 | 58894 | 58895 | 58896 | 58897 | 58898 | 58899 | 58900 | 58901 | 58902 | 58903 | 58904 | 58905 | 58906 | 58907 | 59037 | 59051 | 59140 | 59141 | 59174 | 59188 | 59277 | 59279 | 59280 | 59281 | 59628 | 59703 | 59705 | 59706 | 59707 | 59708 | 59709 | 59710 | 59711 | 59712 | 59742 | 59826 | 59830 | 59840 | 59841 | 59842 | 59856 | 59857 | 60092 | 61667 | 61668 | 61986 | 62186 | 62191 | 62192 | 62193 | 62220 | 62221 | 62222 | 62223 | 62231 | 62233 | 62234 | 62235 | 62236 | 62237 | 62238 | 62239 | 62240 | 62241 | 62242 | 62243 | 62251 | 62252 | 62253 | 62254 | 62255 | 62256 | 62257 | 62258 | 62259 | 62260 | 62261 | 62262 | 62263 | 62281 | 62282 | 62283 | 62284 | 62285 | 62286 | 62287 | 62288 | 62668 | 62669 | 62670 | 62671 | 62672 | 62673 | 62674 | 62675