From f6038ffc7360d052ae0cd36c7b5e0c1f127744d4 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Wed, 7 Dec 2016 23:20:59 +0000 Subject: [PATCH] Bug 17855- In web installer step 3, automatically selected default data values are successfully being inserted into the database. These default data values are now displayed in step 3 with bulletpoints Bug 17855- Removed loop in web installer forcing users to update their database version. Changed default data values in web installer to be displayed with disabled selected checkboxes rather than bulletpoints The web installer step 3 now has disabled selected checkboxes. Bug 17855- Implemented automatic selection of all default data in web installer which are shown with non-editable bulletpoints Altered web installer Moved files from optional to mandatory. Edited MARC screen so that MARC21 is selected by default. Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt Changed mandatory in If statement to default for MARC flavours Changed the radiobuttons to bulletpoints for default settings 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 --- .../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 + .../{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/patron_categories.txt | 6 +- .../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 | 125 ++++++---- 48 files changed, 340 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/{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/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/patron_categories.txt b/installer/data/mysql/en/optional/patron_categories.txt index b94941a..a4a4189 100644 --- a/installer/data/mysql/en/optional/patron_categories.txt +++ b/installer/data/mysql/en/optional/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/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' %]Koha › Web installer › Step 3 +[% IF ( finish ) %][% END %] +[% INCLUDE 'installer-doc-head-close.inc' %] +
+

Koha Koha web installer › Step 3

+ +[% IF ( selectframeworks ) %] + +[% END %] +[% IF ( finish ) %] +

Congratulations, installation complete

+

If this page does not redirect in 5 seconds, click here.

+[% END %] +[% IF ( choosemarc ) %] +

Select your MARC flavor

+
+ + +

+ [% FOREACH flavourloo IN flavourloop %] +

+ [% IF ( flavourloo.checked ) %] + [% flavourloo.label %]
+ [% ELSE %] + [% flavourloo.label %]
+ [% END %] +
+ [% END %] +

+

Click 'Next' to continue

+
+[% END %] + +[% IF ( selectframeworks ) %] +

Selecting Default Settings

+ +
+ + + + [% IF ( frameworksloop ) %] +

MARC frameworks: [% marcflavour %]

+ [% IF ( en_marc_frameworks ) %] +

No MARC frameworks are available for your language. + Defaulting to the frameworks supplied for English (en)

+ [% END %] + [% FOREACH frameworksloo IN frameworksloop %] +
+

[% frameworksloo.label %]

+ [% FOREACH framework IN frameworksloo.frameworks %] + + + + +
+ [% IF ( framework.checked ) %] + + [% ELSE %] + + [% END %] + + +
+ [% END %] +
+ [% END %] +

Other data

+ [% END %] + [% IF ( en_sample_data ) %] +

No sample data and settings are available for your language. + Defaulting to the samples supplied for English (en)

+ [% END %] + [% FOREACH levelloo IN levelloop %] +
+

[% levelloo.label %]

+ [% FOREACH framework IN levelloo.frameworks %] + + + + +
+ [% IF ( framework.checked ) %] + + [% ELSE %] + + [% END %] + + +
+ [% END %] +
+ [% END %] +

When you've made your selections, please click 'Import' below to begin the process. It may take a while to complete, + please be patient.

+

+

+
+[% END %] + + +[% IF ( addframeworks ) %] + [% FOREACH lis IN list %] +

[% lis.level %] data added

+ + [% END %] +

All done!

+

Installation complete.
+

Click on 'Finish' to complete and load the Koha Staff Interface. +

+ + +
+

+

+[% END %] + + +[% IF ( importdatastructure ) %] + [% IF ( error ) %] +

The following error occurred while importing the database structure:

+

[% error %]

+

Please contact your system administrator

+ [% ELSE %] +

Success

+ +
+ +

Click 'Next' to continue

+
+ [% END %] +[% END %] + + +[% IF ( proposeimport ) %] +

Now we're ready to create the database tables and fill them with some default data.

+
+ + +

Click 'Next' to continue

+
+[% END %] + + +[% IF ( default ) %] + [% IF ( upgrading ) %] +

+ We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database +

+ [% ELSE %] +

We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation: +
+
+ +

+ [% END %] +[% END %] + + + +[% IF ( updatestructure ) %] +

Updating database structure

+ [% IF ( has_update_succeeds ) %] +

Update report :

+
    + [% FOREACH update_repor IN update_report %] +
  • [% update_repor.line |html %]
    • + [% END %] +
+ [% END %] + [% IF ( has_update_errors ) %] +

Update errors :

+
    + [% FOREACH update_error IN update_errors %] +
  • [% update_error.line |html %]
    • + [% END %] +
+ [% END %] + [% UNLESS ( has_update_errors ) %] +

Everything went OK, update done.

+ [% END %] +Continue to log in to Koha +
+[% END %] + +
+ + 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..47303ce 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 ) %][% END %] [% INCLUDE 'installer-doc-head-close.inc' %]
-

Koha Web installer › Step 3

+

Koha Koha web installer › Step 3

[% IF ( selectframeworks ) %]
- [% IF ( frameworksloop ) %] -

MARC frameworks: [% marcflavour %]

- [% IF ( en_marc_frameworks ) %] -

No MARC frameworks are available for your language. - Defaulting to the frameworks supplied for English (en)

- [% END %] - [% FOREACH frameworksloo IN frameworksloop %] -
-

[% frameworksloo.label %]

- [% FOREACH framework IN frameworksloo.frameworks %] - - - - + [% IF ( frameworksloop ) %] +

MARC frameworks: [% marcflavour %]

+ [% IF ( en_marc_frameworks ) %] +

No MARC frameworks are available for your language. Defaulting to the frameworks supplied for English (en)

+ [% END %] + [% FOREACH frameworksloo IN frameworksloop %] +
+

[% frameworksloo.label %]

+ [% FOREACH framework IN frameworksloo.frameworks %] +
- [% IF ( framework.checked ) %] - - [% ELSE %] - - [% END %] - - -
+ + + + [% ELSE %] + + [% END %] +
+ [% IF (frameworksloo.label == "Default" ) %] + + [% ELSE %] + + [% END %] + + [% IF (frameworksloo.label == "Default" ) %] +
    + +
+ 		+ +
- [% END %] -
- [% END %] + [% END %] +
+ [% END %]

Other data

- [% END %] - [% IF ( en_sample_data ) %] -

No sample data and settings are available for your language. - Defaulting to the samples supplied for English (en)

- [% END %] + [% END %] + [% IF ( en_sample_data ) %] +

No sample data and settings ar e available for your language. + 132 Defaulting to the samples supplied for English (en)

+ [% END %] [% FOREACH levelloo IN levelloop %]

[% levelloo.label %]

@@ -138,18 +150,30 @@ + [% ELSE %] + + [% END %] +
- [% IF ( framework.checked ) %] - - [% ELSE %] - - [% END %] + [% IF (levelloo.label == "Default" ) %] + + [% ELSE %] + + [% END %] + [% IF (levelloo.label == "Default") %] +
    +
+ 		+
[% END %]
@@ -214,12 +238,15 @@ [% IF ( default ) %] [% IF ( upgrading ) %]

- We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database + We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database. +
+

[% ELSE %] -

We are ready to do some basic configuration. Please - install basic configuration settings - to continue the installation. +

We are ready to do some basic configuration. Please install some basic configuration settings to continue the installation: +
+
+

[% END %] [% END %] @@ -247,7 +274,7 @@ [% UNLESS ( has_update_errors ) %]

Everything went OK, update done.

[% END %] -Continue to log in to Koha + [% END %] -- 2.1.4