From f4c0b2f80d1f511cf995768aef4f0e1ac8a40d5f Mon Sep 17 00:00:00 2001 From: kados Date: Sat, 17 Mar 2007 23:29:33 +0000 Subject: [PATCH] improvements to the language of the installer validation improvements for installer improvements to descriptions of the optional sql data defaults --- .../en/includes/installer-doc-head-close.inc | 3 -- .../intranet-tmpl/prog/en/installer/auth.tmpl | 21 +++++---- .../prog/en/installer/step1.tmpl | 8 ++-- .../prog/en/installer/step2.tmpl | 4 +- .../prog/en/installer/step3.tmpl | 46 +++++++++++-------- misc/sql-datas/en/optional/auth_val.txt | 2 +- .../en/optional/itemtypes_default.txt | 2 +- misc/sql-datas/en/optional/library.txt | 2 +- .../optional/marc21_simple_bib_frameworks.txt | 3 +- 9 files changed, 53 insertions(+), 38 deletions(-) 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 d02d00e06b..08b62e248c 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 @@ -1,4 +1,3 @@ - - -

Koha

diff --git a/koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl b/koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl index a5bab318f9..4801694e1e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/installer/auth.tmpl @@ -1,10 +1,13 @@ - - Koha › Error: Access Denied - Koha › Error: Session Timed Out -- - Koha › Error: IP Address Change -- - Koha › Error Invalid Username or Password -- - Koha › Welcome to the Koha Web Installer - + +<!-- TMPL_IF NAME="nopermission" -->Koha › Error: Access Denied<!-- /TMPL_IF --> +<!-- TMPL_IF NAME="timed_out" -->Koha › Error: Session Timed Out --<!-- /TMPL_IF --> +<!-- TMPL_IF NAME="different_ip" -->Koha › Error: IP Address Change -- <!-- /TMPL_IF --> +<!-- TMPL_IF NAME="invalid_username_or_password" -->Koha › Error Invalid Username or Password -- <!-- /TMPL_IF --> +<!-- TMPL_IF NAME="loginprompt" -->Koha › Welcome to the Koha Web Installer<!-- /TMPL_IF --> + + +
+

Koha

Login Error

Sorry, Koha doesn't think you have permission for this page.

@@ -34,9 +37,9 @@

Welcome to the Koha Web Installer

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 -koha.xml.

+koha.xml configuration file.

- +
Please enter your username and passwordPlease enter your username and password:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl b/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl index 3959ed05b4..75887350f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/installer/step1.tmpl @@ -1,13 +1,15 @@ -Koha › Web Installer › Step 1 +<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --> +<title>Koha › Web Installer › Step 1 +
+

Koha

Koha › Web Installer › Step 1

You are about to install Koha.

-

Please pick up your language from the following list. If your langauge is not listed, please inform your systems administrator.

- +