Merge branch '2021.03-rc' into copyright-2021

[friendica.git] / view / templates / install_checks.tpl

diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl
index ca12425f0584bede0e152d94d2477d6de0d9d1b8..4574faf060b0c960e49a2d53fce4685e93af604c 100644 (file)
--- a/view/templates/install_checks.tpl
+++ b/view/templates/install_checks.tpl
@@ -1,25 +1,41 @@
 
-<h1>{{$title}}</h1>
+<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
-<form  action="{{$baseurl}}/index.php?q=install" method="post">
+<form  action="{{$baseurl}}/index.php?pagename=install" method="post">
 <table>
 {{foreach $checks as $check}}
-       <tr><td>{{$check.title}} </td><td><span class="icon s22 {{if $check.status}}on{{else}}{{if $check.required}}off{{else}}yellow{{/if}}{{/if}}"></td><td>{{if $check.required}}(required){{/if}}</td></tr>
+       <tr><td>{{$check.title nofilter}} </td><td>
+       {{if $check.status}}
+               <img src="{{$baseurl}}/view/install/green.png" alt="{{$ok}}">
+       {{else}}
+               {{if $check.required}}
+                       <img src="{{$baseurl}}/view/install/red.png" alt="{{$requirement_not_satisfied}}">
+               {{else}}
+                       <img src="{{$baseurl}}/view/install/yellow.png" alt="{{$optional_requirement_not_satisfied}}">
+               {{/if}}
+       {{/if}}
+       </td><td>{{if $check.required}}{{$required}}{{/if}}</td></tr>
        {{if $check.help}}
-       <tr><td colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
+       <tr><td class="help" colspan="3">
+               <blockquote>{{$check.help nofilter}}</blockquote>
+               {{if $check.error_msg}}
+               <div class="error_header"><b>{{$check.error_msg.head}}<br><a href="{{$check.error_msg.url}}">{{$check.error_msg.url}}</a></b></div>
+               <blockquote>{{$check.error_msg.msg}}</blockquote>
+               {{/if}}
+       </td></tr>
        {{/if}}
 {{/foreach}}
 </table>
 
 {{if $phpath}}
-       <input type="hidden" name="phpath" value="{{$phpath|escape:'html'}}">
+       <input type="hidden" name="config-php_path" value="{{$php_path}}">
 {{/if}}
 
 {{if $passed}}
        <input type="hidden" name="pass" value="2">
-       <input type="submit" value="{{$next|escape:'html'}}">
+       <input type="submit" value="{{$next}}">
 {{else}}
        <input type="hidden" name="pass" value="1">
-       <input type="submit" value="{{$reload|escape:'html'}}">
+       <input type="submit" value="{{$reload}}">
 {{/if}}
 </form>