aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-03-03 20:45:12 +0100
committermarijus <mario@mariovavti.com>2014-03-03 20:45:12 +0100
commit636a52d001be9bce66f5b2fd7313ffa6540a97e4 (patch)
treedab3081a4ba63e9ff3ec64866336bd156d0ea21f
parent64b32d9146fb7823536ed6d409ad3cba66924dad (diff)
parent002a86fb7160437a8413dfc40a84732c9afa2153 (diff)
downloadvolse-hubzilla-636a52d001be9bce66f5b2fd7313ffa6540a97e4.tar.gz
volse-hubzilla-636a52d001be9bce66f5b2fd7313ffa6540a97e4.tar.bz2
volse-hubzilla-636a52d001be9bce66f5b2fd7313ffa6540a97e4.zip
Merge branch 'master' of https://github.com/friendica/red
-rw-r--r--version.inc2
-rw-r--r--view/tpl/hdr.tpl8
2 files changed, 9 insertions, 1 deletions
diff --git a/version.inc b/version.inc
index be1090ad2..b61d1e350 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-03-02.604
+2014-03-03.605
diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl
new file mode 100644
index 000000000..b0d936742
--- /dev/null
+++ b/view/tpl/hdr.tpl
@@ -0,0 +1,8 @@
+<div id="banner" class="hidden-sm hidden-xs">{{$banner}}</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>
+
+{{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}}
+<div id="panel" style="display: none;"></div>