You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2010/09/15 19:56:48 UTC
svn commit: r997421 - in /ofbiz/trunk: framework/images/webapp/images/
themes/bizznesstime/includes/ themes/bizznesstime/webapp/bizznesstime/css/
themes/bluelight/includes/ themes/bluelight/webapp/bluelight/
themes/droppingcrumbs/includes/ themes/dropp...
Author: doogie
Date: Wed Sep 15 17:56:48 2010
New Revision: 997421
URL: http://svn.apache.org/viewvc?rev=997421&view=rev
Log:
Display the ajax spinner absolutely in the center of the document,
instead of allocating static space in the control area. This takes the
width of the control area back to something sensible. With always
allocated space in the control area, there ends up being a blank
space(because of the use of visibility:hidden instead of display:none).
When the Person.name and Company.Name fields are then long, this control
area breaks the flow, and word-wraps in IE, or flows underneath the
breadcrumbs in firefox.
Modified:
ofbiz/trunk/framework/images/webapp/images/selectall.js
ofbiz/trunk/themes/bizznesstime/includes/header.ftl
ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
ofbiz/trunk/themes/bluelight/includes/header.ftl
ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
ofbiz/trunk/themes/flatgrey/includes/header.ftl
ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
ofbiz/trunk/themes/multiflex/includes/header.ftl
ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css
ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl
ofbiz/trunk/themes/tomahawk/includes/header.ftl
ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
Modified: ofbiz/trunk/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/selectall.js?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/selectall.js Wed Sep 15 17:56:48 2010
@@ -596,9 +596,39 @@ function toggleLeftColumn(){
}
function waitSpinnerShow() {
- document.getElementById("wait-spinner").style.visibility = 'visible';
+ var spinner = document.getElementById("wait-spinner");
+ if (spinner == null) {
+ return;
+ }
+ spinner.style.display = 'block';
+ var bdy = document.body;
+
+ var dimensions = spinner.getDimensions();
+ var lookupLeft = (bdy.offsetWidth / 2) - (dimensions.width / 2);
+ var scrollOffY = document.viewport.getScrollOffsets().top;
+ var winHeight = document.viewport.getHeight();
+ var lookupTop = (scrollOffY + winHeight / 2) - (dimensions.height / 2);
+
+ spinner.style.left = lookupLeft + "px";
+ spinner.style.top = lookupTop + "px";
+ Effect.Appear(spinner, {duration: 0.3});
}
function waitSpinnerHide() {
- document.getElementById("wait-spinner").style.visibility = 'hidden';
-}
\ No newline at end of file
+ var spinner = document.getElementById("wait-spinner");
+ if (spinner == null) {
+ return;
+ }
+ Effect.Fade(spinner, {duration: 0.3});
+ window.setTimeout(function() {
+ spinner.style.display = 'none';
+ }, 400);
+}
+document.observe('dom:loaded', function() {
+ setTimeout(function() {
+ waitSpinnerShow();
+ setTimeout(function() {
+ waitSpinnerHide();
+ }, 5000);
+ }, 2000);
+});
Modified: ofbiz/trunk/themes/bizznesstime/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/includes/header.ftl?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bizznesstime/includes/header.ftl Wed Sep 15 17:56:48 2010
@@ -102,6 +102,9 @@ under the License.
</head>
<body>
<div id="wrap">
+ <div id="wait-spinner" style="display:none">
+ <div id="wait-spinner-image"></div>
+ </div>
<div id="header">
<div id="logo"></div>
<div id="shelf"></div>
@@ -136,10 +139,5 @@ under the License.
<a href="${layoutSettings.middleTopLink3?if_exists}">${layoutSettings.middleTopMessage3?if_exists}</a>
</span>
</#if>
- <div class="wait-spinner" style="background:none; visibility:hidden">
- <div id="wait-spinner" style="">
- <img src="/images/spinner.gif" alt="" title=""/>
- </div>
- </div>
</div>
- </div>
\ No newline at end of file
+ </div>
Modified: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/style.css Wed Sep 15 17:56:48 2010
@@ -1566,12 +1566,14 @@ height:16px;
background: none !important;
}
-.wait-spinner {
- float: right;
- margin-right: 10px;
+#wait-spinner {
+z-index:50000;
+position:absolute;
}
-.wait-spinner div {
- padding-top: 4px;
+#wait-spinner-image {
+height:21px;
+width:56px;
+background-image:url(/images/spinner.gif);
}
#controls span#last-system-msg{
@@ -1583,4 +1585,4 @@ margin-right: 20px;
.last-system-msg a{
color:#1C334D;
-}
\ No newline at end of file
+}
Modified: ofbiz/trunk/themes/bluelight/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/includes/header.ftl?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/includes/header.ftl (original)
+++ ofbiz/trunk/themes/bluelight/includes/header.ftl Wed Sep 15 17:56:48 2010
@@ -104,6 +104,9 @@ under the License.
</#if>
<body>
+ <div id="wait-spinner" style="display:none">
+ <div id="wait-spinner-image"></div>
+ </div>
<div class="page-container">
<div class="hidden">
<a href="#column-container" title="${uiLabelMap.CommonSkipNavigation}" accesskey="2">
@@ -183,11 +186,6 @@ under the License.
</#if>
</#if>
<li class="control-area">
- <div class="wait-spinner" style="background:none; visibility:hidden">
- <div id="wait-spinner" style="">
- <img src="/images/spinner.gif" alt="" title=""/>
- </div>
- </div>
</li>
</ul>
</li>
Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/trunk/themes/bluelight/webapp/bluelight/style.css Wed Sep 15 17:56:48 2010
@@ -2271,10 +2271,12 @@ Lookups
top: 0px;
}
-.wait-spinner {
- float: right;
- margin-right: 10px;
+#wait-spinner {
+z-index:50000;
+position:absolute;
+}
+#wait-spinner-image {
+height:21px;
+width:56px;
+background-image:url(/images/spinner.gif);
}
-.wait-spinner div {
- padding-top: 4px;
-}
\ No newline at end of file
Modified: ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (original)
+++ ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl Wed Sep 15 17:56:48 2010
@@ -104,6 +104,9 @@ under the License.
</#if>
<body>
+ <div id="wait-spinner" style="display:none">
+ <div id="wait-spinner-image"></div>
+ </div>
<div class="page-container">
<div class="hidden">
<a href="#column-container" title="${uiLabelMap.CommonSkipNavigation}" accesskey="2">
@@ -183,11 +186,6 @@ under the License.
</#if>
</#if>
<li class="control-area">
- <div class="wait-spinner" style="background:none; visibility:hidden">
- <div id="wait-spinner" style="">
- <img src="/images/spinner.gif" alt="" title=""/>
- </div>
- </div>
</li>
</ul>
</li>
Modified: ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/trunk/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Wed Sep 15 17:56:48 2010
@@ -2249,10 +2249,12 @@ Lookups
top: 0px;
}
-.wait-spinner {
- float: right;
- margin-right: 10px;
+#wait-spinner {
+z-index:50000;
+position:absolute;
+}
+#wait-spinner-image {
+height:21px;
+width:56px;
+background-image:url(/images/spinner.gif);
}
-.wait-spinner div {
- padding-top: 4px;
-}
\ No newline at end of file
Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Wed Sep 15 17:56:48 2010
@@ -85,6 +85,9 @@ under the License.
<#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}">
</#if>
<body>
+ <div id="wait-spinner" style="display:none">
+ <div id="wait-spinner-image"></div>
+ </div>
<div class="page-container">
<div class="hidden">
<a href="#column-container" title="${uiLabelMap.CommonSkipNavigation}" accesskey="2">
@@ -185,11 +188,6 @@ under the License.
<li><a <#if pageAvail?has_content>class="alert"</#if> href="javascript:lookup_popup2('showHelp?helpTopic=${helpTopic}&portalPageId=${parameters.portalPageId?if_exists}','help' ,500,500);">${uiLabelMap.CommonHelp}</a></li>
</#if>
<li class="control-area">
- <div class="wait-spinner" style="background:none; visibility:hidden">
- <div id="wait-spinner" style="">
- <img src="/images/spinner.gif" alt="" title=""/>
- </div>
- </div>
</li>
</ul>
</li>
Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original)
+++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Wed Sep 15 17:56:48 2010
@@ -2297,10 +2297,12 @@ Lookups
left: 0px;
top: 0px;
}
-.wait-spinner {
- float: right;
- margin-right: 10px;
+#wait-spinner {
+z-index:50000;
+position:absolute;
+}
+#wait-spinner-image {
+height:21px;
+width:56px;
+background-image:url(/images/spinner.gif);
}
-.wait-spinner div {
- padding-top: 4px;
-}
\ No newline at end of file
Modified: ofbiz/trunk/themes/multiflex/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/includes/header.ftl?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/multiflex/includes/header.ftl (original)
+++ ofbiz/trunk/themes/multiflex/includes/header.ftl Wed Sep 15 17:56:48 2010
@@ -20,6 +20,9 @@ under the License.
<!-- Global IE fix to avoid layout crash when single word size wider than column width -->
<!--[if IE]><style type="text/css"> body {word-wrap: break-word;}</style><![endif]-->
+ <div id="wait-spinner" style="display:none">
+ <div id="wait-spinner-image"></div>
+ </div>
<div class="page-container">
<div class="header">
<div class="header-top">
Modified: ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css (original)
+++ ofbiz/trunk/themes/multiflex/webapp/multiflex/style.css Wed Sep 15 17:56:48 2010
@@ -2295,10 +2295,12 @@ font-size: 1px;
height: 1px;
}
-.wait-spinner {
- float: right;
- margin-right: 10px;
+#wait-spinner {
+z-index:50000;
+position:absolute;
+}
+#wait-spinner-image {
+height:21px;
+width:56px;
+background-image:url(/images/spinner.gif);
}
-.wait-spinner div {
- padding-top: 4px;
-}
\ No newline at end of file
Modified: ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl Wed Sep 15 17:56:48 2010
@@ -53,13 +53,6 @@ under the License.
<div id="control-area">
<ul id="preferences-menu">
<#if userLogin?exists>
- <li>
- <div class="wait-spinner" style="background:none; visibility:hidden;">
- <div id="wait-spinner" style="">
- <img src="/tomahawk/images/spinner.gif" alt="" title=""/>
- </div>
- </div>
- </li>
<#if (userPreferences.COMPACT_HEADER)?default("N") == "Y">
<li class="collapsed"><a href="javascript:document.setUserPreferenceCompactHeaderN.submit()"> </a>
<form name="setUserPreferenceCompactHeaderN" method="post" action="<@o...@ofbizUrl>">
Modified: ofbiz/trunk/themes/tomahawk/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/includes/header.ftl?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/includes/header.ftl (original)
+++ ofbiz/trunk/themes/tomahawk/includes/header.ftl Wed Sep 15 17:56:48 2010
@@ -88,6 +88,9 @@ under the License.
</#if>
<body>
+ <div id="wait-spinner" style="display:none">
+ <div id="wait-spinner-image"></div>
+ </div>
<div class="page-container">
<div class="hidden">
<a href="#column-container" title="${uiLabelMap.CommonSkipNavigation}" accesskey="2">
Modified: ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css?rev=997421&r1=997420&r2=997421&view=diff
==============================================================================
--- ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/trunk/themes/tomahawk/webapp/tomahawk/css/style.css Wed Sep 15 17:56:48 2010
@@ -2492,10 +2492,12 @@ background-color:#a9b996;
background-color:#b29898;
}
-.wait-spinner {
- float: right;
- margin-right: 10px;
+#wait-spinner {
+z-index:50000;
+position:absolute;
+}
+#wait-spinner-image {
+height:21px;
+width:56px;
+background-image:url(/tomahawk/images/spinner.gif);
}
-.wait-spinner div {
- padding-top: 4px;
-}
\ No newline at end of file