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

put login form into the nav bar. Proof of concept - needs a bit of UI tweaks.

Browse Source
This commit is contained in:
zotlabs 2017-01-23 16:31:40 -08:00
parent 61588a4b77
commit cb47354a4f
5 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/channel.php
View File

@ -1908,4 +1908,18 @@ function channel_manual_conv_update($channel_id) {
return intval($x); return intval($x);
}
function remote_login() {
$o = replace_macros(get_markup_template('remote_login.tpl'),array(
'$title' => t('Remote Authentication'),
'$desc' => t('Enter your channel address (e.g. channel@example.com)'),
'$submit' => t('Authenticate')
));
return $o;
} }

2
include/nav.php
View File

@ -112,6 +112,7 @@ EOT;
} }
else { else {
if(! get_account_id()) { if(! get_account_id()) {
$nav['login'] = login();
$nav['loginmenu'][] = Array('login',t('Login'),'',t('Sign in'),'login_nav_btn'); $nav['loginmenu'][] = Array('login',t('Login'),'',t('Sign in'),'login_nav_btn');
} }
else else
@ -128,6 +129,7 @@ EOT;
} }
elseif(! $_SESSION['authenticated']) { elseif(! $_SESSION['authenticated']) {
$nav['remote_login'] = remote_login();
$nav['loginmenu'][] = Array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn'); $nav['loginmenu'][] = Array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn');
} }

4
view/theme/redbasic/css/style.css
View File

@ -2104,4 +2104,8 @@ dl.bb-dl > dd > li {
.app-icon { .app-icon {
font-size: 80px; font-size: 80px;
text-align: center; text-align: center;
}
.rmagic-button {
margin-left: 10px;
} }

11
view/tpl/nav.tpl
View File

@ -154,13 +154,16 @@
</li> </li>
{{/if}} {{/if}}
{{if $nav.loginmenu && !$userinfo}} {{if $nav.login && !$userinfo}}
<li class="{{$nav.loginmenu.0.2}} hidden-xs"> <li class="nav-login hidden-xs">
<a data-toggle="dropdown" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a> <a data-toggle="dropdown" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
{{foreach $nav.loginmenu as $loginmenu}} {{$nav.login}}
{{$nav.remote_login}}
<!-- {{foreach $nav.loginmenu as $loginmenu}}
<li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li> <li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem" id="{{$loginmenu.4}}">{{$loginmenu.1}}</a></li>
{{/foreach}} {{/foreach}} --!>
</ul> </ul>
</li> </li>
{{foreach $nav.loginmenu as $loginmenu}} {{foreach $nav.loginmenu as $loginmenu}}

1
view/tpl/remote_login.tpl Normal file
View File

@ -0,0 +1 @@
<a href="rmagic" class="btn btn-default rmagic-button">{{$title}}</a>