mirror of
https://github.com/friendica/friendica
synced 2025-12-13 20:24:36 +01:00
Additional log in screen adjustments
This commit is contained in:
parent
d8ff25aca6
commit
39023df019
5 changed files with 25 additions and 19 deletions
|
|
@ -217,9 +217,9 @@ class Nav
|
|||
|
||||
// nav links: array of array('href', 'text', 'extra css classes', 'title')
|
||||
if ($this->session->isAuthenticated()) {
|
||||
$nav['logout'] = ['logout', $this->l10n->t('Logout'), '', $this->l10n->t('End this session')];
|
||||
$nav['logout'] = ['logout', $this->l10n->t('Sign out'), '', $this->l10n->t('End this session')];
|
||||
} else {
|
||||
$nav['login'] = ['login', $this->l10n->t('Login'), ($this->router->getModuleClass() == Login::class ? 'selected' : ''), $this->l10n->t('Sign in')];
|
||||
$nav['login'] = ['login', $this->l10n->t('Sign in'), ($this->router->getModuleClass() == Login::class ? 'selected' : ''), $this->l10n->t('Sign in')];
|
||||
}
|
||||
|
||||
if ($this->session->isAuthenticated()) {
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ class Login extends BaseModule
|
|||
$reg = false;
|
||||
if ($register && Register::getPolicy() !== Register::CLOSED) {
|
||||
$reg = [
|
||||
'title' => DI::l10n()->t('Create a New Account'),
|
||||
'title' => DI::l10n()->t('Create an account'),
|
||||
'desc' => DI::l10n()->t('Register'),
|
||||
'url' => self::getRegisterURL()
|
||||
];
|
||||
|
|
@ -148,7 +148,7 @@ class Login extends BaseModule
|
|||
$identity = DI::session()->get('openid_identity');
|
||||
$username_desc = DI::l10n()->t('Please enter your username and password to add the OpenID to your existing account.');
|
||||
} else {
|
||||
$openid_title = DI::l10n()->t('Or login using OpenID');
|
||||
$openid_title = DI::l10n()->t('Or sign in using OpenID');
|
||||
$openid_readonly = false;
|
||||
$identity = '';
|
||||
$username_desc = '';
|
||||
|
|
@ -160,8 +160,9 @@ class Login extends BaseModule
|
|||
[
|
||||
'$notices' => $notices,
|
||||
'$dest_url' => DI::baseUrl() . '/login',
|
||||
'$logout' => DI::l10n()->t('Logout'),
|
||||
'$login' => DI::l10n()->t('Login'),
|
||||
'$logout' => DI::l10n()->t('Sign out'),
|
||||
'$login' => DI::l10n()->t('Sign in'),
|
||||
'$new' => DI::l10n()->t('New here?'),
|
||||
|
||||
'$lname' => ['username', DI::l10n()->t('Nickname or email'), '', $username_desc],
|
||||
'$lpassword' => ['password', DI::l10n()->t('Password'), '', ''],
|
||||
|
|
|
|||
|
|
@ -2592,6 +2592,11 @@ section > .generic-page-wrapper,
|
|||
overflow: hidden;
|
||||
}
|
||||
/* Home and Login Page */
|
||||
#login-head h1 {
|
||||
margin-top: 0;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
body.mod-home nav.navbar .nav > li > a:hover {
|
||||
background-color: rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
|
|
@ -2623,6 +2628,11 @@ body.mod-login .navbar #nav-login {
|
|||
margin: 15px 0;
|
||||
}
|
||||
|
||||
#new-here {
|
||||
font-size: 20px;
|
||||
margin-top: -5px;
|
||||
}
|
||||
|
||||
/* contacts page */
|
||||
ul.viewcontact_wrapper {
|
||||
margin-left: -15px;
|
||||
|
|
@ -3699,14 +3709,11 @@ section .profile-match-wrapper {
|
|||
text-align: right;
|
||||
}
|
||||
#div_id_remember {
|
||||
float: left;
|
||||
margin: 20px 0;
|
||||
}
|
||||
#id_password_wrapper {
|
||||
margin-bottom: unset;
|
||||
}
|
||||
#login_openid {
|
||||
clear: both;
|
||||
}
|
||||
.login-form hr, #modal-body hr {
|
||||
margin: 25px 0;
|
||||
}
|
||||
|
|
@ -3716,12 +3723,9 @@ section .profile-match-wrapper {
|
|||
#register-link {
|
||||
color: white;
|
||||
background: #5aa071;
|
||||
margin-bottom: 15px;
|
||||
margin-bottom: 10px;
|
||||
width: 75%;
|
||||
}
|
||||
#login-end {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.mod-home.is-not-singleuser,
|
||||
.mod-login {
|
||||
|
|
@ -3927,7 +3931,7 @@ section .profile-match-wrapper {
|
|||
.mod-home.is-not-singleuser .login-form,
|
||||
.mod-login #content .login-form {
|
||||
background-color: #fff;
|
||||
padding: 1em;
|
||||
padding: 1.5em;
|
||||
position: relative;
|
||||
}
|
||||
.mod-home.is-not-singleuser .login-form > #login-extra-links {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<div id="login-group" role="group" aria-labelledby="login-head">
|
||||
<input type="hidden" name="auth-params" value="login" />
|
||||
|
||||
<div id="login-head" class="sr-only">{{$login}}</div>
|
||||
<div id="login-head"><h1>{{$login}}</h1></div>
|
||||
|
||||
<div id="login_standard">
|
||||
<div id="id_{{$lname.0}}_wrapper" class="form-group field input">
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
</div>
|
||||
<div id="login-end"></div>
|
||||
<div id="login-lost-password-link">
|
||||
<a href="lostpass" title="{{$lostpass}}" id="lost-password-link">{{$lostlink}}</a>
|
||||
<a href="lostpass" id="lost-password-link">{{$lostlink}}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -58,7 +58,8 @@
|
|||
{{if $register}}
|
||||
<hr>
|
||||
<div id="login-extra-links">
|
||||
<p id="new-here">{{$new}}</p>
|
||||
<h3 id="login-head" class="sr-only">{{$register.title}}</h3>
|
||||
<a href="{{$register.url}}" title="{{$register.title}}" id="register-link" class="btn btn-default">{{$register.desc}}</a>
|
||||
<a href="{{$register.url}}" id="register-link" class="btn btn-default">{{$register.title}}</a>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
<div id="register-name-wrapper" class="form-group">
|
||||
<label for="register-name" id="label-register-name">{{$namelabel}}</label>
|
||||
<input type="text" maxlength="60" size="32" name="username" id="register-name" class="form-control" value="{{$username}}" required>
|
||||
<input type="text" maxlength="60" size="32" name="username" id="register-name" class="form-control" value="{{$username}}" required autofocus>
|
||||
</div>
|
||||
<div id="register-name-end"></div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue