mirror of
https://github.com/friendica/friendica
synced 2024-12-23 02:40:17 +00:00
install messages persist, some colour coordination
This commit is contained in:
parent
db22a6cbe0
commit
964ca0e079
3 changed files with 24 additions and 31 deletions
|
@ -17,7 +17,7 @@ if(isset($lang) && strlen($lang))
|
||||||
|
|
||||||
require_once("dba.php");
|
require_once("dba.php");
|
||||||
$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
|
$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
|
||||||
unset($db_host, $db_user, $db_pass, $db_data);
|
unset($db_host, $db_user, $db_pass, $db_data);
|
||||||
|
|
||||||
if(! $install)
|
if(! $install)
|
||||||
require_once("session.php");
|
require_once("session.php");
|
||||||
|
|
|
@ -44,8 +44,11 @@ function install_post(&$a) {
|
||||||
// that you'll see the following important notice (which is stored in the session).
|
// that you'll see the following important notice (which is stored in the session).
|
||||||
|
|
||||||
session_write_close();
|
session_write_close();
|
||||||
|
|
||||||
require_once('session.php');
|
require_once('session.php');
|
||||||
session_start();
|
session_start();
|
||||||
|
session_regenerate_id();
|
||||||
|
|
||||||
$_SESSION['sysmsg'] = '';
|
$_SESSION['sysmsg'] = '';
|
||||||
|
|
||||||
notice( t('Database import succeeded.') . EOL
|
notice( t('Database import succeeded.') . EOL
|
||||||
|
@ -94,12 +97,11 @@ function install_content(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function check_php(&$phpath) {
|
function check_php(&$phpath) {
|
||||||
|
$o = '';
|
||||||
$phpath = trim(shell_exec('which php'));
|
$phpath = trim(shell_exec('which php'));
|
||||||
if(! strlen($phpath)) {
|
if(! strlen($phpath)) {
|
||||||
$o .= <<< EOT
|
$o .= t('Could not find a command line version of PHP in the web server PATH.');
|
||||||
Could not find a command line version of PHP in the web server PATH. This is required. Please adjust the configuration file .htconfig.php accordingly.
|
$o .= t('This is required. Please adjust the configuration file .htconfig.php accordingly.');
|
||||||
|
|
||||||
EOT;
|
|
||||||
}
|
}
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
@ -109,16 +111,10 @@ function check_htconfig() {
|
||||||
if(((file_exists('.htconfig.php')) && (! is_writable('.htconfig.php')))
|
if(((file_exists('.htconfig.php')) && (! is_writable('.htconfig.php')))
|
||||||
|| (! is_writable('.'))) {
|
|| (! is_writable('.'))) {
|
||||||
|
|
||||||
$o .= <<< EOT
|
$o = t('The web installer needs to be able to create a file called ".htconfig.php" in the top folder of your web server and it is unable to do so.');
|
||||||
|
$o .= t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.');
|
||||||
The web installer needs to be able to create a file called ".htconfig.php" in the top folder of
|
$o .= t('Please check with your site documentation or support people to see if this situation can be corrected.');
|
||||||
your web server. It is unable to do so. This is most often a permission setting, as the web server
|
$o .= t('If not, you may be required to perform a manual installation. Please see the file "INSTALL" for instructions.');
|
||||||
may not be able to write files in your folder (even if you can).
|
|
||||||
|
|
||||||
Please check with your site documentation or support people to see if this situation can be corrected.
|
|
||||||
If not, you may be required to perform a manual installation. Please see the file "INSTALL" for instructions.
|
|
||||||
|
|
||||||
EOT;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
|
@ -126,12 +122,9 @@ return $o;
|
||||||
|
|
||||||
|
|
||||||
function manual_config(&$a) {
|
function manual_config(&$a) {
|
||||||
$o .= <<< EOT
|
$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
|
||||||
The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.
|
$o .= "<textarea rows=\"24\" cols=\"80\" >{$a->data}</textarea>";
|
||||||
|
return $o;
|
||||||
<textarea rows="24" cols="80" >{$a->data}</textarea>
|
|
||||||
EOT;
|
|
||||||
return $o;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@ a, a:visited {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
a:hover {
|
a:hover {
|
||||||
color: #29BBF2;
|
color: #0CBEFE;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
input, select {
|
input, select {
|
||||||
|
@ -33,7 +33,7 @@ input, select {
|
||||||
}
|
}
|
||||||
input:hover {
|
input:hover {
|
||||||
|
|
||||||
background-color: #29BBF2;
|
background-color: #0CBEFE;
|
||||||
/* background-color: #49dbFa; */
|
/* background-color: #49dbFa; */
|
||||||
color: black;
|
color: black;
|
||||||
/* color: #F5F6FB; */
|
/* color: #F5F6FB; */
|
||||||
|
@ -76,7 +76,7 @@ blockquote:before {
|
||||||
border: 1px solid #858585;
|
border: 1px solid #858585;
|
||||||
}
|
}
|
||||||
#notification-show-hide-link:hover {
|
#notification-show-hide-link:hover {
|
||||||
background-color: #29BBF2;
|
background-color: #0CBEFE;
|
||||||
color: #F5F6FB;
|
color: #F5F6FB;
|
||||||
border: 1px solid #F5F6FB;
|
border: 1px solid #F5F6FB;
|
||||||
}
|
}
|
||||||
|
@ -105,7 +105,7 @@ blockquote:before {
|
||||||
}
|
}
|
||||||
|
|
||||||
.fakelink:hover {
|
.fakelink:hover {
|
||||||
color: #29BBF2;
|
color: #0CBEFE;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
@ -206,7 +206,7 @@ footer {
|
||||||
/*margin: 20px 20px 20px 20px;*/
|
/*margin: 20px 20px 20px 20px;*/
|
||||||
|
|
||||||
position: fixed;
|
position: fixed;
|
||||||
background-color: #29BBF2;
|
background-color: #0CBEFE;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
padding: 2px 3%;
|
padding: 2px 3%;
|
||||||
}
|
}
|
||||||
|
@ -226,7 +226,7 @@ footer {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
.powered a:hover {
|
.powered a:hover {
|
||||||
color: #F8FF15;
|
color: #FFC019;
|
||||||
}
|
}
|
||||||
.error-message {
|
.error-message {
|
||||||
color: #FF0000;
|
color: #FF0000;
|
||||||
|
@ -253,7 +253,7 @@ footer {
|
||||||
border-radius-topright: 3px;
|
border-radius-topright: 3px;
|
||||||
}
|
}
|
||||||
.nav-link:hover {
|
.nav-link:hover {
|
||||||
background-color: #29BBF2;
|
background-color: #0CBEFE;
|
||||||
color: #F5F6FB;
|
color: #F5F6FB;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -308,7 +308,7 @@ footer {
|
||||||
border-radius-topright: 3px;
|
border-radius-topright: 3px;
|
||||||
}
|
}
|
||||||
.nav-commlink:hover {
|
.nav-commlink:hover {
|
||||||
background-color: #29BBF2;
|
background-color: #0CBEFE;
|
||||||
color: #F5F6FB;
|
color: #F5F6FB;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1320,7 +1320,7 @@ input#dfrn-url {
|
||||||
border: 1px solid #858585;
|
border: 1px solid #858585;
|
||||||
}
|
}
|
||||||
.profile-tabs:hover {
|
.profile-tabs:hover {
|
||||||
background-color: #29BBF2;
|
background-color: #0CBEFE;
|
||||||
color: #F5F6FB;
|
color: #F5F6FB;
|
||||||
border: 1px solid #F5F6FB;
|
border: 1px solid #F5F6FB;
|
||||||
/*cursor: pointer;*/
|
/*cursor: pointer;*/
|
||||||
|
@ -1548,7 +1548,7 @@ a.mail-list-link:hover {
|
||||||
/*display: block;*/
|
/*display: block;*/
|
||||||
}
|
}
|
||||||
.message-links a:hover {
|
.message-links a:hover {
|
||||||
background-color: #29BBF2;
|
background-color: #0CBEFE;
|
||||||
color: #F5F6FB;
|
color: #F5F6FB;
|
||||||
/*border: 1px solid #F5F6FB;*/
|
/*border: 1px solid #F5F6FB;*/
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue