aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-02-10 10:01:43 +0100
committerMario Vavti <mario@mariovavti.com>2017-02-10 10:01:43 +0100
commit0360d42d30ced55cdb5a92320d5915b758c8bc19 (patch)
tree9cbc95dd2d7df1a5a5c3ce8318e7c900ad4456cc
parent1fb37f93ccf4739a6f92f3f36c1ee4ec8ef66a07 (diff)
downloadvolse-hubzilla-0360d42d30ced55cdb5a92320d5915b758c8bc19.tar.gz
volse-hubzilla-0360d42d30ced55cdb5a92320d5915b758c8bc19.tar.bz2
volse-hubzilla-0360d42d30ced55cdb5a92320d5915b758c8bc19.zip
add a login button for collapsed state and refine login modal
-rw-r--r--view/theme/redbasic/css/style.css5
-rwxr-xr-xview/tpl/nav.tpl5
-rw-r--r--view/tpl/nav_login.tpl10
3 files changed, 15 insertions, 5 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 733d6a7c1..a25ed93bc 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1829,7 +1829,8 @@ nav .badge.mail-update {
#expand-tabs,
#doco-return-to-top-btn,
#context-help-btn,
-#notifications-btn {
+#notifications-btn,
+#login_nav_btn_collapse {
color: $nav_active_icon_colour;
padding: 7px 10px;
}
@@ -2118,4 +2119,4 @@ dl.bb-dl > dd > li {
}
#permcat-index {
margin: 10px;
-} \ No newline at end of file
+}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 5afc5d14b..7037881ec 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -5,6 +5,11 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</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}}
<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>
diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl
index 5ad5a4990..e2b580bda 100644
--- a/view/tpl/nav_login.tpl
+++ b/view/tpl/nav_login.tpl
@@ -1,14 +1,18 @@
{{if $nav.login && !$userinfo}}
-<div id="nav-login" class="modal" role="dialog">
- <div class="modal-dialog">
+<div id="nav-login" class="modal modal-sm" tabindex="-1" role="dialog">
+ <div class="modal-dialog" role="document">
<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="form-group">
{{$nav.login}}
{{$nav.remote_login}}
</div>
</div>
+
</div>
</div>
</div>