svn commit: r1340386 [1/3] - in /ofbiz/trunk: applications/content/data/ applications/content/template/
Locked
svn commit: r1340386 [1/3] - in /ofbiz/trunk: applications/content/data/ applications/content/template/
 
|
Author: jleroux
Date: Sat May 19 09:35:12 2012 New Revision: 1340386 URL: http://svn.apache.org/viewvc?rev=1340386&view=rev Log: Adrian suggested to removes all class="tabletext": <<That style was removed from the stylesheet in 2007. All references to it should be removed.>> Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml ofbiz/trunk/applications/content/data/TemplateData.xml ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl ofbiz/trunk/applications/content/testdef/data/LuceneTestsData.xml ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.jsp ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl ofbiz/trunk/specialpurpose/ecommerce/data/DemoWebSitePublishPointData.xml ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/survey/miniresult.ftl ofbiz/trunk/specialpurpose/ecommerce/templates/survey/minisurvey.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showblog.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/forum/showforumresponse.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/footer.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/billsettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/checkoutshippingoptions.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/eftinfo.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/genericaddress.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/paymentoptions.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/quote/QuoteList.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/request/RequestList.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl ofbiz/trunk/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl ofbiz/trunk/themes/multiflex/includes/footer.ftl Modified: ofbiz/trunk/applications/content/data/ContentTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/ContentTypeData.xml?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/applications/content/data/ContentTypeData.xml (original) +++ ofbiz/trunk/applications/content/data/ContentTypeData.xml Sat May 19 09:35:12 2012 @@ -229,7 +229,7 @@ under the License. <#assign mimeTypeId=wrapMimeTypeId?if_exists/> <#assign subContentId=wrapSubContentId?if_exists/> <div id="divTwo" class="wrapOuter"> - <div class="tabletext"> + <div> ${mapKey?if_exists} <a class="buttontext" href="javascript:lookupSubContent('<@ofbizUrl>/LookupSubContent</@ofbizUrl>', '${contentIdTo?if_exists}','${mapKey?if_exists}', '${subDataResourceTypeId?if_exists}', '${mimeTypeId?if_exists}')">[Find]</a> <#assign ofbizRequest=""/> Modified: ofbiz/trunk/applications/content/data/TemplateData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/data/TemplateData.xml?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/applications/content/data/TemplateData.xml (original) +++ ofbiz/trunk/applications/content/data/TemplateData.xml Sat May 19 09:35:12 2012 @@ -88,9 +88,9 @@ under the License. <#if requestAttributes.userLogin?has_content> <tr> <td> - <div class="tabletext"><a href="<@ofbizUrl>/logout</@ofbizUrl>" class="tableText">Logout</a></div> + <div><a href="<@ofbizUrl>/logout</@ofbizUrl>">Logout</a></div> <br/> - <div class="tabletext"><a href="<@ofbizUrl>/viewprofile</@ofbizUrl>" class="tableText">Profile</a></div> + <div><a href="<@ofbizUrl>/viewprofile</@ofbizUrl>">Profile</a></div> </td> </tr> <#else> @@ -103,7 +103,7 @@ under the License. <form method="POST" action="<@ofbizUrl>/login${previousParams?if_exists}</@ofbizUrl>" name="loginform" style='margin: 0;'> <table width='100%' border='0' cellpadding='0' cellspacing='2'> <tr align="center"> - <td align='left'><span class="tabletext">Username: </span></td> + <td align='left'><span>Username: </span></td> </tr> <tr> <td align=left> @@ -111,7 +111,7 @@ under the License. </td> </tr> <tr align="center"> - <td align='left'><span class="tabletext">Password: </span></td> + <td align='left'><span>Password: </span></td> </tr> <tr> <td align='left'><input type="password" class='inputBox' name="PASSWORD" value="" size="20"></td> @@ -129,12 +129,12 @@ under the License. </#if> <tr> <td valign='middle' align='center'> - <div class="tabletext"><a class="tableText" href="<@ofbizUrl>/forgotpasswd</@ofbizUrl>">Forgot Password?</a></div> + <div><a href="<@ofbizUrl>/forgotpasswd</@ofbizUrl>">Forgot Password?</a></div> </td> </tr> <tr> <td valign='middle' align='center'> - <div class="tabletext"><a class="tableText" href="<@ofbizUrl>/newblogger</@ofbizUrl>">New User</a></div> + <div><a href="<@ofbizUrl>/newblogger</@ofbizUrl>">New User</a></div> </td> </tr> </table> @@ -161,7 +161,7 @@ under the License. <#assign mimeTypeId=wrapMimeTypeId?if_exists/> <#assign subContentId=wrapSubContentId?if_exists/> <div id="divTwo" class="wrapOuter"> - <div class="tabletext"> + <div> ${mapKey?if_exists} <a class="buttontext" href="javascript:lookupSubContent('<@ofbizUrl>/LookupSubContent</@ofbizUrl>', '${contentIdTo?if_exists}','${mapKey?if_exists}', '${subDataResourceTypeId?if_exists}', '${mimeTypeId?if_exists}')" >[Find]</a> @@ -302,7 +302,7 @@ ${wrappedContent?if_exists} <#assign mimeTypeId=wrapMimeTypeId?if_exists/> <#assign subContentId=wrapSubContentId?if_exists/> <div id="divTwo" class="wrapOuter"> - <div class="tabletext"> + <div> ${mapKey?if_exists} <a class="buttontext" href="javascript:lookupSubContent('<@ofbizUrl>/LookupSubContent</@ofbizUrl>', '${contentIdTo?if_exists}','${mapKey?if_exists}', '${subDataResourceTypeId?if_exists}', '${mimeTypeId?if_exists}')" >[Find]</a> @@ -377,7 +377,7 @@ ResourceId=${subDataResourceId?if_exists <tr><td> <table border="0" width="100%"> <tr><td> -<span class="tabletext"> +<span> <#if 0 < lowIndex?if_exists > <#assign prevArg=(viewIndex - 1)?string /> <a href="<@ofbizUrl>/main</@ofbizUrl>?viewIndex=${prevArg?if_exists}">Prev</a> Modified: ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl (original) +++ ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl Sat May 19 09:35:12 2012 @@ -18,17 +18,17 @@ under the License. --> <#macro renderSurveyQuestionText surveyQuestionAndAppl> - <div class="tabletext">${surveyQuestionAndAppl.question?if_exists}</div> + <div>${surveyQuestionAndAppl.question?if_exists}</div> <#if surveyQuestionAndAppl.hint?has_content> - <div class="tabletext">${surveyQuestionAndAppl.hint}</div> + <div>${surveyQuestionAndAppl.hint}</div> </#if> </#macro> <#macro renderSurveyQuestionRequired surveyQuestionAndAppl> <#if surveyQuestionAndAppl.requiredField?default("N") == "Y"> - <span class="tabletext">*[required]</span> + <span>*[required]</span> <#else/> - <span class="tabletext">[optional]</span> + <span>[optional]</span> </#if> </#macro> @@ -136,7 +136,7 @@ under the License. ${screens.render("component://common/widget/CommonScreens.xml#countries")} </select> <#else/> - <div class="tabletext">Unsupported question type : ${surveyQuestionAndAppl.surveyQuestionTypeId}</div> + <div>Unsupported question type : ${surveyQuestionAndAppl.surveyQuestionTypeId}</div> </#if> </#macro> @@ -163,7 +163,7 @@ under the License. <br /> <#if survey.comments?has_content> -<div class="tabletext">${survey.comments}</div> +<div>${survey.comments}</div> <br /> </#if> @@ -271,7 +271,7 @@ under the License. <#if surveyQuestionAndAppl?exists && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> <#-- seperator options --> <#if surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_TEXT"> - <td colspan="5"><div class="tabletext">${surveyQuestionAndAppl.question?if_exists}</div></td> + <td colspan="5"><div>${surveyQuestionAndAppl.question?if_exists}</div></td> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE"/> <td colspan="5"><hr /></td> <#else/> Modified: ofbiz/trunk/applications/content/testdef/data/LuceneTestsData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/testdef/data/LuceneTestsData.xml?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/applications/content/testdef/data/LuceneTestsData.xml (original) +++ ofbiz/trunk/applications/content/testdef/data/LuceneTestsData.xml Sat May 19 09:35:12 2012 @@ -22,7 +22,7 @@ under the License. <DataResource dataResourceId="CNTGIZMOSLRG" dataResourceTypeId="ELECTRONIC_TEXT" mimeTypeId="text/html" localeString="en_US" isPublic="Y" dataResourceName="Large Gizmos"/> <ElectronicText dataResourceId="CNTGIZMOSLRG"> <textData><![CDATA[ - <div class="tabletext"> + <div> <ol> <li>Large Gizmos are for those who loves them large!</li> <li>A lot of them and more to come</li> @@ -33,7 +33,7 @@ under the License. <DataResource dataResourceId="CNTGIZMOSSML" dataResourceTypeId="ELECTRONIC_TEXT" mimeTypeId="text/html" localeString="en_US" isPublic="Y" dataResourceName="Small Gizmos"/> <ElectronicText dataResourceId="CNTGIZMOSSML"> <textData><![CDATA[ - <div class="tabletext"> + <div> <ol> <li>Not only for children</li> <li>Just need to be able to hold it in your hand</li> @@ -44,7 +44,7 @@ under the License. <DataResource dataResourceId="GIZMOSLRG" dataResourceTypeId="ELECTRONIC_TEXT" mimeTypeId="text/html" localeString="en_US" isPublic="Y" dataResourceName="Advocacy"/> <ElectronicText dataResourceId="GIZMOSLRG"> <textData><![CDATA[ - <div class="tabletext"> + <div> <ol> <li>Gizmos are the best ones</li> <li>Don't use widgets, use gizmos !</li> Modified: ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/AdminSearch.ftl Sat May 19 09:35:12 2012 @@ -50,10 +50,10 @@ under the License. <table border="0" width="100%"> <tr> <td align="right" valign="middle"> - <div class="tabletext">${uiLabelMap.ProductFeatures}:</div> + <div>${uiLabelMap.ProductFeatures}:</div> </td> <td align="right" valign="middle"> - <div class="tabletext"> + <div> ${uiLabelMap.CommonAll} <input type="radio" name="any_or_all" value="all" checked="checked"/> ${uiLabelMap.CommonAny} <input type="radio" name="any_or_all" value="any"/> </div> @@ -62,10 +62,10 @@ under the License. <#-- <tr> <td align="right" valign="middle"> - <div class="tabletext">Feature IDs:</div> + <div>Feature IDs:</div> </td> <td valign="middle"> - <div class="tabletext"> + <div> <input type="text" class="inputBox" name="SEARCH_FEAT" size="15" value="${requestParameters.SEARCH_FEAT?if_exists}"/> <input type="text" class="inputBox" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT?if_exists}"/> <input type="text" class="inputBox" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT?if_exists}"/> @@ -79,10 +79,10 @@ under the License. <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]> <tr> <td align="right" valign="middle"> - <div class="tabletext">${(productFeatureType.description)?if_exists}:</div> + <div>${(productFeatureType.description)?if_exists}:</div> </td> <td valign="middle"> - <div class="tabletext"> + <div> <select name="pft_${productFeatureTypeId}"> <option value="">- ${uiLabelMap.CommonAny} -</option> <#list productFeatures as productFeature> @@ -96,14 +96,14 @@ under the License. <#if searchConstraintStrings?has_content> <tr> <td align="right" valign="top"> - <div class="tabletext">${uiLabelMap.CommonLast} ${uiLabelMap.CommonSearch}:</div> + <div>${uiLabelMap.CommonLast} ${uiLabelMap.CommonSearch}:</div> </td> <td valign="top"> <#list searchConstraintStrings as searchConstraintString> - <div class="tabletext"> - ${searchConstraintString}</div> + <div> - ${searchConstraintString}</div> </#list> - <div class="tabletext">${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div> - <div class="tabletext"> + <div>${uiLabelMap.CommonSortedBy}: ${searchSortOrderString}</div> + <div> ${uiLabelMap.CommonNew} ${uiLabelMap.CommonSearch} <input type="radio" name="clearSearch" value="Y" checked="checked"/> ${uiLabelMap.CommonRefineSearch} <input type="radio" name="clearSearch" value="N"/> </div> Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl Sat May 19 09:35:12 2012 @@ -324,7 +324,7 @@ ${menuWrapper.renderMenuString()} <#local plusMinus="-"/> ${plusMinus} ${content.contentName?if_exists} </td > - <td class="tabletext" > + <td > <input type="checkbox" name="publish_o_${rowCount}" value="Y" ${isPublished}/> </td > <input type="hidden" name="contentIdTo_o_${rowCount}" value="${subContentId}" /> Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl Sat May 19 09:35:12 2012 @@ -121,7 +121,7 @@ function call_fieldlookup4(rootForumId, <@loopSubContent contentId=forumId viewIndex=0 viewSize=9999 contentAssocTypeId="SUBSITE" returnAfterPickWhen="1==1";> <tr> - <td class="tabletext" > + <td > ${indent} <#local plusMinus="-"/> ${plusMinus} ${content.contentName?if_exists} @@ -156,28 +156,28 @@ function call_fieldlookup4(rootForumId, <#list mostRecentList as content> <@checkPermission entityOperation="_ADMIN" targetOperation="CONTENT_PUBLISH" subContentId=forumId > <tr> - <td class="tabletext"> <b>id:</b>${content.contentId} </td> - <td class="tabletext"> <b>name:</b>${content.contentName} </td> + <td> <b>id:</b>${content.contentId} </td> + <td> <b>name:</b>${content.contentName} </td> <@injectNodeTrailCsv subContentId=content.contentId redo="true" contentAssocTypeId="PUBLISH_LINK"> <td> <a class="tabButton" href="<@ofbizUrl>CMSContentEdit?contentId=${content.contentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" >View</a> </td> - <td class="tabletext"> + <td> <b>submitted:</b> <input type="radio" name="statusId_o_${row}" value="CTNT_FINAL_DRAFT" checked="checked"/> </td> - <td class="tabletext"> + <td> <b>publish:</b> <input type="radio" name="statusId_o_${row}" value="CTNT_PUBLISHED"/> </td> - <td class="tabletext"> + <td> <b>reject:</b> <input type="radio" name="statusId_o_${row}" value="CTNT_DEACTIVATED"/> </td> </tr> <input type="hidden" name="contentId_o_${row}" value="${content.contentId}"/> <tr> - <td colspan="6" class="tabletext"> + <td colspan="6"> <b>content:</b><br /> <@renderSubContentCache subContentId=content.contentId/> </td> Modified: ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl Sat May 19 09:35:12 2012 @@ -20,7 +20,7 @@ under the License. <#-- Render the survey --> <#if surveyString?has_content> <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>updateSurveyResponse</@ofbizUrl>" name="EditSurveyResponseForm" style="margin: 0;"> - <div class="tabletext">${uiLabelMap.PartyPartyId}: <@htmlTemplate.lookupField value="${userLogin.partyId}" formName="EditSurveyResponseForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> + <div>${uiLabelMap.PartyPartyId}: <@htmlTemplate.lookupField value="${userLogin.partyId}" formName="EditSurveyResponseForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> <#-- pass through the dataResourceId so the response can be associated with it --> <input type="hidden" name="dataResourceId" value="${parameters.dataResourceId?if_exists}"/> <input type="hidden" name="rootContentId" value="${parameters.rootContentId?if_exists}"/> 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?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/optionsettings.ftl Sat May 19 09:35:12 2012 @@ -184,8 +184,8 @@ under the License. <td colspan="2"> <div> <span class="h2"><b>${uiLabelMap.OrderIsThisGift}</b></span> - <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('Y') == 'Y'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="true" /><span class="tabletext">${uiLabelMap.CommonYes}</span> - <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('N') == 'N'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="false" /><span class="tabletext">${uiLabelMap.CommonNo}</span> + <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('Y') == 'Y'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="true" /><span>${uiLabelMap.CommonYes}</span> + <input type="radio" <#if cart.getIsGift(shipGroupIndex)?default('N') == 'N'>checked="checked"</#if> name="${shipGroupIndex?default('0')}_is_gift" value="false" /><span>${uiLabelMap.CommonNo}</span> </div> </td> </tr> Modified: ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/portal/listPortalPortlets.ftl Sat May 19 09:35:12 2012 @@ -39,10 +39,10 @@ under the License. <div class="h3"> <form method="post" action="<@ofbizUrl>createPortalPagePortlet</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a> </div> - <div class="tabletext"> + <div> ${portalPortlet.description?if_exists} </div> - <div class="tabletext"> + <div> ${parameters.portletCategoryId} </div> </td> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.jsp URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.jsp?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.jsp (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/xmldsdump.jsp Sat May 19 09:35:12 2012 @@ -186,12 +186,12 @@ under the License. session.setAttribute("entityDateCond", entityDateCond); %> <div class="head1">XML Export from DataSource(s)</div> - <div class="tabletext">This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</div> + <div>This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</div> <hr/> <%if(security.hasPermission("ENTITY_MAINT", session)) {%> <a href="<ofbiz:url>/xmldsrawdump</ofbiz:url>" class="buttontext" target="_blank">Click Here to Get Data (or save to file)</a> <%} else {%> - <div class="tabletext">You do not have permission to use this page (ENTITY_MAINT needed)</div> + <div>You do not have permission to use this page (ENTITY_MAINT needed)</div> <%}%> <%} else {%> <% @@ -335,47 +335,47 @@ under the License. %> <div class="head1">XML Export from DataSource(s)</div> - <div class="tabletext">This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</div> + <div>This page can be used to export data from the database. The exported documents will have a root tag of "<entity-engine-xml>".</div> <hr/> <%if(security.hasPermission("ENTITY_MAINT", session)) {%> <div class="head2">Results:</div> <%if(filename != null && filename.length() > 0 && numberOfEntities > 0) {%> - <div class="tabletext">Wrote XML for all data in <%=numberOfEntities%> entities.</div> - <div class="tabletext">Wrote <%=numberWritten%> records to XML file <%=filename%></div> + <div>Wrote XML for all data in <%=numberOfEntities%> entities.</div> + <div>Wrote <%=numberWritten%> records to XML file <%=filename%></div> <%} else if (outpath != null && numberOfEntities > 0) {%> <%Iterator re = results.iterator();%> <%while (re.hasNext()){%> - <div class="tabletext"><%=(String)re.next()%> </div> + <div><%=(String)re.next()%> </div> <%}%> <%} else {%> - <div class="tabletext">No filename specified or no entity names specified, doing nothing.</div> + <div>No filename specified or no entity names specified, doing nothing.</div> <%}%> <hr/> <div class="head2">Export:</div> <form method="post" action="<ofbiz:url>/xmldsdump</ofbiz:url>" name="entityExport"> - <div class="tabletext">Output Directory : <input type="text" class="inputBox" size="60" name="outpath" value="<%=UtilFormatOut.checkNull(outpath)%>"/></div> - <div class="tabletext">Max Records Per File : <input type="text" class="inputBox" size="10" name="maxrecords"/></div> - <div class="tabletext">Single Filename : <input type="text" class="inputBox" size="60" name="filename" value="<%=UtilFormatOut.checkNull(filename)%>"/></div> + <div>Output Directory : <input type="text" class="inputBox" size="60" name="outpath" value="<%=UtilFormatOut.checkNull(outpath)%>"/></div> + <div>Max Records Per File : <input type="text" class="inputBox" size="10" name="maxrecords"/></div> + <div>Single Filename : <input type="text" class="inputBox" size="60" name="filename" value="<%=UtilFormatOut.checkNull(filename)%>"/></div> - <div class="tabletext">Records Updated Since : + <div>Records Updated Since : <input type="text" class="inputBox" size="25" name="entityFrom" /> <a href="javascript:call_cal(document.entityExport.entityFrom, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> </div> - <div class="tabletext">Records Updated Before : + <div>Records Updated Before : <input type="text" class="inputBox" size="25" name="entityThru" /> <a href="javascript:call_cal(document.entityExport.entityThru, null);"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Click here For Calendar'></a> </div> - <div class="tabletext">OR Out to Browser: <input type="checkbox" name="tobrowser" <%=tobrowser?"checked":""%>></div> + <div>OR Out to Browser: <input type="checkbox" name="tobrowser" <%=tobrowser?"checked":""%>></div> <br/> - <div class="tabletext">Entity Names:</div> + <div>Entity Names:</div> <input type="submit" value="Export"/> <a href="<ofbiz:url>/xmldsdump?checkAll=true</ofbiz:url>" class="buttontext">Check All</a> <a href="<ofbiz:url>/xmldsdump</ofbiz:url>" class="buttontext">Un-Check All</a> - <div class="tabletext">Entity Sync Dump: + <div>Entity Sync Dump: <input name="entitySyncId" class="inputBox" size="30" value="<%=UtilFormatOut.checkNull(entitySyncId)%>"/> </div> Pre-configured set: @@ -403,7 +403,7 @@ under the License. <%ModelEntity curModelEntity = delegator.getModelEntity(curEntityName);%> <%if (curModelEntity instanceof ModelViewEntity) check = false;%> <%}%> - <td><div class="tabletext"><input type="checkbox" name="entityName" value="<%=curEntityName%>" <%=check?"checked":""%>/><%=curEntityName%></div></td> + <td><div><input type="checkbox" name="entityName" value="<%=curEntityName%>" <%=check?"checked":""%>/><%=curEntityName%></div></td> <%}%> </tr> </table> @@ -413,6 +413,6 @@ under the License. <A href="<ofbiz:url>/xmldsdump</ofbiz:url>" class="buttontext">Un-Check All</A> </form> <%} else {%> - <div class="tabletext">You do not have permission to use this page (ENTITY_MAINT needed)</div> + <div>You do not have permission to use this page (ENTITY_MAINT needed)</div> <%}%> <%}%> Modified: ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl (original) +++ ofbiz/trunk/specialpurpose/cmssite/template/ofbiz/ofbizFooter.ftl Sat May 19 09:35:12 2012 @@ -25,7 +25,7 @@ under the License. </div> <br /> <div id="footer" align="center"> - <div>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org/" class="tabletext" target="_blank">www.apache.org</a></div> + <div>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org/" target="_blank">www.apache.org</a></div> </div> <br /> Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoWebSitePublishPointData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoWebSitePublishPointData.xml?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoWebSitePublishPointData.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoWebSitePublishPointData.xml Sat May 19 09:35:12 2012 @@ -67,8 +67,8 @@ under the License. <ElectronicText dataResourceId="STORE_POLICIES"> <textData><![CDATA[ <div class="head2">Store Policies</div> - <div class="tabletext">This is just a demo store, so you might not really like our policies. Here there are any way:</div> - <div class="tabletext"> + <div>This is just a demo store, so you might not really like our policies. Here there are any way:</div> + <div> <ol> <li>If you send us money we'll keep it. So DON'T SEND US MONEY!</li> <li>We will never fulfill anything you order here. In fact, we haven't even bothered to create any of these products. They are all just made up.</li> @@ -84,8 +84,8 @@ under the License. <DataResource dataResourceId="STORE_POLICIES2" dataResourceTypeId="ELECTRONIC_TEXT" mimeTypeId="text/html" localeString="en_US" isPublic="Y" dataResourceName="Store Policies"/> <ElectronicText dataResourceId="STORE_POLICIES2"> <textData><![CDATA[ - <div class="tabletext">These next policies are meaningless, and are really just used to demonstrate having 2 content sections on the page:</div> - <div class="tabletext"> + <div>These next policies are meaningless, and are really just used to demonstrate having 2 content sections on the page:</div> + <div> <ol> <li>Item 1</li> <li>Item 2</li> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl Sat May 19 09:35:12 2012 @@ -18,8 +18,8 @@ under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"> <body> - <p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> - <p class="tabletext">Successfully subscribed from ${contactList.contactListName} contact list.</p> + <p>Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> + <p>Successfully subscribed from ${contactList.contactListName} contact list.</p> <#assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists> <#if (contactListParty.preferredContactMechId)?exists> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl Sat May 19 09:35:12 2012 @@ -18,8 +18,8 @@ under the License. --> <html xmlns="http://www.w3.org/1999/xhtml"> <body> - <p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> - <p class="tabletext">Successfully unsubscribed from ${contactList.contactListName} contact list.</p> + <p>Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> + <p>Successfully unsubscribed from ${contactList.contactListName} contact list.</p> <#--assign verifyUrl = baseEcommerceSecureUrl +'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_SUBS_PENDING&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists> <#if (contactListParty.preferredContactMechId)?exists> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl Sat May 19 09:35:12 2012 @@ -28,11 +28,11 @@ under the License. <#-- custom logo or text can be inserted here --> <h1>${title!}</h1> - <#if note?exists><p class="tabletext">${note}</p></#if> + <#if note?exists><p>${note}</p></#if> - <p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> - <p class="tabletext">We have received a request for unsubscription to the ${contactList.contactListName} contact list.</p> - <p class="tabletext">To complete your unsubscription click the on the following link:</p> + <p>Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> + <p>We have received a request for unsubscription to the ${contactList.contactListName} contact list.</p> + <p>To complete your unsubscription click the on the following link:</p> <#assign verifyUrl = baseEcommerceSecureUrl+'contactListOptOut?contactListId='+contactListParty.contactListId+'&communicationEventId='+communicationEventId?if_exists+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_UNSUBSCRIBED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode> <#if (contactListParty.preferredContactMechId)?exists> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl Sat May 19 09:35:12 2012 @@ -28,11 +28,11 @@ under the License. <#-- custom logo or text can be inserted here --> <h1>${title!}</h1> -<#if note?exists><p class="tabletext">${note}</p></#if> +<#if note?exists><p>${note}</p></#if> -<p class="tabletext">Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> -<p class="tabletext">We have received a request for subscription to the ${contactList.contactListName} contact list.</p> -<p class="tabletext">To complete your subscription click the on the following link:</p> +<p>Hello ${partyName.firstName?if_exists} ${partyName.lastName?if_exists} ${partyName.groupName?if_exists}!</p> +<p>We have received a request for subscription to the ${contactList.contactListName} contact list.</p> +<p>To complete your subscription click the on the following link:</p> <#assign verifyUrl = baseEcommerceSecureUrl+'updateContactListPartyNoUserLogin?contactListId='+contactListParty.contactListId+'&partyId='+contactListParty.partyId+'&fromDate='+contactListParty.fromDate+'&statusId=CLPT_ACCEPTED&optInVerifyCode='+contactListPartyStatus.optInVerifyCode+'&baseLocation='+baseLocation?if_exists> <#if (contactListParty.preferredContactMechId)?exists> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl Sat May 19 09:35:12 2012 @@ -132,7 +132,7 @@ under the License. <h1>${title!}</h1> <#if !isDemoStore?exists || isDemoStore><p>${uiLabelMap.OrderDemoFrontNote}.</p></#if> -<#if note?exists><p class="tabletext">${note}</p></#if> +<#if note?exists><p>${note}</p></#if> <#if orderHeader?exists> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")} <br /> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/survey/genericresult.ftl Sat May 19 09:35:12 2012 @@ -45,7 +45,7 @@ under the License. <#-- seperator options --> <#if surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_TEXT"> - <td colspan="5"><div class="tabletext">${surveyQuestionAndAppl.question?if_exists}</div></td> + <td colspan="5"><div>${surveyQuestionAndAppl.question?if_exists}</div></td> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE"> <td colspan="5"><hr /></td> <#else> @@ -56,9 +56,9 @@ under the License. <#if (results._total?default(0) == 1)> <#assign answerString = "answer"> </#if> - <div class="tabletext">${surveyQuestionAndAppl.question?if_exists} (${results._total?default(0)?string.number} ${answerString})</div> + <div>${surveyQuestionAndAppl.question?if_exists} (${results._total?default(0)?string.number} ${answerString})</div> <#if surveyQuestionAndAppl.hint?has_content> - <div class="tabletext">${surveyQuestionAndAppl.hint}</div> + <div>${surveyQuestionAndAppl.hint}</div> </#if> </td> <td width='1'> </td> @@ -66,36 +66,36 @@ under the License. <td align="${align}"> <#if surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN"> <#assign selectedOption = (answer.booleanResponse)?default("Y")> - <div class="tabletext"><span style="white-space: nowrap;"> + <div><span style="white-space: nowrap;"> <#if "Y" == selectedOption><b>==> <font color="red"></#if>${uiLabelMap.CommonY}<#if "Y" == selectedOption></font></b></#if> [${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%] </span></div> - <div class="tabletext"><span style="white-space: nowrap;"> + <div><span style="white-space: nowrap;"> <#if "N" == selectedOption><b>==> <font color="red"></#if>N<#if "N" == selectedOption></font></b></#if> [${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%] </span></div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXTAREA"> - <div class="tabletext">${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)?if_exists}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_SHORT"> - <div class="tabletext">${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)?if_exists}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_LONG"> - <div class="tabletext">${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)?if_exists}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "EMAIL"> - <div class="tabletext">${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)?if_exists}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "URL"> - <div class="tabletext">${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)?if_exists}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "DATE"> - <div class="tabletext">${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)?if_exists}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CREDIT_CARD"> - <div class="tabletext">${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)?if_exists}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GIFT_CARD"> - <div class="tabletext">${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)?if_exists}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_CURRENCY"> - <div class="tabletext">${answer.currencyResponse?number?default(0)}</div> + <div>${answer.currencyResponse?number?default(0)}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_FLOAT"> - <div class="tabletext">${answer.floatResponse?number?default(0)?string("#")}</div> + <div>${answer.floatResponse?number?default(0)?string("#")}</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_LONG"> - <div class="tabletext">${answer.numericResponse?number?default(0)?string("#")} [${uiLabelMap.CommonTally}: ${results._tally?default(0)?string("#")} / ${uiLabelMap.CommonAverage}: ${results._average?default(0)?string("#")}]</div> + <div>${answer.numericResponse?number?default(0)?string("#")} [${uiLabelMap.CommonTally}: ${results._tally?default(0)?string("#")} / ${uiLabelMap.CommonAverage}: ${results._average?default(0)?string("#")}]</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "PASSWORD"> - <div class="tabletext">[${uiLabelMap.CommonNotShown}]</div> + <div>[${uiLabelMap.CommonNotShown}]</div> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT"> <#if answer.contentId?has_content> <#assign content = answer.getRelatedOne("Content")> @@ -107,7 +107,7 @@ under the License. <#if options?has_content> <#list options as option> <#assign optionResults = results.get(option.surveyOptionSeqId)?if_exists> - <div class="tabletext"><span style="white-space: nowrap;"> + <div><span style="white-space: nowrap;"> <#if option.surveyOptionSeqId == selectedOption><b>==> <font color="red"></#if> ${option.description?if_exists} <#if option.surveyOptionSeqId == selectedOption></font></b></#if> @@ -116,7 +116,7 @@ under the License. </#list> </#if> <#else> - <div class="tabletext">${uiLabelMap.EcommerceUnsupportedQuestionType}: ${surveyQuestionAndAppl.surveyQuestionTypeId}</div> + <div>${uiLabelMap.EcommerceUnsupportedQuestionType}: ${surveyQuestionAndAppl.surveyQuestionTypeId}</div> </#if> </td> <td width="90%"> </td> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/survey/miniresult.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/survey/miniresult.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/survey/miniresult.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/survey/miniresult.ftl Sat May 19 09:35:12 2012 @@ -37,7 +37,7 @@ under the License. <#if (results._total?default(0) == 1)> <#assign answerString = "answer"> </#if> - <div class="tabletext">${surveyQuestionAndAppl.question?if_exists} (${results._total?default(0)?string.number} ${answerString})</div> + <div>${surveyQuestionAndAppl.question?if_exists} (${results._total?default(0)?string.number} ${answerString})</div> </td> </tr> @@ -49,10 +49,10 @@ under the License. <td> <#if surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN"> <#assign selectedOption = (answer.booleanResponse)?default("Y")> - <div class="tabletext"><span style="white-space: nowrap;"> + <div><span style="white-space: nowrap;"> <#if "Y" == selectedOption><b>==> <font color="red"></#if>${uiLabelMap.CommonY}<#if "Y" == selectedOption></font></b></#if> [${results._yes_total?default(0)?string("#")} / ${results._yes_percent?default(0)?string("#")}%] </span></div> - <div class="tabletext"><span style="white-space: nowrap;"> + <div><span style="white-space: nowrap;"> <#if "N" == selectedOption><b>==> <font color="red"></#if>${uiLabelMap.CommonN}<#if "N" == selectedOption></font></b></#if> [${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%] </span></div> @@ -62,7 +62,7 @@ under the License. <#if options?has_content> <#list options as option> <#assign optionResults = results.get(option.surveyOptionSeqId)?if_exists> - <div class="tabletext"><span style="white-space: nowrap;"> + <div><span style="white-space: nowrap;"> <#if option.surveyOptionSeqId == selectedOption><b>==> <font color="red"></#if> ${option.description?if_exists} <#if option.surveyOptionSeqId == selectedOption></font></b></#if> @@ -71,7 +71,7 @@ under the License. </#list> </#if> <#else> - <div class="tabletext">${uiLabelMap.EcommerceUnsupportedQuestionType}${surveyQuestionAndAppl.surveyQuestionTypeId}</div> + <div>${uiLabelMap.EcommerceUnsupportedQuestionType}${surveyQuestionAndAppl.surveyQuestionTypeId}</div> </#if> </td> </tr> Modified: ofbiz/trunk/specialpurpose/ecommerce/templates/survey/minisurvey.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/templates/survey/minisurvey.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/templates/survey/minisurvey.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/templates/survey/minisurvey.ftl Sat May 19 09:35:12 2012 @@ -46,9 +46,9 @@ under the License. <tr> <#-- standard question options --> <td align='left'> - <div class="tabletext">${surveyQuestionAndAppl.question?if_exists}</div> + <div>${surveyQuestionAndAppl.question?if_exists}</div> <#if surveyQuestionAndAppl.hint?has_content> - <div class="tabletext">${surveyQuestionAndAppl.hint}</div> + <div>${surveyQuestionAndAppl.hint}</div> </#if> </td> </tr> @@ -104,12 +104,12 @@ under the License. </#if> </select> <#else> - <div class="tabletext">Unsupported question type : ${surveyQuestionAndAppl.surveyQuestionTypeId}</div> + <div>Unsupported question type : ${surveyQuestionAndAppl.surveyQuestionTypeId}</div> </#if> <#if surveyQuestionAndAppl.requiredField?default("N") == "Y"> - <span class="tabletext">*</span> + <span>*</span> <#else> - <span class="tabletext">[optional]</span> + <span>[optional]</span> </#if> </td> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Sat May 19 09:35:12 2012 @@ -112,7 +112,7 @@ function setAlternateGwp(field) { ${uiLabelMap.CommonQuickAdd} </h2> <div> - <div class="tabletext"> + <div> <form method="post" action="<@ofbizUrl>additem<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="quickaddform"> <fieldset> ${uiLabelMap.EcommerceProductNumber}<input type="text" class="inputBox" name="add_product_id" value="${requestParameters.add_product_id?if_exists}" /> @@ -186,12 +186,12 @@ function setAlternateGwp(field) { <td> <table> <tr> - <td class="tabletext">- ${uiLabelMap.EcommerceStartDate} -</td> - <td class="tabletext">- ${uiLabelMap.EcommerceNbrOfDays} -</td> + <td>- ${uiLabelMap.EcommerceStartDate} -</td> + <td>- ${uiLabelMap.EcommerceNbrOfDays} -</td> </tr> <tr> - <td class="tabletext" >- ${uiLabelMap.EcommerceNbrOfPersons} -</td> - <td class="tabletext" >- ${uiLabelMap.CommonQuantity} -</td> + <td >- ${uiLabelMap.EcommerceNbrOfPersons} -</td> + <td >- ${uiLabelMap.CommonQuantity} -</td> </tr> </table> </td> @@ -297,7 +297,7 @@ function setAlternateGwp(field) { <ul> <#list cartLine.getAlternativeOptionProductIds() as alternativeOptionProductId> <#assign alternativeOptionName = Static["org.ofbiz.product.product.ProductWorker"].getGwpAlternativeOptionName(delegator, alternativeOptionProductId, requestAttributes.locale) /> - <li class="tabletext"><a href="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>" class="button">Select: ${alternativeOptionName?default(alternativeOptionProductId)}</a></li> + <li><a href="<@ofbizUrl>setDesiredAlternateGwpProductId?alternateGwpProductId=${alternativeOptionProductId}&alternateGwpLine=${cartLineIndex}</@ofbizUrl>" class="button">Select: ${alternativeOptionName?default(alternativeOptionProductId)}</a></li> </#list> </ul> --> @@ -333,12 +333,12 @@ function setAlternateGwp(field) { <table > <tr> <td> </td> - <td class="tabletext">${cartLine.getReservStart()?string("yyyy-mm-dd")}</td> - <td class="tabletext">${cartLine.getReservLength()?string.number}</td></tr> + <td>${cartLine.getReservStart()?string("yyyy-mm-dd")}</td> + <td>${cartLine.getReservLength()?string.number}</td></tr> <tr> <td> </td> - <td class="tabletext">${cartLine.getReservPersons()?string.number}</td> - <td class="tabletext"> + <td>${cartLine.getReservPersons()?string.number}</td> + <td> <#else> <table > <tr> @@ -347,15 +347,15 @@ function setAlternateGwp(field) { </tr> <tr> <td>--</td> - <td class="tabletext"> + <td> </#if> ${cartLine.getQuantity()?string.number}</td></tr></table> <#else><#-- fixedAssetExist --> ${cartLine.getQuantity()?string.number} </#if> <#else><#-- Is Promo or Shoppinglist --> - <#if fixedAssetExist == true><#if cartLine.getReservStart()?exists><table><tr><td> </td><td><input type="text" class="inputBox" size="10" name="reservStart_${cartLineIndex}" value=${cartLine.getReservStart()?string}/></td><td><input type="text" class="inputBox" size="2" name="reservLength_${cartLineIndex}" value="${cartLine.getReservLength()?string.number}"/></td></tr><tr><td> </td><td><input type="text" class="inputBox" size="3" name="reservPersons_${cartLineIndex}" value=${cartLine.getReservPersons()?string.number} /></td><td class="tabletext"><#else> - <table><tr><td>--</td><td>--</td></tr><tr><td>--</td><td class="tabletext"></#if> + <#if fixedAssetExist == true><#if cartLine.getReservStart()?exists><table><tr><td> </td><td><input type="text" class="inputBox" size="10" name="reservStart_${cartLineIndex}" value=${cartLine.getReservStart()?string}/></td><td><input type="text" class="inputBox" size="2" name="reservLength_${cartLineIndex}" value="${cartLine.getReservLength()?string.number}"/></td></tr><tr><td> </td><td><input type="text" class="inputBox" size="3" name="reservPersons_${cartLineIndex}" value=${cartLine.getReservPersons()?string.number} /></td><td><#else> + <table><tr><td>--</td><td>--</td></tr><tr><td>--</td><td></#if> <input size="6" class="inputBox" type="text" name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}" /></td></tr></table> <#else><#-- fixedAssetExist --> <input size="6" class="inputBox" type="text" name="update_${cartLineIndex}" value="${cartLine.getQuantity()?string.number}" /> @@ -468,7 +468,7 @@ function setAlternateGwp(field) { <h2>${uiLabelMap.ProductPromoCodes}</h2> </div> <div> - <div class="tabletext"> + <div> <form method="post" action="<@ofbizUrl>addpromocode<#if requestAttributes._CURRENT_VIEW_?has_content>/${requestAttributes._CURRENT_VIEW_}</#if></@ofbizUrl>" name="addpromocodeform"> <fieldset> <input type="text" class="inputBox" size="15" name="productPromoCodeId" value="" /> @@ -497,10 +497,10 @@ function setAlternateGwp(field) { <#-- show promotions text --> <ul> <#list productPromos as productPromo> - <li class="tabletext"><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">[${uiLabelMap.CommonDetails}]</a>${StringUtil.wrapString(productPromo.promoText?if_exists)}</li> + <li><a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">[${uiLabelMap.CommonDetails}]</a>${StringUtil.wrapString(productPromo.promoText?if_exists)}</li> </#list> </ul> - <div class="tabletext"><a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="button">${uiLabelMap.OrderViewAllPromotions}</a></div> + <div><a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="button">${uiLabelMap.OrderViewAllPromotions}</a></div> </div> </div> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl Sat May 19 09:35:12 2012 @@ -47,7 +47,7 @@ under the License. <a href="${linkUrl}" class="linktext">${titleText}</a> </#if> <#if detailText?has_content> - <div class="tabletext">${detailText}</div> + <div>${detailText}</div> </#if> </div> </#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl Sat May 19 09:35:12 2012 @@ -58,7 +58,7 @@ under the License. window.close(); // --> </script> - <div class="tabletext">${uiLabelMap.EcommerceTellAFriendSorry}</div> + <div>${uiLabelMap.EcommerceTellAFriendSorry}</div> </#if> </form> </body> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl Sat May 19 09:35:12 2012 @@ -22,7 +22,7 @@ under the License. <#local csv = ""> <#local counter = 0> <#local len = trail?size> - <table border="0" class="tabletext" cellspacing="4"> + <table border="0" cellspacing="4"> <#list trail as content> <#if counter < (len - endIndexOffset) && startIndex <= counter > <#if 0 < counter > Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl Sat May 19 09:35:12 2012 @@ -38,10 +38,10 @@ under the License. <table> <tr> <td align="right" valign="middle"> - <div class="tabletext">${uiLabelMap.ProductFeatures}:</div> + <div>${uiLabelMap.ProductFeatures}:</div> </td> <td align="right" valign="middle"> - <div class="tabletext"> + <div> ${uiLabelMap.CommonAll} <input type="radio" name="any_or_all" value="all" checked="checked" /> ${uiLabelMap.CommonAny} <input type="radio" name="any_or_all" value="any" /> </div> @@ -53,10 +53,10 @@ under the License. <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId]> <tr> <td align="right" valign="middle"> - <div class="tabletext">${(productFeatureType.get("description",locale))?if_exists}:</div> + <div>${(productFeatureType.get("description",locale))?if_exists}:</div> </td> <td valign="middle"> - <div class="tabletext"> + <div> <select class="selectBox" name="pft_${productFeatureTypeId}"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list productFeatures as productFeature> @@ -70,14 +70,14 @@ under the License. <#if searchConstraintStrings?has_content> <tr> <td align="right" valign="top"> - <div class="tabletext">${uiLabelMap.ProductLastSearch}:</div> + <div>${uiLabelMap.ProductLastSearch}:</div> </td> <td valign="top"> <#list searchConstraintStrings as searchConstraintString> - <div class="tabletext"> - ${searchConstraintString}</div> + <div> - ${searchConstraintString}</div> </#list> - <div class="tabletext">${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</div> - <div class="tabletext"> + <div>${uiLabelMap.ProductSortedBy}: ${searchSortOrderString}</div> + <div> ${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked" /> ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N" /> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl Sat May 19 09:35:12 2012 @@ -103,7 +103,7 @@ under the License. <#local csv = ""> <#local counter = 0> <#local len = trail?size> - <table border="0" class="tabletext" cellspacing="4"> + <table border="0" cellspacing="4"> <#list trail as content> <#if counter < (len - endIndexOffset) && startIndex <= counter > <#if 0 < counter > Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl Sat May 19 09:35:12 2012 @@ -20,24 +20,24 @@ under the License. <table border="0" cellpadding="1"> <tr> <td align="right" width="25%"><div class="tableheadtext">Account Number:</div></td> - <td><div class="tabletext">${ownedFinAccount.finAccountId}</div></td> + <td><div>${ownedFinAccount.finAccountId}</div></td> </tr> <tr> <td align="right"><div class="tableheadtext">Currency:</div></td> - <td><div class="tabletext">${(accountCurrencyUom.description)?if_exists} [${ownedFinAccount.currencyUomId?if_exists}]</div></td> + <td><div>${(accountCurrencyUom.description)?if_exists} [${ownedFinAccount.currencyUomId?if_exists}]</div></td> </tr> <tr> <td align="right"><div class="tableheadtext">Date Opened:</div></td> - <td><div class="tabletext">${ownedFinAccount.fromDate?if_exists}</div></td> + <td><div>${ownedFinAccount.fromDate?if_exists}</div></td> </tr> <tr> <td align="right"><div class="tableheadtext">Status:</div></td> - <td><div class="tabletext">${(finAccountStatusItem.description)?default("Active")}</div></td> + <td><div>${(finAccountStatusItem.description)?default("Active")}</div></td> </tr> <#if ownedFinAccount.replenishLevel?exists> <tr> <td align="right"><div class="tableheadtext">Replenish Level:</div></td> - <td><div class="tabletext">${ownedFinAccount.replenishLevel}</div></td> + <td><div>${ownedFinAccount.replenishLevel}</div></td> </tr> </#if> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl Sat May 19 09:35:12 2012 @@ -44,22 +44,22 @@ under the License. <table width="90%" border="0" cellpadding="2" cellspacing="0"> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ProductProductName}</div></td> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.ProductProductName}</div></td> <td width="5"> </td> <td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="productName" value="${(product.productName)?if_exists}"/>*</td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ProductProductDescription}</div></td> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.ProductProductDescription}</div></td> <td width="5"> </td> <td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${(product.description)?if_exists}"/></td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.ProductPrice}</div></td> + <td width="26%" align="right" valign="top"><div>${uiLabelMap.ProductPrice}</div></td> <td width="5"> </td> <td width="74%"><input type="text" class="inputBox" size="30" maxlength="60" name="price" value="${(productPrice.price)?if_exists}"/>*</td> </tr> <tr> - <td width="26%" align="right" valign="top"><div class="tabletext"> </div></td> + <td width="26%" align="right" valign="top"><div> </div></td> <td width="5"> </td> <td width="74%"><a href="javascript:document.editdigitaluploadform.submit()" class="buttontext">${uiLabelMap.CommonSave}</a></td> </tr> @@ -76,7 +76,7 @@ under the License. </div> <div class="screenlet-body"> <#list productContentAndInfoList as productContentAndInfo> - <div class="tabletext"> + <div> ${productContentAndInfo.contentName} (${uiLabelMap.CommonSince}: ${productContentAndInfo.fromDate}) <a href="<@ofbizUrl>removeCustomerDigitalDownloadProductFile?contentId=${productContentAndInfo.contentId}&productContentTypeId=${productContentAndInfo.productContentTypeId}&fromDate=${productContentAndInfo.fromDate}&productId=${parameters.productId}&currencyUomId=${parameters.currencyUomId}&minimumOrderQuantity=${parameters.minimumOrderQuantity}&availableFromDate=${parameters.availableFromDate}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl Sat May 19 09:35:12 2012 @@ -26,11 +26,11 @@ under the License. <table width="100%" cellpadding="1" cellspacing="0" border="0"> <tr> <td width="30%"> - <div class="tabletext"><b>${uiLabelMap.ProductProductName}</b></div> + <div><b>${uiLabelMap.ProductProductName}</b></div> </td> <td width="5"> </td> <td width="45%"> - <div class="tabletext"><b>${uiLabelMap.CommonDescription}</b></div> + <div><b>${uiLabelMap.CommonDescription}</b></div> </td> <td width="5"> </td> <td width="20%"> </td> @@ -40,11 +40,11 @@ under the License. <tr><td colspan="5"><hr /></td></tr> <tr> <td> - <div class="tabletext">${(product.productName)?if_exists}</div> + <div>${(product.productName)?if_exists}</div> </td> <td width="5"> </td> <td> - <div class="tabletext">${(product.description)?if_exists}</div> + <div>${(product.description)?if_exists}</div> </td> <td width="5"> </td> <td align="right"> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Sat May 19 09:35:12 2012 @@ -54,7 +54,7 @@ under the License. <div> <input type='hidden' name='contactMechTypeId' value='${contactMechTypeId}' /> <#if contactMechPurposeType?exists> - <div class="tabletext">(${uiLabelMap.PartyNewContactHavePurpose} "${contactMechPurposeType.get("description",locale)?if_exists}")</div> + <div>(${uiLabelMap.PartyNewContactHavePurpose} "${contactMechPurposeType.get("description",locale)?if_exists}")</div> </#if> <#if cmNewPurposeTypeId?has_content><input type='hidden' name='contactMechPurposeTypeId' value='${cmNewPurposeTypeId}' /></#if> <#if preContactMechTypeId?has_content><input type='hidden' name='preContactMechTypeId' value='${preContactMechTypeId}' /></#if> Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl?rev=1340386&r1=1340385&r2=1340386&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl Sat May 19 09:35:12 2012 @@ -56,36 +56,36 @@ under the License. ${uiLabelMap.PartyUseCurrentAddress}: <#list curPartyContactMechPurposes as curPartyContactMechPurpose> <#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType") /> - <div class="tabletext"> + <div> ${curContactMechPurposeType.get("description",locale)?if_exists} <#if curPartyContactMechPurpose.thruDate?exists> ((${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()}) </#if> </div> </#list> - <div class="tabletext"> + <div> <#if curPostalAddress.toName?exists>${uiLabelMap.CommonTo}: ${curPostalAddress.toName}<br /></#if> <#if curPostalAddress.attnName?exists>${uiLabelMap.PartyAddrAttnName}: ${curPostalAddress.attnName}<br /></#if> ${curPostalAddress.address1?if_exists}<br /> <#if curPostalAddress.address2?exists>${curPostalAddress.address2}<br /></#if> ${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode} <#if curPostalAddress.countryGeoId?exists><br />${curPostalAddress.countryGeoId}</#if> - <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div> - <#if curPartyContactMech.thruDate?exists><div class="tabletext">${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</#if> + <div>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div> + <#if curPartyContactMech.thruDate?exists><div>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</#if> </div> </td> </tr> <#else> <#-- <tr> <td valign="top" colspan="2"> - <div class="tabletext">${uiLabelMap.PartyBillingAddressNotSelected}</div> + <div>${uiLabelMap.PartyBillingAddressNotSelected}</div> </td> </tr> --> </#if> <#-- is confusing <tr> <td valign="top" colspan="2"> - <div class="tabletext">${uiLabelMap.EcommerceMessage3}</div> + <div>${uiLabelMap.EcommerceMessage3}</div> </td> </tr> --> @@ -101,12 +101,12 @@ under the License. <td valign="middle"> <#list partyContactMechPurposes as partyContactMechPurpose> <#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOneCache("ContactMechPurposeType") /> - <div class="tabletext"> + <div> ${contactMechPurposeType.get("description",locale)?if_exists} <#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if> </div> </#list> - <div class="tabletext"> + <div> <#if postalAddress.toName?exists>${uiLabelMap.CommonTo}: ${postalAddress.toName}<br /></#if> <#if postalAddress.attnName?exists>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br /></#if> ${postalAddress.address1?if_exists}<br /> @@ -114,20 +114,20 @@ under the License. ${postalAddress.city}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId}</#if> ${postalAddress.postalCode} <#if postalAddress.countryGeoId?exists><br />${postalAddress.countryGeoId}</#if> </div> - <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div> - <#if partyContactMech.thruDate?exists><div class="tabletext">${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if> + <div>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div> + <#if partyContactMech.thruDate?exists><div>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if> </td> </tr> </#list> <#if !postalAddressInfos?has_content && !curContactMech?exists> - <tr><td colspan="2"><div class="tabletext">${uiLabelMap.PartyNoContactInformation}.</div></td></tr> + <tr><td colspan="2"><div>${uiLabelMap.PartyNoContactInformation}.</div></td></tr> </#if> <tr> <td align="right" valign="top"> <input type="radio" name="contactMechId" value="_NEW_" <#if !hasCurrent>checked="checked"</#if> /> </td> <td valign="middle"> - <span class="tabletext">${uiLabelMap.PartyCreateNewBillingAddress}.</span> + <span>${uiLabelMap.PartyCreateNewBillingAddress}.</span> </td> </tr> </table> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |