Changeset 3b58a0 in indico

Timestamp:

12/01/11 13:38:14 (19 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

f2c7a7

Parents:

8d0776

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (07/11/11 16:22:47)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (12/01/11 13:38:14)

Message:

[FIX] really fix the loading dialog

Location:

indico/htdocs

Files:

• css/Default.css (modified) (1 diff)
• js/indico/Core/Dialogs/Base.js (modified) (1 diff)
• js/indico/Core/Dialogs/Popup.js (modified) (2 diffs)

indico/htdocs/css/Default.css

@@ -5200 +5200 @@
 .loadingPopup {
     background: transparent url('../images/load_lightblue.gif') scroll no-repeat center center;
-    min-width: 180px;
+    min-width: 130px;
     height: 70px;
 }

indico/htdocs/js/indico/Core/Dialogs/Base.js

@@ -189 +189 @@
                  Html.div('loadingPopup',
                           Html.div('text', this.text)),
-                 {background: '#424242', border: 'none', padding: '20px 5px', overflow:'auto'});
+                 {background: '#424242', border: 'none', padding: '20px', overflow: 'auto'},
+                 {background: '#424242', border: 'none', padding: '1px', overflow: 'auto'});
          }
      },

indico/htdocs/js/indico/Core/Dialogs/Popup.js

@@ -60 +60 @@
     },
 
-    draw: function(content, customStyle) {
+    draw: function(content, customStyle, popupStyle) {
         customStyle = customStyle || {};
         if(!content) {
@@ -69 +69 @@
         }
 
-        var container = $('<div class="exclusivePopup"/>').css(customStyle).append(content);
+        if(popupStyle === undefined) {
+            popupStyle = customStyle;
+        }
+        var container = $('<div class="exclusivePopup"/>').css(popupStyle).append(content);
 
         this.showCloseButton = !!this.title;