diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 4892dc3145..24cd12b0cb 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -41,13 +41,13 @@
- {{ inc field_input.tpl with $field=$sitename }}{{ endinc }} - {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }} - {{ inc field_select.tpl with $field=$language }}{{ endinc }} - {{ inc field_select.tpl with $field=$theme }}{{ endinc }} - {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }} - {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }} + {{ inc $field_input with $field=$sitename }}{{ endinc }} + {{ inc $field_textarea with $field=$banner }}{{ endinc }} + {{ inc $field_select with $field=$language }}{{ endinc }} + {{ inc $field_select with $field=$theme }}{{ endinc }} + {{ inc $field_select with $field=$theme_mobile }}{{ endinc }} + {{ inc $field_select with $field=$ssl_policy }}{{ endinc }} + {{ inc $field_checkbox with $field=$new_share }}{{ endinc }}
@@ -83,23 +83,23 @@

$advanced

- {{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }} - {{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }} - {{ inc field_input.tpl with $field=$proxy }}{{ endinc }} - {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }} - {{ inc field_input.tpl with $field=$timeout }}{{ endinc }} - {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }} - {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }} - {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }} - {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }} - {{ inc field_input.tpl with $field=$lockpath }}{{ endinc }} - {{ inc field_input.tpl with $field=$temppath }}{{ endinc }} - {{ inc field_input.tpl with $field=$basepath }}{{ endinc }} + {{ inc $field_checkbox with $field=$no_utf }}{{ endinc }} + {{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }} + {{ inc $field_input with $field=$proxy }}{{ endinc }} + {{ inc $field_input with $field=$proxyuser }}{{ endinc }} + {{ inc $field_input with $field=$timeout }}{{ endinc }} + {{ inc $field_input with $field=$delivery_interval }}{{ endinc }} + {{ inc $field_input with $field=$poll_interval }}{{ endinc }} + {{ inc $field_input with $field=$maxloadavg }}{{ endinc }} + {{ inc $field_input with $field=$abandon_days }}{{ endinc }} + {{ inc $field_input with $field=$lockpath }}{{ endinc }} + {{ inc $field_input with $field=$temppath }}{{ endinc }} + {{ inc $field_input with $field=$basepath }}{{ endinc }}

$performance

- {{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }} - {{ inc field_input.tpl with $field=$itemcache }}{{ endinc }} - {{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }} + {{ inc $field_checkbox with $field=$use_fulltext_engine }}{{ endinc }} + {{ inc $field_input with $field=$itemcache }}{{ endinc }} + {{ inc $field_input with $field=$itemcache_duration }}{{ endinc }}
diff --git a/view/smarty3/admin_site.tpl b/view/smarty3/admin_site.tpl index 60959eb414..290ee0bb1a 100644 --- a/view/smarty3/admin_site.tpl +++ b/view/smarty3/admin_site.tpl @@ -47,6 +47,8 @@ {{include file="file:{{$field_select}}" field=$theme}} {{include file="file:{{$field_select}}" field=$theme_mobile}} {{include file="file:{{$field_select}}" field=$ssl_policy}} + {{include file="file:{{$field_checkbox}}" field=$new_share}} +
@@ -90,6 +92,15 @@ {{include file="file:{{$field_input}}" field=$poll_interval}} {{include file="file:{{$field_input}}" field=$maxloadavg}} {{include file="file:{{$field_input}}" field=$abandon_days}} + {{include file="file:{{$field_input}}" field=$lockpath}} + {{include file="file:{{$field_input}}" field=$temppath}} + {{include file="file:{{$field_input}}" field=$basepath}} + +

{{$performance}}

