Merge remote-tracking branch 'upstream/master'

6 files changed, 61 insertions, 14 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 70a994809..53d17ea04 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 {
@@ -2440,6 +2439,17 @@ aside input[type='text'] {
 	margin-top: -4px;
 }
 
+.nav-dropdown-indicator {
+    opacity: 0.5;
+    filter:alpha(opacity=50);
+}
+
+.nav-dropdown-indicator:hover {
+    opacity: 1.0;
+    filter:alpha(opacity=100);
+}
+
+
 .location-label, .gender-label, .marital-label, .homepage-label {
 	float: left;
 	text-align: right;
@@ -3770,3 +3780,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/alt_pager.tpl b/view/tpl/alt_pager.tpl
new file mode 100644
index 000000000..b46dc7662
--- /dev/null
+++ b/view/tpl/alt_pager.tpl
@@ -0,0 +1,4 @@
+<div class="pager">
+{{if $has_less}}<a href="{{$url}}&page={{$prevpage}}" class="pager-prev">{{$less}}</a>{{/if}}
+{{if $has_more}}{{if $has_less}}&nbsp;|&nbsp;{{/if}}<a href="{{$url}}&page={{$nextpage}}" class="pager-next">{{$more}}</a>{{/if}}
+</div>
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..1470d0725 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}}"><span class="nav-dropdown-indicator">&nabla;</span></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"
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index b74c73fd3..935b2df0d 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -8,7 +8,7 @@
 {{if $albums}}
 <ul>
 {{foreach $albums as $al}}
-<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.album}}</a></li>
+<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}">{{$al.text}}</a></li>
 {{/foreach}}
 </ul>
 {{/if}}