From 4728e72d182f78dc2f5768fdb55d1e142fc92129 Mon Sep 17 00:00:00 2001 From: git-marijus Date: Mon, 17 Jul 2017 16:19:19 +0200 Subject: [PATCH] some love for the installer --- Zotlabs/Module/Setup.php | 27 +++++++++++-------- view/css/mod_setup.css | 40 --------------------------- view/php/mod_import.php | 2 -- view/php/mod_setup.php | 2 ++ view/tpl/install.tpl | 20 +++++++++----- view/tpl/install_checks.tpl | 49 ++++++++++++++++++--------------- view/tpl/install_db.tpl | 51 ++++++++++++++++++----------------- view/tpl/install_settings.tpl | 48 ++++++++++++++++----------------- 8 files changed, 108 insertions(+), 131 deletions(-) delete mode 100644 view/css/mod_setup.css delete mode 100644 view/php/mod_import.php create mode 100644 view/php/mod_setup.php diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index e5b54cc5f..2134288d6 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -186,14 +186,17 @@ class Setup extends \Zotlabs\Web\Controller { } $db_return_text = ''; if(x(\App::$data, 'db_installed')) { - $txt = '

'; - $txt .= t('Your site database has been installed.') . EOL; + $pass = 'Installation succeeded!'; + $icon = 'check'; + $txt = t('Your site database has been installed.') . EOL; $db_return_text .= $txt; } if(x(\App::$data, 'db_failed')) { + $pass = 'Database install failed!'; + $icon = 'exclamation-triangle'; $txt = t('You may need to import the file "install/schema_xxx.sql" manually using a database client.') . EOL; $txt .= t('Please see the file "install/INSTALL.txt".') . EOL ."

" ; - $txt .= "
".\App::$data['db_failed'] . "
". EOL ; + $txt .= "
" . \App::$data['db_failed'] . "
". EOL ; $db_return_text .= $txt; } if(\DBA::$dba && \DBA::$dba->connected) { @@ -217,8 +220,10 @@ class Setup extends \Zotlabs\Web\Controller { $tpl = get_markup_template('install.tpl'); return replace_macros($tpl, array( '$title' => $install_title, - '$pass' => '', - '$text' => $db_return_text . $this->what_next(), + '$icon' => $icon, + '$pass' => $pass, + '$text' => $db_return_text, + '$what_next' => $this->what_next() )); } @@ -395,7 +400,7 @@ class Setup extends \Zotlabs\Web\Controller { if(!$passed) { $help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL; $help .= t('If you don\'t have a command line version of PHP installed on server, you will not be able to run background polling via cron.') . EOL; - $help .= EOL . EOL ; + $help .= EOL; $tpl = get_markup_template('field_input.tpl'); $help .= replace_macros($tpl, array( '$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable. You can leave this blank to continue the installation.')), @@ -443,7 +448,7 @@ class Setup extends \Zotlabs\Web\Controller { userReadableSize($result['max_upload_filesize']), $result['max_file_uploads'] ); - $help .= '
' . t('You can adjust these settings in the server php.ini file.'); + $help .= '

' . t('You can adjust these settings in the server php.ini file.'); $this->check_add($checks, t('PHP upload limits'), true, false, $help); } @@ -735,12 +740,12 @@ class Setup extends \Zotlabs\Web\Controller { $baseurl = z_root(); return - t('

What next

') - ."

".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') + t('

What next?

') + ."
".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.').EOL .t('Please see the file "install/INSTALL.txt".') - ."

" + ."

" .t("Go to your new hub registration page and register as new member. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.") - ."

"; + ."
"; } /** diff --git a/view/css/mod_setup.css b/view/css/mod_setup.css deleted file mode 100644 index f0d91a0ae..000000000 --- a/view/css/mod_setup.css +++ /dev/null @@ -1,40 +0,0 @@ -#install-dbhost-label, -#install-dbuser-label, -#install-dbpass-label, -#install-dbdata-label, -#install-tz-desc { - float: left; - width: 250px; - margin-top: 10px; - margin-bottom: 10px; - -} - -#install-dbhost, -#install-dbuser, -#install-dbpass, -#install-dbdata { - float: left; - width: 200px; - margin-left: 20px; -} - -#install-dbhost-end, -#install-dbuser-end, -#install-dbpass-end, -#install-dbdata-end, -#install-tz-end { - clear: both; -} - -#install-form select#timezone_select { - float: left; - margin-top: 18px; - margin-left: 20px; -} - -main { - max-width: 790px; - margin-left: auto; - margin-right: auto; -} diff --git a/view/php/mod_import.php b/view/php/mod_import.php deleted file mode 100644 index 56c4eff86..000000000 --- a/view/php/mod_import.php +++ /dev/null @@ -1,2 +0,0 @@ -{{$title}} -

{{$pass}}

+
+
+

{{$title}}

+
+

  {{$pass}}

+
+ {{if $status}} +
{{$status}}
+ {{/if}} -{{if $status}} -

{{$status}}

-{{/if}} - -{{$text}} +
{{$text}}
+
+ {{$what_next}} +
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 @@ -

{{$title}}

-

{{$pass}}

-
- -{{foreach $checks as $check}} - - {{if $check.help}} - - {{/if}} -{{/foreach}} -
{{$check.title}} {{if $check.required}}(required){{/if}}
{{$check.help}}
+
+
+

{{$title}}

+
+

  {{$pass}}

+
+ + + {{foreach $checks as $check}} + {{$check.title}} + {{if $check.help}} + + {{/if}} + {{/foreach}} +
{{if $check.required}}(required){{/if}}
{{$check.help}}
-{{if $phpath}} - -{{/if}} + {{if $phpath}} + + {{/if}} -{{if $passed}} - - -{{else}} - - -{{/if}} - + {{if $passed}} + + + {{else}} + + + {{/if}} + +
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 @@ -

{{$title}}

-

{{$pass}}

+
+
+

{{$title}}

+
+

  {{$pass}}

+
+
+ {{$info_01}}
+ {{$info_02}}
+ {{$info_03}} +
+ {{if $status}} +
{{$status}}
+ {{/if}} -

-{{$info_01}}
-{{$info_02}}
-{{$info_03}} -

+
+ + -{{if $status}} -

{{$status}}

-{{/if}} + {{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}} - - - - - -{{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}} - - - -
+ + +
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 @@ -

{{$title}}

-

{{$pass}}

+
+
+

{{$title}}

+
+

  {{$pass}}

+
+ {{if $status}} +
{{$status}}
+ {{/if}} -{{if $status}} -

{{$status}}

-{{/if}} +
+ + + + + + + + - - - - - - - - - - - -{{include file="field_input.tpl" field=$adminmail}} -{{include file="field_input.tpl" field=$siteurl}} - -{{include file="field_select_grouped.tpl" field=$timezone}} - - - -
+ {{include file="field_input.tpl" field=$adminmail}} + {{include file="field_input.tpl" field=$siteurl}} + {{include file="field_select_grouped.tpl" field=$timezone}} + + +