diff --git a/boot.php b/boot.php index 640fef5413..af3cc2494f 100644 --- a/boot.php +++ b/boot.php @@ -989,6 +989,12 @@ if(! function_exists('login')) { '$lostpass' => t('Forgot your password?'), '$lostlink' => t('Password Reset'), + '$tostitle' => t('Website Terms of Service'), + '$toslink' => t('terms of service'), + + '$privacytitle' => t('Website Privacy Policy'), + '$privacylink' => t('privacy policy'), + )); call_hooks('login_hook',$o); diff --git a/view/theme/dispy/smarty3/theme_settings.tpl b/view/theme/dispy/smarty3/theme_settings.tpl index 0d2d0de3a8..9fcf76b883 100644 --- a/view/theme/dispy/smarty3/theme_settings.tpl +++ b/view/theme/dispy/smarty3/theme_settings.tpl @@ -1,8 +1,8 @@ -{{include file="file:{{$field_select}}" field=$colour}} +{{include file="field_select.tpl" field=$colour}} -{{include file="file:{{$field_select}}" field=$font_size}} +{{include file="field_select.tpl" field=$font_size}} -{{include file="file:{{$field_select}}" field=$line_height}} +{{include file="field_select.tpl" field=$line_height}}
diff --git a/view/theme/dispy/theme_settings.tpl b/view/theme/dispy/theme_settings.tpl index 9b5af70032..9d250cb3aa 100644 --- a/view/theme/dispy/theme_settings.tpl +++ b/view/theme/dispy/theme_settings.tpl @@ -1,8 +1,8 @@ -{{inc $field_select with $field=$colour}}{{endinc}} +{{inc field_select.tpl with $field=$colour}}{{endinc}} -{{inc $field_select with $field=$font_size}}{{endinc}} +{{inc field_select.tpl with $field=$font_size}}{{endinc}} -{{inc $field_select with $field=$line_height}}{{endinc}} +{{inc field_select.tpl with $field=$line_height}}{{endinc}}
diff --git a/view/theme/frost-mobile/contact_edit.tpl b/view/theme/frost-mobile/contact_edit.tpl index da192da7d8..b87b3b651c 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 with $field=$hidden }}{{endinc}} + {{inc field_checkbox.tpl 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 537a7b22f6..d5ade11bc0 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="file:{{$field_checkbox}}" field=$hidden}} + {{include file="field_checkbox.tpl" field=$hidden}}

{{$lbl_info1}}

diff --git a/view/theme/quattro/smarty3/theme_settings.tpl b/view/theme/quattro/smarty3/theme_settings.tpl index 4b87ac24c8..9fb2d4c1c9 100644 --- a/view/theme/quattro/smarty3/theme_settings.tpl +++ b/view/theme/quattro/smarty3/theme_settings.tpl @@ -1,8 +1,8 @@ -{{include file="file:{{$field_select}}" field=$color}} +{{include file="field_select.tpl" field=$color}} -{{include file="file:{{$field_select}}" field=$align}} +{{include file="field_select.tpl" field=$align}}
diff --git a/view/theme/quattro/theme_settings.tpl b/view/theme/quattro/theme_settings.tpl index db70f07e76..b957532cf5 100644 --- a/view/theme/quattro/theme_settings.tpl +++ b/view/theme/quattro/theme_settings.tpl @@ -1,8 +1,8 @@ -{{inc $field_select with $field=$color}}{{endinc}} +{{inc field_select.tpl with $field=$color}}{{endinc}} -{{inc $field_select with $field=$align}}{{endinc}} +{{inc field_select.tpl with $field=$align}}{{endinc}}
diff --git a/view/theme/vier/smarty3/comment_item.tpl b/view/theme/vier/smarty3/comment_item.tpl index 22115b31de..5e4a805dad 100644 --- a/view/theme/vier/smarty3/comment_item.tpl +++ b/view/theme/vier/smarty3/comment_item.tpl @@ -29,15 +29,16 @@