From 0a9e7e5cb3165ccc143604b956ece88614618bc6 Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <tvd@bitspire.de>
Date: Wed, 13 Apr 2016 21:27:44 +0200
Subject: [PATCH] Remove the text from sitemap loading spinner

---
 .../javascripts/alchemy/alchemy.sitemap.js.coffee |  5 +++--
 app/assets/stylesheets/alchemy/sitemap.scss       | 15 ++++-----------
 app/views/alchemy/admin/pages/_sitemap.html.erb   |  7 +++----
 config/locales/alchemy.de.yml                     |  1 -
 config/locales/alchemy.en.yml                     |  1 -
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee b/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee
index 17b7ae3e51..ce8777e3b0 100644
--- a/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee
+++ b/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee
@@ -8,7 +8,7 @@ Alchemy.Sitemap =
     @search_field = $("#search_field")
     @filter_field_clear = $('.js_filter_field_clear')
     @display = $('#page_filter_result')
-    @sitemap_wrapper = $('#sitemap-wrapper .sitemap-load-notice')
+    @sitemap_wrapper = $('#sitemap-wrapper')
     @template = Handlebars.compile($('#sitemap-template').html())
     list_template_regexp = new RegExp '\/' + options.page_root_id, 'g'
     list_template_html = $('#sitemap-list').html().replace(list_template_regexp, '/{{id}}')
@@ -23,7 +23,8 @@ Alchemy.Sitemap =
   # Fetches the sitemap from JSON
   fetch: (foldingId) ->
     self = Alchemy.Sitemap
-    spinner = Alchemy.Spinner.small()
+    spinner_size = @options.spinner_size
+    spinner = if spinner_size == 'small' then Alchemy.Spinner.small() else Alchemy.Spinner.medium()
 
     if foldingId
       spinTarget = $('#fold_button_' + foldingId)
diff --git a/app/assets/stylesheets/alchemy/sitemap.scss b/app/assets/stylesheets/alchemy/sitemap.scss
index 4d3f9dfea4..7211a050a3 100644
--- a/app/assets/stylesheets/alchemy/sitemap.scss
+++ b/app/assets/stylesheets/alchemy/sitemap.scss
@@ -22,17 +22,10 @@
   position: relative;
   min-height: 100%;
 
-  .sitemap-load-notice {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-
-    .spinner {
-      left: 0 !important;
-      top: -1px !important;
-      margin-right: 10px;
-    }
+  .spinner {
+    position: absolute !important;
+    top: 50% !important;
+    left: 50% !important;
   }
 }
 
diff --git a/app/views/alchemy/admin/pages/_sitemap.html.erb b/app/views/alchemy/admin/pages/_sitemap.html.erb
index f07de684f1..bb77a690de 100644
--- a/app/views/alchemy/admin/pages/_sitemap.html.erb
+++ b/app/views/alchemy/admin/pages/_sitemap.html.erb
@@ -1,6 +1,4 @@
-<div id="sitemap-wrapper">
-  <p class="center sitemap-load-notice"><%= _t(:loading_sitemap) %></p>
-</div>
+<div id="sitemap-wrapper"></div>
 
 <script id="sitemap-template" type="text/x-handlebars-template">
   <ul id="sitemap" class="list<%= @sorting ? ' sorting' : nil %>">
@@ -25,7 +23,8 @@
        Alchemy.PageSorter.init();
      }
      <% elsif action_name == 'link' %>
-     ,ready: function () {
+     ,spinner_size: 'small',
+     ready: function () {
        Alchemy.currentDialog().attachEvents();
      }
      <% end %>
diff --git a/config/locales/alchemy.de.yml b/config/locales/alchemy.de.yml
index edde974d1f..7a17c20d10 100644
--- a/config/locales/alchemy.de.yml
+++ b/config/locales/alchemy.de.yml
@@ -427,7 +427,6 @@ de:
       file: "Datei"
       internal: "Intern"
     link_title: "Linktitel"
-    loading_sitemap: "Seitenbaum wird geladen"
     login: "anmelden"
     logout: "abmelden"
     mail_to: "Empfängeradresse"
diff --git a/config/locales/alchemy.en.yml b/config/locales/alchemy.en.yml
index 60bdb1e587..934b6fcb82 100644
--- a/config/locales/alchemy.en.yml
+++ b/config/locales/alchemy.en.yml
@@ -427,7 +427,6 @@ en:
       file: "File"
       internal: "Internal"
     link_title: "Link title"
-    loading_sitemap: "Loading sitemap"
     login: "login"
     logout: "logout"
     mail_to: "Recipient"