simplify by making Smarty include directives behave like Friendica native ones
This commit is contained in:
parent
6603758a5e
commit
11c06e21b7
73 changed files with 376 additions and 587 deletions
|
@ -554,13 +554,7 @@ function settings_content(&$a) {
|
|||
|
||||
if(($a->argc > 2) && ($a->argv[2] === 'add')) {
|
||||
$tpl = get_markup_template("settings_oauth_edit.tpl");
|
||||
|
||||
$includes = array(
|
||||
'$field_input' => 'field_input.tpl',
|
||||
);
|
||||
$includes = set_template_includes($a->theme['template_engine'], $includes);
|
||||
|
||||
$o .= replace_macros($tpl, $includes + array(
|
||||
$o .= replace_macros($tpl, array(
|
||||
'$form_security_token' => get_form_security_token("settings_oauth"),
|
||||
'$title' => t('Add application'),
|
||||
'$submit' => t('Submit'),
|
||||
|
@ -586,13 +580,7 @@ function settings_content(&$a) {
|
|||
$app = $r[0];
|
||||
|
||||
$tpl = get_markup_template("settings_oauth_edit.tpl");
|
||||
|
||||
$includes = array(
|
||||
'$field_input' => 'field_input.tpl',
|
||||
);
|
||||
$includes = set_template_includes($a->theme['template_engine'], $includes);
|
||||
|
||||
$o .= replace_macros($tpl, $includes + array(
|
||||
$o .= replace_macros($tpl, array(
|
||||
'$form_security_token' => get_form_security_token("settings_oauth"),
|
||||
'$title' => t('Add application'),
|
||||
'$submit' => t('Update'),
|
||||
|
@ -675,13 +663,7 @@ function settings_content(&$a) {
|
|||
|
||||
|
||||
$tpl = get_markup_template("settings_features.tpl");
|
||||
|
||||
$includes = array(
|
||||
'$field_yesno' => 'field_yesno.tpl',
|
||||
);
|
||||
$includes = set_template_includes($a->theme['template_engine'], $includes);
|
||||
|
||||
$o .= replace_macros($tpl, $includes + array(
|
||||
$o .= replace_macros($tpl, array(
|
||||
'$form_security_token' => get_form_security_token("settings_features"),
|
||||
'$title' => t('Additional Features'),
|
||||
'$features' => $arr,
|
||||
|
@ -733,16 +715,7 @@ function settings_content(&$a) {
|
|||
}
|
||||
|
||||
|
||||
$includes = array(
|
||||
'$field_checkbox' => 'field_checkbox.tpl',
|
||||
'$field_input' => 'field_input.tpl',
|
||||
'$field_select' => 'field_select.tpl',
|
||||
'$field_custom' => 'field_custom.tpl',
|
||||
'$field_password' => 'field_password.tpl',
|
||||
);
|
||||
$includes = set_template_includes($a->theme['template_engine'], $includes);
|
||||
|
||||
$o .= replace_macros($tpl, $includes + array(
|
||||
$o .= replace_macros($tpl, array(
|
||||
'$form_security_token' => get_form_security_token("settings_connectors"),
|
||||
|
||||
'$title' => t('Connector Settings'),
|
||||
|
@ -832,15 +805,7 @@ function settings_content(&$a) {
|
|||
}
|
||||
|
||||
$tpl = get_markup_template("settings_display.tpl");
|
||||
|
||||
$includes = array(
|
||||
'$field_themeselect' => 'field_themeselect.tpl',
|
||||
'$field_checkbox' => 'field_checkbox.tpl',
|
||||
'$field_input' => 'field_input.tpl',
|
||||
);
|
||||
$includes = set_template_includes($a->theme['template_engine'], $includes);
|
||||
|
||||
$o = replace_macros($tpl, $includes + array(
|
||||
$o = replace_macros($tpl, array(
|
||||
'$ptitle' => t('Display Settings'),
|
||||
'$form_security_token' => get_form_security_token("settings_display"),
|
||||
'$submit' => t('Submit'),
|
||||
|
@ -926,13 +891,7 @@ function settings_content(&$a) {
|
|||
|
||||
|
||||
$pageset_tpl = get_markup_template('pagetypes.tpl');
|
||||
|
||||
$includes = array(
|
||||
'$field_radio' => 'field_radio.tpl',
|
||||
);
|
||||
$includes = set_template_includes($a->theme['template_engine'], $includes);
|
||||
|
||||
$pagetype = replace_macros($pageset_tpl,$includes + array(
|
||||
$pagetype = replace_macros($pageset_tpl, array(
|
||||
'$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL,
|
||||
t('This account is a normal personal profile'),
|
||||
($a->user['page-flags'] == PAGE_NORMAL)),
|
||||
|
@ -1053,17 +1012,7 @@ function settings_content(&$a) {
|
|||
require_once('include/group.php');
|
||||
$group_select = mini_group_select(local_user(),$a->user['def_gid']);
|
||||
|
||||
$includes = array(
|
||||
'$field_password' => 'field_password.tpl',
|
||||
'$field_input' => 'field_input.tpl',
|
||||
'$field_custom' => 'field_custom.tpl',
|
||||
'$field_checkbox' => 'field_checkbox.tpl',
|
||||
'$field_yesno' => 'field_yesno.tpl',
|
||||
'$field_intcheckbox' => 'field_intcheckbox.tpl',
|
||||
);
|
||||
$includes = set_template_includes($a->theme['template_engine'], $includes);
|
||||
|
||||
$o .= replace_macros($stpl,$includes + array(
|
||||
$o .= replace_macros($stpl, array(
|
||||
'$ptitle' => t('Account Settings'),
|
||||
|
||||
'$submit' => t('Submit'),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue