From: Hypolite Petovan Date: Sun, 3 Feb 2019 20:33:59 +0000 (-0500) Subject: Normalize field_*.tpl formatting X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8c9ef56a71f4ebbc1ed4c1aafabb672617fccf4f;p=friendica.git Normalize field_*.tpl formatting --- diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl index b66f5f7027..399cf0c431 100644 --- a/view/templates/field_input.tpl +++ b/view/templates/field_input.tpl @@ -2,7 +2,7 @@
- {{if $field.3}} + {{if $field.3}} {{$field.3 nofilter}} - {{/if}} + {{/if}}
diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl index 2016a0bb7e..c174078e21 100644 --- a/view/templates/field_select.tpl +++ b/view/templates/field_select.tpl @@ -1,11 +1,12 @@ -
- {{if $field.3}} + {{if $field.3}} {{$field.3 nofilter}} - {{/if}} + {{/if}}
diff --git a/view/templates/field_select_raw.tpl b/view/templates/field_select_raw.tpl index 1f4630e995..534ec34fc0 100644 --- a/view/templates/field_select_raw.tpl +++ b/view/templates/field_select_raw.tpl @@ -1,11 +1,10 @@ - -
- - {{$field.4 nofilter}} - {{if $field.3}} + {{if $field.3}} {{$field.3 nofilter}} - {{/if}} + {{/if}}
diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl index 2ee145b0c4..eadcbe56c7 100644 --- a/view/templates/field_textarea.tpl +++ b/view/templates/field_textarea.tpl @@ -1,9 +1,8 @@ - -
- - - {{if $field.3}} +
+ + + {{if $field.3}} {{$field.3 nofilter}} - {{/if}} + {{/if}}
diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl index 6242cc6711..922797eb2d 100644 --- a/view/templates/field_themeselect.tpl +++ b/view/templates/field_themeselect.tpl @@ -1,12 +1,18 @@ - {{if $field.5}}{{/if}} -
- - + {{foreach $field.4 as $opt=>$val}} + + {{/foreach}} - {{if $field.3}} + {{if $field.3}} {{$field.3 nofilter}} - {{/if}} - {{if $field.5}}
{{/if}} + {{/if}} + {{if $field.5}} +
+ {{/if}}
diff --git a/view/templates/field_yesno.tpl b/view/templates/field_yesno.tpl index 182efcf18d..64f0816647 100644 --- a/view/templates/field_yesno.tpl +++ b/view/templates/field_yesno.tpl @@ -1,12 +1,12 @@ -
- -
- - +
+ + diff --git a/view/theme/frio/templates/field_input.tpl b/view/theme/frio/templates/field_input.tpl index 78c3b0b1ea..1a92393a80 100644 --- a/view/theme/frio/templates/field_input.tpl +++ b/view/theme/frio/templates/field_input.tpl @@ -1,11 +1,11 @@ -
+
{{if !isset($label) || $label != false }} - + {{/if}} - + {{if $field.3}} - {{$field.3 nofilter}} + {{$field.3 nofilter}} {{/if}} -
-
+
+
diff --git a/view/theme/frio/templates/field_select.tpl b/view/theme/frio/templates/field_select.tpl index 2a609ed71d..25cfd652cd 100644 --- a/view/theme/frio/templates/field_select.tpl +++ b/view/theme/frio/templates/field_select.tpl @@ -1,10 +1,12 @@ -
+
- {{if $field.3}} + {{if $field.3}} {{$field.3 nofilter}} - {{/if}} -
+ {{/if}} +
diff --git a/view/theme/frio/templates/field_select_raw.tpl b/view/theme/frio/templates/field_select_raw.tpl index bbd8368f26..7cae7144be 100644 --- a/view/theme/frio/templates/field_select_raw.tpl +++ b/view/theme/frio/templates/field_select_raw.tpl @@ -1,10 +1,10 @@ -
- - +
+ + {{if $field.3}} - {{$field.3 nofilter}} + {{$field.3 nofilter}} {{/if}} -
+
diff --git a/view/theme/frio/templates/field_textarea.tpl b/view/theme/frio/templates/field_textarea.tpl index baf2e84487..769a8357ae 100644 --- a/view/theme/frio/templates/field_textarea.tpl +++ b/view/theme/frio/templates/field_textarea.tpl @@ -1,9 +1,9 @@
- - {{if $field.3}} + + {{if $field.3}} {{$field.3 nofilter}} - {{/if}} + {{/if}}
diff --git a/view/theme/frio/templates/field_themeselect.tpl b/view/theme/frio/templates/field_themeselect.tpl index 78c179436b..f71b19131a 100644 --- a/view/theme/frio/templates/field_themeselect.tpl +++ b/view/theme/frio/templates/field_themeselect.tpl @@ -1,12 +1,18 @@ -{{if $field.5=="preview"}}{{/if}} -
- - +{{if $field.5=="preview"}} + +{{/if}} +
+ + {{if $field.3}} - {{$field.3 nofilter}} + {{$field.3 nofilter}} {{/if}} - {{if $field.5=="preview"}}
{{/if}} -
+ {{if $field.5=="preview"}} +
+ {{/if}} +