+{{/if}}
\ No newline at end of file
diff --git a/app/templates/components/gh-subscribers-table.hbs b/app/templates/components/gh-subscribers-table.hbs
index f5cc5a3bf4..9015ed74fd 100644
--- a/app/templates/components/gh-subscribers-table.hbs
+++ b/app/templates/components/gh-subscribers-table.hbs
@@ -13,7 +13,9 @@
}}
{{#if isLoading}}
{{#body.loader}}
- Loading...
+
+
+
{{/body.loader}}
{{else}}
{{#if table.isEmpty}}
@@ -23,4 +25,4 @@
{{/if}}
{{/if}}
{{/t.body}}
-{{/light-table}}
+{{/light-table}}
\ No newline at end of file
diff --git a/app/templates/editor/edit-loading.hbs b/app/templates/editor/edit-loading.hbs
new file mode 100644
index 0000000000..21a6391a83
--- /dev/null
+++ b/app/templates/editor/edit-loading.hbs
@@ -0,0 +1,5 @@
+
+
+ {{gh-loading-spinner}}
+
+
\ No newline at end of file
diff --git a/app/templates/posts-loading.hbs b/app/templates/posts-loading.hbs
new file mode 100644
index 0000000000..05aa2e07f6
--- /dev/null
+++ b/app/templates/posts-loading.hbs
@@ -0,0 +1,12 @@
+
+
+ {{#gh-view-title openMobileMenu="openMobileMenu"}}Content{{/gh-view-title}}
+
+ {{#link-to "editor.new" class="btn btn-green" title="New Post"}}New Post{{/link-to}}
+
+
+
+
+ {{gh-loading-spinner}}
+
+
\ No newline at end of file
diff --git a/app/templates/settings/apps-loading.hbs b/app/templates/settings/apps-loading.hbs
new file mode 100644
index 0000000000..f424f616e8
--- /dev/null
+++ b/app/templates/settings/apps-loading.hbs
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/app/templates/settings/code-injection-loading.hbs b/app/templates/settings/code-injection-loading.hbs
new file mode 100644
index 0000000000..d96992a835
--- /dev/null
+++ b/app/templates/settings/code-injection-loading.hbs
@@ -0,0 +1,12 @@
+
+
+ {{#gh-view-title openMobileMenu="openMobileMenu"}}Code Injection{{/gh-view-title}}
+
+ {{#gh-spin-button class="btn btn-blue" action="save" submitting=submitting}}Save{{/gh-spin-button}}
+
+
+
+
+ {{gh-loading-spinner}}
+
+
\ No newline at end of file
diff --git a/app/templates/settings/general-loading.hbs b/app/templates/settings/general-loading.hbs
new file mode 100644
index 0000000000..a8e433f0d2
--- /dev/null
+++ b/app/templates/settings/general-loading.hbs
@@ -0,0 +1,12 @@
+
+
+ {{#gh-view-title openMobileMenu="openMobileMenu"}}General{{/gh-view-title}}
+
+ {{#gh-spin-button class="btn btn-blue" action="save" submitting=submitting}}Save{{/gh-spin-button}}
+
+
+
+
+ {{gh-loading-spinner}}
+
+
\ No newline at end of file
diff --git a/app/templates/settings/labs-loading.hbs b/app/templates/settings/labs-loading.hbs
new file mode 100644
index 0000000000..00fab7ec86
--- /dev/null
+++ b/app/templates/settings/labs-loading.hbs
@@ -0,0 +1,9 @@
+
+
+ {{#gh-view-title openMobileMenu="openMobileMenu"}}Labs{{/gh-view-title}}
+
+
+
+ {{gh-loading-spinner}}
+
+
\ No newline at end of file
diff --git a/app/templates/settings/navigation-loading.hbs b/app/templates/settings/navigation-loading.hbs
new file mode 100644
index 0000000000..9ff3c8dcb7
--- /dev/null
+++ b/app/templates/settings/navigation-loading.hbs
@@ -0,0 +1,12 @@
+
+
+ {{#gh-view-title openMobileMenu="openMobileMenu"}}Navigation{{/gh-view-title}}
+
+ {{#gh-spin-button class="btn btn-blue" action="save" submitting=submitting}}Save{{/gh-spin-button}}
+
+
+
+
+ {{gh-loading-spinner}}
+
+
\ No newline at end of file
diff --git a/app/templates/settings/tags-loading.hbs b/app/templates/settings/tags-loading.hbs
new file mode 100644
index 0000000000..eb54436de9
--- /dev/null
+++ b/app/templates/settings/tags-loading.hbs
@@ -0,0 +1,12 @@
+
+
+ {{#gh-view-title openMobileMenu="openMobileMenu"}}Tags{{/gh-view-title}}
+
+ {{#link-to "settings.tags.new" class="btn btn-green" title="New Tag"}}New Tag{{/link-to}}
+
+
+
+
+ {{gh-loading-spinner}}
+
+
\ No newline at end of file
diff --git a/app/templates/settings/tags.hbs b/app/templates/settings/tags.hbs
index f67750a544..bfd6394981 100644
--- a/app/templates/settings/tags.hbs
+++ b/app/templates/settings/tags.hbs
@@ -3,7 +3,6 @@
{{#gh-view-title openMobileMenu="openMobileMenu"}}Tags{{/gh-view-title}}
{{#link-to "settings.tags.new" class="btn btn-green" title="New Tag"}}New Tag{{/link-to}}
- {{!-- --}}
@@ -24,4 +23,4 @@
{{outlet}}
{{/gh-tags-management-container}}
-
+
\ No newline at end of file
diff --git a/app/templates/team/index-loading.hbs b/app/templates/team/index-loading.hbs
new file mode 100644
index 0000000000..a0a38e4122
--- /dev/null
+++ b/app/templates/team/index-loading.hbs
@@ -0,0 +1,15 @@
+
+
+ {{#gh-view-title openMobileMenu="openMobileMenu"}}Team{{/gh-view-title}}
+ {{!-- Do not show Invite user button to authors --}}
+ {{#unless session.user.isAuthor}}
+
+
+
+ {{/unless}}
+
+
+
+ {{gh-loading-spinner}}
+
+
\ No newline at end of file
diff --git a/app/templates/team/user-loading.hbs b/app/templates/team/user-loading.hbs
new file mode 100644
index 0000000000..92b5bd5334
--- /dev/null
+++ b/app/templates/team/user-loading.hbs
@@ -0,0 +1,16 @@
+
+
+ {{#gh-view-title openMobileMenu="openMobileMenu"}}
+ {{link-to "Team" "team"}}
+
+ {{/gh-view-title}}
+
+
+
Save
+
+
+
+
+ {{gh-loading-spinner}}
+
+
\ No newline at end of file
diff --git a/tests/acceptance/version-mismatch-test.js b/tests/acceptance/version-mismatch-test.js
index 51acb5f7c3..79247aca7b 100644
--- a/tests/acceptance/version-mismatch-test.js
+++ b/tests/acceptance/version-mismatch-test.js
@@ -63,8 +63,8 @@ describe('Acceptance: Version Mismatch', function() {
click('.gh-nav-settings-tags');
andThen(() => {
- // navigation is blocked
- expect(currentPath()).to.equal('posts.index');
+ // navigation is blocked on loading screen
+ expect(currentPath()).to.equal('settings.tags_loading');
// has the refresh to update alert
expect(find('.gh-alert').length).to.equal(1);
@@ -80,7 +80,7 @@ describe('Acceptance: Version Mismatch', function() {
andThen(() => {
// navigation is blocked
- expect(currentPath()).to.equal('settings.tags.index');
+ expect(currentPath()).to.equal('settings.general_loading');
// has the refresh to update alert
expect(find('.gh-alert').length).to.equal(1);