svn commit: r562934 - in /ofbiz/trunk: applications/ecommerce/webapp/
Locked
svn commit: r562934 - in /ofbiz/trunk: applications/ecommerce/webapp/
 
|
Author: jleroux
Date: Sun Aug 5 12:18:22 2007 New Revision: 562934 URL: http://svn.apache.org/viewvc?view=rev&rev=562934 Log: Closes "Convert all remaining tag head1, head2, head3 to h1, h2, h3 in eCommerce" (https://issues.apache.org/jira/browse/OFBIZ-1183) Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/tpl_mb_content.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl ofbiz/trunk/applications/ecommerce/webapp/ecommerce/requirePasswordChange.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl ofbiz/trunk/framework/images/webapp/images/ecommain.css Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/tpl_mb_content.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/tpl_mb_content.ftl?view=diff&rev=562934&r1=562933&r2=562934 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/tpl_mb_content.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/content/tpl_mb_content.ftl Sun Aug 5 12:18:22 2007 @@ -37,7 +37,7 @@ <#macro "ask:section"> <#list .node?children as kid> <#if kid?node_name == "sectionTitle"> - <h3 class="head2"> <#recurse kid> </h3> + <h3><#recurse kid></h3> <#else> ${kid.@@markup} </#if> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl?view=diff&rev=562934&r1=562933&r2=562934 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl Sun Aug 5 12:18:22 2007 @@ -80,7 +80,7 @@ </#if> <#if carrierShipmentMethod.partyId != "_NA_">${carrierShipmentMethod.partyId?if_exists} </#if>${carrierShipmentMethod.description?if_exists} <#if shippingEst?has_content> - <#if (shippingEst > -1)><@ofbizCurrency amount=shippingEst isoCode=shoppingCart.getCurrency()/><#else>${uiLabelMap.OrderCalculatedOffline}</#if></#if> - </div> + </div> </td> </tr> </#list> @@ -97,7 +97,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.OrderShipAllAtOnce}?</b></h2> + <h2>${uiLabelMap.OrderShipAllAtOnce}?</h2> </td> </tr> <tr> @@ -119,7 +119,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.OrderSpecialInstructions}</b></h2> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2> </td> </tr> <tr> @@ -130,7 +130,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <span class="head2"><b>${uiLabelMap.OrderPoNumber}</b></span> + <h2>${uiLabelMap.OrderPoNumber}</h2> <#if shoppingCart.getPoNumber()?exists && shoppingCart.getPoNumber() != "(none)"> <#assign currentPoNumber = shoppingCart.getPoNumber()> </#if> @@ -142,7 +142,7 @@ <tr> <td colspan="2"> <div> - <span class="head2"><b>${uiLabelMap.OrderIsThisGift}?</b></span> + <h2>${uiLabelMap.OrderIsThisGift}?</h2> <input type="radio" <#if "Y" == shoppingCart.getIsGift()?default("N")>checked</#if> name="is_gift" value="true"/><span class="tabletext">${uiLabelMap.CommonYes}</span> <input type="radio" <#if "Y" != shoppingCart.getIsGift()?default("N")>checked</#if> name="is_gift" value="false"/><span class="tabletext">${uiLabelMap.CommonNo}</span> </div> @@ -151,7 +151,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.OrderGiftMessage}</b></h2> + <h2>${uiLabelMap.OrderGiftMessage}</h2> </td> </tr> <tr> @@ -165,7 +165,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.PartyEmailAddresses}</b></h2> + <h2>${uiLabelMap.PartyEmailAddresses}</h2> </td> </tr> <tr> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl?view=diff&rev=562934&r1=562933&r2=562934 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/optionsettings.ftl Sun Aug 5 12:18:22 2007 @@ -55,7 +55,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.OrderShipAllAtOnce}?</b></h2> + <h2>${uiLabelMap.OrderShipAllAtOnce}?</h2> </td> </tr> <tr> @@ -77,7 +77,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.OrderSpecialInstructions}</b></h2> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2> </td> </tr> <tr> @@ -88,7 +88,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <span class="head2"><b>${uiLabelMap.OrderPoNumber}</b></span> + <h2>${uiLabelMap.OrderPoNumber}</h2> <input type="text" class="inputBox" name="correspondingPoId" size="15" value="${shoppingCart.getPoNumber()?if_exists}"/> </td> </tr> @@ -97,7 +97,7 @@ <tr> <td colspan="2"> <div> - <span class="head2"><b>${uiLabelMap.OrderIsThisGift}?</b></span> + <h2>${uiLabelMap.OrderIsThisGift}?</h2> <input type="radio" <#if shoppingCart.getIsGift()?default("Y") == "Y">checked="checked"</#if> name="is_gift" value="true"/><span class="tabletext">${uiLabelMap.CommonYes}</span> <input type="radio" <#if shoppingCart.getIsGift()?default("N") == "N">checked="checked"</#if> name="is_gift" value="false"/><span class="tabletext">${uiLabelMap.CommonNo}</span> </div> @@ -105,9 +105,8 @@ </tr> <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> - <td colspan="2"> - <h2><b>${uiLabelMap.OrderGiftMessage}</b></h2> - </td> + <td colspan="2"><h2>${uiLabelMap.OrderGiftMessage}</h2> + </td> </tr> <tr> <td colspan="2"> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl?view=diff&rev=562934&r1=562933&r2=562934 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/orderhistory.ftl Sun Aug 5 12:18:22 2007 @@ -45,10 +45,10 @@ <div class="tabletext"><b>${uiLabelMap.CommonStatus}</b></div> </td> <td width="10"> </td> - <td width="15%"><b></b></td> + <td width="15%"><b></b></td> </tr> <#list orderHeaderList as orderHeader> - <#assign status = orderHeader.getRelatedOneCache("StatusItem")> + <#assign status = orderHeader.getRelatedOneCache("StatusItem")> <tr><td colspan="9"><hr class="sepbar"/></td></tr> <tr> <td> @@ -101,11 +101,11 @@ <div class="tabletext"><b>${uiLabelMap.CommonStatus}</b></div> </td> <td width="10"> </td> - <td width="15%"><b></b></td> + <td width="15%"><b></b></td> </tr> <#if porderHeaderList?has_content> <#list porderHeaderList as porderHeader> - <#assign pstatus = porderHeader.getRelatedOneCache("StatusItem")> + <#assign pstatus = porderHeader.getRelatedOneCache("StatusItem")> <tr><td colspan="9"><hr class="sepbar"/></td></tr> <tr> <td> @@ -131,7 +131,7 @@ </#list> </#if> <#if !porderHeaderList?has_content> - <tr><td colspan="9"><div class="head3">${uiLabelMap.OrderNoOrderFound}</div></td></tr> + <tr><td colspan="9"><h3>${uiLabelMap.OrderNoOrderFound}</h3></td></tr> </#if> </table> </div> @@ -159,7 +159,7 @@ <div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div> </td> <td width="10"> </td> - <td width="10%"><b></b></td> + <td width="10%"><b></b></td> </tr> <#list downloadOrderRoleAndProductContentInfoList as downloadOrderRoleAndProductContentInfo> <tr><td colspan="9"><hr class="sepbar"/></td></tr> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl?view=diff&rev=562934&r1=562933&r2=562934 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl Sun Aug 5 12:18:22 2007 @@ -36,11 +36,11 @@ if (formToSubmit.shipping_method[i].checked){ shipMethodOption = formToSubmit.shipping_method[i].value; } - } + } if (shipMethodOption != "none") { dojo.io.bind({ url: formToSubmit.action, load: function(type, evaldObj){ document.getElementById("optInfoSection").innerHTML = evaldObj; - + var result = invocation.proceed(); return result; },formNode: document.quickAnonOptSetupForm}); @@ -72,13 +72,13 @@ <tr><td><div class="errorMessage" id="noShippingMethodSelectedError"></div></td></tr> <tr> <td> - <h2><b>${uiLabelMap.OrderMethod}</b></h2> + <h2>${uiLabelMap.OrderMethod}</h2> </td> </tr> <#list carrierShipmentMethodList as carrierShipmentMethod> <tr> <td> - <div class="tabletext"> + <div class="tabletext"> <#assign shippingMethod = carrierShipmentMethod.shipmentMethodTypeId + "@" + carrierShipmentMethod.partyId> <input type="radio" onclick="return onClickShippingMethod(event)" name="shipping_method" value="${shippingMethod}" <#if shippingMethod == chosenShippingMethod?default("N@A")>checked</#if>/> <#if shoppingCart.getShippingContactMechId()?exists> @@ -104,7 +104,7 @@ <table hight="100%" > <tr> <td colspan="2"> - <h2><b>${uiLabelMap.OrderSpecialInstructions}</b></h2> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2> </td> </tr> <tr> @@ -115,7 +115,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <span class="head2"><b>${uiLabelMap.OrderPoNumber}</b></span> + <h2>${uiLabelMap.OrderPoNumber}</h2> <input type="text" class='inputBox' name="correspondingPoId" size="15" value='${shoppingCart.getPoNumber()?if_exists}'/> </td> </tr> @@ -124,7 +124,7 @@ <tr> <td colspan="2"> <div> - <span class="head2"><b>${uiLabelMap.OrderIsThisGift}?</b></span> + <h2>${uiLabelMap.OrderIsThisGift}?</h2> <input type='radio' <#if shoppingCart.getIsGift()?default("Y") == "Y">checked</#if> name='is_gift' value='true'/><span class='tabletext'>${uiLabelMap.CommonYes}</span> <input type='radio' <#if shoppingCart.getIsGift()?default("N") == "N">checked</#if> name='is_gift' value='false'/><span class='tabletext'>${uiLabelMap.CommonNo}</span> </div> @@ -133,7 +133,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.OrderGiftMessage}</b></h2> + <h2>${uiLabelMap.OrderGiftMessage}</h2> </td> </tr> <tr> @@ -146,7 +146,7 @@ </td> </tr> <tr><td colspan="2"><hr class="sepbar"/></td></tr> - <tr><td colspan="2"><h2><b>${uiLabelMap.OrderShipAllAtOnce}?</b></h2></td></tr> + <tr><td colspan="2"><h2>${uiLabelMap.OrderShipAllAtOnce}?</h2></td></tr> <tr> <td valign="top" colspan="2"> <div> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl?view=diff&rev=562934&r1=562933&r2=562934 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl Sun Aug 5 12:18:22 2007 @@ -108,7 +108,7 @@ </#list> </select> - <h2><b>${uiLabelMap.OrderSpecialInstructions}</b></h2> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2> <textarea class='textAreaBox' cols="35" rows="3" wrap="hard" name="shippingInstructions">${cart.getShippingInstructions(groupIdx)?if_exists}</textarea> </td> <td> @@ -129,7 +129,7 @@ </select> </div> - <h2><b>${uiLabelMap.OrderGiftMessage}</b></h2> + <h2>${uiLabelMap.OrderGiftMessage}</h2> <textarea class='textAreaBox' cols="30" rows="3" wrap="hard" name="giftMessage">${cart.getGiftMessage(groupIdx)?if_exists}</textarea> </td> <td><input type="button" class="smallSubmit" value="${uiLabelMap.CommonSave}" onclick="javascript:submitForm(document.editgroupform${groupIdx}, 'SV', null);"/></td> Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/requirePasswordChange.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/requirePasswordChange.ftl?view=diff&rev=562934&r1=562933&r2=562934 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/requirePasswordChange.ftl (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/requirePasswordChange.ftl Sun Aug 5 12:18:22 2007 @@ -24,7 +24,7 @@ <#assign username = autoUserLogin.userLoginId/> </#if> -<div class="head1">${uiLabelMap.CommonLogin}</div> +<h1>${uiLabelMap.CommonLogin}</h1> <br/> <div style="float: center; width: 49%; margin-right: 5px; text-align: center;" class="screenlet"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl?view=diff&rev=562934&r1=562933&r2=562934 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkoutoptions.ftl Sun Aug 5 12:18:22 2007 @@ -184,7 +184,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.OrderShipAllAtOnce}?</b></h2> + <h2>${uiLabelMap.OrderShipAllAtOnce}?</h2> </td> </tr> <tr> @@ -211,7 +211,7 @@ </#if> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.OrderSpecialInstructions}</b></h2> + <h2>${uiLabelMap.OrderSpecialInstructions}</h2> </td> </tr> <tr> @@ -234,7 +234,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.OrderGiftMessage}</b></h2> + <h2>${uiLabelMap.OrderGiftMessage}</h2> </td> </tr> <tr> @@ -249,7 +249,7 @@ <tr><td colspan="2"><hr class="sepbar"/></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.PartyEmailAddresses}</b></h2> + <h2>${uiLabelMap.PartyEmailAddresses}</h2> </td> </tr> <tr> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl?view=diff&rev=562934&r1=562933&r2=562934 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl Sun Aug 5 12:18:22 2007 @@ -86,7 +86,7 @@ </#if> <tr> <td colspan='2'> - <h2><b>${uiLabelMap.FacilityShipOnceOrAvailable}</b></h2> + <h2>${uiLabelMap.FacilityShipOnceOrAvailable}</h2> </td> </tr> <tr> @@ -108,7 +108,7 @@ <tr><td colspan="2"><hr class='sepbar'></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.FacilitySpecialInstructions}</b></h2> + <h2>${uiLabelMap.FacilitySpecialInstructions}</h2> </td> </tr> <tr> @@ -133,7 +133,7 @@ <tr><td colspan="2"><hr class='sepbar'></td></tr> <tr> <td colspan="2"> - <h2><b>${uiLabelMap.OrderGiftMessage}</b></h2> + <h2>${uiLabelMap.OrderGiftMessage}</h2> </td> </tr> <tr> Modified: ofbiz/trunk/framework/images/webapp/images/ecommain.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/ecommain.css?view=diff&rev=562934&r1=562933&r2=562934 ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/ecommain.css (original) +++ ofbiz/trunk/framework/images/webapp/images/ecommain.css Sun Aug 5 12:18:22 2007 @@ -360,30 +360,6 @@ visibility: hidden; } -.head1 { -font-family: Verdana, Arial, Helvetica, sans-serif; -margin: 0px; -font-size: 12pt; -font-weight: bold; -color: #000099; -} - -.head2 { -font-family: Verdana, Arial, Helvetica, sans-serif; -margin: 0px; -font-size: 10pt; -font-weight: bold; -color: #000000; -} - -.head3 { -font-family: Verdana, Arial, Helvetica, sans-serif; -margin: 0px; -font-size: 8pt; -font-weight: bold; -color: #000000; -} - h1 { font-family: Verdana, Arial, Helvetica, sans-serif; margin: 0px; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |