Merge remote-tracking branch 'upstream/master' into retriever

Conflicts:
	retriever/view/help.tpl

altpager/view/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>

altpager/view/admin.tpl.old

@@ -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>

blackout/view/admin.tpl

@@ -1,11 +0,0 @@
-{{ inc field_input.tpl with $field=$startdate }}{{ endinc }}
-{{ inc field_input.tpl with $field=$enddate }}{{ endinc }}
-{{ inc field_input.tpl 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
-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/view/communityhome.tpl

@@ -1,70 +0,0 @@
-<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>
-{{ endif }}
-$login_form
-
-
-{{ if $lastusers_title }}
-<h3>$lastusers_title</h3>
-<div class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-{{ if $photos_title }}
-<h3>$photos_title</h3>
-<div class='items-wrapper'>
-{{ for $photos_items as $i }}
-	$i
-{{ endfor }}
-</div>
-{{ endif }}
-
-
-{{ if $like_title }}
-<h3>$like_title</h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-	<li>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}

communityhome/view/directory_item.tpl

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

defaultfeatures/view/admin.tpl

@@ -1,9 +0,0 @@
-<input type='hidden' name='form_security_token' value='$form_security_token'>
-{{ for $features as $f }}
-<h3 class="settings-heading">$f.0</h3>
-
-{{ for $f.1 as $fcat }}
-	{{ inc field_yesno.tpl with $field=$fcat }}{{endinc}}
-{{ endfor }}
-{{ endfor }}
-<div class="submit"><input type="submit" name="defaultfeatures-submit" value="$submit" /></div>

forumdirectory/view/forumdirectory_item.tpl

@@ -1,42 +0,0 @@
-
-<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>{{ endif }}
-    	<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>{{ endif }}
-					<span class="city-state-zip">
-						<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-						<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>{{ endif }}
-				</dd>
-				</dl>
-			{{ endif }}
-
-			{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-			</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>{{ endif }}
-
-				{{ 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>{{ endif }}
-			</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>{{ endif }}
-  		</div>
-	</div>
-</div>

gravatar/view/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>

impressum/view/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>

libravatar/view/admin.tpl

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

mailstream/view/admin.tpl

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

mailstream/view/mail.tpl

@@ -1,5 +0,0 @@
-<div class="mailstream-item-body">$item.body</div>
-{{ if $item.plink }}
-<div>$upstream: <a class="mailstream-item-plink" href="$item.plink">$item.plink</a><div>
-<div>$local: <a class="mailstream-item-url" href="$item.url">$item.url</a></div>
-{{ endif }}

mailstream/view/settings.tpl

@@ -1,6 +0,0 @@
-<div class="settings-block">
-  <h3>$title</h3>
-{{ inc field_input.tpl with $field=$address }}{{ endinc }}
-{{ inc field_checkbox.tpl with $field=$enabled }}{{ endinc }}
-  <input type="submit" value="$submit">
-</div>

mathjax/view/admin.tpl

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

openstreetmap/view/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>

piwik/view/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>

remote_permissions/view/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/view/settings.tpl

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

retriever/templates/help.tpl

@@ -1,3 +1,8 @@
+{{*
+ *	AUTOMATICALLY GENERATED TEMPLATE
+ *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
 <h2>Retriever Plugin Help</h2>
 <p>
 This plugin replaces the short excerpts you normally get in RSS feeds