aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-06-03 16:30:16 -0700
committerfriendica <info@friendica.com>2013-06-03 16:30:16 -0700
commitc796f2ac9579807246e07f2f1bf5f7b81dfbaf6b (patch)
tree4633a25f7f90a35ef93d9e3125aa445c6738d90e /view
parent6cafab10e6e168da73a9916c04e54fa43e2ae85b (diff)
parentb02242786c3f009df107afe547dda8e3ecbd3dd7 (diff)
downloadvolse-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')
-rw-r--r--view/theme/redbasic/css/style.css39
-rwxr-xr-xview/tpl/mail_list.tpl2
-rwxr-xr-xview/tpl/nav.tpl2
-rwxr-xr-xview/tpl/opensearch.tpl15
4 files changed, 45 insertions, 13 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 70a994809..92f91541d 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1663,7 +1663,6 @@ border: 1px #111;
iframe#profile-jot-text_ifr {
width: 100% !important;
-height: 100% !important;
box-shadow: 5px 5px 5px #000 inset !important;}
tr.mceLast {
@@ -3770,3 +3769,41 @@ ul.menu-popup {
.reshared-content { margin-left: 30px; }
.shared_header img { margin-right: 10px; }
+
+
+.mail-list-wrapper {
+
+border-bottom: 1px solid #ccc;
+padding: 20px;
+}
+
+span.mail-delete {
+float: left;
+width: 30px;
+}
+
+a.mail-list-sender-url {
+float: left;
+width: 35px;
+}
+
+img.mail-list-sender-photo {
+height: 16px;
+width: 16px;
+}
+
+
+span.mail-from {
+float: left;
+width: 200px;
+}
+
+span.mail-subject.unseen{
+float: left;
+width: 200px;
+}
+
+span.mail-date {
+float:left;
+width: 200px;
+}
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}}">&nabla;</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"