add a login button for collapsed state and refine login modal

This commit is contained in:
Mario Vavti 2017-02-10 10:01:43 +01:00
parent 1fb37f93cc
commit 0360d42d30
3 changed files with 15 additions and 5 deletions

View File

@ -1829,7 +1829,8 @@ nav .badge.mail-update {
#expand-tabs, #expand-tabs,
#doco-return-to-top-btn, #doco-return-to-top-btn,
#context-help-btn, #context-help-btn,
#notifications-btn { #notifications-btn,
#login_nav_btn_collapse {
color: $nav_active_icon_colour; color: $nav_active_icon_colour;
padding: 7px 10px; padding: 7px 10px;
} }

View File

@ -5,6 +5,11 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
{{if $nav.login && !$userinfo}}
<button type="button" class="navbar-toggle" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
{{$nav.loginmenu.1.1}}
</button>
{{/if}}
{{if $localuser}} {{if $localuser}}
<button id="notifications-btn" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1" style="color: grey;"> <button id="notifications-btn" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1" style="color: grey;">
<i class="fa fa-exclamation-circle"></i> <i class="fa fa-exclamation-circle"></i>

View File

@ -1,14 +1,18 @@
{{if $nav.login && !$userinfo}} {{if $nav.login && !$userinfo}}
<div id="nav-login" class="modal" role="dialog"> <div id="nav-login" class="modal modal-sm" tabindex="-1" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"><h3>{{$nav.loginmenu.1.1}}</h3></div> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h3 class="modal-title">{{$nav.loginmenu.1.1}}</h3>
</div>
<div class="modal-body"> <div class="modal-body">
<div class="form-group"> <div class="form-group">
{{$nav.login}} {{$nav.login}}
{{$nav.remote_login}} {{$nav.remote_login}}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>