harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some love for the installer

Browse Source
This commit is contained in:
git-marijus
2017-07-17 16:19:19 +02:00
parent 5408264559
commit 4728e72d18
8 changed files with 108 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Zotlabs/Module/Setup.php
View File

@@ -186,14 +186,17 @@ class Setup extends \Zotlabs\Web\Controller {
}
$db_return_text = '';
if(x(\App::$data, 'db_installed')) {
$txt = '<p style="font-size: 130%;">';
$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 ."<hr>" ;
$txt .= "<pre>".\App::$data['db_failed'] . "</pre>". EOL ;
$txt .= "<pre>" . \App::$data['db_failed'] . "</pre>". 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 .= '<br>' . t('You can adjust these settings in the server php.ini file.');
$help .= '<br><br>' . 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('<h1>What next</h1>')
."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
t('<h1>What next?</h1>')
."<div class=\"alert alert-info\">".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.').EOL
.t('Please see the file "install/INSTALL.txt".')
."</p><p>"
."</div><div>"
.t("Go to your new hub <a href='$baseurl/register'>registration page</a> 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.")
."</p>";
."</div>";
}
/**

40
view/css/mod_setup.css
View File

@@ -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;
}

2
view/php/mod_import.php
View File

@@ -1,2 +0,0 @@
<?php
App::$page['template'] = 'full';

2
view/php/mod_setup.php Normal file
View File

@@ -0,0 +1,2 @@
<?php
App::$page['template'] = 'zen';

20
view/tpl/install.tpl
View File

@@ -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>

49
view/tpl/install_checks.tpl
View File

@@ -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>

51
view/tpl/install_db.tpl
View File

@@ -1,30 +1,31 @@
<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-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}}
<p>
{{$info_01}}<br>
{{$info_02}}<br>
{{$info_03}}
</p>
<form id="install-form" action="{{$baseurl}}/setup" method="post">
<input type="hidden" name="phpath" value="{{$phpath}}" />
<input type="hidden" name="pass" value="3" />
{{if $status}}
<h3 class="error-message">{{$status}}</h3>
{{/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}}
<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>
<button class="btn btn-primary" id="install-submit" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
</form>
</div>

48
view/tpl/install_settings.tpl
View File

@@ -1,28 +1,28 @@
<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-cogs"></i>&nbsp; {{$pass}}</h2>
</div>
{{if $status}}
<div class="alert alert-danger">{{$status}}</div>
{{/if}}
{{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" />
<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>
{{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>