diff --git a/altpager.tgz b/altpager.tgz index 87bb2f8f..fbfd5594 100644 Binary files a/altpager.tgz and b/altpager.tgz differ diff --git a/altpager/altpager.php b/altpager/altpager.php index ddb6d352..c6f537bd 100755 --- a/altpager/altpager.php +++ b/altpager/altpager.php @@ -94,13 +94,7 @@ function altpager_settings(&$a,&$s) { function altpager_plugin_admin(&$a, &$o){ $t = get_markup_template( "admin.tpl", "addon/altpager/" ); - - $includes = array( - '$field_radio' => 'field_radio.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros($t, $includes + array( + $o = replace_macros($t, array( '$submit' => t('Submit'), '$global' => array('altpagerchoice', t('Global'), 1, t('Force global use of the alternate pager'), get_config('alt_pager', 'global') == 1), '$individual' => array('altpagerchoice', t('Individual'), 2, t('Each user chooses whether to use the alternate pager'), get_config('alt_pager', 'global') == 0) diff --git a/altpager/view/admin.tpl b/altpager/view/admin.tpl old mode 100755 new mode 100644 index 1176db41..60558808 --- a/altpager/view/admin.tpl +++ b/altpager/view/admin.tpl @@ -1,3 +1,3 @@ -{{ inc $field_radio with $field=$global }}{{ endinc }} -{{ inc $field_radio with $field=$individual }}{{ endinc }} +{{ inc field_radio.tpl with $field=$global }}{{ endinc }} +{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
diff --git a/altpager/view/smarty3/admin.tpl b/altpager/view/smarty3/admin.tpl index 50780231..e67afd73 100644 --- a/altpager/view/smarty3/admin.tpl +++ b/altpager/view/smarty3/admin.tpl @@ -1,3 +1,3 @@ -{{include file="file:{{$field_radio}}" field=$global}} -{{include file="file:{{$field_radio}}" field=$individual}} +{{include file="field_radio.tpl" field=$global}} +{{include file="field_radio.tpl" field=$individual}}
diff --git a/blackout.tgz b/blackout.tgz index 4b5a5d31..6d081dc4 100644 Binary files a/blackout.tgz and b/blackout.tgz differ diff --git a/blackout/blackout.php b/blackout/blackout.php index 4c2a74b6..83495611 100644 --- a/blackout/blackout.php +++ b/blackout/blackout.php @@ -95,12 +95,7 @@ function blackout_plugin_admin(&$a, &$o) { if (! is_string($myurl)) { $myurl = "http://www.example.com"; } $t = get_markup_template( "admin.tpl", "addon/blackout/" ); - $includes = array( - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros($t, $includes + array( + $o = replace_macros($t, array( '$submit' => t('Submit'), '$rurl' => array("rurl", "Redirect URL", $myurl, "all your visitors from the web will be redirected to this URL"), '$startdate' => array("startdate", "Begin of the Blackout
(YYYY-MM-DD hh:mm)", $mystart, "format is YYYY year, MM month, DD day, hh hour and mm minute"), diff --git a/blackout/view/admin.tpl b/blackout/view/admin.tpl index e19bd246..25922193 100644 --- a/blackout/view/admin.tpl +++ b/blackout/view/admin.tpl @@ -1,6 +1,6 @@ -{{ inc $field_input with $field=$startdate }}{{ endinc }} -{{ inc $field_input with $field=$enddate }}{{ endinc }} -{{ inc $field_input with $field=$rurl }}{{ endinc }} +{{ inc field_input.tpl with $field=$startdate }}{{ endinc }} +{{ inc field_input.tpl with $field=$enddate }}{{ endinc }} +{{ inc field_input.tpl with $field=$rurl }}{{ endinc }}
Note: The redirect will be active from the moment you diff --git a/blackout/view/smarty3/admin.tpl b/blackout/view/smarty3/admin.tpl index f77a5948..11a4d914 100644 --- a/blackout/view/smarty3/admin.tpl +++ b/blackout/view/smarty3/admin.tpl @@ -1,6 +1,6 @@ -{{include file="file:{{$field_input}}" field=$startdate}} -{{include file="file:{{$field_input}}" field=$enddate}} -{{include file="file:{{$field_input}}" field=$rurl}} +{{include file="field_input.tpl" field=$startdate}} +{{include file="field_input.tpl" field=$enddate}} +{{include file="field_input.tpl" field=$rurl}}
Note: The redirect will be active from the moment you diff --git a/communityhome.tgz b/communityhome.tgz index 20f7b964..71f1f8e3 100755 Binary files a/communityhome.tgz and b/communityhome.tgz differ diff --git a/forumdirectory.tgz b/forumdirectory.tgz index 09fcb4ce..249cd226 100644 Binary files a/forumdirectory.tgz and b/forumdirectory.tgz differ diff --git a/fromgplus.tgz b/fromgplus.tgz index 712019e4..0a402b76 100644 Binary files a/fromgplus.tgz and b/fromgplus.tgz differ diff --git a/gravatar.tgz b/gravatar.tgz index 25106f26..561c4aae 100644 Binary files a/gravatar.tgz and b/gravatar.tgz differ diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index a0b5a02b..12a8e44f 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -91,13 +91,7 @@ function gravatar_plugin_admin (&$a, &$o) { // output Gravatar settings $o .= ''; - - $includes = array( - '$field_select' => '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'), '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars), '$rating' => array('rating', t('Rating of images'), $rating, t('Select the appropriate avatar rating for your site. See README'), $ratings), diff --git a/gravatar/view/admin.tpl b/gravatar/view/admin.tpl index b187e1ea..83144e43 100644 --- a/gravatar/view/admin.tpl +++ b/gravatar/view/admin.tpl @@ -1,3 +1,3 @@ -{{ inc $field_select with $field=$default_avatar}}{{ endinc }} -{{ inc $field_select with $field=$rating }}{{ endinc }} +{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }} +{{ inc field_select.tpl with $field=$rating }}{{ endinc }}
diff --git a/gravatar/view/smarty3/admin.tpl b/gravatar/view/smarty3/admin.tpl index 30d760af..5dfd4488 100644 --- a/gravatar/view/smarty3/admin.tpl +++ b/gravatar/view/smarty3/admin.tpl @@ -1,3 +1,3 @@ -{{include file="file:{{$field_select}}" field=$default_avatar}} -{{include file="file:{{$field_select}}" field=$rating}} +{{include file="field_select.tpl" field=$default_avatar}} +{{include file="field_select.tpl" field=$rating}}
diff --git a/impressum.tgz b/impressum.tgz index 8c36df6f..b47b625c 100755 Binary files a/impressum.tgz and b/impressum.tgz differ diff --git a/impressum/impressum.php b/impressum/impressum.php index 305dd9a9..3c1106c9 100755 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -79,14 +79,7 @@ function impressum_plugin_admin_post (&$a) { } function impressum_plugin_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/impressum/" ); - - $includes = array( - '$field_input' => 'field_input.tpl', - '$field_textarea' => 'field_textarea.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros($t, $includes + array( + $o = replace_macros($t, array( '$submit' => t('Submit'), '$owner' => array('owner', t('Site Owner'), get_config('impressum','owner'), t('The page operators name.')), '$ownerprofile' => array('ownerprofile', t('Site Owners Profile'), get_config('impressum','ownerprofile'), t('Profile address of the operator.')), diff --git a/impressum/view/admin.tpl b/impressum/view/admin.tpl old mode 100755 new mode 100644 index e3651137..901df73f --- a/impressum/view/admin.tpl +++ b/impressum/view/admin.tpl @@ -1,7 +1,7 @@ -{{ inc $field_input with $field=$owner }}{{ endinc }} -{{ inc $field_input with $field=$ownerprofile }}{{ endinc }} -{{ inc $field_textarea with $field=$postal }}{{ endinc }} -{{ inc $field_textarea with $field=$notes }}{{ endinc }} -{{ inc $field_input with $field=$email }}{{ endinc }} -{{ inc $field_textarea with $field=$footer_text }}{{ endinc }} +{{ inc field_input.tpl with $field=$owner }}{{ endinc }} +{{ inc field_input.tpl with $field=$ownerprofile }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$postal }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$notes }}{{ endinc }} +{{ inc field_input.tpl with $field=$email }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$footer_text }}{{ endinc }}
diff --git a/impressum/view/smarty3/admin.tpl b/impressum/view/smarty3/admin.tpl index a3b0ef27..80b67824 100644 --- a/impressum/view/smarty3/admin.tpl +++ b/impressum/view/smarty3/admin.tpl @@ -1,7 +1,7 @@ -{{include file="file:{{$field_input}}" field=$owner}} -{{include file="file:{{$field_input}}" field=$ownerprofile}} -{{include file="file:{{$field_textarea}}" field=$postal}} -{{include file="file:{{$field_textarea}}" field=$notes}} -{{include file="file:{{$field_input}}" field=$email}} -{{include file="file:{{$field_textarea}}" field=$footer_text}} +{{include file="field_input.tpl" field=$owner}} +{{include file="field_input.tpl" field=$ownerprofile}} +{{include file="field_textarea.tpl" field=$postal}} +{{include file="field_textarea.tpl" field=$notes}} +{{include file="field_input.tpl" field=$email}} +{{include file="field_textarea.tpl" field=$footer_text}}
diff --git a/libravatar.tgz b/libravatar.tgz index 0405af9b..d61f63ba 100644 Binary files a/libravatar.tgz and b/libravatar.tgz differ diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index c966052f..8cbf1e98 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -95,13 +95,7 @@ function libravatar_plugin_admin (&$a, &$o) { // output Libravatar settings $o .= ''; - - $includes = array( - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros( $t, $includes + array( + $o .= replace_macros( $t, array( '$submit' => t('Submit'), '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found. See README'), $default_avatars), )); diff --git a/libravatar/view/admin.tpl b/libravatar/view/admin.tpl index 01b113c4..814f4a44 100644 --- a/libravatar/view/admin.tpl +++ b/libravatar/view/admin.tpl @@ -1,2 +1,2 @@ -{{ inc $field_select with $field=$default_avatar}}{{ endinc }} +{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }}
diff --git a/libravatar/view/smarty3/admin.tpl b/libravatar/view/smarty3/admin.tpl index 4e930a74..ee958287 100644 --- a/libravatar/view/smarty3/admin.tpl +++ b/libravatar/view/smarty3/admin.tpl @@ -1,2 +1,2 @@ -{{include file="file:{{$field_select}}" field=$default_avatar}} +{{include file="field_select.tpl" field=$default_avatar}}
diff --git a/mathjax.tgz b/mathjax.tgz index 37bfbf61..a340aee4 100644 Binary files a/mathjax.tgz and b/mathjax.tgz differ diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php index 33cdd439..e57d69bf 100644 --- a/mathjax/mathjax.php +++ b/mathjax/mathjax.php @@ -71,12 +71,7 @@ function mathjax_plugin_admin (&$a, &$o) { set_config('mathjax','baseurl','http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'); } - $includes = array( - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros( $t, $includes + array( + $o = replace_macros( $t, array( '$baseurl' => array('baseurl', t('MathJax Base URL'), get_config('mathjax','baseurl' ), t('The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax.')), )); } diff --git a/mathjax/view/admin.tpl b/mathjax/view/admin.tpl index ed60d734..1c723cdd 100644 --- a/mathjax/view/admin.tpl +++ b/mathjax/view/admin.tpl @@ -1,2 +1,2 @@ -{{ inc $field_input with $field=$baseurl }}{{endinc }} +{{ inc field_input.tpl with $field=$baseurl }}{{endinc }}
diff --git a/mathjax/view/smarty3/admin.tpl b/mathjax/view/smarty3/admin.tpl index 8d0388ca..f6ec03e0 100644 --- a/mathjax/view/smarty3/admin.tpl +++ b/mathjax/view/smarty3/admin.tpl @@ -1,2 +1,2 @@ -{{include file="file:{{$field_input}}" field=$baseurl}} +{{include file="field_input.tpl" field=$baseurl}}
diff --git a/openstreetmap.tgz b/openstreetmap.tgz index c195d151..967b5601 100644 Binary files a/openstreetmap.tgz and b/openstreetmap.tgz differ diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index bf663253..cb9abcd7 100755 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -58,7 +58,6 @@ function openstreetmap_location($a, &$item) { function openstreetmap_plugin_admin (&$a, &$o) { -# $t = file_get_contents( dirname(__file__)."/admin.tpl"); $t = get_markup_template( "admin.tpl", "addon/openstreetmap/" ); $tmsserver = get_config('openstreetmap','tmsserver'); if(! $tmsserver) @@ -67,12 +66,7 @@ function openstreetmap_plugin_admin (&$a, &$o) { if(! $zoom) $zoom = 17; - $includes = array( - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros( $t, $includes + array( + $o = replace_macros( $t, array( '$submit' => t('Submit'), '$tmsserver' => array('tmsserver', t('Tile Server URL'), $tmsserver, t('A list of public tile servers')), '$zoom' => array('zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest)')), diff --git a/openstreetmap/view/admin.tpl b/openstreetmap/view/admin.tpl index f733a917..75db9cd7 100644 --- a/openstreetmap/view/admin.tpl +++ b/openstreetmap/view/admin.tpl @@ -1,3 +1,3 @@ -{{ inc $field_input with $field=$tmsserver }}{{ endinc }} -{{ inc $field_input with $field=$zoom }}{{ endinc }} +{{ inc field_input.tpl with $field=$tmsserver }}{{ endinc }} +{{ inc field_input.tpl with $field=$zoom }}{{ endinc }}
diff --git a/openstreetmap/view/smarty3/admin.tpl b/openstreetmap/view/smarty3/admin.tpl index 90baf1be..6ee07174 100644 --- a/openstreetmap/view/smarty3/admin.tpl +++ b/openstreetmap/view/smarty3/admin.tpl @@ -1,3 +1,3 @@ -{{include file="file:{{$field_input}}" field=$tmsserver}} -{{include file="file:{{$field_input}}" field=$zoom}} +{{include file="field_input.tpl" field=$tmsserver}} +{{include file="field_input.tpl" field=$zoom}}
diff --git a/page.tgz b/page.tgz index 02140ce9..c9610e28 100644 Binary files a/page.tgz and b/page.tgz differ diff --git a/piwik.tgz b/piwik.tgz index 080dd9e3..a5bd437a 100755 Binary files a/piwik.tgz and b/piwik.tgz differ diff --git a/piwik/piwik.php b/piwik/piwik.php index a0dd1c25..3501b2c8 100755 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -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' ), ''), diff --git a/piwik/view/admin.tpl b/piwik/view/admin.tpl old mode 100755 new mode 100644 index 21a6ea87..e57758a9 --- a/piwik/view/admin.tpl +++ b/piwik/view/admin.tpl @@ -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 }}
diff --git a/piwik/view/smarty3/admin.tpl b/piwik/view/smarty3/admin.tpl index 3fd39737..bfe04aa3 100644 --- a/piwik/view/smarty3/admin.tpl +++ b/piwik/view/smarty3/admin.tpl @@ -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}}
diff --git a/privacy_image_cache.tgz b/privacy_image_cache.tgz index 13239d90..b0690fc2 100644 Binary files a/privacy_image_cache.tgz and b/privacy_image_cache.tgz differ diff --git a/remote_permissions.tgz b/remote_permissions.tgz index 8c137d10..fef4f39b 100644 Binary files a/remote_permissions.tgz and b/remote_permissions.tgz differ diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php index 3c99f008..8955130f 100644 --- a/remote_permissions/remote_permissions.php +++ b/remote_permissions/remote_permissions.php @@ -191,15 +191,8 @@ function remote_permissions_content($a, $item_copy) { } function remote_permissions_plugin_admin(&$a, &$o){ -// $t = file_get_contents( "addon/remote_permissions/admin.tpl" ); $t = get_markup_template( "admin.tpl", "addon/remote_permissions/" ); - - $includes = array( - '$field_radio' => 'field_radio.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros($t, $includes + array( + $o = replace_macros($t, array( '$submit' => t('Submit'), '$global' => array('remotepermschoice', t('Global'), 1, t('The posts of every user on this server show the post recipients'), get_config('remote_perms', 'global') == 1), '$individual' => array('remotepermschoice', t('Individual'), 2, t('Each user chooses whether his/her posts show the post recipients'), get_config('remote_perms', 'global') == 0) diff --git a/remote_permissions/view/admin.tpl b/remote_permissions/view/admin.tpl index 1176db41..60558808 100644 --- a/remote_permissions/view/admin.tpl +++ b/remote_permissions/view/admin.tpl @@ -1,3 +1,3 @@ -{{ inc $field_radio with $field=$global }}{{ endinc }} -{{ inc $field_radio with $field=$individual }}{{ endinc }} +{{ inc field_radio.tpl with $field=$global }}{{ endinc }} +{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
diff --git a/statusnet.tgz b/statusnet.tgz index 92a10317..9801af55 100755 Binary files a/statusnet.tgz and b/statusnet.tgz differ diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index d7af352e..4781fcc2 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -699,14 +699,7 @@ function statusnet_plugin_admin(&$a, &$o){ $t = get_markup_template( "admin.tpl", "addon/statusnet/" ); - - $includes = array( - '$field_input' => 'field_input.tpl', - '$field_checkbox' => 'field_checkbox.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros($t, $includes + array( + $o = replace_macros($t, array( '$submit' => t('Submit'), '$sites' => $sitesform, diff --git a/statusnet/view/admin.tpl b/statusnet/view/admin.tpl old mode 100755 new mode 100644 index 02eacf73..b40adf35 --- a/statusnet/view/admin.tpl +++ b/statusnet/view/admin.tpl @@ -1,10 +1,10 @@ {{ for $sites as $s }} - {{ inc $field_input with $field=$s.sitename }}{{ endinc }} - {{ inc $field_input with $field=$s.apiurl }}{{ endinc }} - {{ inc $field_input with $field=$s.secret }}{{ endinc }} - {{ inc $field_input with $field=$s.key }}{{ endinc }} + {{ inc field_input.tpl with $field=$s.sitename }}{{ endinc }} + {{ inc field_input.tpl with $field=$s.apiurl }}{{ endinc }} + {{ inc field_input.tpl with $field=$s.secret }}{{ endinc }} + {{ inc field_input.tpl with $field=$s.key }}{{ endinc }} {{ if $s.delete }} - {{ inc $field_checkbox with $field=$s.delete }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$s.delete }}{{ endinc }}
{{ else }}

Fill this form to add a new site

diff --git a/statusnet/view/smarty3/admin.tpl b/statusnet/view/smarty3/admin.tpl index 5a77b2cf..e2a8408f 100644 --- a/statusnet/view/smarty3/admin.tpl +++ b/statusnet/view/smarty3/admin.tpl @@ -1,10 +1,10 @@ {{foreach $sites as $s}} - {{include file="file:{{$field_input}}" field=$s.sitename}} - {{include file="file:{{$field_input}}" field=$s.apiurl}} - {{include file="file:{{$field_input}}" field=$s.secret}} - {{include file="file:{{$field_input}}" field=$s.key}} + {{include file="field_input.tpl" field=$s.sitename}} + {{include file="field_input.tpl" field=$s.apiurl}} + {{include file="field_input.tpl" field=$s.secret}} + {{include file="field_input.tpl" field=$s.key}} {{if $s.delete}} - {{include file="file:{{$field_checkbox}}" field=$s.delete}} + {{include file="field_checkbox.tpl" field=$s.delete}}
{{else}}

Fill this form to add a new site

diff --git a/tumblr.tgz b/tumblr.tgz index 4c0fecf3..b4f6ff9b 100755 Binary files a/tumblr.tgz and b/tumblr.tgz differ diff --git a/twitter.tgz b/twitter.tgz index 287619c2..0505830c 100755 Binary files a/twitter.tgz and b/twitter.tgz differ diff --git a/twitter/view/admin.tpl b/twitter/view/admin.tpl old mode 100755 new mode 100644 index d3649fce..a83eb07a --- a/twitter/view/admin.tpl +++ b/twitter/view/admin.tpl @@ -1,3 +1,3 @@ -{{ inc $field_input with $field=$consumerkey }}{{ endinc }} -{{ inc $field_input with $field=$consumersecret }}{{ endinc }} +{{ inc field_input.tpl with $field=$consumerkey }}{{ endinc }} +{{ inc field_input.tpl with $field=$consumersecret }}{{ endinc }}
diff --git a/twitter/view/smarty3/admin.tpl b/twitter/view/smarty3/admin.tpl index ad1e07e9..9efcb065 100644 --- a/twitter/view/smarty3/admin.tpl +++ b/twitter/view/smarty3/admin.tpl @@ -1,3 +1,3 @@ -{{include file="file:{{$field_input}}" field=$consumerkey}} -{{include file="file:{{$field_input}}" field=$consumersecret}} +{{include file="field_input.tpl" field=$consumerkey}} +{{include file="field_input.tpl" field=$consumersecret}}
diff --git a/uhremotestorage.tgz b/uhremotestorage.tgz index 4aa58096..7a758b00 100755 Binary files a/uhremotestorage.tgz and b/uhremotestorage.tgz differ diff --git a/uhremotestorage/uhremotestorage.php b/uhremotestorage/uhremotestorage.php index d7d03692..85d6b13e 100755 --- a/uhremotestorage/uhremotestorage.php +++ b/uhremotestorage/uhremotestorage.php @@ -78,16 +78,8 @@ function uhremotestorage_settings($a, &$s){ 'Dropbox' => 'Dropbox', ); */ -// $tpl = file_get_contents(dirname(__file__)."/settings.tpl"); $tpl = get_markup_template("settings.tpl", "addon/uhremotestorage/"); - - $includes = array( - '$field_input' => 'field_input.tpl', - '$field_select' => 'field_select.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $s .= replace_macros($tpl, $includes + array( + $s .= replace_macros($tpl, array( '$title' => 'Unhosted remote storage', '$desc' => sprintf( t('Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See RemoteStorage WebFinger'), $uid ), '$url' => array( 'unhoestedurl', t('Template URL (with {category})'), $url, 'If your are using ownCloud, your unhosted url will be like http://HOST/apps/remoteStorage/WebDAV.php/USER/remoteStorage/{category}'), diff --git a/uhremotestorage/view/settings.tpl b/uhremotestorage/view/settings.tpl old mode 100755 new mode 100644 index 51650c85..22d7d608 --- a/uhremotestorage/view/settings.tpl +++ b/uhremotestorage/view/settings.tpl @@ -1,9 +1,9 @@

$title

$desc

- {{ inc $field_input with $field=$url }}{{ endinc }} - {{ inc $field_input with $field=$auth }}{{ endinc }} - {{ inc $field_select with $field=$api }}{{ endinc }} + {{ inc field_input.tpl with $field=$url }}{{ endinc }} + {{ inc field_input.tpl with $field=$auth }}{{ endinc }} + {{ inc field_select.tpl with $field=$api }}{{ endinc }}
diff --git a/uhremotestorage/view/smarty3/settings.tpl b/uhremotestorage/view/smarty3/settings.tpl index 217f069a..9a0a55f3 100644 --- a/uhremotestorage/view/smarty3/settings.tpl +++ b/uhremotestorage/view/smarty3/settings.tpl @@ -1,9 +1,9 @@

{{$title}}

{{$desc}}

- {{include file="file:{{$field_input}}" field=$url}} - {{include file="file:{{$field_input}}" field=$auth}} - {{include file="file:{{$field_select}}" field=$api}} + {{include file="field_input.tpl" field=$url}} + {{include file="field_input.tpl" field=$auth}} + {{include file="field_select.tpl" field=$api}}
diff --git a/widgets.tgz b/widgets.tgz index f3b18578..d89204f5 100755 Binary files a/widgets.tgz and b/widgets.tgz differ