From be5187718c0f1791a692b7743aca51ea5f37649e Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 27 Feb 2018 19:34:51 -0800
Subject: provide usage hint on addon settings page to save each panel before
 opening another. [String change, not for 3.2]

---
 view/tpl/settings_addons.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view/tpl')

diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl
index 52f8d9d3f..2a925f1f7 100755
--- a/view/tpl/settings_addons.tpl
+++ b/view/tpl/settings_addons.tpl
@@ -1,5 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
+		<div class="descriptive-text pull-right">{{$descrip}}</div>
 		<h2>{{$title}}</h2>
 	</div>
 	<form action="settings/featured" method="post" autocomplete="off">
-- 
cgit v1.2.3


From 14e14c6c92dadf4c95900978135a161f5da696d9 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Feb 2018 19:49:33 -0800
Subject: provide new member widget which sits beneath the notifications for
 the first 60 days after an account creation.

---
 view/tpl/new_member.tpl | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 view/tpl/new_member.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/new_member.tpl b/view/tpl/new_member.tpl
new file mode 100644
index 000000000..60e347ab3
--- /dev/null
+++ b/view/tpl/new_member.tpl
@@ -0,0 +1,17 @@
+<div class="widget">
+<h3>{{$title}}</h3>
+{{if $options}}
+<ul class="nav nav-pills flex-column">
+{{foreach $options as $x}}
+	{{if is_array($x) }}
+		{{foreach $x as $y => $z}}
+		<li class="nav-item"><a href="{{$y}}" class="nav-link">{{$z}}</a></li>
+		{{/foreach}}
+	{{else}}
+		<div><strong>{{$x}}</strong></div>
+	{{/if}}
+{{/foreach}}
+</ul>
+{{/if}}
+</div>
+
-- 
cgit v1.2.3


From 01015bc0d54343831189ce1b09a69b70a6371fd5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 28 Feb 2018 21:15:26 -0800
Subject: several email validation issues

---
 view/tpl/email_validation.tpl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/email_validation.tpl b/view/tpl/email_validation.tpl
index f049a040f..9913e0971 100644
--- a/view/tpl/email_validation.tpl
+++ b/view/tpl/email_validation.tpl
@@ -2,15 +2,15 @@
 
 <div class="descriptive-paragraph" style="font-size: 1.2em;"><p>{{$desc}}</p></div>
 
-<form action="email_validation" method="post">
+<form action="email_validation/{{$email}}" method="post">
 {{include file="field_input.tpl" field=$token}}
 
-<div class="pull-right">
-	<a href="email_resend/{{$email}}" class="btn btn-warning">{{$resend}}</a>
-</div>
-<div class="submit-wrapper" >
+<div class="pull-right submit-wrapper">
 	<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 </div>
+<div class="resend-email" >
+	<a href="email_resend/{{$email}}" class="btn btn-warning">{{$resend}}</a>
+</div>
 </form>
 <div class="clear"></div>
 
-- 
cgit v1.2.3