svn commit: r985480 - in /ofbiz/branches/jquery: ./ applications/order/webapp/orde
Locked
svn commit: r985480 - in /ofbiz/branches/jquery: ./ applications/order/webapp/orde
 
|
Author: jleroux
Date: Sat Aug 14 12:36:56 2010 New Revision: 985480 URL: http://svn.apache.org/viewvc?rev=985480&view=rev Log: Merge the trunk at r985473 Added: ofbiz/branches/jquery/framework/base/lib/j2eespecs/tomcat-6.0.29-annotations-api.jar - copied unchanged from r985475, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.29-annotations-api.jar ofbiz/branches/jquery/framework/base/lib/j2eespecs/tomcat-6.0.29-el-api.jar - copied unchanged from r985475, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.29-el-api.jar ofbiz/branches/jquery/framework/base/lib/j2eespecs/tomcat-6.0.29-jsp-api.jar - copied unchanged from r985475, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.29-jsp-api.jar ofbiz/branches/jquery/framework/base/lib/j2eespecs/tomcat-6.0.29-servlet-api.jar - copied unchanged from r985475, ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.29-servlet-api.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.29-catalina-ha.jar - copied unchanged from r985475, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-catalina-ha.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.29-catalina-tribes.jar - copied unchanged from r985475, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-catalina-tribes.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.29-catalina.jar - copied unchanged from r985475, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-catalina.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.29-jasper-el.jar - copied unchanged from r985475, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-jasper-el.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.29-jasper-jdt.jar - copied unchanged from r985475, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-jasper-jdt.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.29-jasper.jar - copied unchanged from r985475, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-jasper.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.29-tomcat-coyote.jar - copied unchanged from r985475, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-tomcat-coyote.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.29-tomcat-dbcp.jar - copied unchanged from r985475, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-tomcat-dbcp.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.29-tomcat-juli-adapters.jar - copied unchanged from r985475, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-tomcat-juli-adapters.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.29-tomcat-juli.jar - copied unchanged from r985475, ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-tomcat-juli.jar Removed: ofbiz/branches/jquery/framework/base/lib/j2eespecs/tomcat-6.0.26-annotations-api.jar ofbiz/branches/jquery/framework/base/lib/j2eespecs/tomcat-6.0.26-el-api.jar ofbiz/branches/jquery/framework/base/lib/j2eespecs/tomcat-6.0.26-jsp-api.jar ofbiz/branches/jquery/framework/base/lib/j2eespecs/tomcat-6.0.26-servlet-api.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.26-catalina-ha.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.26-catalina-tribes.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.26-catalina.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.26-jasper-el.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.26-jasper-jdt.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.26-jasper.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.26-tomcat-coyote.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.26-tomcat-dbcp.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.26-tomcat-juli-adapters.jar ofbiz/branches/jquery/framework/catalina/lib/tomcat-6.0.26-tomcat-juli.jar Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/.classpath ofbiz/branches/jquery/LICENSE ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml ofbiz/branches/jquery/framework/common/webcommon/portal/editPortalPage.ftl ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/GenericDelegator.java ofbiz/branches/jquery/framework/images/webapp/images/myportal.css ofbiz/branches/jquery/framework/images/webapp/images/myportal.js ofbiz/branches/jquery/framework/webtools/widget/PortalAdmScreens.xml ofbiz/branches/jquery/specialpurpose/ebaystore/entitydef/entitymodel.xml ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/login.ftl ofbiz/branches/jquery/specialpurpose/myportal/widget/login.ftl Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 12:36:56 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-984373 +/ofbiz/trunk:951708-985475 Modified: ofbiz/branches/jquery/.classpath URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/.classpath?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/.classpath (original) +++ ofbiz/branches/jquery/.classpath Sat Aug 14 12:36:56 2010 @@ -79,10 +79,10 @@ <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar"/> <classpathentry kind="lib" path="framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.26-annotations-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.26-el-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.26-jsp-api.jar"/> - <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.26-servlet-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.29-annotations-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.29-el-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.29-jsp-api.jar"/> + <classpathentry kind="lib" path="framework/base/lib/j2eespecs/tomcat-6.0.29-servlet-api.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/antlr-2.7.6.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/> <classpathentry kind="lib" path="framework/base/lib/scripting/asm-analysis-3.2.jar"/> @@ -110,16 +110,16 @@ <classpathentry kind="lib" path="framework/birt/lib/saaj.jar"/> <classpathentry kind="lib" path="framework/birt/lib/scriptapi.jar"/> <classpathentry kind="lib" path="framework/birt/lib/viewservlets.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-catalina.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-catalina-ha.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-catalina-tribes.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-jasper.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-jasper-el.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-jasper-jdt.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-tomcat-coyote.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-tomcat-dbcp.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-tomcat-juli.jar"/> - <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.26-tomcat-juli-adapters.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.29-catalina.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.29-catalina-ha.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.29-catalina-tribes.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.29-jasper.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.29-jasper-el.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.29-jasper-jdt.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.29-tomcat-coyote.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.29-tomcat-dbcp.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.29-tomcat-juli.jar"/> + <classpathentry kind="lib" path="framework/catalina/lib/tomcat-6.0.29-tomcat-juli-adapters.jar"/> <classpathentry kind="lib" path="framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar"/> <classpathentry kind="lib" path="framework/entity/lib/ofbiz-minerva.jar"/> <classpathentry kind="lib" path="framework/geronimo/lib/geronimo-connector-2.1.1.jar"/> Modified: ofbiz/branches/jquery/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/LICENSE?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/LICENSE (original) +++ ofbiz/branches/jquery/LICENSE Sat Aug 14 12:36:56 2010 @@ -60,25 +60,25 @@ ofbiz/trunk/framework/base/lib/j2eespecs ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-jta_1.1_spec-1.1.1.jar ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-qname_1.1_spec-1.0.jar ofbiz/trunk/framework/base/lib/j2eespecs/geronimo-saaj_1.1_spec-1.0.jar -ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-annotations-api.jar -ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-el-api.jar -ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-jsp-api.jar -ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.26-servlet-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.29-annotations-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.29-el-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.29-jsp-api.jar +ofbiz/trunk/framework/base/lib/j2eespecs/tomcat-6.0.29-servlet-api.jar ofbiz/trunk/framework/base/lib/scripting/bsf-2.4.0.jar ofbiz/trunk/framework/base/lib/scripting/jakarta-oro-2.0.8.jar ofbiz/trunk/framework/base/lib/scripting/groovy-all-1.7.3.jar ofbiz/trunk/framework/base/lib/xmlrpc-client-3.1.2.jar ofbiz/trunk/framework/base/lib/xmlrpc-common-3.1.2.jar ofbiz/trunk/framework/base/lib/xmlrpc-server-3.1.2.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-ha.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina-tribes.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-catalina.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper-el.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-jasper.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-coyote.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-dbcp.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.26-tomcat-juli.jar -ofbiz/trunk/framework/catalina/lib/tomcat-6.0.16-tomcat-juli-adapters.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-catalina-ha.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-catalina-tribes.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-catalina.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-jasper-el.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-jasper.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-tomcat-coyote.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-tomcat-dbcp.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-tomcat-juli.jar +ofbiz/trunk/framework/catalina/lib/tomcat-6.0.29-tomcat-juli-adapters.jar ofbiz/trunk/framework/entity/lib/commons-dbcp-1.3-20091113-r835956.jar ofbiz/trunk/framework/entity/lib/jdbc/derby-10.6.1.0.jar ofbiz/trunk/framework/jetty/lib/ant-1.6.5.jar Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/ShowPromotionDetails.groovy Sat Aug 14 12:36:56 2010 @@ -22,6 +22,7 @@ import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.order.shoppingcart.product.ProductPromoWorker; productPromoId = request.getParameter("productPromoId"); +if (!productPromoId) productPromoId = parameters.productPromoId; productPromo = delegator.findByPrimaryKey("ProductPromo", [productPromoId : productPromoId]); promoAutoDescription = ProductPromoWorker.makeAutoDescription(productPromo, delegator, locale); Modified: ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml Sat Aug 14 12:36:56 2010 @@ -901,7 +901,7 @@ <value xml:lang="de">Anmelden</value> <value xml:lang="en">Login</value> <value xml:lang="es">Conectar</value> - <value xml:lang="fr">vous connecter</value> + <value xml:lang="fr">Connectez-vous</value> <value xml:lang="hi_IN">लà¥à¤à¤à¤¨</value> <value xml:lang="it">Accedi</value> <value xml:lang="nl">Login</value> Modified: ofbiz/branches/jquery/framework/common/webcommon/portal/editPortalPage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/portal/editPortalPage.ftl?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/portal/editPortalPage.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/portal/editPortalPage.ftl Sat Aug 14 12:36:56 2010 @@ -57,8 +57,8 @@ under the License. <#assign portletFields = '<input name="portalPageId" value="' + portlet.portalPageId + '" type="hidden"/><input name="portalPortletId" value="' + portlet.portalPortletId + '" type="hidden"/><input name="portletSeqId" value="' + portlet.portletSeqId + '" type="hidden"/>'> <div class="portlet-config" id="portalPortlet_${portlet_index}" onmouseover="javascript:this.style.cursor='move';"> <div class="portlet-config-title-bar"> - <script type="text/javascript">makeDragable("${portlet_index}");</script> - <script type="text/javascript">makeDroppable("${portlet_index}");</script> + <script type="text/javascript">makeDragable("portalPortlet_${portlet_index}");</script> + <script type="text/javascript">makeDroppable("portalPortlet_${portlet_index}");</script> <form method="post" action="<@ofbizUrl>updatePortalPagePortletAjax</@ofbizUrl>" name="freeMove_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index].columnSeqId}" type="hidden"/><input name="mode" value="RIGHT" type="hidden"/></form> <#list portalPages as portalPageList> <#if portalPage.portalPageId != portalPageList.portalPageId> Modified: ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/GenericDelegator.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original) +++ ofbiz/branches/jquery/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Sat Aug 14 12:36:56 2010 @@ -247,7 +247,6 @@ public class GenericDelegator implements } // initialize helpers by group - TreeSet<String> helpersDone = new TreeSet<String>(); Set<String> groupNames = getModelGroupReader().getGroupNames(delegatorBaseName); for (String groupName: groupNames) { GenericHelperInfo helperInfo = this.getGroupHelperInfo(groupName); @@ -256,12 +255,6 @@ public class GenericDelegator implements if (Debug.infoOn()) Debug.logInfo("Delegator \"" + delegatorFullName + "\" initializing helper \"" + helperBaseName + "\" for entity group \"" + groupName + "\".", module); if (UtilValidate.isNotEmpty(helperInfo.getHelperFullName())) { - // make sure each helper is only loaded once - if (helpersDone.contains(helperInfo.getHelperFullName())) { - if (Debug.infoOn()) Debug.logInfo("Helper \"" + helperInfo.getHelperFullName() + "\" already initialized, not re-initializing.", module); - continue; - } - helpersDone.add(helperInfo.getHelperFullName()); // pre-load field type defs, the return value is ignored ModelFieldTypeReader.getModelFieldTypeReader(helperBaseName); // get the helper and if configured, do the datasource check Modified: ofbiz/branches/jquery/framework/images/webapp/images/myportal.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/myportal.css?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/images/webapp/images/myportal.css (original) +++ ofbiz/branches/jquery/framework/images/webapp/images/myportal.css Sat Aug 14 12:36:56 2010 @@ -17,21 +17,24 @@ * under the License. */ +html,body { +height:100%; +margin:0; +} + #loading { +background-color: rgba(0, 0, 0, 0.496094); position: absolute; -background-image: url(/images/myportal_load_bg.png); -background-repeat:repeat; -background-position:top center; -z-index: 100; top: 0px; -left: 10px; -border: 0px !important; -width: 99%; +left: 0px; +width: 100%; height: 100%; +z-index: 9999; } #loaderImg { position: absolute; -top: 200px; +top: 250px; left: 50%; } + Modified: ofbiz/branches/jquery/framework/images/webapp/images/myportal.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/myportal.js?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/images/webapp/images/myportal.js (original) +++ ofbiz/branches/jquery/framework/images/webapp/images/myportal.js Sat Aug 14 12:36:56 2010 @@ -193,13 +193,17 @@ function makeDroppable(id){ //calls ajax request for dropping container on a portlet function getDestinationInformationPortlets(originId, destinationId, mode){ loadingImage(); - - var move = document.forms['freeMove_' + destinationId]; + + // extract integer part of arguments for freeMove_<id> + var destId = destinationId.replace(/.*_([0-9]+)/, "\$1"); + var origId = originId.replace(/.*_([0-9]+)/, "\$1"); + + var move = document.forms['freeMove_' + destId]; var d_portalPageId = move.elements['portalPageId'].value; var d_portalPortletId = move.elements['portalPortletId'].value; var d_portletSeqId = move.elements['portletSeqId'].value; - var move = document.forms['freeMove_' + originId]; + var move = document.forms['freeMove_' + origId]; var o_portalPageId = move.elements['portalPageId'].value; var o_portalPortletId = move.elements['portalPortletId'].value; var o_portletSeqId = move.elements['portletSeqId'].value; @@ -287,15 +291,32 @@ function onCompleteRequest() { } } +//safely get height of whole document +function getDocHeight() { + var D = document; + return Math.max( + Math.max(D.body.scrollHeight, D.documentElement.scrollHeight), + Math.max(D.body.offsetHeight, D.documentElement.offsetHeight), + Math.max(D.body.clientHeight, D.documentElement.clientHeight) + ); +} + //displays the loading image -function loadingImage() { - var container = document.getElementById("portalContainerId"); +function loadingImage() { var p = document.createElement("div"); - p.setAttribute("id", "loading"); + p.setAttribute("id", "loading"); + p.setAttribute("style", "height: " + getDocHeight() + "px;" ) + var img = document.createElement("img"); img.setAttribute("src", "/images/loader.gif"); img.setAttribute("id", "loaderImg"); + + //place loader image somwhere in the middle of the viewport + img.setAttribute("style", "top: " + (document.viewport.getHeight() / 2 + document.viewport.getScrollOffsets().top - 50) + "px;"); + p.appendChild(img); + + var container = document.getElementById("portalContainerId"); container.appendChild(p); } Modified: ofbiz/branches/jquery/framework/webtools/widget/PortalAdmScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/webtools/widget/PortalAdmScreens.xml?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/webtools/widget/PortalAdmScreens.xml (original) +++ ofbiz/branches/jquery/framework/webtools/widget/PortalAdmScreens.xml Sat Aug 14 12:36:56 2010 @@ -93,6 +93,8 @@ under the License. <section> <actions> <set field="headerItem" value="PortalPageAdminItem"/> + <set field="layoutSettings.javaScripts[]" value="/images/myportal.js" global="true"/> + <set field="layoutSettings.styleSheets[+0]" value="/images/myportal.css" global="true"/> <entity-one entity-name="PortalPage" value-field="portalPage"/> <set field="Adm" value="Adm"/> </actions> Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/entitydef/entitymodel.xml?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/entitydef/entitymodel.xml Sat Aug 14 12:36:56 2010 @@ -126,7 +126,7 @@ under the License. </entity> <entity entity-name="EbayProductStorePrefCond" package-name="org.ofbiz.ebay.store"> <field name="prefCondId" type="id-ne"/> - <field name="condition" type="long-varchar"></field> + <field name="acceptanceCondition" type="long-varchar"></field> <field name="description" type="long-varchar"></field> <field name="parentPrefCondId" type="id-ne"></field> <prim-key field="prefCondId"/> Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayBestOfferAutoPref.java Sat Aug 14 12:36:56 2010 @@ -43,37 +43,37 @@ public class EbayBestOfferAutoPref { String condition11 = (String) context.get("condition11"); try { Map ebayCondition1 = UtilMisc.toMap("userLogin", userLogin); - ebayCondition1.put("condition", condition1); + ebayCondition1.put("acceptanceCondition", condition1); Map ebayCondition2 = UtilMisc.toMap("userLogin", userLogin); - ebayCondition2.put("condition", condition2); + ebayCondition2.put("acceptanceCondition", condition2); Map ebayCondition3 = UtilMisc.toMap("userLogin", userLogin); - ebayCondition3.put("condition", condition3); + ebayCondition3.put("acceptanceCondition", condition3); Map ebayCondition4 = UtilMisc.toMap("userLogin", userLogin); - ebayCondition4.put("condition", condition4); + ebayCondition4.put("acceptanceCondition", condition4); Map ebayCondition5 = UtilMisc.toMap("userLogin", userLogin); - ebayCondition5.put("condition", condition5); + ebayCondition5.put("acceptanceCondition", condition5); Map ebayCondition6 = UtilMisc.toMap("userLogin", userLogin); - ebayCondition6.put("condition", condition6); + ebayCondition6.put("acceptanceCondition", condition6); Map ebayCondition7 = UtilMisc.toMap("userLogin", userLogin); - ebayCondition7.put("condition", condition7); + ebayCondition7.put("acceptanceCondition", condition7); Map ebayCondition8 = UtilMisc.toMap("userLogin", userLogin); - ebayCondition8.put("condition", condition8); + ebayCondition8.put("acceptanceCondition", condition8); Map ebayCondition9 = UtilMisc.toMap("userLogin", userLogin); - ebayCondition9.put("condition", condition9); + ebayCondition9.put("acceptanceCondition", condition9); Map ebayCondition10 = UtilMisc.toMap("userLogin", userLogin); - ebayCondition10.put("condition", condition10); + ebayCondition10.put("acceptanceCondition", condition10); Map ebayCondition11 = UtilMisc.toMap("userLogin", userLogin); - ebayCondition11.put("condition", condition11); + ebayCondition11.put("acceptanceCondition", condition11); GenericValue productStorePref = delegator.findByPrimaryKey("EbayProductStorePref", UtilMisc.toMap("productStoreId", productStoreId, "autoPrefEnumId", "EBAY_AUTO_BEST_OFFER")); if (UtilValidate.isEmpty(productStorePref)) { @@ -165,7 +165,7 @@ public class EbayBestOfferAutoPref { Map ebayPrefCond = UtilMisc.toMap("userLogin", userLogin); for (int i = 0; i < productPref.size(); i++) { ebayPrefCond.put("prefCondId",productPref.get(i).getString("prefCondId")); - ebayPrefCond.put("condition",condition[i]); + ebayPrefCond.put("acceptanceCondition",condition[i]); dispatcher.runSync("updateEbayProductStorePrefCond",ebayPrefCond); } } Modified: ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java (original) +++ ofbiz/branches/jquery/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java Sat Aug 14 12:36:56 2010 @@ -1175,17 +1175,17 @@ public class EbayStoreAutoPreferences { String parentPrefCondId = ebayProductStorePref.getString("parentPrefCondId"); List<GenericValue> ebayProductStorePrefCond = delegator.findByAnd("EbayProductStorePrefCond", UtilMisc.toMap("parentPrefCondId", parentPrefCondId)); //Parameters - String priceType = ebayProductStorePrefCond.get(0).getString("condition"); - String acceptBestOfferValue = ebayProductStorePrefCond.get(1).getString("condition"); - String rejectOffer = ebayProductStorePrefCond.get(2).getString("condition"); - String ignoreOfferMessage = ebayProductStorePrefCond.get(3).getString("condition"); - String rejectGreaterEnable = ebayProductStorePrefCond.get(4).getString("condition"); - String greaterValue = ebayProductStorePrefCond.get(5).getString("condition"); - String lessValue = ebayProductStorePrefCond.get(6).getString("condition"); - String rejectGreaterMsg = ebayProductStorePrefCond.get(7).getString("condition"); - String rejectLessEnable = ebayProductStorePrefCond.get(8).getString("condition"); - String lessThanValue = ebayProductStorePrefCond.get(9).getString("condition"); - String rejectLessMsg = ebayProductStorePrefCond.get(10).getString("condition"); + String priceType = ebayProductStorePrefCond.get(0).getString("acceptanceCondition"); + String acceptBestOfferValue = ebayProductStorePrefCond.get(1).getString("acceptanceCondition"); + String rejectOffer = ebayProductStorePrefCond.get(2).getString("acceptanceCondition"); + String ignoreOfferMessage = ebayProductStorePrefCond.get(3).getString("acceptanceCondition"); + String rejectGreaterEnable = ebayProductStorePrefCond.get(4).getString("acceptanceCondition"); + String greaterValue = ebayProductStorePrefCond.get(5).getString("acceptanceCondition"); + String lessValue = ebayProductStorePrefCond.get(6).getString("acceptanceCondition"); + String rejectGreaterMsg = ebayProductStorePrefCond.get(7).getString("acceptanceCondition"); + String rejectLessEnable = ebayProductStorePrefCond.get(8).getString("acceptanceCondition"); + String lessThanValue = ebayProductStorePrefCond.get(9).getString("acceptanceCondition"); + String rejectLessMsg = ebayProductStorePrefCond.get(10).getString("acceptanceCondition"); //case parameter to double type BigDecimal acceptPercentValue = new BigDecimal(acceptBestOfferValue); BigDecimal greaterPercentValue = new BigDecimal(greaterValue); Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 12:36:56 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-984373 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-985475 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 12:36:56 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-984373 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-985475 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Aug 14 12:36:56 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-984373 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-985475 Modified: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/login.ftl?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/login.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/login.ftl Sat Aug 14 12:36:56 2010 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> - +<#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")> <#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))> <#if username != ""> <#assign focusName = false> @@ -62,6 +62,12 @@ under the License. <input type="password" name="PASSWORD" value="" size="20" /> </td> </tr> + <#if ("Y" == useMultitenant)> + <tr> + <td class="label">TenantId</td> + <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td> + </tr> + </#if> <tr> <td colspan="2" align="center"> <!--<a href="javascript:document.loginform.submit()" class="buttontext">[Login]</a>--> Modified: ofbiz/branches/jquery/specialpurpose/myportal/widget/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/myportal/widget/login.ftl?rev=985480&r1=985479&r2=985480&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/myportal/widget/login.ftl (original) +++ ofbiz/branches/jquery/specialpurpose/myportal/widget/login.ftl Sat Aug 14 12:36:56 2010 @@ -18,6 +18,7 @@ under the License. --> <#if requestAttributes.uiLabelMap?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> +<#assign useMultitenant = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", "multitenant")> <#assign username = requestParameters.USERNAME?default((sessionAttributes.autoUserLogin.userLoginId)?default(""))> <#if username != ""> @@ -41,6 +42,12 @@ under the License. <td class="label">${uiLabelMap.CommonPassword}</td> <td><input type="password" name="PASSWORD" value="" size="20"/></td> </tr> + <#if ("Y" == useMultitenant)> + <tr> + <td class="label">${uiLabelMap.CommonTenantId}</td> + <td><input type="text" name="tenantId" value="${parameters.tenantId?if_exists}" size="20"/></td> + </tr> + </#if> <tr> <td colspan="2" align="center"> <input type="submit" value="${uiLabelMap.CommonLogin}"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |