aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-02-03 15:31:01 -0800
committerzotlabs <mike@macgirvin.com>2017-02-03 15:31:01 -0800
commitfc4083346eb6d7010e018b3dab92711f777f8572 (patch)
tree0b178d114e2b30bbd3a897408557f6e666d4acdf /view
parentf79a11cbf7276cff66a60fbf72bec4518bab10b0 (diff)
downloadvolse-hubzilla-fc4083346eb6d7010e018b3dab92711f777f8572.tar.gz
volse-hubzilla-fc4083346eb6d7010e018b3dab92711f777f8572.tar.bz2
volse-hubzilla-fc4083346eb6d7010e018b3dab92711f777f8572.zip
more work on nav-modal
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css5
-rwxr-xr-xview/tpl/nav.tpl20
-rw-r--r--view/tpl/nav_login.tpl13
3 files changed, 18 insertions, 20 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index fd41b4c89..4cfd42ef1 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2108,5 +2108,8 @@ dl.bb-dl > dd > li {
#nav-login {
padding: 10px;
- min-width: 300px;
+ min-width: 300px;
+
+ border: 1px solid #000;
+ background-color: #fff;
}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 3fccfaeb7..7fae5cb87 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -156,7 +156,7 @@
{{if $nav.login && !$userinfo}}
<li class="">
- <a href="#" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
+ <a href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}} <span class="caret" id="loginmenu-caret"></span></a>
</li>
{{/if}}
@@ -222,24 +222,6 @@
</div>
</div>
-
- {{if $nav.login && !$userinfo}}
-
- <div id="nav-login" class="modal" role="dialog">
- <div class="modal-dialog">
- <div class="modal-header"><h3>{{$nav.loginmenu.0.1}}</h3></div>
- <div class="modal-body">
- <div class="form-group">
- {{$nav.login}}
- {{$nav.remote_login}}
- </div>
- </div>
- </div>
- </div>
-
- {{/if}}
-
-
{{if $nav.help.6}}
<div id="contextual-help-content" class="contextual-help-content">
{{$nav.help.5}}
diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl
new file mode 100644
index 000000000..fe93f0aa2
--- /dev/null
+++ b/view/tpl/nav_login.tpl
@@ -0,0 +1,13 @@
+ {{if $nav.login && !$userinfo}}
+ <div id="nav-login" class="modal" role="dialog">
+ <div class="modal-dialog">
+ <div class="modal-header"><h3>{{$nav.loginmenu.1.1}}</h3></div>
+ <div class="modal-body">
+ <div class="form-group">
+ {{$nav.login}}
+ {{$nav.remote_login}}
+ </div>
+ </div>
+ </div>
+ </div>
+ {{/if}}