diff options
| author | mrjive <mrjive@mrjive.it> | 2015-10-02 09:45:03 +0200 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-10-02 09:45:03 +0200 |
| commit | 32522b61f235266384c81c0669fceaf58afeb4fe (patch) | |
| tree | 48427e8f48421b3bb8f344d85f2ebfe1271ea34e /view/tpl | |
| parent | 11c1573b55f278a664a90a2872d06a40b3ac3026 (diff) | |
| parent | 1da3828a09485a9b2bc6113cbab9ca9ca483ffc0 (diff) | |
| download | volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.tar.gz volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.tar.bz2 volse-hubzilla-32522b61f235266384c81c0669fceaf58afeb4fe.zip | |
Merge pull request #6 from redmatrix/master
updating from original codebase
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/locmanage.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/mail_conv.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/opensearch.tpl | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index e0232547f..4ace457ed 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -12,15 +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> +{{$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> +<td><button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-trash"></i></button></td> </tr> +{{/if}} {{/foreach}} </table> 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> 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" |