From 45f6707ff459ec0e3016521495c712fa83fec6e5 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 5 Feb 2020 22:40:09 -0500 Subject: [PATCH] Reformat dfrn_request and auto_request templates --- view/templates/auto_request.tpl | 88 ++++++----- view/templates/dfrn_request.tpl | 118 +++++++------- view/theme/frio/templates/auto_request.tpl | 109 ++++++------- view/theme/frio/templates/dfrn_request.tpl | 171 +++++++++++---------- 4 files changed, 254 insertions(+), 232 deletions(-) diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl index 3f901f6759..84039fa4fd 100644 --- a/view/templates/auto_request.tpl +++ b/view/templates/auto_request.tpl @@ -1,60 +1,64 @@

{{$header}}

-{{if $myaddr == ""}} +{{if !$myaddr}}

-{{$page_desc}}
+ {{$page_desc}} +

+

+ {{$invite_desc nofilter}}

-{{$invite_desc nofilter}} -

-

-{{$desc nofilter}} + {{$desc nofilter}}

{{/if}} -{{if $request}} -
-{{else}} - -{{/if}} - + {{if $photo}} - + {{/if}} -{{if $url}}
{{$url_label}}
{{$url}}
{{/if}} -{{if $location}}
{{$location_label}}
{{$location}}
{{/if}} -{{if $keywords}}
{{$keywords_label}}
{{$keywords}}
{{/if}} -{{if $about}}
{{$about_label}}
{{$about nofilter}}
{{/if}} +
+{{if $url}} +
{{$url_label}}
+
{{$url}}
+{{/if}} +{{if $location}} +
{{$location_label}}
+
{{$location}}
+{{/if}} +{{if $keywords}} +
{{$keywords_label}}
+
{{$keywords}}
+{{/if}} +{{if $about}} +
{{$about_label}}
+
{{$about nofilter}}
+{{/if}} +
-
- - {{if $myaddr}} - {{$myaddr}} - - {{else}} - - {{/if}} - {{if $url}} - - {{/if}} -
-
- - -
- -
+
+ +{{if $myaddr}} + {{$myaddr}} + +{{else}} + +{{/if}} +{{if $url}} + +{{/if}} +
+
- {{if $submit}} - - {{/if}} - +{{if $submit}} + +{{/if}} +
diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl index 2f6aec62e4..c35285fd68 100644 --- a/view/templates/dfrn_request.tpl +++ b/view/templates/dfrn_request.tpl @@ -1,90 +1,98 @@

{{$header}}

-{{if $myaddr}} -{{else}} +{{if !$myaddr}}

-{{$page_desc}}
+ {{$page_desc}} +

-{{$invite_desc nofilter}} +

+ {{$invite_desc nofilter}}

-{{$desc nofilter}} + {{$desc nofilter}}

{{/if}} -{{if $request}} -
-{{else}} - -{{/if}} - + {{if $photo}} - + {{/if}} -{{if $url}}
{{$url_label}}
{{$url}}
{{/if}} -{{if $location}}
{{$location_label}}
{{$location}}
{{/if}} -{{if $keywords}}
{{$keywords_label}}
{{$keywords}}
{{/if}} -{{if $about}}
{{$about_label}}
{{$about nofilter}}
{{/if}} +
+{{if $url}} +
{{$url_label}}
+
{{$url}}
+{{/if}} +{{if $location}} +
{{$location_label}}
+
{{$location}}
+{{/if}} +{{if $keywords}} +
{{$keywords_label}}
+
{{$keywords}}
+{{/if}} +{{if $about}} +
{{$about_label}}
+
{{$about nofilter}}
+{{/if}} +
-
- - {{if $myaddr}} +
+ +{{if $myaddr}} {{$myaddr}} - - {{else}} - - {{/if}} - {{if $url}} - - {{/if}} -
-
+ +{{else}} + +{{/if}} +{{if $url}} + +{{/if}} +
+
-

-{{$pls_answer}} -

+

+ {{$pls_answer}} +

-
+
-{{include file="field_checkbox.tpl" field=$does_know_you}} - + *}} -

-{{$add_note}} -

-
- +

+ {{$add_note}} +

