Merge branch 'dev' into wip-app-bin

view/tpl/head.tpl

@@ -5,9 +5,8 @@
 {{$head_css}}
 {{$js_strings}}
 {{$head_js}}
-<link rel="shortcut icon" href="{{$icon}}" />
-<link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" title="{{$osearch}}" />
-<link rel="EditURI" type="application/rsd+xml" href="{{$baseurl}}/rsd.xml" />
+{{$linkrel}}
+{{$plugins}}
 <script>
 	var updateInterval = {{$update_interval}};
 	var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}};

view/tpl/opensearch.tpl

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>Hubzilla@{{$nodename}}</ShortName>
-	<Description>Search in Hubzilla@{{$nodename}}</Description>
-	<Contact>http://github.com/redmatrix/hubzilla/</Contact>
-	<Image height="16" width="16" type="image/png">{{$baseurl}}/images/hz-16.png</Image>
-	<Image height="64" width="64" type="image/png">{{$baseurl}}/images/hz-64.png</Image>
-	<Url type="text/html" 
-        template="{{$baseurl}}/search?search={searchTerms}"/>
-	<Url type="application/opensearchdescription+xml"
-      	rel="self"
-      	template="{{$baseurl}}/opensearch" />        
-</OpenSearchDescription>

view/tpl/rsd.tpl

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
-	<service>
-		<engineName>{{$project}}</engineName>
-		<engineLink>{{$baseurl}}</engineLink>
-		<apis>
-			<api name="Twitter" preferred="true" apiLink="{{$apipath}}" blogID="">
-				<settings>
-					<docs>http://status.net/wiki/TwitterCompatibleAPI</docs>
-					<setting name="OAuth">true</setting>
-				</settings>
-			</api>
-		</apis>
-	</service>
-</rsd>

view/tpl/settings.tpl

@@ -25,7 +25,9 @@
 						{{include file="field_checkbox.tpl" field=$adult}}
 						{{include file="field_input.tpl" field=$photo_path}}
 						{{include file="field_input.tpl" field=$attach_path}}
-
+						{{if $basic_addon}}
+						{{$basic_addon}}
+						{{/if}}
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
@@ -82,6 +84,9 @@
 							{{include file="field_checkbox.tpl" field=$blocktags}}
 							{{include file="field_input.tpl" field=$expire}}
 						</div>
+						{{if $sec_addon}}
+						{{$sec_addon}}
+						{{/if}}
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
@@ -135,6 +140,9 @@
 								{{include file="field_input.tpl" field=$evdays}}
 							</div>
 						</div>
+						{{if $notify_addon}}
+						{{$notify_addon}}
+						{{/if}}
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>
@@ -152,9 +160,6 @@
 				</div>
 				<div id="miscellaneous-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="miscellaneous-settings">
 					<div class="section-content-tools-wrapper">
-						<div class="ffsapilink">
-							<a type="button" class="btn btn-default" href="/ffsapi">{{$firefoxshare}}</a>
-						</div>
 						{{if $menus}}
 						<div class="form-group channel-menu">
 							<label for="channel_menu">{{$menu_desc}}</label>
@@ -166,6 +171,11 @@
 						</div>
 						{{/if}}
 						{{include file="field_checkbox.tpl" field=$cal_first_day}}
+
+						{{if $misc_addon}}
+						{{$misc_addon}}
+						{{/if}}
+
 						<div class="settings-submit-wrapper" >
 							<button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
 						</div>