aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-01-27 22:25:46 +0100
committerMario Vavti <mario@mariovavti.com>2018-01-27 22:25:46 +0100
commit843d6311112c9174a1731c42a9d257f3f3a0bd0a (patch)
treeebb275fd10c7010a86667e083b2389a9b4407745 /view
parent2e4e56f7cc696b2c52014f0050294826caa74d7d (diff)
parentbd0f63980ba0d0e606f2dd7a65313f7e150d330a (diff)
downloadvolse-hubzilla-843d6311112c9174a1731c42a9d257f3f3a0bd0a.tar.gz
volse-hubzilla-843d6311112c9174a1731c42a9d257f3f3a0bd0a.tar.bz2
volse-hubzilla-843d6311112c9174a1731c42a9d257f3f3a0bd0a.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view')
-rw-r--r--view/en/register_verify_member.tpl7
-rw-r--r--view/tpl/email_validation.tpl16
2 files changed, 22 insertions, 1 deletions
diff --git a/view/en/register_verify_member.tpl b/view/en/register_verify_member.tpl
index 71f0964d4..9bdd7fa51 100644
--- a/view/en/register_verify_member.tpl
+++ b/view/en/register_verify_member.tpl
@@ -10,7 +10,12 @@ Login with the password you chose at registration.
We need to verify your email address in order to give you full access.
-If you registered this account, please visit the following link:
+Your validation code is
+
+{{$hash}}
+
+
+If you registered this account, please enter the validation code when requested or visit the following link:
{{$siteurl}}/regver/allow/{{$hash}}
diff --git a/view/tpl/email_validation.tpl b/view/tpl/email_validation.tpl
new file mode 100644
index 000000000..f049a040f
--- /dev/null
+++ b/view/tpl/email_validation.tpl
@@ -0,0 +1,16 @@
+<h2>{{$title}}</h2>
+
+<div class="descriptive-paragraph" style="font-size: 1.2em;"><p>{{$desc}}</p></div>
+
+<form action="email_validation" 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" >
+ <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
+</div>
+</form>
+<div class="clear"></div>
+