revert addon Smarty3 templates to non-variable-based includes

This commit is contained in:
Zach Prezkuta 2012-12-25 13:25:09 -07:00
parent 75f47b74d2
commit c12542ef96
53 changed files with 75 additions and 146 deletions

View file

@ -84,16 +84,8 @@ function piwik_analytics($a,&$b) {
}
}
function piwik_plugin_admin (&$a, &$o) {
# $t = file_get_contents( dirname(__file__)."/admin.tpl");
$t = get_markup_template( "admin.tpl", "addon/piwik/" );
$includes = array(
'$field_input' => 'field_input.tpl',
'$field_checkbox' => 'field_select.tpl',
);
$includes = set_template_includes($a->theme['template_engine'], $includes);
$o = replace_macros( $t, $includes + array(
$o = replace_macros( $t, array(
'$submit' => t('Submit'),
'$baseurl' => array('baseurl', t('Piwik Base URL'), get_config('piwik','baseurl' ), t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')),
'$siteid' => array('siteid', t('Site ID'), get_config('piwik','siteid' ), ''),

8
piwik/view/admin.tpl Executable file → Normal file
View file

@ -1,5 +1,5 @@
{{ inc $field_input with $field=$baseurl }}{{ endinc }}
{{ inc $field_input with $field=$siteid }}{{ endinc }}
{{ inc $field_checkbox with $field=$optout }}{{ endinc }}
{{ inc $field_checkbox with $field=$async }}{{ endinc }}
{{ inc field_input.tpl with $field=$baseurl }}{{ endinc }}
{{ inc field_input.tpl with $field=$siteid }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$optout }}{{ endinc }}
{{ inc field_checkbox.tpl with $field=$async }}{{ endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

View file

@ -1,5 +1,5 @@
{{include file="file:{{$field_input}}" field=$baseurl}}
{{include file="file:{{$field_input}}" field=$siteid}}
{{include file="file:{{$field_checkbox}}" field=$optout}}
{{include file="file:{{$field_checkbox}}" field=$async}}
{{include file="field_input.tpl" field=$baseurl}}
{{include file="field_input.tpl" field=$siteid}}
{{include file="field_checkbox.tpl" field=$optout}}
{{include file="field_checkbox.tpl" field=$async}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>