wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenID login link

Browse Source
This commit is contained in:
Hannes Mannerheim 2014-12-08 17:39:47 +01:00
parent 73c32af95d
commit c7b84ce637
4 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
actions/qvitter.php
View File

@ -211,7 +211,8 @@ class QvitterAction extends ApiAction
#user-body #user-groups:hover .label,
#user-body #user-following:hover .label,
ul.stats a strong,
.queet-box-extras button {
.queet-box-extras button,
#openid-login:hover:after {
color:#0084B4;/*COLOREND*/
}
#unseen-notifications,
@ -273,7 +274,7 @@ class QvitterAction extends ApiAction
<li class="fullwidth"><a id="logout"></a></li>
<li class="fullwidth dropdown-divider"></li>
<li class="fullwidth"><a id="edit-profile-header-link"></a></li>
<li class="fullwidth"><a id="settings" href="<?php print $instanceurl; ?>settings/profile"></a></li>
<li class="fullwidth"><a id="settings" href="<?php print $instanceurl; ?>settings/profile" donthijack></a></li>
<li class="fullwidth"><a id="faq-link"></a></li>
<li class="fullwidth"><a id="classic-link"></a></li>
<li class="fullwidth language dropdown-divider"></li>
@ -369,8 +370,15 @@ class QvitterAction extends ApiAction
</td>
</tr></tbody></table>
<div id="remember-forgot">
<input type="checkbox" id="rememberme" name="rememberme" value="yes" tabindex="3" checked="checked"> <span id="rememberme_label"></span> · <a href="<?php print $instanceurl ?>main/recoverpassword"></a>
<input type="hidden" id="token" name="token" value="<?php print common_session_token(); ?>">
<input type="checkbox" id="rememberme" name="rememberme" value="yes" tabindex="3" checked="checked"> <span id="rememberme_label"></span> · <a id="forgot-password" href="<?php print $instanceurl ?>main/recoverpassword" ></a>
<input type="hidden" id="token" name="token" value="<?php print common_session_token(); ?>">
<?php
if(!common_config('plugins','disable-OpenID')) {
print '<a href="'.$instanceurl.'main/openid" id="openid-login" donthijack>OpenID</a>';
}
?>
</div>
</form>
</div>

23
css/qvitter.css
View File

@ -797,6 +797,29 @@ button#submit-login:hover {
margin: -1px 0 0 0;
vertical-align: text-top;
}
#remember-forgot #openid-login {
height:20px;
width:20px;
overflow:hidden;
cursor:pointer;
display:inline;
font-size:0;
}
#remember-forgot #openid-login:hover {
text-decoration:none;
}
#remember-forgot #openid-login:before {
content: " · ";
font-size:11px;
}
#remember-forgot #openid-login:after {
font-family:FontAwesome;
font-size:12px;
content: "\f19b";
}
#username-container {
color: #333333;
left: 12px;

2
js/lan.js
View File

@ -2018,7 +2018,7 @@ $('#nickname').attr('placeholder',window.sL.loginUsername);
$('#password').attr('placeholder',window.sL.loginPassword);
$('button#submit-login').html(window.sL.loginSignIn);
$('#rememberme_label').html(window.sL.loginRememberMe);
$('#remember-forgot a').html(window.sL.loginForgotPassword);
$('#forgot-password').html(window.sL.loginForgotPassword);
$('.front-signup h2').html('<strong>' + window.sL.newToQuitter + '</strong> ' + window.sL.signUp);
$('#signup-user-name').attr('placeholder',window.sL.signUpFullName);
$('#signup-user-email').attr('placeholder',window.sL.signUpEmail);

14
js/qvitter.js
View File

@ -754,14 +754,14 @@ $('body').on('click','a', function(e) {
if($(e.target).is('i.chev-right')) {
e.preventDefault();
return;
}
}
// don't hijack settingslink
if($(e.target).is('#settings')) {
return;
}
// all non-hijacked links opens in new tab
// don't hijack links with donthijack attribute
if(!!$(this).attr('donthijack') || $(this).attr('donthijack') == '') {
return;
}
// all links opens in new tab
$(this).attr('target','_blank');
if(typeof $(this).attr('href') != 'undefined') {