aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-19 18:44:33 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-11-19 18:44:33 +0100
commit059886a1e493451dffddb0fd863cb002930eae9b (patch)
treeb23b06b3a26161574dfced1e87c71f94791c2263 /view/tpl
parentcd49ec92e38044c0707e91500ec482b26ae7f166 (diff)
parentba52af786e0e2f27c36e82df9086dfb8d33d9062 (diff)
downloadvolse-hubzilla-059886a1e493451dffddb0fd863cb002930eae9b.tar.gz
volse-hubzilla-059886a1e493451dffddb0fd863cb002930eae9b.tar.bz2
volse-hubzilla-059886a1e493451dffddb0fd863cb002930eae9b.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/events-js.tpl1
-rwxr-xr-xview/tpl/events_side.tpl1
2 files changed, 1 insertions, 1 deletions
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 03c6a5fb6..d481af2e9 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -6,6 +6,7 @@
<div class="btn-group">
<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
+ <button class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button>
</div>
</div>
diff --git a/view/tpl/events_side.tpl b/view/tpl/events_side.tpl
index 4659063c3..b9a9062b1 100755
--- a/view/tpl/events_side.tpl
+++ b/view/tpl/events_side.tpl
@@ -4,6 +4,5 @@
<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
<li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
<li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
- <li><a href="#" onclick="changeView('today', false); return false;">{{$today}}</a></li>
</ul>
</div>