Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

4 files changed, 98 insertions, 86 deletions

diff --git a/view/tpl/install.tpl b/view/tpl/install.tpl
index 0e77aa97b..5ab722b12 100755
--- a/view/tpl/install.tpl
+++ b/view/tpl/install.tpl
@@ -1,9 +1,15 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
+<div class="container mt-4 mb-4">
+	<div class="jumbotron">
+		<h1>{{$title}}</h1>
+		<hr class="my-4">
+		<h2><i class="fa fa-{{$icon}}"></i>&nbsp; {{$pass}}</h2>
+	</div>
 
+	{{if $status}}
+	<div class="alert alert-danger">{{$status}}</div>
+	{{/if}}
 
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-{{$text}}
+	<div class="alert alert-info">{{$text}}</div>
+	<br>
+	{{$what_next}}
+</div>
diff --git a/view/tpl/install_checks.tpl b/view/tpl/install_checks.tpl
index ad0aef6a3..8bbb9f26d 100755
--- a/view/tpl/install_checks.tpl
+++ b/view/tpl/install_checks.tpl
@@ -1,24 +1,29 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-<form  action="{{$baseurl}}/index.php?q=setup" method="post">
-<table>
-{{foreach $checks as $check}}
-	<tr><td>{{$check.title}} </td><td><i class="fa {{if $check.status}}fa-check-square-o{{else}}{{if $check.required}}fa-square-o{{else}}fa-exclamation{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
-	{{if $check.help}}
-	<tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
-	{{/if}}
-{{/foreach}}
-</table>
+<div class="container mt-4 mb-4">
+	<div class="jumbotron">
+		<h1>{{$title}}</h1>
+		<hr class="my-4">
+		<h2><i class="fa fa-heartbeat"></i>&nbsp; {{$pass}}</h2>
+	</div>
+	<form  action="{{$baseurl}}/index.php?q=setup" method="post">
+		<table class="table">
+			{{foreach $checks as $check}}
+			<tr><td{{if ! $check.status}} class="text-danger"{{/if}}>{{$check.title}}</td><td><i class="fa {{if $check.status}}fa-check-square-o{{else}}{{if $check.required}}fa-square-o{{else}}fa-exclamation text-danger{{/if}}{{/if}}"></i></td><td>{{if $check.required}}(required){{/if}}</td></tr>
+			{{if $check.help}}
+			<tr><td colspan="3" class="border-top-0 pt-0 pb-0"><div class="alert alert-info">{{$check.help}}</div></td></tr>
+			{{/if}}
+			{{/foreach}}
+		</table>
 
-{{if $phpath}}
-	<input type="hidden" name="phpath" value="{{$phpath}}">
-{{/if}}
+		{{if $phpath}}
+		<input type="hidden" name="phpath" value="{{$phpath}}">
+		{{/if}}
 
-{{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}}">
-{{/if}}
-</form>
+		{{if $passed}}
+		<input type="hidden" name="pass" value="2">
+		<button class="btn btn-success" type="submit"><i class="fa fa-check"></i> {{$next}}</button>
+		{{else}}
+		<input type="hidden" name="pass" value="1">
+		<button class="btn btn-warning" type="submit"><i class="fa fa-refresh"></i> {{$reload}}</button>
+		{{/if}}
+	</form>
+</div>
diff --git a/view/tpl/install_db.tpl b/view/tpl/install_db.tpl
index 1a58de129..8b9023443 100755
--- a/view/tpl/install_db.tpl
+++ b/view/tpl/install_db.tpl
@@ -1,30 +1,31 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-<p>
-{{$info_01}}<br>
-{{$info_02}}<br>
-{{$info_03}}
-</p>
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/setup" method="post">
-
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="pass" value="3" />
-
-{{include file="field_input.tpl" field=$dbhost}}
-{{include file="field_input.tpl" field=$dbport}}
-{{include file="field_input.tpl" field=$dbuser}}
-{{include file="field_password.tpl" field=$dbpass}}
-{{include file="field_input.tpl" field=$dbdata}}
-{{include file="field_select.tpl" field=$dbtype}}
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
+<div class="container mt-4 mb-4">
+	<div class="jumbotron">
+		<h1>{{$title}}</h1>
+		<hr class="my-4">
+		<h2><i class="fa fa-database"></i>&nbsp; {{$pass}}</h2>
+	</div>
+	<div class="alert alert-info">
+	{{$info_01}}<br>
+	{{$info_02}}<br>
+	{{$info_03}}
+	</div>
+
+	{{if $status}}
+	<div class="alert alert-danger">{{$status}}</div>
+	{{/if}}
+
+	<form id="install-form" action="{{$baseurl}}/setup" method="post">
+		<input type="hidden" name="phpath" value="{{$phpath}}" />
+		<input type="hidden" name="pass" value="3" />
+
+		{{include file="field_input.tpl" field=$dbhost}}
+		{{include file="field_input.tpl" field=$dbport}}
+		{{include file="field_input.tpl" field=$dbuser}}
+		{{include file="field_password.tpl" field=$dbpass}}
+		{{include file="field_input.tpl" field=$dbdata}}
+		{{include file="field_select.tpl" field=$dbtype}}
+
+		<button class="btn btn-primary" id="install-submit" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> 
+	</form>
+</div>
 
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
index 62dcbb8b3..b62f8508b 100755
--- a/view/tpl/install_settings.tpl
+++ b/view/tpl/install_settings.tpl
@@ -1,28 +1,28 @@
-<h1>{{$title}}</h1>
-<h2>{{$pass}}</h2>
-
-
-{{if $status}}
-<h3 class="error-message">{{$status}}</h3>
-{{/if}}
-
-<form id="install-form" action="{{$baseurl}}/setup" method="post">
-
-<input type="hidden" name="phpath" value="{{$phpath}}" />
-<input type="hidden" name="dbhost" value="{{$dbhost}}" />
-<input type="hidden" name="dbport" value="{{$dbport}}" />
-<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="dbtype" value="{{$dbtype}}" />
-<input type="hidden" name="pass" value="4" />
-
-{{include file="field_input.tpl" field=$adminmail}}
-{{include file="field_input.tpl" field=$siteurl}}
-
-{{include file="field_select_grouped.tpl" field=$timezone}}
-
-<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> 
-
-</form>
-
+<div class="container mt-4 mb-4">
+	<div class="jumbotron">
+		<h1>{{$title}}</h1>
+		<hr class="my-4">
+		<h2><i class="fa fa-cogs"></i>&nbsp; {{$pass}}</h2>
+	</div>
+
+	{{if $status}}
+	<div class="alert alert-danger">{{$status}}</div>
+	{{/if}}
+
+	<form id="install-form" action="{{$baseurl}}/setup" method="post">
+		<input type="hidden" name="phpath" value="{{$phpath}}" />
+		<input type="hidden" name="dbhost" value="{{$dbhost}}" />
+		<input type="hidden" name="dbport" value="{{$dbport}}" />
+		<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="dbtype" value="{{$dbtype}}" />
+		<input type="hidden" name="pass" value="4" />
+
+		{{include file="field_input.tpl" field=$adminmail}}
+		{{include file="field_input.tpl" field=$siteurl}}
+		{{include file="field_select_grouped.tpl" field=$timezone}}
+
+		<button class="btn btn-primary" id="install-submit" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
+	</form>
+</div>