Merge branch 'master' of http://github.com/erikl/friendika into erikl-master

Conflicts:
	view/sv/contact_edit.tpl
	view/sv/strings.php

1 files changed, 40 insertions, 0 deletions

diff --git a/view/sv/install_db.tpl b/view/sv/install_db.tpl
new file mode 100644
index 000000000..c413689c2
--- /dev/null
+++ b/view/sv/install_db.tpl
@@ -0,0 +1,40 @@
+
+<h3>Friendika Social Network</h3>
+<h3>Installation</h3>
+
+<p>
+In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. 
+</p>
+
+<form id="install-form" action="$baseurl/install" method="post">
+
+<input type="hidden" name="phpath" value="$phpath" />
+
+<label for="install-dbhost" id="install-dbhost-label">Database Server Name</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">Database Login Name</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">Database Login Password</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">Database Name</label>
+<input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
+<div id="install-dbdata-end"></div>
+
+<div id="install-tz-desc">
+Please select a default timezone for your website
+</div>
+
+$tzselect
+
+<div id="install-tz-end" ></div>
+<input id="install-submit" type="submit" name="submit" value="$submit" /> 
+
+</form>
+<div id="install-end" ></div>
+