diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-03-01 08:38:17 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-03-01 08:38:17 +0100 |
| commit | 844bef5070b071aa5ddf823036d2fe2285b40a7b (patch) | |
| tree | 129a67cbed69c4ed6f286e9a0bf3770b9c82ffc6 /view/tpl | |
| parent | 97e329906e3cde0bacafcceb94780bedd44f1f32 (diff) | |
| parent | 6210b7727f6c8542daaa62d1ed7f9ec1f74323f2 (diff) | |
| download | volse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.tar.gz volse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.tar.bz2 volse-hubzilla-844bef5070b071aa5ddf823036d2fe2285b40a7b.zip | |
Merge branch 'dev' into 3.2RC
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/email_validation.tpl | 10 | ||||
| -rw-r--r-- | view/tpl/new_member.tpl | 17 | ||||
| -rwxr-xr-x | view/tpl/settings_addons.tpl | 1 |
3 files changed, 23 insertions, 5 deletions
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> 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> + 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"> |