+
+ +
- -
-
- {{if $submit}} - - {{/if}} - +{{if $submit}} + +{{/if}} +
diff --git a/view/theme/frio/templates/auto_request.tpl b/view/theme/frio/templates/auto_request.tpl index 7872881803..e9c4c82509 100644 --- a/view/theme/frio/templates/auto_request.tpl +++ b/view/theme/frio/templates/auto_request.tpl @@ -1,63 +1,66 @@
-

{{$header}}

+

{{$header}}

-{{if $myaddr == ""}} -

-{{$page_desc}}
-

-

-

-{{$invite_desc nofilter}} -

-

-{{$desc}} -

+{{if !$myaddr}} +

+ {{$page_desc}} +

+ +

+ {{$invite_desc nofilter}} +

+

+ {{$desc}} +

{{/if}} -{{if $request}} -
-{{else}} - -{{/if}} + {{if $photo}} - + {{/if}} +
+{{if $url}} +
{{$url_label}}
+
{{$url}}
+{{/if}} +{{if $location}} +
{{$location_label}}
+
{{$location}}
+{{/if}} +{{if $keywords}} +
{{$keywords_label}}
+
{{$keywords}}
+{{/if}} +{{if $about}} +
{{$about_label}}
+
{{$about}}
+{{/if}} +
-{{if $url}}
{{$url_label}}
{{$url}}
{{/if}} -{{if $location}}
{{$location_label}}
{{$location}}
{{/if}} +
+ + {{if $myaddr}} + {{$myaddr}} + + {{else}} + + {{/if}} + {{if $url}} + + {{/if}} +
+
-{{if $keywords}}
{{$keywords_label}}
{{$keywords}}
{{/if}} -{{if $about}}
{{$about_label}}
{{$about}}
{{/if}} - -
- - {{if $myaddr}} - {{$myaddr}} - - {{else}} - - {{/if}} - {{if $url}} - - {{/if}} -
-
- - -
- -
- -
- {{if $submit}} - - {{/if}} - -
-
+
+ {{if $submit}} + + {{/if}} + +
+
diff --git a/view/theme/frio/templates/dfrn_request.tpl b/view/theme/frio/templates/dfrn_request.tpl index 8270ebac21..45d4aeafd6 100644 --- a/view/theme/frio/templates/dfrn_request.tpl +++ b/view/theme/frio/templates/dfrn_request.tpl @@ -1,92 +1,99 @@
-

{{$header}}

+

{{$header}}

-{{if $myaddr}} -{{else}} -

-{{$page_desc}}
-

-{{$invite_desc nofilter}} -

-

-{{$desc}} -

+{{if !$myaddr}} +

+ {{$page_desc}} +

+ +

+ {{$invite_desc nofilter}} +

+

+ {{$desc}} +

{{/if}} -{{if $request}} -
-{{else}} - -{{/if}} + {{if $photo}} - + {{/if}} +
+{{if $url}} +
{{$url_label}}
+
{{$url}}
+{{/if}} +{{if $location}} +
{{$location_label}}
+
{{$location}}
+{{/if}} +{{if $keywords}} +
{{$keywords_label}}
+
{{$keywords}}
+{{/if}} +{{if $about}} +
{{$about_label}}
+
{{$about}}
+{{/if}} +
-{{if $url}}
{{$url_label}}
{{$url}}
{{/if}} -{{if $location}}
{{$location_label}}
{{$location}}
{{/if}} -{{if $keywords}}
{{$keywords_label}}
{{$keywords}}
{{/if}} -{{if $about}}
{{$about_label}}
{{$about}}
{{/if}} - -
- - {{if $myaddr}} - {{$myaddr}} - - {{else}} - - {{/if}} - {{if $url}} - - {{/if}} -
-
- -

-{{$pls_answer}} -

- -
- -{{include file="field_checkbox.tpl" field=$does_know_you}} - - -

-{{$add_note}} -

-
- -
- - -
- -
- {{if $submit}} - +
+ + {{if $myaddr}} + {{$myaddr}} + + {{else}} + {{/if}} - -
- + {{if $url}} + + {{/if}} +
+
+ +

+ {{$pls_answer}} +

+ +
+ {{include file="field_checkbox.tpl" field=$does_know_you}} + {{* +

+ {{$does_know}} +

+ +
+ + + +
+
+
+ + + +
+
+ *}} + +

+ {{$add_note}} +

+
+ +
+
+ +
+{{if $submit}} + +{{/if}} + +
+