svn commit: r986642 [2/2] - in /ofbiz/branches/jquery: ./ applications/commonext/data/ applications/party/config/ applications/party/data/helpda
Locked
svn commit: r986642 [2/2] - in /ofbiz/branches/jquery: ./ applications/commonext/data/ applications/party/config/ applications/party/data/helpda
 
|
Modified: ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml?rev=986642&r1=986641&r2=986642&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml Wed Aug 18 12:19:54 2010 @@ -336,4 +336,134 @@ under the License. </widgets> </section> </screen> + + <screen name="ExampleOsmGeoLocationPointSet1"> + <section> + <actions> + <set field="tabButtonItem" value="ExampleOsmGeoLocationPointSet1"/> + <set field="geoPoints[+0].lat" value="37.4419" type="Float"/> + <set field="geoPoints[0].lon" value="-122.1419" type="Float"/> + <set field="geoPoints[+1].lat" value="37.4819" type="Float"/> + <set field="geoPoints[1].lon" value="-122.1519" type="Float"/> + <set field="geoPoints[+2].lat" value="37.4719" type="Float"/> + <set field="geoPoints[2].lon" value="-122.1319" type="Float"/> + <set field="geoCenter.lat" value="37.4419" type="Float"/> + <set field="geoCenter.lon" value="-122.1419" type="Float"/> + <set field="geoCenter.zoom" value="13"/> + </actions> + <widgets> + <include-screen name="CommonExampleOsmGeoLocationDecorator" location="${parameters.mainDecoratorLocation}"/> + </widgets> + </section> + </screen> + <screen name="ExampleOsmGeoLocationPointSet2"> + <section> + <actions> + <set field="tabButtonItem" value="ExampleOsmGeoLocationPointSet2"/> + <set field="geoPoints[+0].lat" value="37.4459" type="Float"/> + <set field="geoPoints[0].lon" value="-122.1489" type="Float"/> + <set field="geoPoints[+1].lat" value="37.4829" type="Float"/> + <set field="geoPoints[1].lon" value="-122.1599" type="Float"/> + <set field="geoPoints[+2].lat" value="37.4769" type="Float"/> + <set field="geoPoints[2].lon" value="-122.1219" type="Float"/> + <set field="geoCenter.lat" value="37.4419" type="Float"/> + <set field="geoCenter.lon" value="-122.1419" type="Float"/> + <set field="geoCenter.zoom" value="12"/> + </actions> + <widgets> + <include-screen name="CommonExampleOsmGeoLocationDecorator" location="${parameters.mainDecoratorLocation}"/> + </widgets> + </section> + </screen> + <screen name="ExampleOsmGeoLocationPointSet3"> + <section> + <actions> + <set field="tabButtonItem" value="ExampleOsmGeoLocationPointSet3"/> + <set field="geoPoints[+0].lat" value="37.4379" type="Float"/> + <set field="geoPoints[0].lon" value="-122.1119" type="Float"/> + <set field="geoPoints[+1].lat" value="37.4819" type="Float"/> + <set field="geoPoints[1].lon" value="-122.1519" type="Float"/> + <set field="geoPoints[+2].lat" value="37.4229" type="Float"/> + <set field="geoPoints[2].lon" value="-122.1369" type="Float"/> + <set field="geoCenter.lat" value="37.4419" type="Float"/> + <set field="geoCenter.lon" value="-122.1419" type="Float"/> + <set field="geoCenter.zoom" value="11"/> + </actions> + <widgets> + <include-screen name="CommonExampleOsmGeoLocationDecorator" location="${parameters.mainDecoratorLocation}"/> + </widgets> + </section> + </screen> + <screen name="ExampleOsmGeoLocationPointSet4"> + <section> + <actions> + <set field="headerItem" value="ExampleGeoLocation"/> + <set field="tabButtonItem" value="ExampleOsmGeoLocationPointSet4"/> + <set field="geoChart.dataSourceId" value="GEOPT_GOOGLE"/> + <set field="geoChart.width" value="600px"/> + <set field="geoChart.height" value="500px"/> + <set field="geoChart.points" from-field="geoPoints"/> + <set field="geoChart.center" from-field="geoCenter"/> + </actions> + <widgets> + <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> + <decorator-section name="pre-body"> + <include-menu name="ExampleGeoLocation" location="component://example/widget/example/ExampleMenus.xml"/> + </decorator-section> + <decorator-section name="body"> + <section> + <widgets> + <section> + <actions> + <set field="geoPoints[+0].lat" value="37.4459" type="Float"/> + <set field="geoPoints[0].lon" value="-122.1489" type="Float"/> + <set field="geoPoints[+1].lat" value="37.4829" type="Float"/> + <set field="geoPoints[1].lon" value="-122.1599" type="Float"/> + <set field="geoPoints[+2].lat" value="37.4769" type="Float"/> + <set field="geoPoints[2].lon" value="-122.1219" type="Float"/> + <set field="geoCenter.lat" value="37.4419" type="Float"/> + <set field="geoCenter.lon" value="-122.1419" type="Float"/> + <set field="geoCenter.zoom" value="12"/> + <set field="geoChart.id" value="chart1"/> + <set field="geoChart.dataSourceId" value="GEOPT_OSM"/> + <set field="geoChart.width" value="600px"/> + <set field="geoChart.height" value="500px"/> + <set field="geoChart.points" from-field="geoPoints"/> + <set field="geoChart.center" from-field="geoCenter"/> + </actions> + <widgets> + <container style="clear" /> + <include-screen name="geoChart" location="component://common/widget/CommonScreens.xml"/> + </widgets> + </section> + <section> + <actions> + <set field="geoPoints" value=""/> + <set field="geoPoints[+0].lat" value="37.4379" type="Float"/> + <set field="geoPoints[0].lon" value="-122.1119" type="Float"/> + <set field="geoPoints[+1].lat" value="37.4819" type="Float"/> + <set field="geoPoints[1].lon" value="-122.1519" type="Float"/> + <set field="geoPoints[+2].lat" value="37.4229" type="Float"/> + <set field="geoPoints[2].lon" value="-122.1369" type="Float"/> + <set field="geoCenter.lat" value="37.4419" type="Float"/> + <set field="geoCenter.lon" value="-122.1419" type="Float"/> + <set field="geoCenter.zoom" value="11"/> + <set field="geoChart.id" value="chart2"/> + <set field="geoChart.dataSourceId" value="GEOPT_OSM"/> + <set field="geoChart.width" value="800px"/> + <set field="geoChart.height" value="500px"/> + <set field="geoChart.points" from-field="geoPoints"/> + <set field="geoChart.center" from-field="geoCenter"/> + </actions> + <widgets> + <include-screen name="geoChart" location="component://common/widget/CommonScreens.xml"/> + </widgets> + </section> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml?rev=986642&r1=986641&r2=986642&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleForms.xml Wed Aug 18 12:19:54 2010 @@ -215,19 +215,43 @@ under the License. <!-- *** field7 *** --> <!-- ***************** --> <field name="field7" - title="${uiLabelMap.ExampleDropDownField7Title}" - tooltip="${uiLabelMap.ExampleToDo}"> + title="${uiLabelMap.ExampleDropDownField7Title}" + tooltip="${uiLabelMap.ExampleToDo}"> <drop-down> <entity-options entity-name="ExampleType" - key-field-name="exampleTypeId" - description="${description}"> + key-field-name="exampleTypeId" + description="${description}"> <entity-constraint name="exampleTypeId" - value="INSPIRED" - operator="greater"/> + value="INSPIRED" + operator="greater"/> <entity-order-by field-name="description"/> </entity-options> </drop-down> </field> + <!-- ****************************** --> + <!-- *** Dependent dropdowns *** --> + <!-- ****************************** --> + <field name="emptyField" title="${uiLabelMap.CommonEmptyHeader}"><display/></field> + <field name="dependendDropDownFields" title="${uiLabelMap.ExampleDependentDropDowns}"> + <display description="${uiLabelMap.ExampleDependentDropDownTooltip}"/> + </field> + <field name="stateProvinceGeoId" title="${uiLabelMap.CommonState}" widget-style="required"><drop-down allow-empty="false"/></field> + <field name="countryGeoId" title="${uiLabelMap.CommonCountry}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> + <drop-down no-current-selected-key="USA"> + <entity-options entity-name="Geo" key-field-name="geoId" description="${geoName}"> + <entity-constraint name="geoTypeId" value="COUNTRY"/> + <entity-order-by field-name="geoName"/> + </entity-options> + </drop-down> + </field> + + <field name="separator" title="${uiLabelMap.CommonEmptyHeader}"><display/></field> + <field name="productCategoryId" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"> + <drop-down> + <entity-options entity-name="ProductCategory" key-field-name="productCategoryId" description="${categoryName } ${description}"/> + </drop-down> + </field> + <field name="productId" widget-style="required"><drop-down allow-empty="false"></drop-down></field> </form> <!-- Simple form to print a FOP PDF file with the fonts available in OFBiz Project --> Modified: ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml?rev=986642&r1=986641&r2=986642&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml (original) +++ ofbiz/branches/jquery/framework/example/widget/example/FormWidgetExampleScreens.xml Wed Aug 18 12:19:54 2010 @@ -51,11 +51,39 @@ under the License. <label>${uiLabelMap.ExampleDefinitionName} "DropDownFieldsExampleForm" ${uiLabelMap.ExampleDefinitionFile}</label> <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> </container> - <include-form name="DropDownFieldsExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/> + <section> + <actions> + <!-- fields for the form where dependent dropdowns are--> + <set field="dependentForm" value="DropDownFieldsExampleForm"/> + + <!-- fields for setCountryStatesEventJs --> + <set field="selectedStateProvinceGeoId" from-field="postalAddress.stateProvinceGeoId" default-value="_none_"/><!-- postalAddress.stateProvinceGeoId does not make much sense here, only to get the idea --> + + <!-- fields for setDependentDropdownValuesJs.ftl, it's a try on generalization but there are still issues. For instance: what if we have 2 couple of dependent dropdowns in the same form? --> + <set field="mainId" value="productCategoryId"/><!-- here mainId and its key are same --> + <set field="dependentId" value="productId"/> + <set field="requestName" value="getAssociatedProductsList"/> + <set field="responseName" value="products"/> + <set field="dependentKeyName" value="productId"/> + <set field="descName" value="internalName"/> + <set field="selectedDependentOption" from-field="parameters.productId" default-value="_none_"/> + </actions> + <widgets> + <platform-specific><html><html-template location="component://common/webcommon/includes/setCountryStatesEventJs.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://common/webcommon/includes/setDependentDropdownValuesJs.ftl"/></html></platform-specific> + <include-form name="DropDownFieldsExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/> + </widgets> + </section> </container> <container style="screenlet-body"> - <container style="button-bar"><label style="h2">${uiLabelMap.ExampleLookupFields}</label></container> - <include-form name="ExampleLookupFields" location="component://example/widget/example/FormWidgetExampleForms.xml"/> + <container style="button-bar"><label style="h2">${uiLabelMap.ExampleLookupFieldsTitle}</label></container> + <container style="screenlet-body"> + <label style="h3">${uiLabelMap.ExampleSourceCode}</label> + <label>${uiLabelMap.ExampleDefinitionName} "ExampleLookupFields" ${uiLabelMap.ExampleDefinitionFile}</label> + <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> + <label>${uiLabelMap.ExampleLookupFields}</label> + <include-form name="ExampleLookupFields" location="component://example/widget/example/FormWidgetExampleForms.xml"/> + </container> </container> <container style="screenlet-body"> <container style="button-bar"><label style="h2">${uiLabelMap.ExampleGroupFields}</label></container> @@ -63,6 +91,10 @@ under the License. <label style="h3">${uiLabelMap.ExampleSourceCode}</label> <label>${uiLabelMap.ExampleDefinitionName} "FieldGroupExampleForm" ${uiLabelMap.ExampleDefinitionFile}</label> <link target="http://svn.apache.org/repos/asf/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml" url-mode="plain" target-window="svnPage" text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/> + <container style="button-bar"> + <link target="javascript:expandAll(true);" text="${uiLabelMap.CommonExpandAll}" style="buttontext expand-all" url-mode="plain"/> + <link target="javascript:expandAll(false);" text="${uiLabelMap.CommonCollapseAll}" style="buttontext collapse-all" url-mode="plain"/> + </container> <include-form name="FieldGroupExampleForm" location="component://example/widget/example/FormWidgetExampleForms.xml"/> </container> </container> Modified: ofbiz/branches/jquery/framework/images/webapp/images/fieldlookup.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/images/webapp/images/fieldlookup.js?rev=986642&r1=986641&r2=986642&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/images/webapp/images/fieldlookup.js (original) +++ ofbiz/branches/jquery/framework/images/webapp/images/fieldlookup.js Wed Aug 18 12:19:54 2010 @@ -195,7 +195,7 @@ function ConstructLookup(requestUrl, inp var hiddenDiv = document.createElement("DIV"); hiddenDiv.id = lookupId; hiddenDiv.css = "{display: none;}"; - hiddenDiv.title = "___________________________________________________________________________________________"; + hiddenDiv.title = ""; parent.appendChild(hiddenDiv); Modified: ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=986642&r1=986641&r2=986642&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl Wed Aug 18 12:19:54 2010 @@ -491,7 +491,7 @@ ${item.description}</span> <li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxFirstUrl}')<#else>${firstUrl}</#if>">${paginateFirstLabel}</a><#else>-disabled"><span>${paginateFirstLabel}</span></#if></li> <li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>${previousUrl}</#if>">${paginatePreviousLabel}</a><#else>-disabled"><span>${paginatePreviousLabel}</span></#if></li> <#if listSize gt 0 && javaScriptEnabled><li>${pageLabel}<select name="page" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectUrl}')<#else>location.href='${selectUrl}'+this.value;</#if>"><#rt/> -<#assign x=listSize/viewSize?floor> +<#assign x=Static["java.lang.Math"].floor(listSize/viewSize)> <#if listSize gt (viewIndex*viewSize)><#assign x=x+1></#if> <#list 1..x as i> <#if i == (viewIndex+1)><option selected="selected" value="<#else><option value="</#if>${i-1}">${i}</option> Modified: ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoShipping.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoShipping.xml?rev=986642&r1=986641&r2=986642&view=diff ============================================================================== --- ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoShipping.xml (original) +++ ofbiz/branches/jquery/specialpurpose/ecommerce/data/DemoShipping.xml Wed Aug 18 12:19:54 2010 @@ -110,24 +110,24 @@ under the License. <QuantityBreak fromQuantity="0.0" quantityBreakId="9008" quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/> <QuantityBreak fromQuantity="0.0" quantityBreakId="9009" quantityBreakTypeId="SHIP_WEIGHT" thruQuantity="0.0"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="5.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9000" shipmentMethodTypeId="AIR" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9000" weightUnitPrice="0.2"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="3.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9001" shipmentMethodTypeId="GROUND" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9001" weightUnitPrice="0.1"/> <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="5.0" orderItemFlatPrice="0.0" carrierPartyId="Company" carrierRoleTypeId="CARRIER" orderPricePercent="0.0" shipmentCostEstimateId="9002" shipmentMethodTypeId="LOCAL_DELIVERY"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="10.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9003" shipmentMethodTypeId="NEXT_DAY" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9002" weightUnitPrice="0.35"/> - <ShipmentCostEstimate productStoreId="9000" shipmentCostEstimateId="9004" shipmentMethodTypeId="STANDARD" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" orderFlatPrice="0.0" orderPricePercent="20.0" orderItemFlatPrice="0.0"/> - <ShipmentCostEstimate productStoreId="9000" shipmentCostEstimateId="9005" shipmentMethodTypeId="NO_SHIPPING" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" orderFlatPrice="0.0" orderPricePercent="0.0" orderItemFlatPrice="0.0"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="10.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9100" shipmentMethodTypeId="EXPRESS" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9003" weightUnitPrice="0.2"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="9.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9101" shipmentMethodTypeId="NEXT_PM" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9004" weightUnitPrice="0.2"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="5.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9102" shipmentMethodTypeId="SECOND_DAY" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9005" weightUnitPrice="0.2"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="3.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9103" shipmentMethodTypeId="GROUND" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9006" weightUnitPrice="0.1"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9203" shipmentMethodTypeId="NEXT_AM" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9204" shipmentMethodTypeId="NEXT_DAY" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9205" shipmentMethodTypeId="NEXT_PM" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9206" shipmentMethodTypeId="SECOND_DAY" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9207" shipmentMethodTypeId="EXPRESS" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9208" shipmentMethodTypeId="GROUND" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> - <ShipmentCostEstimate productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9209" shipmentMethodTypeId="GROUND_HOME" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> - + <ShipmentCostEstimate productStoreShipMethId="9002" productStoreId="9000" orderFlatPrice="5.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9000" shipmentMethodTypeId="AIR" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9000" weightUnitPrice="0.2"/> + <ShipmentCostEstimate productStoreShipMethId="9001" productStoreId="9000" orderFlatPrice="3.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9001" shipmentMethodTypeId="GROUND" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9001" weightUnitPrice="0.1"/> + <ShipmentCostEstimate productStoreShipMethId="9003" productStoreId="9000" orderFlatPrice="10.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9003" shipmentMethodTypeId="NEXT_DAY" carrierPartyId="UPS" carrierRoleTypeId="CARRIER" weightBreakId="9002" weightUnitPrice="0.35"/> + <ShipmentCostEstimate productStoreShipMethId="9000" productStoreId="9000" shipmentCostEstimateId="9004" shipmentMethodTypeId="STANDARD" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" orderFlatPrice="0.0" orderPricePercent="20.0" orderItemFlatPrice="0.0"/> + <ShipmentCostEstimate productStoreShipMethId="9000" productStoreId="9000" shipmentCostEstimateId="9005" shipmentMethodTypeId="NO_SHIPPING" carrierPartyId="_NA_" carrierRoleTypeId="CARRIER" orderFlatPrice="0.0" orderPricePercent="0.0" orderItemFlatPrice="0.0"/> + <ShipmentCostEstimate productStoreShipMethId="9006" productStoreId="9000" orderFlatPrice="10.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9100" shipmentMethodTypeId="EXPRESS" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9003" weightUnitPrice="0.2"/> + <ShipmentCostEstimate productStoreShipMethId="9007" productStoreId="9000" orderFlatPrice="9.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9101" shipmentMethodTypeId="NEXT_PM" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9004" weightUnitPrice="0.2"/> + <ShipmentCostEstimate productStoreShipMethId="9008" productStoreId="9000" orderFlatPrice="5.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9102" shipmentMethodTypeId="SECOND_DAY" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9005" weightUnitPrice="0.2"/> + <ShipmentCostEstimate productStoreShipMethId="9009" productStoreId="9000" orderFlatPrice="3.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9103" shipmentMethodTypeId="GROUND" carrierPartyId="DHL" carrierRoleTypeId="CARRIER" weightBreakId="9006" weightUnitPrice="0.1"/> + <ShipmentCostEstimate productStoreShipMethId="9010" productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9203" shipmentMethodTypeId="NEXT_AM" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> + <ShipmentCostEstimate productStoreShipMethId="9011" productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9204" shipmentMethodTypeId="NEXT_DAY" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> + <ShipmentCostEstimate productStoreShipMethId="9012" productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9205" shipmentMethodTypeId="NEXT_PM" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> + <ShipmentCostEstimate productStoreShipMethId="9013" productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9206" shipmentMethodTypeId="SECOND_DAY" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> + <ShipmentCostEstimate productStoreShipMethId="9014" productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9207" shipmentMethodTypeId="EXPRESS" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> + <ShipmentCostEstimate productStoreShipMethId="9015" productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9208" shipmentMethodTypeId="GROUND" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> + <ShipmentCostEstimate productStoreShipMethId="9016" productStoreId="9000" orderFlatPrice="0.0" orderItemFlatPrice="0.0" orderPricePercent="0.0" shipmentCostEstimateId="9209" shipmentMethodTypeId="GROUND_HOME" carrierPartyId="FEDEX" carrierRoleTypeId="CARRIER"/> + <ShipmentBoxType shipmentBoxTypeId="FXENV" description="FedEx Envelope" dimensionUomId="LEN_in" boxLength="9.5" boxWidth="12.5" boxHeight="0"/> <ShipmentBoxType shipmentBoxTypeId="FXENV_LGL" description="FedEx Envelope (Legal)" dimensionUomId="LEN_in" boxLength="10" boxWidth="15.75" boxHeight="0"/> <ShipmentBoxType shipmentBoxTypeId="FXPAK_SM" description="FedEx Pak (Small)" dimensionUomId="LEN_in" boxLength="10.25" boxWidth="12.75" boxHeight="0"/> Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 18 12:19:54 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-985475 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:951708-986606 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 18 12:19:54 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-985475 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:951708-986606 Propchange: ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 18 12:19:54 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-985475 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:951708-986606 Modified: ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css?rev=986642&r1=986641&r2=986642&view=diff ============================================================================== --- ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css (original) +++ ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css Wed Aug 18 12:19:54 2010 @@ -995,10 +995,6 @@ padding: 0; color: #AAAAAA; } -ul#preferences-menu li.org { -clear: both; -} - ul#preferences-menu li.user a, ul#preferences-menu li.org a { color: #AAAAAA; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |