From 67db1c6e9bc474c34cb10029794b64be8c85a393 Mon Sep 17 00:00:00 2001 From: Hilmar R Date: Sat, 23 Jan 2021 15:24:24 +0100 Subject: melt diff prod fork 4.6.2 air onto 5.2.1 to 5.2.2 DB 1241 --- view/tpl/admin_accounts.tpl | 107 +++++++++++++++++++++++++++++------- view/tpl/admin_site.tpl | 93 +++++++++++++++++++------------ view/tpl/invite.tpl | 130 +++++++++++++++++++++++++++++++++++++++++--- view/tpl/plain.tpl | 3 + view/tpl/regate.tpl | 23 ++++++++ view/tpl/register.tpl | 35 ++++++++++-- view/tpl/register_duty.tpl | 28 ++++++++++ 7 files changed, 350 insertions(+), 69 deletions(-) create mode 100644 view/tpl/plain.tpl create mode 100644 view/tpl/regate.tpl create mode 100644 view/tpl/register_duty.tpl (limited to 'view/tpl') diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl index 2dd56c8dc..8d6506184 100755 --- a/view/tpl/admin_accounts.tpl +++ b/view/tpl/admin_accounts.tpl @@ -1,15 +1,3 @@ -

{{$title}} - {{$page}}

@@ -17,6 +5,7 @@

{{$h_pending}}

+ {{if $debug}}
{{$debug}}
{{/if}} {{if $pending}} @@ -27,20 +16,34 @@ - {{foreach $pending as $u}} - - - - + {{foreach $pending as $n => $u}} + + + + + + {{/foreach}}
{{$u.account_created}}
{{$u.reg_created}}
{{$u.reg_n}} + {{if $u.reg_expires < $now}} ★EXPIRED★{{/if}}
{{$u.reg_startup}}
{{$u.reg_expires}}
- - + + +
- + {{* before, alternate: + * + {{$select_all}} + * + *}} +
+ {{$sel_aprv}} ◄► + {{$sel_deny}} ◄► + {{$sel_tall}} +

+
@@ -83,7 +86,11 @@ {{/foreach}} + + + {{* + *}}
@@ -93,3 +100,63 @@ {{/if}}
+{{* + COMMENTS for this template: + hilmar, 2020.01 + script placed at the end +*}} + diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 8d32ba9a4..4896a2b26 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -1,39 +1,3 @@ -

{{$title}} - {{$page}}

@@ -69,10 +33,19 @@ {{include file="field_input.tpl" field=$register_text}} {{include file="field_select_grouped.tpl" field=$role}} {{include file="field_select.tpl" field=$register_policy}} + {{include file="register_duty.tpl" field=$register_duty}} + {{include file="field_input.tpl" field=$register_perday}} + {{include file="field_input.tpl" field=$register_sameip}} + {{$reg_delay}} + {{$reg_expire}} + {{include file="field_checkbox.tpl" field=$reg_autochannel}} {{include file="field_checkbox.tpl" field=$invite_only}} + {{include file="field_checkbox.tpl" field=$invite_also}} {{include file="field_input.tpl" field=$minimum_age}} {{include file="field_select.tpl" field=$access_policy}} {{include file="field_input.tpl" field=$location}} + {{include file="field_select.tpl" field=$access_policy}} + {{include file="field_input.tpl" field=$minimum_age}} {{include file="field_input.tpl" field=$sellpage}} {{include file="field_input.tpl" field=$first_page}} @@ -115,3 +88,51 @@
+{{* + COMMENTS for this template: + hilmar, 2020.01 + script placed at the end +*}} + diff --git a/view/tpl/invite.tpl b/view/tpl/invite.tpl index 440e1e02b..2712cfee4 100755 --- a/view/tpl/invite.tpl +++ b/view/tpl/invite.tpl @@ -1,6 +1,7 @@
-

{{$invite}}

+

{{$invite}}

+

{{$lcclane}}

@@ -8,21 +9,136 @@ +
{{$ihave}}
{{$wehave}}
+ + +
- - + + + + + {{$m10}}({{$n10}}) + check
+ +
+ {{$inv_expire}}
-
- - +
+ +
+
{{$subject_label}} + {{$subject}} +
+ +
+ + +
+
{{$m13}}
({{$n13}}) {{$tplin}}
+
+      {{$standard_message}}
+      
+
+      {{$due}}
+      
+
- +
+ + diff --git a/view/tpl/plain.tpl b/view/tpl/plain.tpl new file mode 100644 index 000000000..9af76718e --- /dev/null +++ b/view/tpl/plain.tpl @@ -0,0 +1,3 @@ +

{{$title}}

+{{if $now}}
{{$now}}
{{/if}} +
{{$infos}}
diff --git a/view/tpl/regate.tpl b/view/tpl/regate.tpl new file mode 100644 index 000000000..38135d424 --- /dev/null +++ b/view/tpl/regate.tpl @@ -0,0 +1,23 @@ +

{{$title}}

+ +

{{$now}}

+ +

{{$desc}}

+ +
+ +{{include file="field_input.tpl" field=[$acpin.0,$acpin.1,"","","",$atform]}} + +
+ +
+ +{{if $resend > ''}} +
+ +
+{{/if}} + +
+
+ diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 1054c7567..451a16c2a 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -9,6 +9,7 @@
{{$reg_is}}
{{$other_sites}}
+

{{$now}}

{{/if}} @@ -19,14 +20,19 @@ {{/if}} {{if $invitations}} - {{include file="field_input.tpl" field=$invite_code}} +
+ {{$haveivc}} +
+ {{/if}} - {{include file="field_input.tpl" field=$email}} + {{include file="field_input.tpl" field=[$email.0,$email.1,"",$email.3,"",""]}} - {{include file="field_password.tpl" field=$pass1}} + {{include file="field_password.tpl" field=[$pass1.0,$pass1.1,"","","",$atform]}} - {{include file="field_password.tpl" field=$pass2}} + {{include file="field_password.tpl" field=[$pass2.0,$pass2.1,"","","",$atform]}} {{if $auto_create}} {{if $default_role}} @@ -46,12 +52,12 @@ {{/if}} {{if $enable_tos}} - {{include file="field_checkbox.tpl" field=$tos}} + {{include file="field_checkbox.tpl" field=[$tos.0,$tos.1,"","","",$atform]}} {{else}} {{/if}} - +

@@ -59,3 +65,20 @@
+{{* + COMMENTS for this template: + hilmar, 2020.02 +*}} + diff --git a/view/tpl/register_duty.tpl b/view/tpl/register_duty.tpl new file mode 100644 index 000000000..d5a66e556 --- /dev/null +++ b/view/tpl/register_duty.tpl @@ -0,0 +1,28 @@ +{{include file="field_input.tpl" field=$register_duty}} +

+
\ No newline at end of file
-- 
cgit v1.2.3