aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-02-03 09:24:09 +0100
committerMario Vavti <mario@mariovavti.com>2017-02-03 09:24:09 +0100
commitdd2a5e6b28d537b9a8c2bb1a978faa46dfb869cc (patch)
treecd4aa364519bee76e1cbec9d5f776bb494fc543f /view/tpl
parent028b2a655de8c9d7b1f0de05a869e59c2b219818 (diff)
parent7e1e9ac94a1cf2fb01a3052f7fd9d0f2049079b5 (diff)
downloadvolse-hubzilla-dd2a5e6b28d537b9a8c2bb1a978faa46dfb869cc.tar.gz
volse-hubzilla-dd2a5e6b28d537b9a8c2bb1a978faa46dfb869cc.tar.bz2
volse-hubzilla-dd2a5e6b28d537b9a8c2bb1a978faa46dfb869cc.zip
Merge branch 'dev' into wip-app-bin
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/head.tpl5
-rwxr-xr-xview/tpl/opensearch.tpl13
-rw-r--r--view/tpl/rsd.tpl15
-rwxr-xr-xview/tpl/settings.tpl18
4 files changed, 16 insertions, 35 deletions
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 7e7155fec..5f874426c 100755
--- a/view/tpl/head.tpl
+++ b/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}};
diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl
deleted file mode 100755
index f247e3401..000000000
--- a/view/tpl/opensearch.tpl
+++ /dev/null
@@ -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>
diff --git a/view/tpl/rsd.tpl b/view/tpl/rsd.tpl
deleted file mode 100644
index 9fd02c472..000000000
--- a/view/tpl/rsd.tpl
+++ /dev/null
@@ -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> \ No newline at end of file
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 05e531ba7..15ddd7f71 100755
--- a/view/tpl/settings.tpl
+++ b/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>