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')

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/theme/redbasic/css/style.css |  5 ++++-
 view/tpl/nav.tpl                  | 20 +-------------------
 view/tpl/nav_login.tpl            | 13 +++++++++++++
 3 files changed, 18 insertions(+), 20 deletions(-)
 create mode 100644 view/tpl/nav_login.tpl

(limited to 'view')

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}}
-- 
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/theme/redbasic/css/style.css | 12 +++++++-----
 view/tpl/nav.tpl                  |  2 +-
 view/tpl/nav_login.tpl            | 12 +++++++-----
 3 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 4cfd42ef1..b398738e0 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2107,9 +2107,11 @@ dl.bb-dl > dd > li {
 }
 
 #nav-login {
-	padding: 10px;
-	min-width: 300px; 
-
-	border: 1px solid #000;
-	background-color: #fff;
 }
+
+.rmagic-button {
+	max-width: 400px;
+	margin-top: 20px;
+	margin-left: auto;
+	margin-right: auto;
+}
\ No newline at end of file
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}}
 
diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl
index fe93f0aa2..0605ce44f 100644
--- a/view/tpl/nav_login.tpl
+++ b/view/tpl/nav_login.tpl
@@ -1,11 +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 class="modal-content">
+								<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>
-- 
cgit v1.2.3


From e2ee4ae0244ff1698b28f89b05ea9b0ce65273aa Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 5 Feb 2017 14:45:28 -0800
Subject: better theming of rmagic page

---
 view/tpl/rmagic.tpl | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'view')

diff --git a/view/tpl/rmagic.tpl b/view/tpl/rmagic.tpl
index d0f7aab64..9d84e4a36 100755
--- a/view/tpl/rmagic.tpl
+++ b/view/tpl/rmagic.tpl
@@ -1,13 +1,9 @@
 <div class="generic-content-wrapper-styled">
-<h3>{{$title}}</h3>
-
-<form action="rmagic" method="post" >
-
-	<label for="rmagic-address" id="label-rmagic-address" class="rmagic-label">{{$desc}}</label>
-	<input type="text" maxlength="255" size="32" name="address" id="rmagic-address" class="rmagic-input" value="" />
-
-	<input type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" />
-	<div id="rmagic-submit-end" class="rmagic-field-end"></div>
-
-</form>
+	<h3>{{$title}}</h3>
+	<form action="rmagic" method="post" >
+		<div class="form-group">
+			{{include file="field_input.tpl" field=$address}}
+			<input class="btn btn-primary" type="submit" name="submit" id="rmagic-submit-button" value="{{$submit}}" />
+		</div>
+	</form>
 </div>
-- 
cgit v1.2.3


From 201a6b8742313d2b58f9668922f18b9ef38cf424 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 5 Feb 2017 14:55:46 -0800
Subject: nav_login element width was page dependent. Put this in theme css

---
 view/theme/redbasic/css/style.css |  5 +----
 view/tpl/nav_login.tpl            | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 19 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b398738e0..f5da8a222 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2106,10 +2106,7 @@ dl.bb-dl > dd > li {
 	text-align: center;
 }
 
-#nav-login {
-}
-
-.rmagic-button {
+#login-main, .rmagic-button {
 	max-width: 400px;
 	margin-top: 20px;
 	margin-left: auto;
diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl
index 0605ce44f..5ad5a4990 100644
--- a/view/tpl/nav_login.tpl
+++ b/view/tpl/nav_login.tpl
@@ -1,15 +1,15 @@
-			{{if $nav.login && !$userinfo}}
-					<div id="nav-login" class="modal" role="dialog">
-						<div class="modal-dialog">
-							<div class="modal-content">
-								<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>
-					</div>
-			{{/if}}
+{{if $nav.login && !$userinfo}}
+<div id="nav-login" class="modal" role="dialog">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<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>
+</div>
+{{/if}}
-- 
cgit v1.2.3


From eb3685f5377be06615de66aba104aad6f4927495 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 5 Feb 2017 18:47:35 -0800
Subject: remove per-page login css (home, login); add support for alternative
 markdown mention format

---
 view/css/mod_home.css  | 5 -----
 view/css/mod_login.css | 5 -----
 2 files changed, 10 deletions(-)
 delete mode 100644 view/css/mod_login.css

(limited to 'view')

diff --git a/view/css/mod_home.css b/view/css/mod_home.css
index b6112eb38..fa2b2b28d 100644
--- a/view/css/mod_home.css
+++ b/view/css/mod_home.css
@@ -3,8 +3,3 @@
 	margin-bottom: 50px;
 }
 
-#login-main {
-	max-width: 400px;
-	margin-left: auto;
-	margin-right: auto;
-}
diff --git a/view/css/mod_login.css b/view/css/mod_login.css
deleted file mode 100644
index 53ba9cb1d..000000000
--- a/view/css/mod_login.css
+++ /dev/null
@@ -1,5 +0,0 @@
-#login-main {
-	max-width: 400px;
-	margin-left: auto;
-	margin-right: auto;
-}
-- 
cgit v1.2.3