+ {{include file="file:{{$field_checkbox}}" field=$use_fulltext_engine}} + {{include file="file:{{$field_input}}" field=$itemcache}} + {{include file="file:{{$field_input}}" field=$itemcache_duration}} +
diff --git a/view/theme/dispy/config.php b/view/theme/dispy/config.php index f2fe11b3d2..78166312dc 100644 --- a/view/theme/dispy/config.php +++ b/view/theme/dispy/config.php @@ -65,7 +65,6 @@ function dispy_form(&$a, $font_size, $line_height, $colour) { 'dark' => 'dark', ); - //$t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); $t = get_markup_template("theme_settings.tpl" ); $includes = array( diff --git a/view/theme/dispy/smarty3/theme_settings.tpl b/view/theme/dispy/smarty3/theme_settings.tpl index 9fcf76b883..0d2d0de3a8 100644 --- a/view/theme/dispy/smarty3/theme_settings.tpl +++ b/view/theme/dispy/smarty3/theme_settings.tpl @@ -1,8 +1,8 @@ -{{include file="field_select.tpl" field=$colour}} +{{include file="file:{{$field_select}}" field=$colour}} -{{include file="field_select.tpl" field=$font_size}} +{{include file="file:{{$field_select}}" field=$font_size}} -{{include file="field_select.tpl" field=$line_height}} +{{include file="file:{{$field_select}}" field=$line_height}}
diff --git a/view/theme/dispy/theme_settings.tpl b/view/theme/dispy/theme_settings.tpl index 9d250cb3aa..9b5af70032 100644 --- a/view/theme/dispy/theme_settings.tpl +++ b/view/theme/dispy/theme_settings.tpl @@ -1,8 +1,8 @@ -{{inc field_select.tpl with $field=$colour}}{{endinc}} +{{inc $field_select with $field=$colour}}{{endinc}} -{{inc field_select.tpl with $field=$font_size}}{{endinc}} +{{inc $field_select with $field=$font_size}}{{endinc}} -{{inc field_select.tpl with $field=$line_height}}{{endinc}} +{{inc $field_select with $field=$line_height}}{{endinc}}
diff --git a/view/theme/frost-mobile/contact_edit.tpl b/view/theme/frost-mobile/contact_edit.tpl index b87b3b651c..da192da7d8 100644 --- a/view/theme/frost-mobile/contact_edit.tpl +++ b/view/theme/frost-mobile/contact_edit.tpl @@ -70,7 +70,7 @@ {{ endif }}
- {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} + {{inc $field_checkbox with $field=$hidden }}{{endinc}}

$lbl_info1

diff --git a/view/theme/frost-mobile/smarty3/contact_edit.tpl b/view/theme/frost-mobile/smarty3/contact_edit.tpl index d5ade11bc0..537a7b22f6 100644 --- a/view/theme/frost-mobile/smarty3/contact_edit.tpl +++ b/view/theme/frost-mobile/smarty3/contact_edit.tpl @@ -70,7 +70,7 @@ {{/if}}
- {{include file="field_checkbox.tpl" field=$hidden}} + {{include file="file:{{$field_checkbox}}" field=$hidden}}

{{$lbl_info1}}

diff --git a/view/theme/quattro/smarty3/theme_settings.tpl b/view/theme/quattro/smarty3/theme_settings.tpl index cf2a4935de..4b87ac24c8 100644 --- a/view/theme/quattro/smarty3/theme_settings.tpl +++ b/view/theme/quattro/smarty3/theme_settings.tpl @@ -1,8 +1,8 @@ -{{include file="field_select.tpl" field=$color}} +{{include file="file:{{$field_select}}" field=$color}} -{{include file="field_select.tpl" field=$align}} +{{include file="file:{{$field_select}}" field=$align}}
@@ -29,4 +29,4 @@ \ No newline at end of file + diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl index 47105d7aa4..db70f07e76 100644 --- a/view/theme/quattro/theme_settings.tpl +++ b/view/theme/quattro/theme_settings.tpl @@ -1,8 +1,8 @@ -{{inc field_select.tpl with $field=$color}}{{endinc}} +{{inc $field_select with $field=$color}}{{endinc}} -{{inc field_select.tpl with $field=$align}}{{endinc}} +{{inc $field_select with $field=$align}}{{endinc}}
@@ -29,4 +29,4 @@ \ No newline at end of file +