diff options
| author | friendica <info@friendica.com> | 2013-06-03 16:30:16 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-06-03 16:30:16 -0700 |
| commit | c796f2ac9579807246e07f2f1bf5f7b81dfbaf6b (patch) | |
| tree | 4633a25f7f90a35ef93d9e3125aa445c6738d90e /view/tpl | |
| parent | 6cafab10e6e168da73a9916c04e54fa43e2ae85b (diff) | |
| parent | b02242786c3f009df107afe547dda8e3ecbd3dd7 (diff) | |
| download | volse-hubzilla-c796f2ac9579807246e07f2f1bf5f7b81dfbaf6b.tar.gz volse-hubzilla-c796f2ac9579807246e07f2f1bf5f7b81dfbaf6b.tar.bz2 volse-hubzilla-c796f2ac9579807246e07f2f1bf5f7b81dfbaf6b.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/mail_list.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/opensearch.tpl | 15 |
3 files changed, 7 insertions, 12 deletions
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 717df51d5..10f453632 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -4,9 +4,9 @@ * *}} <div class="mail-list-wrapper"> + <span class="mail-delete"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="icon drophide mail-list-delete delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></span> <a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a> <span class="mail-from">{{$from_name}}</span> <span class="mail-subject {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span> <span class="mail-date" title="{{$date}}">{{$date}}</span> - <span class="mail-delete"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="icon drophide mail-list-delete delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></span> </div> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index beddc9109..af619f8d4 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -11,7 +11,7 @@ <ul> {{if $userinfo}} - <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a> + <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">∇</a> {{if $localuser}} <ul id="nav-user-menu" class="menu-popup"> {{foreach $nav.usermenu as $usermenu}} diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl index 63d2a1752..26fb5a799 100755 --- a/view/tpl/opensearch.tpl +++ b/view/tpl/opensearch.tpl @@ -1,15 +1,10 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>Friendika@{{$nodename}}</ShortName> - <Description>Search in Friendika@{{$nodename}}</Description> - <Contact>http://bugs.friendika.com/</Contact> - <Image height="16" width="16" type="image/png">{{$baseurl}}/images/friendika-16.png</Image> - <Image height="64" width="64" type="image/png">{{$baseurl}}/images/friendika-64.png</Image> + <ShortName>Red Matrix@{{$nodename}}</ShortName> + <Description>Search in The Red Matrix@{{$nodename}}</Description> + <Contact>http://github.com/friendica/red/</Contact> + <Image height="16" width="16" type="image/png">{{$baseurl}}/images/rhash-16.png</Image> + <Image height="64" width="64" type="image/png">{{$baseurl}}/images/rhash-64.png</Image> <Url type="text/html" template="{{$baseurl}}/search?search={searchTerms}"/> <Url type="application/opensearchdescription+xml" |