Installer use static css, fix #2071

diff --git a/mod/install.php b/mod/install.php
index e30c30689308ae4e9c41c39154b24376c621e481..8434b38e387f21e7953bc68b9c2163750284cd34 100755 (executable)
--- a/mod/install.php
+++ b/mod/install.php
@@ -11,6 +11,14 @@ function install_init(&$a){
                echo "ok";
                killme();
        }
+       
+       // We overwrite current theme css, because during install we could not have a working mod_rewrite
+       // so we could not have a css at all. Here we set a static css file for the install procedure pages
+       $a->config['system']['theme'] = "../install";
+       $a->theme['stylesheet'] = $a->get_baseurl()."/view/install/style.css";
+       
+       
+       
        global $install_wizard_pass;
        if (x($_POST,'pass'))
                $install_wizard_pass = intval($_POST['pass']);

diff --git a/view/install/green.png b/view/install/green.png
new file mode 100644 (file)
index 0000000..a4de276
Binary files /dev/null and b/view/install/green.png differ

diff --git a/view/install/info.png b/view/install/info.png
new file mode 100644 (file)
index 0000000..760eca5
Binary files /dev/null and b/view/install/info.png differ

diff --git a/view/install/red.png b/view/install/red.png
new file mode 100644 (file)
index 0000000..fcd655b
Binary files /dev/null and b/view/install/red.png differ

diff --git a/view/install/style.css b/view/install/style.css
new file mode 100644 (file)
index 0000000..2f995d5
--- /dev/null
+++ b/view/install/style.css
@@ -0,0 +1,58 @@
+/***\r
+ * Friendica Communcation Server\r
+ *\r
+ * This is the static css for the install procedure\r
+ */\r
+\r
+body {\r
+       background-color: #FFF;\r
+       max-width: 750px;\r
+       margin: 0 auto;\r
+}\r
+\r
+section {\r
+    background-color: rgb(252, 252, 252);\r
+    padding: 0.5em 2em;\r
+}\r
+\r
+h1 img {\r
+       vertical-align: sub;\r
+}\r
+\r
+td {\r
+       padding: 0.2em;\r
+       border-bottom: 1px solid rgb(238, 238, 238);\r
+}\r
+td.help {\r
+       border-width: 0px 0px 2px 2px;\r
+       border-style: solid;\r
+       border-color: #000;\r
+       background: transparent url("/friendica/view/install/info.png") no-repeat scroll 5px 5px;\r
+}\r
+td.help blockquote {\r
+       margin-left: 60px;\r
+}\r
+input[type="submit"] {\r
+       margin: 2em 0;\r
+}\r
+\r
+tt {\r
+       background-color: rgb(238, 238, 238);\r
+       padding: 0.1em 0.2em;\r
+}\r
+\r
+.field {\r
+       margin-bottom: 0.5em;\r
+}\r
+.field label,\r
+.field input, .field select, .field textarea {\r
+    width: 100%;\r
+    display: block;\r
+}\r
+.field .field_help {\r
+       color: #999;\r
+       text-align: right;\r
+       width: 100%;\r
+       display: block;\r
+       font-size: 0.8em;\r
+}\r

diff --git a/view/install/yellow.png b/view/install/yellow.png
new file mode 100644 (file)
index 0000000..52b31f3
Binary files /dev/null and b/view/install/yellow.png differ

diff --git a/view/templates/install.tpl b/view/templates/install.tpl
index 958ee40143d20beadb1272f4dba9a6d0d96d5a54..24ae0224241e703f2a3c56e823634afc50109601 100644 (file)
--- a/view/templates/install.tpl
+++ b/view/templates/install.tpl
@@ -1,6 +1,6 @@
 
 
-<h1>{{$title}}</h1>
+<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
 
 

diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl
index ca12425f0584bede0e152d94d2477d6de0d9d1b8..10a197482b9b2689bdaa047f93f8f894649025c4 100644 (file)
--- a/view/templates/install_checks.tpl
+++ b/view/templates/install_checks.tpl
@@ -1,12 +1,22 @@
 
-<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">
 <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}} </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}}</blockquote></td></tr>
        {{/if}}
 {{/foreach}}
 </table>

diff --git a/view/templates/install_db.tpl b/view/templates/install_db.tpl
index f66bf119e88bbf8f6a959ad3ddd723189795e31c..6b6c1c1e64e1d01c6eff9a212a15a264b8c0e28d 100644 (file)
--- a/view/templates/install_db.tpl
+++ b/view/templates/install_db.tpl
@@ -1,6 +1,6 @@
 
 
-<h1>{{$title}}</h1>
+<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
 <h2>{{$pass}}</h2>
 
 

diff --git a/view/templates/install_settings.tpl b/view/templates/install_settings.tpl
index 735672fe6e749f3e01dd7299c57ccc8dbb1e406a..8d6823f11414f4902d83fb85200dc9506f36284b 100644 (file)
--- a/view/templates/install_settings.tpl
+++ b/view/templates/install_settings.tpl
@@ -1,6 +1,6 @@
 
 
-<h1>{{$title}}</h1>
+<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
 <h2>{{$pass}}</h2>