From 0d32addd88c57ba4ff5c5989cf38121eae58d313 Mon Sep 17 00:00:00 2001 From: Sean Hamlin Date: Fri, 25 Jul 2014 13:55:48 +1200 Subject: [PATCH] Bug 12658: Installter step 3 - select framework "select all" button, labels and misc HTML formatting issues. To test: 1/ Visit /cgi-bin/koha/installer/install.pl?step=3&op=selectframeworks 2/ Assert you can see a link "Select all frameworks" (with JavaScript enabled) 3/ Assert when you click the "Select all frameworks" link all checkboxes are now ticked on the page 4/ Assert when you click on the text next to a checkbox, that it will toogle the corresponding checkbox (accessibility) 5/ Assert there is less unclosed HTML tags on the page (should be none on the select framework page now) 6/ Assert the installer still functions as expected for a clean install Signed-off-by: Nick Clemens Link says "Select all frameworks" perhaps "Select all options" or "Select all" would be clearer, but seems to work as desired Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/installer/step3.tt | 131 ++++++++---------- 1 file changed, 61 insertions(+), 70 deletions(-) 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 ea13ac5889..8eee0a3c5e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/step3.tt @@ -5,53 +5,19 @@

Koha Web installer › Step 3

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

Congratulations, installation complete

-

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

+

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 ) %] @@ -102,14 +88,17 @@ [% IF ( selectframeworks ) %]

Selecting Default Settings

+ - + [% IF ( frameworksloop ) %]

MARC frameworks: [% marcflavour %]

[% IF ( en_marc_frameworks ) %] -

No MARC frameworks are available for your language. +

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

[% END %] [% FOREACH frameworksloo IN frameworksloop %] @@ -120,24 +109,25 @@ [% IF ( framework.checked ) %] - + [% ELSE %] - + [% END %] - [% framework.fwkdescription %] - ([% framework.fwkname %]) + [% END %]

-

[% END %]

Other data

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

No sample data and settings are available for your language. +

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

[% END %] [% FOREACH levelloo IN levelloop %] @@ -148,26 +138,26 @@ [% IF ( framework.checked ) %] - + [% ELSE %] - + [% END %] - [% framework.fwkdescription %] - ([% framework.fwkname %]) + [% 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 %] @@ -226,7 +216,7 @@ We are upgrading from Koha [% dbversion %] to [% kohaversion %], you must update your database

[% ELSE %] -

We are ready to do some basic configuration. Please +

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

@@ -242,7 +232,7 @@
    [% FOREACH update_repor IN update_report %]
  • [% update_repor.line |html %]
    • - [% END %] + [% END %]
[% END %] [% IF ( has_update_errors ) %] @@ -250,7 +240,7 @@
    [% FOREACH update_error IN update_errors %]
  • [% update_error.line |html %]
    • - [% END %] + [% END %]
[% END %] [% UNLESS ( has_update_errors ) %] @@ -260,5 +250,6 @@ [% END %] + -- 2.39.5