From 9bdb7bef5dadb3cfb8e3ff661f68b5cc7a70c5cd Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Wed, 30 Sep 2015 19:27:53 -0700
Subject: add delivery reports to mail (not backported to redmatrix)

---
 view/tpl/mail_conv.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view/tpl')

diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 2e64de7bc..09333ae11 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -9,6 +9,7 @@
 		<div class="mail-conv-body">{{$mail.body}}</div>
 		<div class="btn-group pull-right" id="mail-conv-delete-wrapper-{{$mail.id}}" >
 			{{if $mail.can_recall}}
+			<a href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-barcode mail-icons"></i></a>
 			<a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-undo mail-icons"></i></a>
 			{{/if}}
 			<a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="btn btn-default" ><i class="icon-trash mail-icons"></i></a>
-- 
cgit v1.2.3


From 526bc36b40abb5911f74228fa4445e11c68d4f9f Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Wed, 30 Sep 2015 19:31:25 -0700
Subject: update the opensearch template

---
 view/tpl/opensearch.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl
index 8885c12bc..f247e3401 100755
--- a/view/tpl/opensearch.tpl
+++ b/view/tpl/opensearch.tpl
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
 	<ShortName>Hubzilla@{{$nodename}}</ShortName>
-	<Description>Search in The Hubzilla@{{$nodename}}</Description>
-	<Contact>http://github.com/friendica/red/</Contact>
-	<Image height="16" width="16" type="image/png">{{$baseurl}}/images/rm-16.png</Image>
-	<Image height="64" width="64" type="image/png">{{$baseurl}}/images/rm-64.png</Image>
+	<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"
-- 
cgit v1.2.3


From 1df1c15e48821f1339579e119826c78df97289c6 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Wed, 30 Sep 2015 21:59:33 -0700
Subject: issue #61 - provide un-useable icons as placeholders for location
 setting options on deleted hublocs

---
 view/tpl/locmanage.tpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl
index e0232547f..0620e2dcb 100644
--- a/view/tpl/locmanage.tpl
+++ b/view/tpl/locmanage.tpl
@@ -15,11 +15,15 @@ function drophub(id) {
 <tr><td>
 {{if $hub.deleted}}<strike>{{/if}}
 {{$hub.hubloc_url}} ({{$hub.hubloc_addr}}){{if $hub.deleted}}</strike>{{/if}}</td>
-<td>
 
+{{if ! $hub.deleted}}
+<td>
 {{if $hub.primary}}<button class="btn btn-std"><i class="icon-check"></i></button>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty"  ></i></button>{{/if}}
 </td>
 <td>{{if ! $hub.deleted}}<button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-trash"></i></button>{{/if}}</td>
+{{else}}
+<td><button class="btn btn-std"><i class="icon-minus"></i></button></td><td><button class="btn btn-std"><i class="icon-minus"></i></button></td>
+{{/if}}
 </tr>
 {{/foreach}}
 </table>
-- 
cgit v1.2.3


From e7131bc8f8cbb264c0416dd1664721f50023ce73 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Wed, 30 Sep 2015 22:10:26 -0700
Subject: this is an even better fix for issue #61

---
 view/tpl/locmanage.tpl | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl
index 0620e2dcb..4ace457ed 100644
--- a/view/tpl/locmanage.tpl
+++ b/view/tpl/locmanage.tpl
@@ -12,19 +12,15 @@ function drophub(id) {
 <table>
 <tr><td>{{$loc}}</td><td>{{$mkprm}}</td><td>{{$drop}}</td></tr>
 {{foreach $hubs as $hub}}
+{{if ! $hub.deleted }}
 <tr><td>
-{{if $hub.deleted}}<strike>{{/if}}
-{{$hub.hubloc_url}} ({{$hub.hubloc_addr}}){{if $hub.deleted}}</strike>{{/if}}</td>
-
-{{if ! $hub.deleted}}
+{{$hub.hubloc_url}} ({{$hub.hubloc_addr}})</td>
 <td>
 {{if $hub.primary}}<button class="btn btn-std"><i class="icon-check"></i></button>{{else}}<button class="btn btn-std" onclick="primehub({{$hub.hubloc_id}}); return false;" ><i class="icon-check-empty"  ></i></button>{{/if}}
 </td>
-<td>{{if ! $hub.deleted}}<button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-trash"></i></button>{{/if}}</td>
-{{else}}
-<td><button class="btn btn-std"><i class="icon-minus"></i></button></td><td><button class="btn btn-std"><i class="icon-minus"></i></button></td>
-{{/if}}
+<td><button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-trash"></i></button></td>
 </tr>
+{{/if}}
 {{/foreach}}
 </table>
 
-- 
cgit v1.2.3