From c7bfd1e1bae28f2305e2d1d3425052a864a6e251 Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabio@krik.localdomain>
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 @@
+
+<h1>$title</h1>
+<h2>$pass</h2>
+
+
+{{ if $status }}
+<h3 class="error-message">$status</h3>
+{{ 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 @@
+<h1>$title</h1>
+<h2>$pass</h2>
+<form  action="$baseurl/install" method="POST">
+<table>
+{{ for $checks as $check }}
+	<tr><td>$check.title </td><td><span class="icon s22 {{if $check.status}}on{{else}}off{{endif}}"></td><td>{{if $check.required}}(required){{endif}}</td></tr>
+	{{if $check.help }}
+	<tr><td colspan="3">$check.help</td></tr>
+	{{endif}}
+{{ endfor }}
+</table>
+
+{{ if $phpath }}
+	<input type="hidden" name="phpath" value="$phpath">
+{{ endif }}
+
+{{ if $passed }}
+	<input type="hidden" name="pass" value="2">
+	<input type="submit" value="$next">
+{{ else }}
+	<input type="hidden" name="pass" value="1">
+	<input type="submit" value="$reload">
+{{ endif }}
+</form>
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 @@
 
-<h3>$lbl_01</h3>
-<h3>$lbl_02</h3>
+<h1>$title</h1>
+<h2>$pass</h2>
+
 
 <p>
-$lbl_03 $lbl_04 $lbl_05
+$info_01<br>
+$info_02<br>
+$info_03
 </p>
 
+{{ if $status }}
+<h3 class="error-message">$status</h3>
+{{ endif }}
+
 <form id="install-form" action="$baseurl/install" method="post">
 
 <input type="hidden" name="phpath" value="$phpath" />
+<input type="hidden" name="pass" value="3" />
 
-<label for="install-dbhost" id="install-dbhost-label">$lbl_06</label>
-<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
-<div id="install-dbhost-end"></div>
-
-<label for="install-dbuser" id="install-dbuser-label">$lbl_07</label>
-<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
-<div id="install-dbuser-end"></div>
-
-<label for="install-dbpass" id="install-dbpass-label">$lbl_08</label>
-<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
-<div id="install-dbpass-end"></div>
-
-<label for="install-dbdata" id="install-dbdata-label">$lbl_09</label>
-<input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
-<div id="install-dbdata-end"></div>
-
-<label for="install-admin" id="install-admin-label">$lbl_11</label>
-<input type="text" name="adminmail" id="install-admin"  value="$adminmail" />
-<div id="install-admin-end"></div>
-
-<div id="install-tz-desc">
-$lbl_10
-</div>
+{{ 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
 
-<div id="install-tz-end" ></div>
 <input id="install-submit" type="submit" name="submit" value="$submit" /> 
 
 </form>
-<div id="install-end" ></div>
 
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 @@
+
+<h1>$title</h1>
+<h2>$pass</h2>
+
+
+{{ if $status }}
+<h3 class="error-message">$status</h3>
+{{ endif }}
+
+<form id="install-form" action="$baseurl/install" method="post">
+
+<input type="hidden" name="phpath" value="$phpath" />
+<input type="hidden" name="dbhost" value="$dbhost" />
+<input type="hidden" name="dbuser" value="$dbuser" />
+<input type="hidden" name="dbpass" value="$dbpass" />
+<input type="hidden" name="dbdata" value="$dbdata" />
+<input type="hidden" name="pass" value="4" />
+
+{{ inc field_input.tpl with $field=$adminmail }}{{endinc}}
+$timezone
+
+<input id="install-submit" type="submit" name="submit" value="$submit" /> 
+
+</form>
+
-- 
cgit v1.2.3