diff --git a/include/text.php b/include/text.php index b5010864e6..f210bff721 100644 --- a/include/text.php +++ b/include/text.php @@ -20,6 +20,10 @@ function replace_macros($s,$r) { $stamp1 = microtime(true); $a = get_app(); + + // pass $baseurl to all templates + $r['$baseurl'] = $a->get_baseurl(); + $t = $a->template_engine(); try { diff --git a/mod/install.php b/mod/install.php index e30c306893..8434b38e38 100755 --- 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 index 0000000000..a4de276be9 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 index 0000000000..760eca5c3c 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 index 0000000000..fcd655bf65 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 index 0000000000..2f995d5993 --- /dev/null +++ b/view/install/style.css @@ -0,0 +1,58 @@ +/*** + * Friendica Communcation Server + * + * This is the static css for the install procedure + */ + +body { + background-color: #FFF; + max-width: 750px; + margin: 0 auto; +} + +section { + background-color: rgb(252, 252, 252); + padding: 0.5em 2em; +} + +h1 img { + vertical-align: sub; +} + +td { + padding: 0.2em; + border-bottom: 1px solid rgb(238, 238, 238); +} +td.help { + border-width: 0px 0px 2px 2px; + border-style: solid; + border-color: #000; + background: transparent url("/friendica/view/install/info.png") no-repeat scroll 5px 5px; +} +td.help blockquote { + margin-left: 60px; +} +input[type="submit"] { + margin: 2em 0; +} + +tt { + background-color: rgb(238, 238, 238); + padding: 0.1em 0.2em; +} + +.field { + margin-bottom: 0.5em; +} +.field label, +.field input, .field select, .field textarea { + width: 100%; + display: block; +} +.field .field_help { + color: #999; + text-align: right; + width: 100%; + display: block; + font-size: 0.8em; +} diff --git a/view/install/yellow.png b/view/install/yellow.png new file mode 100644 index 0000000000..52b31f3d34 Binary files /dev/null and b/view/install/yellow.png differ diff --git a/view/templates/install.tpl b/view/templates/install.tpl index 958ee40143..24ae022424 100644 --- a/view/templates/install.tpl +++ b/view/templates/install.tpl @@ -1,6 +1,6 @@ -

{{$title}}

+

{{$title}}

{{$pass}}

diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl index ca12425f05..10a197482b 100644 --- a/view/templates/install_checks.tpl +++ b/view/templates/install_checks.tpl @@ -1,12 +1,22 @@ -

{{$title}}

+

{{$title}}

{{$pass}}

{{foreach $checks as $check}} - + {{if $check.help}} - + {{/if}} {{/foreach}}
{{$check.title}} {{if $check.required}}(required){{/if}}
{{$check.title}} + {{if $check.status}} + Ok + {{else}} + {{if $check.required}} + Requirement not satisfied + {{else}} + Optional requirement not satisfied + {{/if}} + {{/if}} + {{if $check.required}}(required){{/if}}
{{$check.help}}
{{$check.help}}
diff --git a/view/templates/install_db.tpl b/view/templates/install_db.tpl index f66bf119e8..6b6c1c1e64 100644 --- a/view/templates/install_db.tpl +++ b/view/templates/install_db.tpl @@ -1,6 +1,6 @@ -

{{$title}}

+

{{$title}}

{{$pass}}

diff --git a/view/templates/install_settings.tpl b/view/templates/install_settings.tpl index 735672fe6e..8d6823f114 100644 --- a/view/templates/install_settings.tpl +++ b/view/templates/install_settings.tpl @@ -1,6 +1,6 @@ -

{{$title}}

+

{{$title}}

{{$pass}}