update addons to support Smarty3

altpager/altpager.php

@@ -93,8 +93,14 @@ function altpager_settings(&$a,&$s) {
 }
 
 function altpager_plugin_admin(&$a, &$o){
-	$t = file_get_contents( "addon/altpager/admin.tpl" );
+	$t = get_markup_template( "admin.tpl", "addon/altpager/" );
-	$o = replace_macros($t, array(
+ 
+	$includes = array(
+		'$field_radio' => 'field_radio.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o = replace_macros($t, $includes + 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)
@@ -106,3 +112,4 @@ function altpager_plugin_admin_post(&$a){
 	set_config('alt_pager','global',($choice == 1 ? 1 : 0));
 	info( t('Settings updated.'). EOL );
 }
+

altpager/view/admin.tpl

@@ -0,0 +1,3 @@
+{{ inc $field_radio with $field=$global }}{{ endinc }}
+{{ inc $field_radio with $field=$individual }}{{ endinc }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

altpager/view/smarty3/admin.tpl

@@ -0,0 +1,3 @@
+{{include file="file:{{$field_radio}}" field=$global}}
+{{include file="file:{{$field_radio}}" field=$individual}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

blackout/blackout.php

@@ -93,8 +93,14 @@ function blackout_plugin_admin(&$a, &$o) {
     if (! is_string($myend)) { $myend = "YYYY-MM-DD:hhmm"; }
     $myurl   = get_config('blackout','url');
     if (! is_string($myurl)) { $myurl = "http://www.example.com"; }
-    $t = file_get_contents( dirname(__file__)."/admin.tpl" );
+    $t = get_markup_template( "admin.tpl", "addon/blackout/" );
-    $o = replace_macros($t, array(
+ 
+	$includes = array(
+		'$field_input' => 'field_input.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+   $o = replace_macros($t, $includes + 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<br />(YYYY-MM-DD hh:mm)", $mystart, "format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"),

blackout/view/admin.tpl

@@ -1,6 +1,6 @@
-{{ inc field_input.tpl with $field=$startdate }}{{ endinc }}
+{{ inc $field_input with $field=$startdate }}{{ endinc }}
-{{ inc field_input.tpl with $field=$enddate }}{{ endinc }}
+{{ inc $field_input with $field=$enddate }}{{ endinc }}
-{{ inc field_input.tpl with $field=$rurl }}{{ endinc }}
+{{ inc $field_input with $field=$rurl }}{{ endinc }}
 
 <div style="border: 2px solid #f00; padding: 10px; margin:
 10px;font-size: 1.2em;"><strong>Note</strong>: The redirect will be active from the moment you

blackout/view/smarty3/admin.tpl

@@ -0,0 +1,11 @@
+{{include file="file:{{$field_input}}" field=$startdate}}
+{{include file="file:{{$field_input}}" field=$enddate}}
+{{include file="file:{{$field_input}}" field=$rurl}}
+
+<div style="border: 2px solid #f00; padding: 10px; margin:
+10px;font-size: 1.2em;"><strong>Note</strong>: The redirect will be active from the moment you
+press the submit button. Users currently logged in will <strong>not</strong> be
+thrown out but can't login again after logging out should the blackout is
+still in place.</div>
+
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

communityhome/communityhome.php

@@ -47,7 +47,8 @@ function communityhome_home(&$a, &$o){
 		0,
 		12
 	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+#	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+	$tpl = get_markup_template( 'directory_item.tpl', 'addon/communityhome/' );
 	if(count($r)) {
 		$photo = 'thumb';
 		foreach($r as $rr) {
@@ -114,7 +115,8 @@ function communityhome_home(&$a, &$o){
 
 		
 	if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+#		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		$tpl = get_markup_template( 'directory_item.tpl', 'addon/communityhome/' );
 		foreach($r as $rr) {
 			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
 			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
@@ -174,7 +176,8 @@ function communityhome_home(&$a, &$o){
 		
 	}
 	
-	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+#	$tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+	$tpl = get_markup_template('communityhome.tpl', 'addon/communityhome/');
 	$a->page['aside'] = replace_macros($tpl, $aside);
 	
 	$o = '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>';

communityhome/view/smarty3/communityhome.tpl

@@ -0,0 +1,70 @@
+<script>
+	$(function(){
+		$("#tab_1 a").click(function(e){
+			$("#login_standard").show();
+			$("#login_openid").hide();
+			$("#tab_1").addClass("active");
+			$("#tab_2").removeClass("active");
+			e.preventDefault();
+			return false;
+		});
+		$("#tab_2 a").click(function(e){
+			$("#login_openid").show();
+			$("#login_standard").hide();
+			$("#tab_2").addClass("active");
+			$("#tab_1").removeClass("active");
+			e.preventDefault();
+			return false;
+			
+		});
+		
+	});
+</script>
+{{if $noOid}}
+	<h3>{{$login_title}}</h3>
+{{else}}
+<ul class="tabs">
+	<li id="tab_1" class="tab button active"><a href="#">{{$tab_1}}</a></li>
+	<li id="tab_2" class="tab button"><a href="#">{{$tab_2}}</a></li>
+</ul>
+{{/if}}
+{{$login_form}}
+
+
+{{if $lastusers_title}}
+<h3>{{$lastusers_title}}</h3>
+<div class='items-wrapper'>
+{{foreach $lastusers_items as $i}}
+	{{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+
+
+{{if $activeusers_title}}
+<h3>{{$activeusers_title}}</h3>
+<div class='items-wrapper'>
+{{foreach $activeusers_items as $i}}
+	{{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+
+{{if $photos_title}}
+<h3>{{$photos_title}}</h3>
+<div class='items-wrapper'>
+{{foreach $photos_items as $i}}
+	{{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+
+
+{{if $like_title}}
+<h3>{{$like_title}}</h3>
+<ul id='likes'>
+{{foreach $like_items as $i}}
+	<li>{{$i}}</li>
+{{/foreach}}
+</ul>
+{{/if}}

communityhome/view/smarty3/directory_item.tpl

@@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-{{$id}}" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
+		<div class="directory-photo" id="directory-photo-{{$id}}" >
+			<a href="{{$profile}}-link" class="directory-profile-link" id="directory-profile-link-{{$id}}" >
+				<img class="directory-photo-img" src="{{$photo}}" alt="{{$alt}}-text" title="{{$alt}}-text" />
+			</a>
+		</div>
+	</div>
+</div>

forumdirectory/forumdirectory.php

@@ -163,7 +163,8 @@ function forumdirectory_content(&$a) {
 
 			$about = ((x($profile,'about') == 1) ?  t('About:') : False);
 			
-			$tpl = file_get_contents( dirname(__file__).'/forumdirectory_item.tpl');
+#			$tpl = file_get_contents( dirname(__file__).'/forumdirectory_item.tpl');
+			$tpl = get_markup_template( 'forumdirectory_item.tpl', 'addon/forumdirectory/' );
 
 			$entry = replace_macros($tpl,array(
 				'$id' => $rr['id'],

forumdirectory/view/smarty3/forumdirectory_item.tpl

@@ -0,0 +1,42 @@
+
+<div class="forumdirectory-item" id="forumdirectory-item-{{$id}}" >
+	<div class="forumdirectory-photo-wrapper" id="forumdirectory-photo-wrapper-{{$id}}" > 
+		<div class="forumdirectory-photo" id="forumdirectory-photo-{{$id}}" >
+			<a href="{{$profile}}-link" class="forumdirectory-profile-link" id="forumdirectory-profile-link-{{$id}}" >
+				<img class="forumdirectory-photo-img photo" src="{{$photo}}" alt="{{$alt}}-text" title="{{$alt}}-text" />
+			</a>
+		</div>
+	</div>
+	<div class="forumdirectory-profile-wrapper" id="forumdirectory-profile-wrapper-{{$id}}" >
+		<div class="contact-name" id="forumdirectory-name-{{$id}}">{{$name}}</div>
+		<div class="page-type">{{$page}}-type</div>
+		{{if $pdesc}}<div class="forumdirectory-profile-title">{{$profile.pdesc}}</div>{{/if}}
+    	<div class="forumdirectory-detailcolumns-wrapper" id="forumdirectory-detailcolumns-wrapper-{{$id}}">
+        	<div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn1-wrapper-{{$id}}">	
+			{{if $location}}
+			    <dl class="location"><dt class="location-label">{{$location}}</dt>
+				<dd class="adr">
+					{{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+					<span class="city-state-zip">
+						<span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+						<span class="region">{{$profile.region}}</span>
+						<span class="postal-code">{{$profile.postal-code}}</span>
+					</span>
+					{{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+				</dd>
+				</dl>
+			{{/if}}
+
+			{{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+			</div>	
+			<div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn2-wrapper-{{$id}}">	
+				{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+				{{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+			</div>
+		</div>
+	  	<div class="forumdirectory-copy-wrapper" id="forumdirectory-copy-wrapper-{{$id}}" >
+			{{if $about}}<dl class="forumdirectory-copy"><dt class="forumdirectory-copy-label">{{$about}}</dt><dd class="forumdirectory-copy-data">{{$profile.about}}</dd></dl>{{/if}}
+  		</div>
+	</div>
+</div>

gravatar/admin.tpl

@@ -1,3 +0,0 @@
-{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }}
-{{ inc field_select.tpl with $field=$rating }}{{ endinc }}
-<div class="submit"><input type="submit" value="$submit" /></div>

gravatar/gravatar.php

@@ -55,7 +55,7 @@ function gravatar_lookup($a, &$b) {
  * Display admin settings for this addon
  */
 function gravatar_plugin_admin (&$a, &$o) {
-	$t = file_get_contents( dirname(__file__)."/admin.tpl");
+	$t = get_markup_template( "admin.tpl", "addon/gravatar/" );
 
 	$default_avatar = get_config('gravatar', 'default_img');
 	$rating = get_config('gravatar', 'rating');
@@ -91,7 +91,13 @@ function gravatar_plugin_admin (&$a, &$o) {
 
 	// output Gravatar settings
 	$o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("gravatarsave") .'">';
-	$o .= replace_macros( $t, array(
+
+	$includes = array(
+		'$field_select' => 'field_select.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros( $t, $includes + 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),

gravatar/view/admin.tpl

@@ -0,0 +1,3 @@
+{{ inc $field_select with $field=$default_avatar}}{{ endinc }}
+{{ inc $field_select with $field=$rating }}{{ endinc }}
+<div class="submit"><input type="submit" value="$submit" /></div>

gravatar/view/smarty3/admin.tpl

@@ -0,0 +1,3 @@
+{{include file="file:{{$field_select}}" field=$default_avatar}}
+{{include file="file:{{$field_select}}" field=$rating}}
+<div class="submit"><input type="submit" value="{{$submit}}" /></div>

impressum/admin.tpl

@@ -1,7 +0,0 @@
-{{ 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 }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

impressum/impressum.php

@@ -78,8 +78,15 @@ function impressum_plugin_admin_post (&$a) {
     info( t('Settings updated.'). EOL );
 }
 function impressum_plugin_admin (&$a, &$o) {
-    $t = file_get_contents( dirname(__file__). "/admin.tpl" );
+    $t = get_markup_template( "admin.tpl", "addon/impressum/" );
-    $o = replace_macros($t, array(
+
+	$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(
         '$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.')),

impressum/view/admin.tpl

@@ -0,0 +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 }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

impressum/view/smarty3/admin.tpl

@@ -0,0 +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}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

libravatar/libravatar.php

@@ -60,7 +60,7 @@ function libravatar_lookup($a, &$b) {
  * Display admin settings for this addon
  */
 function libravatar_plugin_admin (&$a, &$o) {
-	$t = file_get_contents( dirname(__file__)."/admin.tpl");
+	$t = get_markup_template( "admin.tpl", "addon/libravatar" );
 
 	$default_avatar = get_config('libravatar', 'default_img');
 
@@ -95,7 +95,13 @@ function libravatar_plugin_admin (&$a, &$o) {
 
 	// output Libravatar settings
 	$o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("libravatarsave") .'">';
-	$o .= replace_macros( $t, array(
+ 
+	$includes = array(
+		'$field_input' => 'field_input.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros( $t, $includes + 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),
 	));

libravatar/view/admin.tpl

@@ -1,2 +1,2 @@
-{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }}
+{{ inc $field_select with $field=$default_avatar}}{{ endinc }}
 <div class="submit"><input type="submit" value="$submit" /></div>

libravatar/view/smarty3/admin.tpl

@@ -0,0 +1,2 @@
+{{include file="file:{{$field_select}}" field=$default_avatar}}
+<div class="submit"><input type="submit" value="{{$submit}}" /></div>

mathjax/mathjax.php

@@ -66,11 +66,17 @@ function mathjax_plugin_admin_post (&$a) {
     info( t('Settings updated.'). EOL);
 }
 function mathjax_plugin_admin (&$a, &$o) {
-	$t = file_get_contents( dirname(__file__)."/admin.tpl");
+	$t = get_markup_template( "admin.tpl", "addon/mathjax/" );
 	if (get_config('mathjax','baseurl','') == '') {
 		set_config('mathjax','baseurl','http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML');
 	}
-        $o = replace_macros( $t, array(
+
+	$includes = array(
+		'$field_input' => 'field_input.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o = replace_macros( $t, $includes + 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.')),
 	));
 }

mathjax/view/admin.tpl

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

mathjax/view/smarty3/admin.tpl

@@ -0,0 +1,2 @@
+{{include file="file:{{$field_input}}" field=$baseurl}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

openstreetmap/admin.tpl

@@ -1,3 +0,0 @@
-{{ inc field_input.tpl with $field=$tmsserver }}{{ endinc }}
-{{ inc field_input.tpl with $field=$zoom }}{{ endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

openstreetmap/openstreetmap.php

@@ -58,7 +58,8 @@ function openstreetmap_location($a, &$item) {
 
 
 function openstreetmap_plugin_admin (&$a, &$o) {
-	$t = file_get_contents( dirname(__file__)."/admin.tpl");
+#	$t = file_get_contents( dirname(__file__)."/admin.tpl");
+	$t = get_markup_template( "admin.tpl", "addon/openstreetmap/" );
 	$tmsserver = get_config('openstreetmap','tmsserver');
 	if(! $tmsserver)
 		$tmsserver = 'http://openstreetmap.org';
@@ -66,7 +67,12 @@ function openstreetmap_plugin_admin (&$a, &$o) {
 	if(! $zoom)
 		$zoom = 17;
 
-	$o = replace_macros( $t, array(
+	$includes = array(
+		'$field_input' => 'field_input.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o = replace_macros( $t, $includes + array(
 		'$submit' => t('Submit'),
 		'$tmsserver' => array('tmsserver', t('Tile Server URL'), $tmsserver, t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')),
 		'$zoom' => array('zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest)')),

openstreetmap/view/admin.tpl

@@ -0,0 +1,3 @@
+{{ inc $field_input with $field=$tmsserver }}{{ endinc }}
+{{ inc $field_input with $field=$zoom }}{{ endinc }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

openstreetmap/view/smarty3/admin.tpl

@@ -0,0 +1,3 @@
+{{include file="file:{{$field_input}}" field=$tmsserver}}
+{{include file="file:{{$field_input}}" field=$zoom}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

piwik/admin.tpl

@@ -1,5 +0,0 @@
-{{ 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>

piwik/piwik.php

@@ -84,8 +84,16 @@ function piwik_analytics($a,&$b) {
 	}
 }
 function piwik_plugin_admin (&$a, &$o) {
-	$t = file_get_contents( dirname(__file__)."/admin.tpl");
+#	$t = file_get_contents( dirname(__file__)."/admin.tpl");
-	$o = replace_macros( $t, array(
+	$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(
 		'$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' ), ''),

piwik/view/admin.tpl

@@ -0,0 +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 }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

piwik/view/smarty3/admin.tpl

@@ -0,0 +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}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

remote_permissions/admin.tpl

@@ -1,3 +0,0 @@
-{{ inc field_radio.tpl with $field=$global }}{{ endinc }}
-{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

remote_permissions/remote_permissions.php

@@ -39,7 +39,8 @@ function remote_permissions_settings(&$a,&$o) {
 	
 	/* Add some HTML to the existing form */
 
-	$t = file_get_contents("addon/remote_permissions/settings.tpl" );
+//	$t = file_get_contents("addon/remote_permissions/settings.tpl" );
+	$t = get_markup_template("settings.tpl", "addon/remote_permissions/" );
 	$o .= replace_macros($t, array(
 		'$remote_perms_title' => t('Remote Permissions Settings'),
 		'$remote_perms_label' => t('Allow recipients of your private posts to see the other recipients of the posts'),
@@ -190,8 +191,15 @@ function remote_permissions_content($a, $item_copy) {
 }
 
 function remote_permissions_plugin_admin(&$a, &$o){
-	$t = file_get_contents( "addon/remote_permissions/admin.tpl" );
+//	$t = file_get_contents( "addon/remote_permissions/admin.tpl" );
-	$o = replace_macros($t, array(
+	$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(
 		'$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)

remote_permissions/view/admin.tpl

@@ -0,0 +1,3 @@
+{{ inc $field_radio with $field=$global }}{{ endinc }}
+{{ inc $field_radio with $field=$individual }}{{ endinc }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

remote_permissions/view/smarty3/admin.tpl

@@ -0,0 +1,3 @@
+{{include file="field_radio.tpl" field=$global}}
+{{include file="field_radio.tpl" field=$individual}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

remote_permissions/view/smarty3/settings.tpl

@@ -0,0 +1,8 @@
+	<div class="settings-block">
+	<h3>{{$remote_perms_title}}</h3>
+	<div id="remote-perms-wrapper">
+	<label id="remote-perms-label" for="remote-perms">{{$remote_perms_label}}</label>
+	<input id="remote-perms-input" type="checkbox" name="remote-perms" value="1" {{$checked}} />
+	</div><div class="clear"></div>
+	<div class="settings-submit-wrapper" ><input type="submit" name="remote-perms-submit" class="settings-submit" value="{{$submit}}" /></div></div>
+

statusnet/admin.tpl

@@ -1,16 +0,0 @@
-{{ for $sites as $s }}
-	{{ 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.tpl with $field=$s.delete }}{{ endinc }}
-		<hr>
-	{{ else }}
-		<p>Fill this form to add a new site</p>
-	{{ endif }}
-	
-{{ endfor }}
-
-
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

statusnet/statusnet.php

@@ -698,8 +698,15 @@ function statusnet_plugin_admin(&$a, &$o){
 	);
 
 	
-	$t = file_get_contents( dirname(__file__). "/admin.tpl" );
+	$t = get_markup_template( "admin.tpl", "addon/statusnet/" );
-	$o = replace_macros($t, array(
+ 
+	$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(
 		'$submit' => t('Submit'),
 							
 		'$sites' => $sitesform,

statusnet/view/admin.tpl

@@ -0,0 +1,16 @@
+{{ 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 }}
+	{{ if $s.delete }}
+		{{ inc $field_checkbox with $field=$s.delete }}{{ endinc }}
+		<hr>
+	{{ else }}
+		<p>Fill this form to add a new site</p>
+	{{ endif }}
+	
+{{ endfor }}
+
+
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

statusnet/view/smarty3/admin.tpl

@@ -0,0 +1,16 @@
+{{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}}
+	{{if $s.delete}}
+		{{include file="file:{{$field_checkbox}}" field=$s.delete}}
+		<hr>
+	{{else}}
+		<p>Fill this form to add a new site</p>
+	{{/if}}
+	
+{{/foreach}}
+
+
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

tumblr/tumblr.php

@@ -377,3 +377,4 @@ function tumblr_send(&$a,&$b) {
 
 	}
 }
+

twitter/admin.tpl

@@ -1,3 +0,0 @@
-{{ inc field_input.tpl with $field=$consumerkey }}{{ endinc }}
-{{ inc field_input.tpl with $field=$consumersecret }}{{ endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

twitter/twitter.php

@@ -504,8 +504,14 @@ function twitter_plugin_admin_post(&$a){
 	info( t('Settings updated.'). EOL );
 }
 function twitter_plugin_admin(&$a, &$o){
-	$t = file_get_contents( dirname(__file__). "/admin.tpl" );
+	$t = get_markup_template( "admin.tpl", "addon/twitter/" );
-	$o = replace_macros($t, array(
+
+	$includes = array(
+		'$field_input' => 'field_input.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o = replace_macros($t, $includes + array(
 		'$submit' => t('Submit'),
 								// name, label, value, help, [extra values]
 		'$consumerkey' => array('consumerkey', t('Consumer key'),  get_config('twitter', 'consumerkey' ), ''),

twitter/view/admin.tpl

@@ -0,0 +1,3 @@
+{{ inc $field_input with $field=$consumerkey }}{{ endinc }}
+{{ inc $field_input with $field=$consumersecret }}{{ endinc }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

twitter/view/smarty3/admin.tpl

@@ -0,0 +1,3 @@
+{{include file="file:{{$field_input}}" field=$consumerkey}}
+{{include file="file:{{$field_input}}" field=$consumersecret}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

uhremotestorage/settings.tpl

@@ -1,9 +0,0 @@
-<div class="settings-block">
-	<h3>$title</h3>
-	<p>$desc</p>
-	{{ inc field_input.tpl with $field=$url }}{{ endinc }}
-	{{ inc field_input.tpl with $field=$auth }}{{ endinc }}
-	{{ inc field_select.tpl with $field=$api }}{{ endinc }}
-	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>	
-
-</div>

uhremotestorage/uhremotestorage.php

@@ -78,8 +78,16 @@ function uhremotestorage_settings($a, &$s){
 		'Dropbox' => 'Dropbox',
 	);
 	*/
-	$tpl = file_get_contents(dirname(__file__)."/settings.tpl");
+//	$tpl = file_get_contents(dirname(__file__)."/settings.tpl");
-	$s .= replace_macros($tpl, array(
+	$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(
 		'$title' => 'Unhosted remote storage',
 		'$desc' => sprintf( t('Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href="http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger">RemoteStorage WebFinger</a>'), $uid ),
 		'$url'	=> array( 'unhoestedurl', t('Template URL (with {category})'), $url, 'If your are using ownCloud, your unhosted url will be like <tt>http://<i>HOST</i>/apps/remoteStorage/WebDAV.php/<i>USER</i>/remoteStorage/{category}</tt>'),

uhremotestorage/view/settings.tpl

@@ -0,0 +1,9 @@
+<div class="settings-block">
+	<h3>$title</h3>
+	<p>$desc</p>
+	{{ inc $field_input with $field=$url }}{{ endinc }}
+	{{ inc $field_input with $field=$auth }}{{ endinc }}
+	{{ inc $field_select with $field=$api }}{{ endinc }}
+	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>	
+
+</div>

uhremotestorage/view/smarty3/settings.tpl

@@ -0,0 +1,9 @@
+<div class="settings-block">
+	<h3>{{$title}}</h3>
+	<p>{{$desc}}</p>
+	{{include file="file:{{$field_input}}" field=$url}}
+	{{include file="file:{{$field_input}}" field=$auth}}
+	{{include file="file:{{$field_select}}" field=$api}}
+	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>	
+
+</div>

widgets/view/smarty3/settings.tpl

@@ -0,0 +1,19 @@
+<div class="settings-block">
+	<h3 class="settings-heading">{{$title}}</h3>
+	<div class='field noedit'>
+		<label>{{$label}}</label>
+		<tt>{{$key}}</tt>
+	</div>
+	
+	<div class="settings-submit-wrapper">
+		<input type="submit" value="{{$submit}}" class="settings-submit" name="widgets-submit" />
+	</div>
+	
+	<h4>{{$widgets_h}}</h4>
+	<ul>
+		{{foreach $widgets as $w}}
+			<li><a href="{{$baseurl}}/widgets/{{$w.0}}/?k={{$key}}&p=1">{{$w.1}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>

widgets/view/smarty3/widget_like.tpl

@@ -0,0 +1,3 @@
+<style>body {font-size: 0.8em; margin: 0px; padding: 0px;}</style>
+<span class='f9k_like' title="{{$strlike}}">{{$like}} <img src="{{$baseurl}}/images/like.gif" alt="like"/></span> 
+<span class='f9k_dislike' title="{{$strdislike}}">{{$dislike}} <img src="{{$baseurl}}/images/dislike.gif" alt="dislike"/></span>

widgets/widget_like.php

@@ -52,7 +52,8 @@ function like_widget_content(&$a, $conf){
 	
 	$o = "";
 	
-	$t = file_get_contents( dirname(__file__). "/widget_like.tpl" );
+#	$t = file_get_contents( dirname(__file__). "/widget_like.tpl" );
+	$t = get_markup_template("widget_like.tpl", "addon/widgets/");
 	$o .= replace_macros($t, array(
 		'$like'		=> $likes,
 		'$strlike'	=> sprintf( tt("%d person likes this", "%d people like this", $likes), $likes),

widgets/widgets.php

@@ -51,7 +51,8 @@ function widgets_settings(&$a,&$o) {
 
 	
 	
-	$t = file_get_contents( dirname(__file__). "/settings.tpl" );
+#	$t = file_get_contents( dirname(__file__). "/settings.tpl" );
+	$t = get_markup_template("settings.tpl", "addon/widgets/");
 	$o .= replace_macros($t, array(
 		'$submit' => t('Generate new key'),
 		'$baseurl' => $a->get_baseurl(),