[BUGFIX][EM] Get extension show spinner icon in upper right table 97/19097/4
authorChristian Kuhn <lolli@schwarzbu.ch>
Wed, 20 Mar 2013 15:45:01 +0000 (16:45 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Wed, 20 Mar 2013 20:22:36 +0000 (21:22 +0100)
The load mask logic in extension manager stumbles upon the fluid change
of issue #40826 and now always shows a spinner in the "Get extensions"
tab.
This is solved with a small cleanup of the classes and markup added to
this HTML section which anyway are obsolete since #46029.

Change-Id: I0a2e5b26c890ba7ba93bf4abb1f6485084ebf808
Resolves: #46455
Related: #46029
Related: #40826
Releases: 6.1
Reviewed-on: https://review.typo3.org/19097
Reviewed-by: Jost Baron
Tested-by: Jost Baron
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Mattias Nilsson
Tested-by: Mattias Nilsson
Reviewed-by: Alexander Schnitzler
Tested-by: Alexander Schnitzler
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/extensionmanager/Resources/Private/Partials/List/UpdateFromTer.html
typo3/sysext/extensionmanager/Resources/Private/Scss/page/_get.scss
typo3/sysext/extensionmanager/Resources/Public/Css/main.css
typo3/sysext/extensionmanager/Resources/Public/JavaScript/update.js

index d765e48..ddde192 100644 (file)
@@ -1,16 +1,12 @@
-
-<div class="splash-receivedata x-mask-loading is-shown">
-       <div class="spinner"></div>
-       <f:form
-               action="updateExtensionListFromTer"
-               controller="UpdateFromTer"
-               format="json"
-               class="update-from-ter"
-               >
-               {f:translate(key: 'extensionList.updateFromTer.lastUpdate.label')}
-               <span class="text">{f:translate(key: 'extensionList.updateFromTer.lastUpdate.noInfo')}</span>
-               <input
-                       type="submit"
-                       value="{f:translate(key: 'extensionList.updateFromTer.buttonLabel')}" />
-       </f:form>
-</div>
+<f:form
+       action="updateExtensionListFromTer"
+       controller="UpdateFromTer"
+       format="json"
+       class="update-from-ter"
+       >
+       {f:translate(key: 'extensionList.updateFromTer.lastUpdate.label')}
+       <span class="text">{f:translate(key: 'extensionList.updateFromTer.lastUpdate.noInfo')}</span>
+       <input
+               type="submit"
+               value="{f:translate(key: 'extensionList.updateFromTer.buttonLabel')}" />
+</f:form>
index 9fa36fd..f8293e8 100644 (file)
        opacity: 0;
 }
 
-
-// In header
-.typo3-extensionmanager-headerRowRight {
-
-       .splash-receivedata {
-               position: relative;
-
-               .spinner {
-                       display: none;
-               }
-       }
-}
-
 // If something is hidden
 .is-hidden {
        display: none;
index 46e93c5..6f4180e 100644 (file)
@@ -1762,11 +1762,6 @@ button.ui-button::-moz-focus-inner {
 .is-loading {
   opacity: 0; }
 
-.typo3-extensionmanager-headerRowRight .splash-receivedata {
-  position: relative; }
-  .typo3-extensionmanager-headerRowRight .splash-receivedata .spinner {
-    display: none; }
-
 .is-hidden {
   display: none; }
 
index 8140685..fbb3fab 100644 (file)
@@ -4,7 +4,7 @@
        $(document).ready(function() {
 
                // Register "update from ter" action
-               $('.splash-receivedata form.update-from-ter').each(function() {
+               $('.update-from-ter').each(function() {
 
                        // "this" is the form which updates the extension list from
                        // TER on submit
                if (forceUpdate == 1) {
                        url = url + '&tx_extensionmanager_tools_extensionmanagerextensionmanager%5BforceUpdateCheck%5D=1';
                }
-               $('.splash-receivedata').addClass('is-shown');
-               $('.typo3-extensionmanager-headerRowRight .splash-receivedata').addClass('is-hidden');
 
+               // Hide triggers for TER update
+               $('.update-from-ter').addClass('is-hidden');
+
+               // Show loaders
+               $('.splash-receivedata').addClass('is-shown');
                $('#terTable_wrapper').addClass('is-loading');
 
                $.ajax({
@@ -45,7 +48,7 @@
                                }
 
                                // Message with latest updates
-                               $('.typo3-extensionmanager-headerRowRight .splash-receivedata .text').html(
+                               $('.update-from-ter .text').html(
                                        data.message
                                );
 
                        },
                        complete: function() {
 
-                               // Hide loader
+                               // Hide loaders
                                $('.splash-receivedata').removeClass('is-shown');
-
-                               // Show content
                                $('#terTable_wrapper').removeClass('is-loading');
 
-                               // Header: Show message
-                               $('.typo3-extensionmanager-headerRowRight .splash-receivedata').removeClass('is-hidden');
+                               // Show triggers for TER-update
+                               $('.update-from-ter').removeClass('is-hidden');
                        }
                });
        }