diff options
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"> |