diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-28 16:26:24 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-28 16:26:24 +0100 |
| commit | 17907f11a350536bbcac248e6b81b63eecee964d (patch) | |
| tree | 93f8413b78c6fb12fde059ecc8f8831e9996731a /view/tpl/events-js.tpl | |
| parent | cb7df797e1d5a87ff8b6dbb6c07faf68e3e725f7 (diff) | |
| parent | 122d7281f7d4b55ef8adf8791bdab51b4b797ba8 (diff) | |
| download | volse-hubzilla-17907f11a350536bbcac248e6b81b63eecee964d.tar.gz volse-hubzilla-17907f11a350536bbcac248e6b81b63eecee964d.tar.bz2 volse-hubzilla-17907f11a350536bbcac248e6b81b63eecee964d.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
include/datetime.php
include/text.php
mod/events.php
version.inc
view/css/mod_events.css
view/theme/redbasic/css/style.css
view/tpl/event_head.tpl
view/tpl/events-js.tpl
view/tpl/jot.tpl
Diffstat (limited to 'view/tpl/events-js.tpl')
| -rwxr-xr-x | view/tpl/events-js.tpl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index b2de90da1..cef7b45cc 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,12 +1,16 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> +<<<<<<< HEAD <button class="btn btn-default btn-xs" onclick="openClose('event-tools'); closeMenu('form');"><i class="icon-cog"></i></button> <button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button> +======= + <button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button> +>>>>>>> upstream/master <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 id="events-spinner" 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> @@ -15,6 +19,7 @@ </div> <div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}> {{$form}} +<<<<<<< HEAD </div> <div id="event-tools" class="section-content-tools-wrapper" style="display:none;"> <div class="form-group"> @@ -28,6 +33,8 @@ </form> </div> +======= +>>>>>>> upstream/master </div> <div class="clear"></div> <div class="section-content-wrapper-np"> |