From 9595c27cc10ab5538738a777aa99312e6e4e78fe Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Thu, 30 May 2013 23:32:40 +0100
Subject: Put a stop to "I couldn't find the menu" by adding a nabla - until
 somebody comes up with something that looks less crap.

---
 view/tpl/nav.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

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}}
-- 
cgit v1.2.3


From cbd988004edccb284ccfa9c11068381ad0d45965 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Sun, 2 Jun 2013 02:37:31 +0100
Subject: Fix opensearch

---
 view/tpl/opensearch.tpl | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl
index 63d2a1752..f90592061 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-16.png</Image>
 	<Url type="text/html" 
         template="{{$baseurl}}/search?search={searchTerms}"/>
 	<Url type="application/opensearchdescription+xml"
-- 
cgit v1.2.3


From 330ace2cbe2a1a78777df1b69bd5affb6fe109ee Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Sun, 2 Jun 2013 02:41:43 +0100
Subject: Typo

---
 view/tpl/opensearch.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl
index f90592061..26fb5a799 100755
--- a/view/tpl/opensearch.tpl
+++ b/view/tpl/opensearch.tpl
@@ -4,7 +4,7 @@
 	<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-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"
-- 
cgit v1.2.3


From b02242786c3f009df107afe547dda8e3ecbd3dd7 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <founder@kakste.com>
Date: Sun, 2 Jun 2013 03:40:31 +0100
Subject: Make a start at making mail look less dreadful.

---
 view/tpl/mail_list.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

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>
-- 
cgit v1.2.3


From b866cc26fa95c6fc1df98bef2994350b9eb07231 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 3 Jun 2013 18:16:00 -0700
Subject: templatise alt_pager

---
 view/tpl/alt_pager.tpl | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 view/tpl/alt_pager.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/alt_pager.tpl b/view/tpl/alt_pager.tpl
new file mode 100644
index 000000000..140255eca
--- /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>
-- 
cgit v1.2.3


From a2584878017f933a3a2761754dd9d1eecf0c6e4f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 3 Jun 2013 18:20:31 -0700
Subject: syntax error

---
 view/tpl/alt_pager.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/alt_pager.tpl b/view/tpl/alt_pager.tpl
index 140255eca..b46dc7662 100644
--- a/view/tpl/alt_pager.tpl
+++ b/view/tpl/alt_pager.tpl
@@ -1,4 +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}}
+{{if $has_more}}{{if $has_less}}&nbsp;|&nbsp;{{/if}}<a href="{{$url}}&page={{$nextpage}}" class="pager-next">{{$more}}</a>{{/if}}
 </div>
-- 
cgit v1.2.3


From 21491100f834372545569035e525ab74fc64cf26 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 3 Jun 2013 22:34:35 -0700
Subject: fix buggered contact photos

---
 view/tpl/nav.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index af619f8d4..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}}">&nabla;</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}}
-- 
cgit v1.2.3


From e0c6ee208297123ddc2aa37eadda69289230a01f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 5 Jun 2013 23:07:52 -0700
Subject: photo album listing widget broken

---
 view/tpl/photo_albums.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

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}}
-- 
cgit v1.2.3