svn commit: r1563823 - in /ofbiz/branches/OFBIZ-5312-ofb
Locked
svn commit: r1563823 - in /ofbiz/branches/OFBIZ-5312-ofb
 
|
Author: jleroux
Date: Mon Feb 3 10:19:59 2014 New Revision: 1563823 URL: http://svn.apache.org/r1563823 Log: Merges trunk HEAD Added: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.11.0.js - copied unchanged from r1563821, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.11.0.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.11.0.min.js - copied unchanged from r1563821, ofbiz/trunk/framework/images/webapp/images/jquery/jquery-1.11.0.min.js Removed: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.10.2.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.10.2.min.js ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/jquery/jquery-1.10.2.min.map Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed) ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/ofbiz-component.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/CommonScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/LookupScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/EmplPositionForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/LookupForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/PartySkillForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/EN/Help_MFG_EditProductManufacturingRules.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderinfo.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editShoppingList.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/findparty.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryProducts.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditContactMech.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ComponentContainer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilMisc.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/htmlTemplate.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/lookup.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods.xsd ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/HtmlHead.ftl ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/EcommerceTypeData.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CommonScreens.xml ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/webapp/flatgrey/js/application.js Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1559795-1563821 Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/FixedAssetForms.xml Mon Feb 3 10:19:59 2014 @@ -588,7 +588,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListFixedAssetDepMethods" type="list" + <form name="ListFixedAssetDepMethods" type="list" list-name="fixedAssetDepMethods" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="FixedAssetDepMethod" list="fixedAssetDepMethods"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/ofbiz-component.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/ofbiz-component.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/ofbiz-component.xml Mon Feb 3 10:19:59 2014 @@ -70,12 +70,5 @@ under the License. location="webapp/content" base-permission="CONTENTMGR" mount-point="/content"/> - - <webapp name="contentimages" - title="Content Images" - server="default-server" - location="webapp/content/images" - mount-point="/contentimages/" - app-bar-display="false"/> </ofbiz-component> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/webapp/content/WEB-INF/actions/content/GetContentLookupList.groovy Mon Feb 3 10:19:59 2014 @@ -125,7 +125,7 @@ context.highIndex = highIndex; context.arraySize = arraySize; context.resultPartialList = resultPartialList; -viewIndexLast = (int) (arraySize/viewSize); +viewIndexLast = UtilMisc.getViewLastIndex(arraySize, viewSize); context.viewIndexLast = viewIndexLast; contentAssoc = FastList.newInstance(); context.contentAssoc=resultPartialList; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/CommonScreens.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/widget/CommonScreens.xml Mon Feb 3 10:19:59 2014 @@ -32,7 +32,7 @@ under the License. <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <set field="layoutSettings.companyName" from-field="uiLabelMap.ContentCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ContentCompanySubtitle" global="true"/> - <set field="layoutSettings.styleSheets[]" value="/contentimages/contentForum.css" global="true"/> + <set field="layoutSettings.styleSheets[]" value="/content/images/contentForum.css" global="true"/> <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> <set field="activeApp" value="contentmgr" global="true"/> <set field="applicationMenuName" value="ContentAppBar" global="true"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/LookupScreens.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/LookupScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/LookupScreens.xml Mon Feb 3 10:19:59 2014 @@ -61,6 +61,12 @@ <actions> <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.HumanResLookupEmplPositionByName}"/> + <set field="queryString" from-field="result.queryString"/> + <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> + <property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/> + <set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/> + <set field="entityName" value="EmplPosition"/> + <set field="searchFields" value="[emplPositionId, partyId, emplPositionTypeId]"/> </actions> <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/EmplPositionForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/EmplPositionForms.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/EmplPositionForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/EmplPositionForms.xml Mon Feb 3 10:19:59 2014 @@ -63,7 +63,7 @@ under the License. <field use-when="emplPosition!=null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="emplPosition==null&&emplPositionId==null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}"><lookup target-form-name="LookupEmplPosition"/></field> <field use-when="emplPosition==null&&emplPositionId!=null" name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${emplPositionId}]"><display/></field> - <field name="partyId" use-when="emplPosition!=null" parameter-name="partyId" title="organization partyId"> + <field name="partyId" parameter-name="partyId" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}" tooltip="${uiLabelMap.HumanResEmploymentPartyIdFromToolTip}"> <drop-down allow-empty="false"> <entity-options description="${groupName}" entity-name="PartyRoleAndPartyDetail" key-field-name="partyId"> <entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/> @@ -168,7 +168,7 @@ under the License. <field name="submitButton" title="${uiLabelMap.CommonAdd}"><submit button-type="button"/></field> </form> <form name="ListReportedToEmplPositionReportingStructs" type="list" target="updateEmplPositionReportingStruct" title="" paginate-target="EditReportedToEmplPositionReportingStruct" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" list-name="emplPositionReportingStructList"> <actions> <entity-condition entity-name="EmplPositionReportingStruct" list="emplPositionReportingStructList"> <condition-expr field-name="emplPositionIdReportingTo" from-field="parameters.emplPositionId"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/LookupForms.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/LookupForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/LookupForms.xml Mon Feb 3 10:19:59 2014 @@ -82,12 +82,12 @@ under the License. <auto-fields-entity entity-name="EmplPosition" default-field-type="hidden"/> <field name="emplPositionId" title="${uiLabelMap.HumanResEmplPositionId}"><text-find/></field> <field name="statusId"> - <drop-down allow-empty="false"> + <drop-down allow-empty="true"> <entity-options description="${description}" key-field-name="statusId" entity-name="StatusItem"></entity-options> </drop-down> </field> <field name="emplPositionTypeId"> - <drop-down allow-empty="false"> + <drop-down allow-empty="true"> <entity-options description="${description}" key-field-name="emplPositionTypeId" entity-name="EmplPositionType"></entity-options> </drop-down> </field> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/PartySkillForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/PartySkillForms.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/PartySkillForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/humanres/widget/forms/PartySkillForms.xml Mon Feb 3 10:19:59 2014 @@ -40,10 +40,13 @@ under the License. <form name="ListPartySkills" type="list" list-name="listIt" use-row-submit="true" separate-columns="true" target="updatePartySkillExt" paginate-target="findPartySkills" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <entity-condition entity-name="PartySkill"> - <condition-expr field-name="partyId" from-field="partyId"/> - <order-by field-name="skillTypeId"/> - </entity-condition> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="entityName" value="PartySkill"/> + <field-map field-name="orderBy" value="skillTypeId"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> + </service> </actions> <auto-fields-service default-field-type="hidden" service-name="updatePartySkill"/> <field name="skillTypeId"> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/EN/Help_MFG_EditProductManufacturingRules.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/EN/Help_MFG_EditProductManufacturingRules.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/EN/Help_MFG_EditProductManufacturingRules.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/data/helpdata/EN/Help_MFG_EditProductManufacturingRules.xml Mon Feb 3 10:19:59 2014 @@ -32,7 +32,8 @@ <section> <title>Create new manufacturing rule</title> <para> - WIP + This form enables you to define replacing materials for the BoM components. + In the second part of the screen the overview of replacement rules is shown. </para> </section> </section> \ No newline at end of file Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/src/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.java Mon Feb 3 10:19:59 2014 @@ -1991,7 +1991,7 @@ public class ProductionRunServices { try { Map<String, Object> inventoryResult = dispatcher.runSync("productionRunTaskProduce", UtilMisc.<String, Object>toMap("workEffortId", productionRunTaskId, - "productId", productId, "quantity", quantity, "lotId", lotId, "uomId", uomId, "isReturned", "Y", + "productId", productId, "quantity", quantity, "lotId", lotId, "currencyUomId", uomId, "isReturned", "Y", "inventoryItemTypeId", inventoryItemTypeId, "userLogin", userLogin)); if (ServiceUtil.isError(inventoryResult)) { return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ManufacturingProductionRunTaskProduceError" + ServiceUtil.getErrorMessage(inventoryResult), locale)); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/manufacturing/widget/manufacturing/ProductionRunForms.xml Mon Feb 3 10:19:59 2014 @@ -828,7 +828,7 @@ under the License. <form name="mandatoryWorkEfforts" type="list" target="" title="" list-name="mandatoryWorkEfforts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="workEffortIdFrom" title=" " widget-style="buttontext"> - <hyperlink target="ShowProductionRun" description="${workEffortIdFrom}" also-hidden="false"> + <hyperlink target="ShowProductionRun" description="${workEffortIdFrom}" also-hidden="false" link-type="anchor"> <parameter param-name="productionRunId" from-field="workEffortIdFrom"/> </hyperlink> </field> @@ -857,7 +857,7 @@ under the License. <form name="dependentWorkEfforts" type="list" target="" title="" list-name="dependentWorkEfforts" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="workEffortIdTo" title=" " widget-style="buttontext"> - <hyperlink target="ShowProductionRun" description="${workEffortIdTo}" also-hidden="false"> + <hyperlink target="ShowProductionRun" description="${workEffortIdTo}" also-hidden="false" link-type="anchor"> <parameter param-name="productionRunId" from-field="workEffortIdTo"/> </hyperlink> </field> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Mon Feb 3 10:19:59 2014 @@ -273,10 +273,12 @@ if (orderHeader) { context.productStore = productStore; if (productStore) { facility = productStore.getRelatedOne("Facility", false); - inventorySummaryByFacility = dispatcher.runSync("getProductInventorySummaryForItems", [orderItems : orderItems, facilityId : facility.facilityId]); - context.availableToPromiseByFacilityMap = inventorySummaryByFacility.availableToPromiseMap; - context.quantityOnHandByFacilityMap = inventorySummaryByFacility.quantityOnHandMap; - context.facility = facility; + if (facility) { + inventorySummaryByFacility = dispatcher.runSync("getProductInventorySummaryForItems", [orderItems : orderItems, facilityId : facility.facilityId]); + context.availableToPromiseByFacilityMap = inventorySummaryByFacility.availableToPromiseMap; + context.quantityOnHandByFacilityMap = inventorySummaryByFacility.quantityOnHandMap; + context.facility = facility; + } } // Get a list of facilities for purchase orders to receive against. Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/entry/catalog/categorydetail.ftl Mon Feb 3 10:19:59 2014 @@ -125,7 +125,7 @@ under the License. <#assign viewIndexFirst = 0/> <#assign viewIndexPrevious = viewIndex - 1/> <#assign viewIndexNext = viewIndex + 1/> - <#assign viewIndexLast = Static["java.lang.Math"].floor(listSize/viewSize)/> + <#assign viewIndexLast = Static["org.ofbiz.base.util.UtilMisc"].getViewLastIndex(listSize, viewSize) /> <#assign messageMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("lowCount", lowIndex, "highCount", highIndex, "total", listSize)/> <#assign commonDisplaying = Static["org.ofbiz.base.util.UtilProperties"].getMessage("CommonUiLabels", "CommonDisplaying", messageMap, locale)/> <@nextPrev commonUrl=commonUrl ajaxEnabled=false javaScriptEnabled=false paginateStyle="nav-pager" paginateFirstStyle="nav-first" viewIndex=viewIndex highIndex=highIndex listSize=listSize viewSize=viewSize ajaxFirstUrl="" firstUrl="" paginateFirstLabel="" paginatePreviousStyle="nav-previous" ajaxPreviousUrl="" previousUrl="" paginatePreviousLabel="" pageLabel="" ajaxSelectUrl="" selectUrl="" ajaxSelectSizeUrl="" selectSizeUrl="" commonDisplaying=commonDisplaying paginateNextStyle="nav-next" ajaxNextUrl="" nextUrl="" paginateNextLabel="" paginateLastStyle="nav-last" ajaxLastUrl="" lastUrl="" paginateLastLabel="" paginateViewSizeLabel="" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderinfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/order/orderinfo.ftl Mon Feb 3 10:19:59 2014 @@ -192,7 +192,7 @@ under the License. </#if> </td> </tr> - <#if orderItem.cancelBackOrderDate?exists> + <#if (orderItem.cancelBackOrderDate)?exists> <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_cancelBackOrderDate}</td> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editShoppingList.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/editShoppingList.ftl Mon Feb 3 10:19:59 2014 @@ -182,7 +182,7 @@ under the License. <#assign viewIndexFirst = 0/> <#assign viewIndexPrevious = viewIndex - 1/> <#assign viewIndexNext = viewIndex + 1/> - <#assign viewIndexLast = Static["java.lang.Math"].floor(listSize/viewSize)/> + <#assign viewIndexLast = Static["org.ofbiz.base.util.UtilMisc"].getViewLastIndex(listSize, viewSize) /> <#assign messageMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("lowCount", lowIndex, "highCount", highIndex, "total", listSize)/> <#assign commonDisplaying = Static["org.ofbiz.base.util.UtilProperties"].getMessage("CommonUiLabels", "CommonDisplaying", messageMap, locale)/> <@nextPrev commonUrl=commonUrl ajaxEnabled=false javaScriptEnabled=false paginateStyle="nav-pager" paginateFirstStyle="nav-first" viewIndex=viewIndex highIndex=highIndex listSize=listSize viewSize=viewSize ajaxFirstUrl="" firstUrl="" paginateFirstLabel="" paginatePreviousStyle="nav-previous" ajaxPreviousUrl="" previousUrl="" paginatePreviousLabel="" pageLabel="" ajaxSelectUrl="" selectUrl="" ajaxSelectSizeUrl="" selectSizeUrl="" commonDisplaying=commonDisplaying paginateNextStyle="nav-next" ajaxNextUrl="" nextUrl="" paginateNextLabel="" paginateLastStyle="nav-last" ajaxLastUrl="" lastUrl="" paginateLastLabel="" paginateViewSizeLabel="" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/findparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/findparty.ftl?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/findparty.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/findparty.ftl Mon Feb 3 10:19:59 2014 @@ -213,7 +213,7 @@ under the License. <#assign viewIndexFirst = 0/> <#assign viewIndexPrevious = viewIndex - 1/> <#assign viewIndexNext = viewIndex + 1/> - <#assign viewIndexLast = Static["java.lang.Math"].floor(partyListSize/viewSize)/> + <#assign viewIndexLast = Static["org.ofbiz.base.util.UtilMisc"].getViewLastIndex(partyListSize, viewSize) /> <#assign messageMap = Static["org.ofbiz.base.util.UtilMisc"].toMap("lowCount", lowIndex, "highCount", highIndex, "total", partyListSize)/> <#assign commonDisplaying = Static["org.ofbiz.base.util.UtilProperties"].getMessage("CommonUiLabels", "CommonDisplaying", messageMap, locale)/> <@nextPrev commonUrl=commonUrl ajaxEnabled=false javaScriptEnabled=false paginateStyle="nav-pager" paginateFirstStyle="nav-first" viewIndex=viewIndex highIndex=highIndex listSize=partyListSize viewSize=viewSize ajaxFirstUrl="" firstUrl="" paginateFirstLabel="" paginatePreviousStyle="nav-previous" ajaxPreviousUrl="" previousUrl="" paginatePreviousLabel="" pageLabel="" ajaxSelectUrl="" selectUrl="" ajaxSelectSizeUrl="" selectSizeUrl="" commonDisplaying=commonDisplaying paginateNextStyle="nav-next" ajaxNextUrl="" nextUrl="" paginateNextLabel="" paginateLastStyle="nav-last" ajaxLastUrl="" lastUrl="" paginateLastLabel="" paginateViewSizeLabel="" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl Mon Feb 3 10:19:59 2014 @@ -36,7 +36,7 @@ under the License. <td>${pContent.fromDate?if_exists}</td> <td class="button-col"> <#if (content.contentName?has_content)> - <a href="<@ofbizUrl>img/${content.contentName}?imgId=${content.dataResourceId}</@ofbizUrl>">${uiLabelMap.CommonView}</a> + <a href="<@ofbizUrl>img/${content.contentName}?imgId=${(content.dataResourceId)?if_exists}</@ofbizUrl>">${uiLabelMap.CommonView}</a> </#if> <form name="removePartyContent_${pContent_index}" method="post" action="<@ofbizUrl>removePartyContent/viewprofile</@ofbizUrl>"> <input type="hidden" name="contentId" value="${pContent.contentId}" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/config/ProductUiLabels.xml Mon Feb 3 10:19:59 2014 @@ -24052,7 +24052,7 @@ <value xml:lang="de">Produktseite</value> <value xml:lang="en">Product Page</value> <value xml:lang="es">Página de producto</value> - <value xml:lang="fr">Page d'articles</value> + <value xml:lang="fr">Vue de l'article (ecom)</value> <value xml:lang="it">Pagina Prodotto</value> <value xml:lang="ja">製åãã¼ã¸</value> <value xml:lang="ro">Pagina Produs </value> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Mon Feb 3 10:19:59 2014 @@ -160,6 +160,7 @@ under the License. <br/> <span class="label">${uiLabelMap.CommonFromDate}</span> <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <span class="tooltip">${uiLabelMap.CommonRequired}</span> <br /> <span class="label">${uiLabelMap.CommonComments}</span> <textarea name="comments" rows="2" cols="40"></textarea> <input type="submit" value="${uiLabelMap.CommonAdd}" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditContactMech.ftl?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditContactMech.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/facility/facility/EditContactMech.ftl Mon Feb 3 10:19:59 2014 @@ -19,7 +19,7 @@ under the License. <#if !mechMap.facilityContactMech?exists && mechMap.contactMech?exists> <p><h3>${uiLabelMap.PartyContactInfoNotBelongToYou}.</h3></p> - <a href="<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMapCommon.Back}</a> + <a href="<@ofbizUrl>authview/${donePage}?facilityId=${facilityId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonGoBack}</a> <#else> <#if !mechMap.contactMech?exists> <#-- When creating a new contact mech, first select the type, then actually create --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml Mon Feb 3 10:19:59 2014 @@ -1155,16 +1155,22 @@ under the License. <ivy:cleancache/> </target> - <target name="download-activemq" description="Download activemq for DCC (Distributed Cache Clearing)"> + <target name="download-activemq" description="Download activemq for DCC (Distributed Cache Clearing"> <ivy:retrieve pattern="framework/base/lib/[artifact]-[revision].[ext]" conf="activemq"/> + <echo> </echo> + <echo>======================================================</echo> + <echo>Please check that this version is appropriate for you!</echo> </target> <target name="download-cobertura" description="Download cobertura related files"> <ivy:retrieve pattern="framework/base/lib/[artifact]-[revision].[ext]" conf="cobertura"/> </target> - <target name="download-PG-JDBC" description="Download postgres jdbc driver"> + <target name="download-PG-JDBC" description="Download postgres jdbc driver"> <ivy:retrieve pattern="framework/entity/lib/jdbc/[artifact]-[revision].[ext]" conf="postgres"/> + <echo> </echo> + <echo>======================================================</echo> + <echo>Please check that this version is appropriate for you!</echo> </target> <target name="download-sonar-ant-task" description="Download sonar related files"> @@ -1173,6 +1179,9 @@ under the License. <target name="download-mySQL-JDBC" description="Download mySQL jdbc driver"> <ivy:retrieve pattern="framework/entity/lib/jdbc/[artifact]-[revision].[ext]" conf="mysql"/> + <echo> </echo> + <echo>======================================================</echo> + <echo>Please check that this version is appropriate for you!</echo> </target> <!-- ================================================================== --> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ComponentContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ComponentContainer.java?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ComponentContainer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/ComponentContainer.java Mon Feb 3 10:19:59 2014 @@ -102,10 +102,6 @@ public class ComponentContainer implemen return true; } - public synchronized void loadComponents(String loaderConfig, boolean updateClasspath) throws AlreadyLoadedException, ComponentException { - loadComponents(loaderConfig, updateClasspath, null, null); - } - public synchronized void loadComponents(String loaderConfig, boolean updateClasspath, String instrumenterClassName, String instrumenterFile) throws AlreadyLoadedException, ComponentException { // set the loaded list; and fail if already loaded //if (loadedComponents == null) { @@ -303,16 +299,4 @@ public class ComponentContainer implemen return name; } - /** - * Static method for easy loading of components for use when the container system is not. - * - * @param updateClasspath Tells the component loader to update the classpath, and thread classloader - * @throws AlreadyLoadedException - * @throws ComponentException - */ - public static synchronized void loadComponents(boolean updateClasspath) throws AlreadyLoadedException, ComponentException { - ComponentContainer cc = new ComponentContainer(); - cc.loadComponents(null, updateClasspath); - cc = null; - } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/container/JustLoadComponentsContainer.java Mon Feb 3 10:19:59 2014 @@ -35,7 +35,8 @@ public class JustLoadComponentsContainer public void init(String[] args, String name, String configFile) { this.name = name; try { - ComponentContainer.loadComponents(true); + ComponentContainer cc = new ComponentContainer(); + cc.loadComponents(null, true, null, null); } catch (AlreadyLoadedException e) { Debug.logError(e, module); } catch (ComponentException e) { Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilMisc.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/src/org/ofbiz/base/util/UtilMisc.java Mon Feb 3 10:19:59 2014 @@ -788,4 +788,9 @@ public class UtilMisc { out.close(); } } + + public static int getViewLastIndex(int listSize, int viewSize) { + return (int)Math.ceil(listSize / viewSize) - 1; + } + } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/htmlTemplate.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/htmlTemplate.ftl?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/htmlTemplate.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/htmlTemplate.ftl Mon Feb 3 10:19:59 2014 @@ -29,23 +29,14 @@ under the License. <#if (!id?has_content)> <#local id = Static["org.ofbiz.base.util.UtilHttp"].getNextUniqueId(request) /> </#if> - <#if (!ajaxUrl?has_content)> - <#local ajaxUrl = requestAttributes._REQUEST_HANDLER_.makeLink(request, response, fieldFormName)/> - <#local ajaxUrl = id + "," + ajaxUrl + ",ajaxLookup=Y" /> + <#if "true" == readonly> + <#local readonly = true/> + <#else> + <#local readonly = false /> </#if> - <#if (!showDescription?has_content)> - <#local showDescription = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("widget.properties", "widget.lookup.showDescription", "N")> - <#if "Y" == showDescription> - <#local showDescription = "true" /> - <#else> - <#local showDescription = "false" /> - </#if> + <#if userPreferences.VISUAL_THEME == "BIZZNESS_TIME"> + <#local position = "center" /> </#if> - <#if "true" == readonly> - <#local readonly = true/> - <#else> - <#local readonly = false /> - </#if> <@renderLookupField name formName fieldFormName className alert value size maxlength id event action readonly autocomplete descriptionFieldName targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height position fadeBackground clearText showDescription initiallyCollapsed/> </#macro> @@ -75,4 +66,4 @@ under the License. </#if> </#if> <@renderNextPrev paginateStyle paginateFirstStyle viewIndex highIndex listSize viewSize ajaxEnabled javaScriptEnabled ajaxFirstUrl firstUrl uiLabelMap.CommonFirst paginatePreviousStyle ajaxPreviousUrl previousUrl uiLabelMap.CommonPrevious uiLabelMap.CommonPage ajaxSelectUrl selectUrl ajaxSelectSizeUrl selectSizeUrl commonDisplaying paginateNextStyle ajaxNextUrl nextUrl uiLabelMap.CommonNext paginateLastStyle ajaxLastUrl lastUrl uiLabelMap.CommonLast uiLabelMap.CommonItemsPerPage/> -</#macro> \ No newline at end of file +</#macro> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/lookup.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/lookup.ftl?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/lookup.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/webcommon/includes/lookup.ftl Mon Feb 3 10:19:59 2014 @@ -34,7 +34,7 @@ under the License. if (typeof(jQuery) == 'undefined') { if (!jQueryLibLoaded) { jQueryLibLoaded = true; - document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-1.10.2.min.js</@ofbizContentUrl>\"></scr" + "ipt>"); + document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-1.11.0.min.js</@ofbizContentUrl>\"></scr" + "ipt>"); document.write("<scr" + "ipt type=\"text/javascript\" src=\"<@ofbizContentUrl>/images/jquery/jquery-migrate-1.2.1.js</@ofbizContentUrl>\"></scr" + "ipt>"); } setTimeout("initJQuery()", 50); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/common/widget/CommonScreens.xml Mon Feb 3 10:19:59 2014 @@ -150,7 +150,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true" /> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true" /> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true" /> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.11.0.min.js" global="true" /> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true" /> @@ -481,7 +481,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/fjTimer/jquerytimer-min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.11.0.min.js" global="true"/> <!-- jQuery CSSs --> <set field="layoutSettings.styleSheets[+0]" value="/images/jquery/plugins/asmselect/jquery.asmselect-1.0.4a-beta.css" global="true"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods.xsd URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods.xsd?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods.xsd (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/dtd/simple-methods.xsd Mon Feb 3 10:19:59 2014 @@ -199,7 +199,7 @@ under the License. <xs:annotation> <xs:documentation> Is a logged in user (UserLogin object, or login.username and login.password Strings) required to run this method? - "true" or "false" (defauts to "true") + "true" or "false" (defaults to "true") </xs:documentation> </xs:annotation> <xs:simpleType> @@ -213,7 +213,7 @@ under the License. <xs:annotation> <xs:documentation> Create a transaction if none exists for this thread? - "true" or "false" (defauts to "true") + "true" or "false" (defaults to "true") </xs:documentation> </xs:annotation> <xs:simpleType> @@ -226,14 +226,14 @@ under the License. <xs:attribute type="xs:string" name="default-error-code" default="error"> <xs:annotation> <xs:documentation> - The default error return code. (defauts to "error") + The default error return code. (defaults to "error") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="default-success-code" default="success"> <xs:annotation> <xs:documentation> - The default success return code. (defauts to "success") + The default success return code. (defaults to "success") </xs:documentation> </xs:annotation> </xs:attribute> @@ -242,119 +242,119 @@ under the License. <xs:documentation> As event: copy of request parameters. As service: incoming context. - (defauts to "parameters") + (defaults to "parameters") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="event-request-object-name" default="request"> <xs:annotation> <xs:documentation> - As event only (defauts to "request") + As event only (defaults to "request") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="event-response-object-name" default="response"> <xs:annotation> <xs:documentation> - As event only (defauts to "response") + As event only (defaults to "response") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="event-response-code-name" default="_response_code_"> <xs:annotation> <xs:documentation> - As event only (defauts to "_response_code") + As event only (defaults to "_response_code") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="event-error-message-name" default="_error_message_"> <xs:annotation> <xs:documentation> - As event only (defauts to "_error_message_") + As event only (defaults to "_error_message_") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="event-event-message-name" default="_event_message_"> <xs:annotation> <xs:documentation> - As event only (defauts to "_event_message_") + As event only (defaults to "_event_message_") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-response-message-name" default="responseMessage"> <xs:annotation> <xs:documentation> - As service only (defauts to "responseMessage") + As service only (defaults to "responseMessage") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-error-message-name" default="errorMessage"> <xs:annotation> <xs:documentation> - As service only (defauts to "errorMessage") + As service only (defaults to "errorMessage") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-error-message-list-name" default="errorMessageList"> <xs:annotation> <xs:documentation> - As service only (defauts to "errorMessageList") + As service only (defaults to "errorMessageList") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-error-message-map-name" default="errorMessageMap"> <xs:annotation> <xs:documentation> - As service only (defauts to "errorMessageMap") + As service only (defaults to "errorMessageMap") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-success-message-name" default="successMessage"> <xs:annotation> <xs:documentation> - As service only (defauts to "successMessage") + As service only (defaults to "successMessage") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="service-success-message-list-name" default="successMessageList"> <xs:annotation> <xs:documentation> - As service only (defauts to "successMessageList") + As service only (defaults to "successMessageList") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="locale-name" default="locale"> <xs:annotation> <xs:documentation> - Name of locale variable (defauts to "locale") + Name of locale variable (defaults to "locale") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="delegator-name" default="delegator"> <xs:annotation> <xs:documentation> - A GenericDelegator object to use in the method (defauts to "delegator") + A GenericDelegator object to use in the method (defaults to "delegator") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="security-name" default="security"> <xs:annotation> <xs:documentation> - A Security object to use in the method (defauts to "security") + A Security object to use in the method (defaults to "security") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="dispatcher-name" default="dispatcher"> <xs:annotation> <xs:documentation> - A LocalDispatcher object to use in the method (defauts to "dispatcher") + A LocalDispatcher object to use in the method (defaults to "dispatcher") </xs:documentation> </xs:annotation> </xs:attribute> <xs:attribute type="xs:string" name="user-login-name" default="userLogin"> <xs:annotation> <xs:documentation> - Name of user login variable (defauts to "userLogin") + Name of user login variable (defaults to "userLogin") </xs:documentation> </xs:annotation> </xs:attribute> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/ModelService.java Mon Feb 3 10:19:59 2014 @@ -919,6 +919,7 @@ public class ModelService extends Abstra for (Map.Entry<String, ? extends Object> entry: source.entrySet()) { String key = entry.getKey(); if (key.startsWith(param.stringMapPrefix)) { + key=key.replace(param.stringMapPrefix,""); paramMap.put(key, entry.getValue()); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/webtools/webapp/webtools/WEB-INF/actions/entity/FindGeneric.groovy Mon Feb 3 10:19:59 2014 @@ -16,6 +16,8 @@ * specific language governing permissions and limitations * under the License. */ + +import org.ofbiz.base.util.UtilMisc import org.ofbiz.entity.Delegator; import org.ofbiz.entity.GenericValue; import org.ofbiz.entity.GenericEntityException; @@ -209,7 +211,7 @@ context.highIndex = highIndex; context.arraySize = arraySize; context.resultPartialList = resultPartialList; -viewIndexLast = (int) (arraySize/viewSize); +viewIndexLast = UtilMisc.getViewLastIndex(arraySize, viewSize); context.viewIndexLast = viewIndexLast; List fieldList = FastList.newInstance(); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Mon Feb 3 10:19:59 2014 @@ -2303,10 +2303,11 @@ public class MacroFormRenderer implement } // Last button if (highIndex < listSize) { + int lastIndex = UtilMisc.getViewLastIndex(listSize, viewSize); if (ajaxEnabled) { - ajaxLastUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + (listSize / viewSize) + anchor, context); + ajaxLastUrl = createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + lastIndex + anchor, context); } else { - linkText = prepLinkText + (listSize / viewSize) + anchor; + linkText = prepLinkText + lastIndex + anchor; lastUrl = rh.makeLink(this.request, this.response, urlPath + linkText); } } Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlFormRenderer.java Mon Feb 3 10:19:59 2014 @@ -2524,11 +2524,12 @@ public class HtmlFormRenderer extends Ht // Last button writer.append(" <li class=\"").append(modelForm.getPaginateLastStyle()); if (highIndex < listSize) { + int lastIndex = UtilMisc.getViewLastIndex(listSize, viewSize); writer.append("\"><a href=\""); if (ajaxEnabled) { - writer.append("javascript:ajaxUpdateAreas('").append(createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + (listSize / viewSize) + anchor, context)).append("')"); + writer.append("javascript:ajaxUpdateAreas('").append(createAjaxParamsFromUpdateAreas(updateAreas, prepLinkText + lastIndex + anchor, context)).append("')"); } else { - linkText = prepLinkText + (listSize / viewSize) + anchor; + linkText = prepLinkText + lastIndex + anchor; appendOfbizUrl(writer, urlPath + linkText); } writer.append("\">").append(modelForm.getPaginateLastLabel(context)).append("</a>"); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java Mon Feb 3 10:19:59 2014 @@ -340,8 +340,8 @@ public class HtmlScreenRenderer extends writer.append("<li class=\"").append(modelForm.getPaginateLastStyle()); if (highIndex < listSize) { writer.append("\"><a href=\""); - int page = (listSize / viewSize) - 1; - linkText = prepLinkText + page + anchor; + int lastIndex = UtilMisc.getViewLastIndex(listSize, viewSize); + linkText = prepLinkText + lastIndex + anchor; // - make the link writer.append(rh.makeLink(request, response, linkText)); writer.append("\">").append(modelForm.getPaginateLastLabel(context)).append("</a>"); Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java Mon Feb 3 10:19:59 2014 @@ -760,8 +760,8 @@ public class MacroScreenRenderer impleme // Last button String lastLinkUrl = ""; if (highIndex < listSize) { - int page = (listSize / viewSize); - linkText = prepLinkText + page + anchor; + int lastIndex = UtilMisc.getViewLastIndex(listSize, viewSize); + linkText = prepLinkText + lastIndex + anchor; lastLinkUrl = rh.makeLink(request, response, linkText); } String nextLinkUrl = ""; Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/HtmlHead.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/HtmlHead.ftl?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/HtmlHead.ftl (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/cmssite/template/cms/HtmlHead.ftl Mon Feb 3 10:19:59 2014 @@ -32,7 +32,7 @@ under the License. <script language="javascript" src="/images/selectall.js" type="text/javascript"></script> <link rel="stylesheet" href="/images/ecommain.css" type="text/css"/> <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/> - <link rel="stylesheet" href="/contentimages/contentForum.css" type="text/css"/> + <link rel="stylesheet" href="/content/images/contentForum.css" type="text/css"/> <meta name="description" content="${(decoratedContent.subcontent.metaDescription.render)!}"/> <meta name="keywords" content="${(decoratedContent.subcontent.metaKeywords.render)!}"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/EcommerceTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/EcommerceTypeData.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/EcommerceTypeData.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/data/EcommerceTypeData.xml Mon Feb 3 10:19:59 2014 @@ -23,7 +23,7 @@ under the License. <VisualTheme visualThemeId="EC_DEFAULT" visualThemeSetId="ECOMMERCE" description="OFBiz Ecommerce Standard Floating Layout"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/ecommerce/images/blog.css" sequenceId="01"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/images/ecommain.css" sequenceId="02"/> - <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/contentimages/contentForum.css" sequenceId="03"/> + <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/content/images/contentForum.css" sequenceId="03"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="04"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/images/ofbiz_logo.gif" sequenceId="05"/> <VisualThemeResource visualThemeId="EC_DEFAULT" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://ecommerce/webapp/ecommerce/includes/header.ftl" sequenceId="06"/> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CommonScreens.xml Mon Feb 3 10:19:59 2014 @@ -47,7 +47,7 @@ under the License. <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.10.3.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.11.0.min.js" global="true"/> <script location="component://ecommerce/widget/EcommerceSetup.groovy"/> @@ -262,7 +262,7 @@ under the License. <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/> - <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true"/> + <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.11.0.min.js" global="true"/> <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true" /> Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/webapp/flatgrey/js/application.js URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/webapp/flatgrey/js/application.js?rev=1563823&r1=1563822&r2=1563823&view=diff ============================================================================== --- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/webapp/flatgrey/js/application.js (original) +++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/webapp/flatgrey/js/application.js Mon Feb 3 10:19:59 2014 @@ -104,10 +104,6 @@ var j = 1; /********************* JQuery Formalize *********************/ -jQuery(document).ready(function() { - FORMALIZE.go(); -}); - var FORMALIZE = (function($, window, document, undefined) { var PLACEHOLDER_SUPPORTED = 'placeholder' in document.createElement('input'); var AUTOFOCUS_SUPPORTED = 'autofocus' in document.createElement('input'); @@ -198,3 +194,8 @@ var FORMALIZE = (function($, window, doc } }; })(jQuery, this, this.document); + +jQuery(document).ready(function() { + FORMALIZE.go(); +}); + |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |