Commit 278a5d39 authored by Brandon Labuschagne's avatar Brandon Labuschagne

Migrate users page spinner

This MR updates all the spinners on the public users page.
This includes clicking the calendatr and navigating tabs.
parent 7e3f8440
...@@ -18,7 +18,7 @@ const firstDayOfWeekChoices = Object.freeze({ ...@@ -18,7 +18,7 @@ const firstDayOfWeekChoices = Object.freeze({
const LOADING_HTML = ` const LOADING_HTML = `
<div class="text-center"> <div class="text-center">
<i class="fa fa-spinner fa-spin user-calendar-activities-loading"></i> <div class="spinner spinner-md"></div>
</div> </div>
`; `;
......
...@@ -57,10 +57,8 @@ import UserOverviewBlock from './user_overview_block'; ...@@ -57,10 +57,8 @@ import UserOverviewBlock from './user_overview_block';
* </div> * </div>
* </div> * </div>
* *
* <div class="loading-status"> * <div class="loading">
* <div class="loading"> * Loading Animation
* Loading Animation
* </div>
* </div> * </div>
*/ */
...@@ -242,7 +240,7 @@ export default class UserTabs { ...@@ -242,7 +240,7 @@ export default class UserTabs {
} }
toggleLoading(status) { toggleLoading(status) {
return this.$parentEl.find('.loading-status .loading').toggleClass('hide', !status); return this.$parentEl.find('.loading').toggleClass('hide', !status);
} }
setCurrentAction(source) { setCurrentAction(source) {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.calendar-block.prepend-top-default.append-bottom-default .calendar-block.prepend-top-default.append-bottom-default
.user-calendar.d-none.d-sm-block{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path, utc_offset: Time.zone.utc_offset } } .user-calendar.d-none.d-sm-block{ data: { calendar_path: user_calendar_path(@user, :json), calendar_activities_path: user_calendar_activities_path, utc_offset: Time.zone.utc_offset } }
%h4.center.light %h4.center.light
= spinner nil, true .spinner.spinner-md
.user-calendar-activities.d-none.d-sm-block .user-calendar-activities.d-none.d-sm-block
.row .row
.col-md-12.col-lg-6 .col-md-12.col-lg-6
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
= link_to s_('UserProfile|View all'), user_activity_path, class: "hide js-view-all" = link_to s_('UserProfile|View all'), user_activity_path, class: "hide js-view-all"
.overview-content-list{ data: { href: user_path } } .overview-content-list{ data: { href: user_path } }
.center.light.loading .center.light.loading
= spinner nil, true .spinner.spinner-md
.col-md-12.col-lg-6 .col-md-12.col-lg-6
.projects-block .projects-block
...@@ -27,4 +27,4 @@ ...@@ -27,4 +27,4 @@
= link_to s_('UserProfile|View all'), user_projects_path, class: "hide js-view-all" = link_to s_('UserProfile|View all'), user_projects_path, class: "hide js-view-all"
.overview-content-list{ data: { href: user_projects_path } } .overview-content-list{ data: { href: user_projects_path } }
.center.light.loading .center.light.loading
= spinner nil, true .spinner.spinner-md
...@@ -130,7 +130,8 @@ ...@@ -130,7 +130,8 @@
%h4.prepend-top-20 %h4.prepend-top-20
= s_('UserProfile|Most Recent Activity') = s_('UserProfile|Most Recent Activity')
.content_list{ data: { href: user_path } } .content_list{ data: { href: user_path } }
= spinner .loading
.spinner.spinner-md
- if profile_tab?(:groups) - if profile_tab?(:groups)
#groups.tab-pane #groups.tab-pane
...@@ -152,8 +153,8 @@ ...@@ -152,8 +153,8 @@
#snippets.tab-pane #snippets.tab-pane
-# This tab is always loaded via AJAX -# This tab is always loaded via AJAX
.loading-status .loading.hide
= spinner .spinner.spinner-md
- if profile_tabs.empty? - if profile_tabs.empty?
.row .row
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment