Modify callback messages

olafgleba · Dec 27, 2011 · 7ae910e · 7ae910e
1 parent 05a0973
commit 7ae910e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 deletions.
diff --git a/welcompose/admin/smarty/templates/mediamanager/mediamanager_edit.html b/welcompose/admin/smarty/templates/mediamanager/mediamanager_edit.html
@@ -33,8 +33,8 @@
 <div id="lyLowerOpacity"> </div>
 
 <div id="uploadMessage" style="display:none;">
-<h1>{i18n Please wait. Edits processing...}</h1>
-<p></p>	
+<h1>{i18n Please wait. Upload processing...} <img src="../static/img/indicatorblue.gif" alt="" /></h1>
+<p><img src="../static/img/bg_uploadmessage_bot.gif" width="500" height="3" alt="" /></p>
 </div>
 
 <div id="modalContainer">

diff --git a/welcompose/admin/smarty/templates/mediamanager/mediamanager_upload.html b/welcompose/admin/smarty/templates/mediamanager/mediamanager_upload.html
@@ -34,8 +34,8 @@
 <div id="lyLowerOpacity"> </div>
 
 <div id="uploadMessage" style="display:none;">
-<h1>{i18n Please wait. Upload processing...} <img src="../static/img/indicator.gif" alt="" /></h1>
-<p></p>	
+<h1>{i18n Please wait. Upload processing...} <img src="../static/img/indicatorblue.gif" alt="" /></h1>
+<p><img src="../static/img/bg_uploadmessage_bot.gif" width="500" height="3" alt="" /></p>	
 </div>
 
 <div id="modalContainer">

diff --git a/welcompose/admin/static/img/bg_uploadmessage_bot.gif b/welcompose/admin/static/img/bg_uploadmessage_bot.gif
diff --git a/welcompose/admin/static/img/indicatorblue.gif b/welcompose/admin/static/img/indicatorblue.gif
diff --git a/welcompose/admin/static/libs/wcom.core.js b/welcompose/admin/static/libs/wcom.core.js
@@ -12,8 +12,6 @@
  * This file is licensed under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE v3
  * http://www.opensource.org/licenses/agpl-v3.html
  *
- * $Id$
- *
  * @copyright 2008 creatics, Olaf Gleba
  * @author Olaf Gleba
  * @package Welcompose
@@ -270,7 +268,7 @@ function Base ()
 		/**
 		 * Comprehensive popup height application wide
 		 */
-		this.callbacksPopupWindowHeight664 = '664';
+		this.callbacksPopupWindowHeight664 = '666';
 
 		/**
 		 * Help string supposed to delivered within the DOM.

diff --git a/welcompose/admin/static/styles/wcom.basic.css b/welcompose/admin/static/styles/wcom.basic.css
@@ -305,25 +305,28 @@ padding: 0 10px 10px 10px;
 background: transparent url(../img/bg_statuschange_bot.gif) left bottom no-repeat;
 }
 #uploadMessage {
-/*display: none;*/
-}
-#uploadMessage {
 position: absolute;
-top: 40%;
+top: 36%;
 left: 15%;
 width: 500px;
 background: transparent url(../img/bg_uploadmessage_top.gif) 0 0 no-repeat;
 z-index: 2;
 }
 #uploadMessage h1 {
 margin: 0;
-padding: 10px 10px 0 10px;
+padding: 15px 15px 0 15px;
 color: #036;
+text-align: left;
+}
+#uploadMessage h1 img {
+position: absolute;
+right: 15px;
 }
 #uploadMessage p {
-margin: 0;
-padding: 0 10px 10px 10px;
-background: transparent url(../img/bg_uploadmessage_bot.gif) left bottom no-repeat;
+margin: 11px 0 0 0;
+padding: 0;
+line-height: 0;
+height: 3px;
 }
 
 /* response */