From f79a11cbf7276cff66a60fbf72bec4518bab10b0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 3 Feb 2017 13:47:29 -0800
Subject: trying nav-login as modal

---
 view/tpl/nav.tpl | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'view/tpl/nav.tpl')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index f59afee5b..3fccfaeb7 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -156,13 +156,7 @@
 
 			{{if $nav.login && !$userinfo}}
 				<li class="">
-					<a href="#" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}" onclick="openClose('nav-login'); return false;">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
-					<div id="nav-login" class="dropdown-menu">
-						<div class="form-group">
-							{{$nav.login}}
-						</div>
-						{{$nav.remote_login}}
-					</div>
+					<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>
 				</li>
 			{{/if}}
 
@@ -227,6 +221,25 @@
 			{{$navapps}}
 		</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}}
-- 
cgit v1.2.3


From fc4083346eb6d7010e018b3dab92711f777f8572 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 3 Feb 2017 15:31:01 -0800
Subject: more work on nav-modal

---
 view/tpl/nav.tpl | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'view/tpl/nav.tpl')

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}}
-- 
cgit v1.2.3


From 73845e01ed5e00a62341f2125e2a61c16bd73962 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sat, 4 Feb 2017 14:58:13 -0800
Subject: cleanup

---
 view/tpl/nav.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl/nav.tpl')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 7fae5cb87..c504e5515 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.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>
+					<a href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a>
 				</li>
 			{{/if}}
 
-- 
cgit v1.2.3