Merge https://github.com/friendica/red into zpull

2014-03-03 11:34:15 -08:00 · 2014-03-03 11:34:15 -08:00 · 002a86fb71
commit 002a86fb71
parent 608c7501fe c028d9b1d0
1 changed files with 3 additions and 0 deletions
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@ -171,3 +171,6 @@
 	</div>


+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li>
+</ul>