diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-27 20:43:47 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-27 20:43:47 -0700 |
| commit | 0f36916fb40ae963652aa150e7b3aa22a9572d15 (patch) | |
| tree | 146701f0742f27bbdd2e22830f13ed859f781779 /view/tpl/cdav_calendar.tpl | |
| parent | b9664f6980452390b120e0c7443fd773d527b3bd (diff) | |
| parent | 1fd2b6f5b673b78af594f778db5f30954897adce (diff) | |
| download | volse-hubzilla-0f36916fb40ae963652aa150e7b3aa22a9572d15.tar.gz volse-hubzilla-0f36916fb40ae963652aa150e7b3aa22a9572d15.tar.bz2 volse-hubzilla-0f36916fb40ae963652aa150e7b3aa22a9572d15.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl/cdav_calendar.tpl')
| -rw-r--r-- | view/tpl/cdav_calendar.tpl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl index 5d683d751..b0245e853 100644 --- a/view/tpl/cdav_calendar.tpl +++ b/view/tpl/cdav_calendar.tpl @@ -129,11 +129,11 @@ $(document).ready(function() { }, loading: function(isLoading, view) { - $('#events-spinner').spin('tiny'); - $('#events-spinner > i').css('color', 'transparent'); + $('#events-spinner').show(); + $('#today-btn > i').hide(); if(!isLoading) { - $('#events-spinner').spin(false); - $('#events-spinner > i').css('color', ''); + $('#events-spinner').hide(); + $('#today-btn > i').show(); } } }); @@ -292,7 +292,7 @@ function on_more() { </div> <div class="btn-group"> <button class="btn btn-outline-secondary btn-sm" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button> - <button id="events-spinner" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button> + <button id="today-btn" class="btn btn-outline-secondary btn-sm" onclick="changeView('today', false);" title="{{$today}}"><div id="events-spinner" class="spinner s"></div><i class="fa fa-bullseye" style="display: none; width: 1rem;"></i></button> <button class="btn btn-outline-secondary btn-sm" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button> </div> <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> |