From f35109827bd2e6184974989ac65bf3bd305f2fa0 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 2 Jan 2012 20:09:25 +0100 Subject: datetime: new field_timezone() function, new template field_select_raw.tpl returns a timezone select like select_timezone() but using template field_select_raw.tpl. field_select_raw get options html as forth argument, instead of array value=>label like field_select --- view/field_select_raw.tpl | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 view/field_select_raw.tpl (limited to 'view') diff --git a/view/field_select_raw.tpl b/view/field_select_raw.tpl new file mode 100644 index 000000000..765b285d9 --- /dev/null +++ b/view/field_select_raw.tpl @@ -0,0 +1,8 @@ + +
+ + + $field.3 +
-- cgit v1.2.3 From c7bfd1e1bae28f2305e2d1d3425052a864a6e251 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 2 Jan 2012 20:16:28 +0100 Subject: install: fix install procedure install procedure as a wizard graphical rappresentation of passed/unpassed system checks db connection test don't try anymore to create the db admin email and timezone are asked in a separate pass fix loading of database.sql, removing comments from phpmyadmin export fix check for .htconfig.php writability ask for php-cli path if not found in PATH install_db.tpl use field_* templates to render the form --- view/install.tpl | 10 ++++++++++ view/install_checks.tpl | 24 ++++++++++++++++++++++++ view/install_db.tpl | 44 +++++++++++++++----------------------------- view/install_settings.tpl | 25 +++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 29 deletions(-) create mode 100644 view/install.tpl create mode 100644 view/install_checks.tpl create mode 100644 view/install_settings.tpl (limited to 'view') diff --git a/view/install.tpl b/view/install.tpl new file mode 100644 index 000000000..b3a5f46ff --- /dev/null +++ b/view/install.tpl @@ -0,0 +1,10 @@ + +

$title

+

$pass

+ + +{{ if $status }} +

$status

+{{ endif }} + +$text diff --git a/view/install_checks.tpl b/view/install_checks.tpl new file mode 100644 index 000000000..538bdf0ba --- /dev/null +++ b/view/install_checks.tpl @@ -0,0 +1,24 @@ +

$title

+

$pass

+
+ +{{ for $checks as $check }} + + {{if $check.help }} + + {{endif}} +{{ endfor }} +
$check.title {{if $check.required}}(required){{endif}}
$check.help
+ +{{ if $phpath }} + +{{ endif }} + +{{ if $passed }} + + +{{ else }} + + +{{ endif }} +
diff --git a/view/install_db.tpl b/view/install_db.tpl index ff4e11ab1..7e2acdca5 100644 --- a/view/install_db.tpl +++ b/view/install_db.tpl @@ -1,44 +1,30 @@ -

$lbl_01

-

$lbl_02

+

$title

+

$pass

+

-$lbl_03 $lbl_04 $lbl_05 +$info_01
+$info_02
+$info_03

+{{ if $status }} +

$status

+{{ endif }} +
+ - - -
- - - -
- - - -
- - - -
- - - -
- -
-$lbl_10 -
+{{ inc field_input.tpl with $field=$dbhost }}{{endinc}} +{{ inc field_input.tpl with $field=$dbuser }}{{endinc}} +{{ inc field_input.tpl with $field=$dbpass }}{{endinc}} +{{ inc field_input.tpl with $field=$dbdata }}{{endinc}} -$tzselect -
-
diff --git a/view/install_settings.tpl b/view/install_settings.tpl new file mode 100644 index 000000000..05b87f904 --- /dev/null +++ b/view/install_settings.tpl @@ -0,0 +1,25 @@ + +

$title

+

$pass

+ + +{{ if $status }} +

$status

+{{ endif }} + +
+ + + + + + + + +{{ inc field_input.tpl with $field=$adminmail }}{{endinc}} +$timezone + + + +
+ -- cgit v1.2.3