svn commit: r835375 - in /ofbiz/trunk: framework/images/webapp/images
Locked
 
|
Author: ashish
Date: Thu Nov 12 13:13:34 2009 New Revision: 835375 URL: http://svn.apache.org/viewvc?rev=835375&view=rev Log: Applied patch from jira issue - OFBIZ-2999 - Fix layout of profile pages. Layout of profile pages (new pages) is not displayed properly. Thanks Deepak for the contribution. Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css ofbiz/trunk/framework/images/webapp/images/forms.css ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?rev=835375&r1=835374&r2=835375&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original) +++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Thu Nov 12 13:13:34 2009 @@ -303,8 +303,8 @@ } #ecom-mainarea .center { -margin-left:201px; -margin-right:261px; +margin-left:150px; +margin-right:150px; voice-family:inherit; } Modified: ofbiz/trunk/framework/images/webapp/images/forms.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/forms.css?rev=835375&r1=835374&r2=835375&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/forms.css (original) +++ ofbiz/trunk/framework/images/webapp/images/forms.css Thu Nov 12 13:13:34 2009 @@ -20,11 +20,11 @@ /*********************************************** Forms ***********************************************/ -form {clear:both; margin:0; padding:0} +form {margin:0; padding:0} form p.desc {margin:.5em 0; padding:.75em 0;} -fieldset {clear: both; margin: 0 0 2em 0;} +fieldset {margin: 0 0 2em 0;} fieldset.col {clear:none; float:left; display:inline; margin:0 2em 2em 0} legend {padding: 0 0 1.286em; font-size: 1.167em; font-weight: 700;} @@ -38,7 +38,7 @@ form .inline li, form .inline label {display: inline;} form .inline li {padding: 0 .75em 0 0;} -form .form-row input, form .form-row select, form .form-row textarea, form table input, form table select { +form .form-row input, form .form-row select, form .form-row textarea, form table input, form table select,select { border-style:solid; border-width:1px; background-color:#fbfbfb; Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl?rev=835375&r1=835374&r2=835375&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditBillToAddress.ftl Thu Nov 12 13:13:34 2009 @@ -77,7 +77,7 @@ - <input type="text" name="extension" value="${extension?default("${billToExtension?if_exists}")}" size="3" maxlength="3" /> </div> </#if> - <div> + <div class="inline"> <label for="setShippingPurposeForBilling">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label> <input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForBilling" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> /> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl?rev=835375&r1=835374&r2=835375&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl Thu Nov 12 13:13:34 2009 @@ -67,11 +67,11 @@ </select> <span id="advice-required-stateProvinceGeoId_${contactMech.contactMechId}" style="display: none" class="errorMessage">(required)</span> </div> - <div> + <div class="inline"> <label for="setBillingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label> <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForPostalAddress" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if> /> </div> - <div> + <div class="inline"> <label for="setShippingPurposeForPostalAddress">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label> <input type="checkbox" name="setShippingPurpose" id="setShippingPurposeForPostalAddress" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> /> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl?rev=835375&r1=835374&r2=835375&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditShipToAddress.ftl Thu Nov 12 13:13:34 2009 @@ -77,7 +77,7 @@ - <input type="text" name="extension" value="${extension?default("${shipToExtension?if_exists}")}" size="3" maxlength="3" /> </div> </#if> - <div> + <div class="inline"> <label for="setBillingPurposeForShipping">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label> <input type="checkbox" name="setBillingPurpose" id="setBillingPurposeForShipping" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if> /> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl?rev=835375&r1=835374&r2=835375&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ManageAddress.ftl Thu Nov 12 13:13:34 2009 @@ -18,7 +18,7 @@ --> <#assign productStoreId = Static["org.ofbiz.product.store.ProductStoreWorker"].getProductStoreId(request) /> -<div class="screenlet"> +<div class="screenlet clearfix"> <form id="refreshRequestForm" method="post" action="<@ofbizUrl>manageAddress</@ofbizUrl>"> </form> @@ -77,11 +77,11 @@ </#if> </select> </div> - <div> + <div class="inline"> <label for="setBillingPurpose">${uiLabelMap.EcommerceMyDefaultBillingAddress}</label> <input type="checkbox" name="setBillingPurpose" id="setBillingPurpose" value="Y" <#if setBillingPurpose?exists>checked="checked"</#if> /> </div> - <div> + <div class="inline"> <label for="setShippingPurpose">${uiLabelMap.EcommerceMyDefaultShippingAddress}</label> <input type="checkbox" name="setShippingPurpose" id="setShippingPurpose" value="Y" <#if setShippingPurpose?exists>checked="checked"</#if> /> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl?rev=835375&r1=835374&r2=835375&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/NewCustomer.ftl Thu Nov 12 13:13:34 2009 @@ -112,7 +112,7 @@ - <input type="text" name="shipToContactNumber" id="shipToContactNumber" class="required" value="${contactNumber?default("${parameters.shipToContactNumber?if_exists}")}" size="6" maxlength="7" /> - <input type="text" name="shipToExtension" id="shipToExtension" value="${extension?default("${parameters.shipToExtension?if_exists}")}" size="3" maxlength="3" /> </div> - <div> + <div class="inline"> <input type="checkbox" class="checkbox" name="useShippingAddressForBilling" id="useShippingAddressForBilling" value="Y" <#if parameters.useShippingAddressForBilling?has_content && parameters.useShippingAddressForBilling?default("")=="Y">checked="checked"</#if> /> <label for="useShippingAddressForBilling">${uiLabelMap.FacilityBillingAddressSameShipping}</label> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl?rev=835375&r1=835374&r2=835375&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/ViewProfile.ftl Thu Nov 12 13:13:34 2009 @@ -19,7 +19,7 @@ <div class="screenlet"> <h3>${uiLabelMap.EcommerceMyAccount}</h3> - <div class="screenlet-body"> + <div class="screenlet-body clearfix"> <div> <a class="button" href="<@ofbizUrl>editProfile</@ofbizUrl>">${uiLabelMap.EcommerceEditProfile}</a> <h3>${uiLabelMap.PartyContactInformation}</h3> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |