You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/07/03 21:42:46 UTC
svn commit: r1356888 [3/5] - in /ofbiz/branches/20120329_portletWidget:
applications/accounting/ applications/commonext/ applications/content/
applications/content/data/ applications/content/template/survey/
applications/content/testdef/data/ applicati...
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoWebSitePublishPointData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoWebSitePublishPointData.xml?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoWebSitePublishPointData.xml (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/data/DemoWebSitePublishPointData.xml Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListSubscribeEmail.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeVerifyEmail.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/ContactListVerifyEmail.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/email/OrderNoticeEmail.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/genericresult.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/genericresult.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/genericresult.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/genericresult.ftl Tue Jul 3 19:42:32 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", false)>
@@ -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/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/miniresult.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/miniresult.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/miniresult.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/miniresult.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/minisurvey.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/minisurvey.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/minisurvey.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/templates/survey/minisurvey.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/cart/showcart.ftl Tue Jul 3 19:42:32 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_}</#...@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="<@o...@ofbizUrl>" class="button">Select: ${alternativeOptionName?default(alternativeOptionProductId)}</a></li>
+ <li><a href="<@o...@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_}</#...@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="<@o...@ofbizUrl>" class="linktext">[${uiLabelMap.CommonDetails}]</a>${StringUtil.wrapString(productPromo.promoText?if_exists)}</li>
+ <li><a href="<@o...@ofbizUrl>" class="linktext">[${uiLabelMap.CommonDetails}]</a>${StringUtil.wrapString(productPromo.promoText?if_exists)}</li>
</#list>
</ul>
- <div class="tabletext"><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderViewAllPromotions}</a></div>
+ <div><a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.OrderViewAllPromotions}</a></div>
</div>
</div>
</#if>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategoryLink.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/catalog/tellafriend.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/bloglib.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/searchContent.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/content/viewcontent.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/FinAccountDetail.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductedit.ftl Tue Jul 3 19:42:32 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="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a>
</div>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/digitalproductlist.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcontactmech.ftl Tue Jul 3 19:42:32 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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editcreditcard.ftl Tue Jul 3 19:42:32 2012
@@ -56,36 +56,36 @@ under the License.
${uiLabelMap.PartyUseCurrentAddress}:
<#list curPartyContactMechPurposes as curPartyContactMechPurpose>
<#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
- <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.getRelatedOne("ContactMechPurposeType", true) />
- <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>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editeftaccount.ftl Tue Jul 3 19:42:32 2012
@@ -34,35 +34,35 @@ under the License.
<p/>
<table width="90%" border="0" cellpadding="2" cellspacing="0">
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingNameOnAccount}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="nameOnAccount" value="${eftAccountData.nameOnAccount?if_exists}" />
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCompanyNameOnAccount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="companyNameOnAccount" value="${eftAccountData.companyNameOnAccount?if_exists}" />
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingBankName}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingBankName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="bankName" value="${eftAccountData.bankName?if_exists}" />
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingRoutingNumber}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingRoutingNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="10" maxlength="30" name="routingNumber" value="${eftAccountData.routingNumber?if_exists}" />
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingAccountType}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingAccountType}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="accountType" class="selectBox">
@@ -74,14 +74,14 @@ under the License.
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingAccountNumber}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingAccountNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="40" name="accountNumber" value="${eftAccountData.accountNumber?if_exists}" />
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" />
@@ -89,7 +89,7 @@ under the License.
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.PartyBillingAddress}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.PartyBillingAddress}</div></td>
<td width="5"> </td>
<td width="74%">
<#-- Removed because is confusing, can add but would have to come back here with all data populated as before...
@@ -103,17 +103,17 @@ under the License.
<input type="radio" name="contactMechId" value="${curContactMechId}" checked="checked" />
</td>
<td valign="top" width="80%">
- <div class="tabletext"><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div>
+ <div><b>${uiLabelMap.PartyUseCurrentAddress}:</b></div>
<#list curPartyContactMechPurposes as curPartyContactMechPurpose>
<#assign curContactMechPurposeType = curPartyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
- <div class="tabletext">
+ <div>
<b>${curContactMechPurposeType.get("description",locale)?if_exists}</b>
<#if curPartyContactMechPurpose.thruDate?exists>
(${uiLabelMap.CommonExpire}:${curPartyContactMechPurpose.thruDate.toString()})
</#if>
</div>
</#list>
- <div class="tabletext">
+ <div>
<#if curPostalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${curPostalAddress.toName}<br /></#if>
<#if curPostalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${curPostalAddress.attnName}<br /></#if>
${curPostalAddress.address1?if_exists}<br />
@@ -121,21 +121,21 @@ under the License.
${curPostalAddress.city}<#if curPostalAddress.stateProvinceGeoId?has_content>, ${curPostalAddress.stateProvinceGeoId}</#if> ${curPostalAddress.postalCode}
<#if curPostalAddress.countryGeoId?exists><br />${curPostalAddress.countryGeoId}</#if>
</div>
- <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div>
- <#if curPartyContactMech.thruDate?exists><div class="tabletext"><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div></#if>
+ <div>(${uiLabelMap.CommonUpdated}: ${(curPartyContactMech.fromDate.toString())?if_exists})</div>
+ <#if curPartyContactMech.thruDate?exists><div><b>${uiLabelMap.CommonDelete}: ${curPartyContactMech.thruDate.toString()}</b></div></#if>
</td>
</tr>
<#else>
<#-- <tr>
<td valign="top" colspan="2">
- <div class="tabletext">${uiLabelMap.PartyNoBillingAddress}</div>
+ <div>${uiLabelMap.PartyNoBillingAddress}</div>
</td>
</tr> -->
</#if>
<#-- is confusing
<tr>
<td valign="top" colspan="2">
- <div class="tabletext"><b>${uiLabelMap.EcommerceMessage3}</b></div>
+ <div><b>${uiLabelMap.EcommerceMessage3}</b></div>
</td>
</tr>
-->
@@ -151,12 +151,12 @@ under the License.
<td valign="top" width="80%">
<#list partyContactMechPurposes as partyContactMechPurpose>
<#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true)>
- <div class="tabletext">
+ <div>
<b>${contactMechPurposeType.get("description",locale)?if_exists}</b>
<#if partyContactMechPurpose.thruDate?exists>(${uiLabelMap.CommonExpire}:${partyContactMechPurpose.thruDate})</#if>
</div>
</#list>
- <div class="tabletext">
+ <div>
<#if postalAddress.toName?exists><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br /></#if>
<#if postalAddress.attnName?exists><b>${uiLabelMap.PartyAddrAttnName}:</b> ${postalAddress.attnName}<br /></#if>
${postalAddress.address1?if_exists}<br />
@@ -164,13 +164,13 @@ 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"><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></div></#if>
+ <div>(${uiLabelMap.CommonUpdated}: ${(partyContactMech.fromDate.toString())?if_exists})</div>
+ <#if partyContactMech.thruDate?exists><div><b>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</b></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>
</table>
</td>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editgiftcard.ftl Tue Jul 3 19:42:32 2012
@@ -34,7 +34,7 @@ under the License.
<p/>
<table width="90%" border="0" cellpadding="2" cellspacing="0">
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingCardNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<#if giftCardData?has_content && giftCardData.cardNumber?has_content>
@@ -56,14 +56,14 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingPINNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="password" class="inputBox" size="10" maxlength="60" name="pinNumber" value="${giftCardData.pinNumber?if_exists}" />
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.AccountingExpirationDate}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.AccountingExpirationDate}</div></td>
<td width="5"> </td>
<td width="74%">
<#assign expMonth = "">
@@ -100,7 +100,7 @@ under the License.
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tabletext">${uiLabelMap.CommonDescription}</div></td>
+ <td width="26%" align="right" valign="top"><div>${uiLabelMap.CommonDescription}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="description" value="${paymentMethodData.description?if_exists}" />
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/editperson.ftl Tue Jul 3 19:42:32 2012
@@ -98,7 +98,7 @@ under the License.
<td align="right">${uiLabelMap.PartyBirthDate}</td>
<td>
<input type="text" class='inputBox' size="11" maxlength="20" name="birthDate" value="${(personData.birthDate.toString())?if_exists}"/>
- <div class="tabletext">${uiLabelMap.CommonFormatDate}</div>
+ <div>${uiLabelMap.CommonFormatDate}</div>
</td>
</tr>
<tr>
@@ -156,7 +156,7 @@ under the License.
<td align="right">${uiLabelMap.PartyPassportExpireDate}</td>
<td>
<input type="text" class='inputBox' size="11" maxlength="20" name="passportExpireDate" value="${personData.passportExpireDate?if_exists}"/>
- <div class="tabletext">${uiLabelMap.CommonFormatDate}</div>
+ <div>${uiLabelMap.CommonFormatDate}</div>
</td>
</tr>
<tr>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardbalance.ftl Tue Jul 3 19:42:32 2012
@@ -19,7 +19,7 @@ under the License.
<h1>${uiLabelMap.AccountingGiftCardBalance}</h1>
<br />
-<div class="tabletext">${uiLabelMap.AccountingEnterGiftCardNumber}</div>
+<div>${uiLabelMap.AccountingEnterGiftCardNumber}</div>
<br />
<br />
@@ -27,7 +27,7 @@ under the License.
<#if requestAttributes.processResult?exists>
<tr>
<td colspan="2">
- <div align="center" class="tabletext">
+ <div align="center">
${uiLabelMap.AccountingCurrentBalance}
</div>
</td>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/giftcardlink.ftl Tue Jul 3 19:42:32 2012
@@ -19,7 +19,7 @@ under the License.
<h1>${uiLabelMap.AccountingGiftCardLink}</h1>
<br />
-<div class="tabletext">${uiLabelMap.AccountingEnterGiftCardLink}.</div>
+<div>${uiLabelMap.AccountingEnterGiftCardLink}.</div>
<br />
<form name="gclink" method="post" action="<@o...@ofbizUrl>">
@@ -34,11 +34,11 @@ under the License.
</td>
</tr>
<tr>
- <td><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td>
+ <td><div>${uiLabelMap.AccountingCardNumber}</div></td>
<td><input type="text" class="inputBox" name="physicalCard" size="20" /></td>
</tr>
<tr>
- <td><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
+ <td><div>${uiLabelMap.AccountingPINNumber}</div></td>
<td><input type="text" class="inputBox" name="physicalPin" size="20" /></td>
</tr>
<tr>
@@ -50,11 +50,11 @@ under the License.
</td>
</tr>
<tr>
- <td><div class="tabletext">${uiLabelMap.AccountingCardNumber}</div></td>
+ <td><div>${uiLabelMap.AccountingCardNumber}</div></td>
<td><input type="text" class="inputBox" name="virtualCard" size="20" /></td>
</tr>
<tr>
- <td><div class="tabletext">${uiLabelMap.AccountingPINNumber}</div></td>
+ <td><div>${uiLabelMap.AccountingPINNumber}</div></td>
<td><input type="text" class="inputBox" name="virtualPin" size="20" /></td>
</tr>
<tr>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/messagedetail.ftl Tue Jul 3 19:42:32 2012
@@ -40,25 +40,25 @@ under the License.
<tr><td> </td></tr>
<tr>
<td align="right"><div class="tableheadtext">${uiLabelMap.CommonFrom}:</div></td>
- <td><div class="tabletext">${fromName?if_exists}</div></td>
+ <td><div>${fromName?if_exists}</div></td>
</tr>
<tr>
<td align="right"><div class="tableheadtext">${uiLabelMap.CommonTo}:</div></td>
- <td><div class="tabletext">${toName?if_exists}</div></td>
+ <td><div>${toName?if_exists}</div></td>
</tr>
<tr>
<td align="right"><div class="tableheadtext">${uiLabelMap.CommonDate}:</div></td>
- <td><div class="tabletext">${communicationEvent.entryDate}</div></td>
+ <td><div>${communicationEvent.entryDate}</div></td>
</tr>
<tr>
<td align="right"><div class="tableheadtext">${uiLabelMap.EcommerceSubject}:</div></td>
- <td><div class="tabletext"> ${(communicationEvent.subject)?default("[${uiLabelMap.EcommerceNoSubject}]")}</div></td>
+ <td><div> ${(communicationEvent.subject)?default("[${uiLabelMap.EcommerceNoSubject}]")}</div></td>
</tr>
<tr><td> </td></tr>
<tr>
<td> </td>
<td>
- <div class="tabletext">${StringUtil.wrapString(communicationEvent.content)?default("[${uiLabelMap.EcommerceEmptyBody}]")}</div>
+ <div>${StringUtil.wrapString(communicationEvent.content)?default("[${uiLabelMap.EcommerceEmptyBody}]")}</div>
</td>
</tr>
</table>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/messagelist.ftl Tue Jul 3 19:42:32 2012
@@ -29,10 +29,10 @@ under the License.
<#assign partyNameTo = "${uiLabelMap.CommonNA}">
</#if>
<tr>
- <td><div class="tabletext">${partyNameFrom}</div></td>
- <td><div class="tabletext">${partyNameTo}</div></td>
- <td><div class="tabletext">${communicationEvent.subject?default("")}</div></td>
- <td><div class="tabletext">${communicationEvent.entryDate}</div></td>
+ <td><div>${partyNameFrom}</div></td>
+ <td><div>${partyNameTo}</div></td>
+ <td><div>${communicationEvent.subject?default("")}</div></td>
+ <td><div>${communicationEvent.entryDate}</div></td>
<td align="right">
<form method="post" action="<@o...@ofbizUrl>" name="ecomm_read_mess${index}">
<input name="communicationEventId" value="${communicationEvent.communicationEventId}" type="hidden"/>
@@ -63,7 +63,7 @@ under the License.
<div class="screenlet-body">
<table width="100%" border="0" cellpadding="1">
<#if (!receivedCommunicationEvents?has_content && !sentCommunicationEvents?has_content)>
- <tr><td><div class="tabletext">${uiLabelMap.EcommerceNoMessages}.</div></td></tr>
+ <tr><td><div>${uiLabelMap.EcommerceNoMessages}.</div></td></tr>
<#else/>
<tr>
<td><div class="tableheadtext">${uiLabelMap.CommonFrom}</div></td>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/newmsg.ftl Tue Jul 3 19:42:32 2012
@@ -51,7 +51,7 @@ under the License.
<tr>
<td width="5"> </td>
<td align="right"><div class="tableheadtext">${uiLabelMap.CommonFrom}:</div></td>
- <td><div class="tabletext"> ${sessionAttributes.autoName?if_exists} [${userLogin.partyId}] (${uiLabelMap.CommonNotYou}? <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)</div></td>
+ <td><div> ${sessionAttributes.autoName?if_exists} [${userLogin.partyId}] (${uiLabelMap.CommonNotYou}? <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>)</div></td>
</tr>
<#if partyIdTo?has_content>
<#assign partyToName = Static["org.ofbiz.party.party.PartyHelper"].getPartyName(delegator, partyIdTo, true)>
@@ -62,7 +62,7 @@ under the License.
<tr>
<td width="5"> </td>
<td align="right"><div class="tableheadtext">${uiLabelMap.CommonTo}:</div></td>
- <td><div class="tabletext"> ${partyToName}</div></td>
+ <td><div> ${partyToName}</div></td>
</tr>
</#if>
<tr>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/customer/viewprofile.ftl Tue Jul 3 19:42:32 2012
@@ -127,7 +127,7 @@ under the License.
<td valign="top">
<#list partyContactMechValueMap.partyContactMechPurposes?if_exists as partyContactMechPurpose>
<#assign contactMechPurposeType = partyContactMechPurpose.getRelatedOne("ContactMechPurposeType", true) />
- <div class="tabletext">
+ <div>
<#if contactMechPurposeType?exists>
${contactMechPurposeType.get("description",locale)}
<#if contactMechPurposeType.contactMechPurposeTypeId == "SHIPPING_LOCATION" && (profiledefs.defaultShipAddr)?default("") == contactMech.contactMechId>
@@ -148,7 +148,7 @@ under the License.
</#list>
<#if contactMech.contactMechTypeId?if_exists = "POSTAL_ADDRESS">
<#assign postalAddress = partyContactMechValueMap.postalAddress?if_exists />
- <div class="tabletext">
+ <div>
<#if postalAddress?exists>
<#if postalAddress.toName?has_content>${uiLabelMap.CommonTo}: ${postalAddress.toName}<br /></#if>
<#if postalAddress.attnName?has_content>${uiLabelMap.PartyAddrAttnName}: ${postalAddress.attnName}<br /></#if>
@@ -170,7 +170,7 @@ under the License.
</div>
<#elseif contactMech.contactMechTypeId?if_exists = "TELECOM_NUMBER">
<#assign telecomNumber = partyContactMechValueMap.telecomNumber?if_exists>
- <div class="tabletext">
+ <div>
<#if telecomNumber?exists>
${telecomNumber.countryCode?if_exists}
<#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber?if_exists}
@@ -187,7 +187,7 @@ under the License.
${contactMech.infoString}
<a href="mailto:${contactMech.infoString}" class="linktext">(${uiLabelMap.PartySendEmail})</a>
<#elseif contactMech.contactMechTypeId?if_exists = "WEB_ADDRESS">
- <div class="tabletext">
+ <div>
${contactMech.infoString}
<#assign openAddress = contactMech.infoString?if_exists />
<#if !openAddress.startsWith("http") && !openAddress.startsWith("HTTP")><#assign openAddress = "http://" + openAddress /></#if>
@@ -196,10 +196,10 @@ under the License.
<#else>
${contactMech.infoString?if_exists}
</#if>
- <div class="tabletext">(${uiLabelMap.CommonUpdated}: ${partyContactMech.fromDate.toString()})</div>
- <#if partyContactMech.thruDate?exists><div class="tabletext">${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if>
+ <div>(${uiLabelMap.CommonUpdated}: ${partyContactMech.fromDate.toString()})</div>
+ <#if partyContactMech.thruDate?exists><div>${uiLabelMap.CommonDelete}: ${partyContactMech.thruDate.toString()}</div></#if>
</td>
- <td align="center" valign="top"><div class="tabletext">(${partyContactMech.allowSolicitation?if_exists})</div></td>
+ <td align="center" valign="top"><div>(${partyContactMech.allowSolicitation?if_exists})</div></td>
<td> </td>
<td align="right" valign="top">
<a href="<@o...@ofbizUrl>" class="button">${uiLabelMap.CommonUpdate}</a>
@@ -242,7 +242,7 @@ under the License.
<tr>
<#if paymentMethod.paymentMethodTypeId?if_exists == "CREDIT_CARD">
<td valign="top">
- <div class="tabletext">
+ <div>
${uiLabelMap.AccountingCreditCard}:
<#if creditCard.companyNameOnCard?has_content>${creditCard.companyNameOnCard} </#if>
<#if creditCard.titleOnCard?has_content>${creditCard.titleOnCard} </#if>
@@ -279,7 +279,7 @@ under the License.
</#if>
<td valign="top">
- <div class="tabletext">
+ <div>
${uiLabelMap.AccountingGiftCard}: ${giftCardNumber}
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
<#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate.toString()})</#if>
@@ -293,7 +293,7 @@ under the License.
</td>
<#elseif paymentMethod.paymentMethodTypeId?if_exists == "EFT_ACCOUNT">
<td valign="top">
- <div class="tabletext">
+ <div>
${uiLabelMap.AccountingEFTAccount}: ${eftAccount.nameOnAccount?if_exists} - <#if eftAccount.bankName?has_content>${uiLabelMap.AccountingBank}: ${eftAccount.bankName}</#if> <#if eftAccount.accountNumber?has_content>${uiLabelMap.AccountingAccount} #: ${eftAccount.accountNumber}</#if>
<#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
<#if paymentMethod.fromDate?has_content>(${uiLabelMap.CommonUpdated}: ${paymentMethod.fromDate.toString()})</#if>
@@ -382,7 +382,7 @@ under the License.
<tr>
<td> </td>
<td>
- <div class="tabletext"><span style="white-space:;"><#if shipMeth.partyId != "_NA_">${shipMeth.partyId?if_exists} </#if>${shipMeth.get("description",locale)?if_exists}</span></div>
+ <div><span style="white-space:;"><#if shipMeth.partyId != "_NA_">${shipMeth.partyId?if_exists} </#if>${shipMeth.get("description",locale)?if_exists}</span></div>
</td>
<td><input type="radio" name="defaultShipMeth" value="${shippingMethod}" <#if profiledefs.defaultShipMeth?default("") == shippingMethod>checked="checked"</#if> /></td>
</tr>
@@ -482,7 +482,7 @@ under the License.
<tr><td colspan="7"></td></tr>
<tr>
<td>${contactList.contactListName?if_exists}<#if contactList.description?has_content> - ${contactList.description}</#if></td>
- <#-- <td><div class="tabletext">${contactListType.get("description",locale)?if_exists}</div></td> -->
+ <#-- <td><div>${contactListType.get("description",locale)?if_exists}</div></td> -->
<td>${contactListParty.fromDate?if_exists}</td>
<td>${contactListParty.thruDate?if_exists}</td>
<td>${(statusItem.get("description",locale))?if_exists}</td>
@@ -567,7 +567,7 @@ under the License.
<#assign survey = surveyAppl.getRelatedOne("Survey", false) />
<tr>
<td> </td>
- <td valign="top"><div class="tabletext">${survey.surveyName?if_exists} - ${survey.description?if_exists}</div></td>
+ <td valign="top"><div>${survey.surveyName?if_exists} - ${survey.description?if_exists}</div></td>
<td> </td>
<td valign="top">
<#assign responses = Static["org.ofbiz.product.store.ProductStoreWorker"].checkSurveyResponse(request, survey.surveyId)?default(0)>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/bloglib.ftl Tue Jul 3 19:42:32 2012
@@ -52,7 +52,7 @@ under the License.
<tr>
<td width="40px"> </td>
<td class="blogtext" >
- <div class="tabletext">
+ <div>
by:<#if authorName?has_content>${authorName?if_exists}
<#else>
<#if content?has_content>${content.createdByUserLogin?if_exists}</#if>
@@ -69,7 +69,7 @@ under the License.
</#if>
</div>
</td>
- <td class="tabletext" >
+ <td >
<#if content?has_content>${content.contentName?if_exists}</#if>
--
<#if content?has_content>${content.description?if_exists}</#if>
@@ -89,7 +89,7 @@ under the License.
<#if sz == 0 >
- <tr><td class="tabletext" align="center">${uiLabelMap.CommonNoRecordFound}</td></tr>
+ <tr><td align="center">${uiLabelMap.CommonNoRecordFound}</td></tr>
</#if>
<@wrapSubContentCache subContentId=contentIdx wrapTemplateId=stdWrapId contentPurposeList="ARTICLE">
</...@wrapSubContentCache>
@@ -106,7 +106,7 @@ under the License.
</td></tr>
</...@checkPermission>
<@checkPermission mode="not-equals" entityOperation="_CREATE" subContentId=contentDept statusId="CTNT_PUBLISHED" targetOperation=targOp contentPurposeList="ARTICLE" quickCheckContentId=contentIdx>
-<tr><td class="tabletext" align="right">
+<tr><td align="right">
${uiLabelMap.EcommerceLoggedToPost}
</td></tr>
</...@checkPermission>
@@ -124,7 +124,7 @@ ${uiLabelMap.EcommerceLoggedToPost}
<#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/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/forumPaging.ftl Tue Jul 3 19:42:32 2012
@@ -38,7 +38,7 @@ under the License.
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> |
</#if>
<#if (listSize?int > 0)>
- <span class="tabletext">${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
+ <span>${lowIndex} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}</span>
</#if>
<#if highIndex?int < listSize?int>
| <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a>
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/messageDisplay.ftl Tue Jul 3 19:42:32 2012
@@ -41,13 +41,13 @@ under the License.
${uiLabelMap.CommonTitle}: ${result.resultData.content.description?if_exists} ${uiLabelMap.CommonBy}:${result.resultData.content.createdByUserLogin} ${uiLabelMap.CommonAt}: ${result.resultData.content.createdDate.toString().substring(0,16)}
<a href="addForumMessage?forumId=${parameters.forumId}&forumMessageIdTo=${result.resultData.content.contentId}&threadView=${parameters.threadView?if_exists}" class="buttontext">${uiLabelMap.PartyReply}</a>
</div>
- <div class="tabletext">
+ <div>
<#if result.resultData.electronicText?exists>
${result.resultData.electronicText.textData}
</#if>
</div>
<hr />
<#else>
- <div class="tabletext"> ${result.errorMessage?if_exists}</div>
+ <div> ${result.errorMessage?if_exists}</div>
</#if>
-->
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl?rev=1356888&r1=1356887&r2=1356888&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/specialpurpose/ecommerce/webapp/ecommerce/forum/mostrecent.ftl Tue Jul 3 19:42:32 2012
@@ -35,24 +35,24 @@ under the License.
<#list entityList as content>
<@checkPermission entityOperation="_ADMIN" targetOperation="CONTENT_PUBLISH" subContentId=forumId >
<tr>
- <td class="tabletext"> ${uiLabelMap.CommonId}:${content.contentId} </td>
- <td class="tabletext"> ${uiLabelMap.CommonName}:${content.contentName} </td>
+ <td> ${uiLabelMap.CommonId}:${content.contentId} </td>
+ <td> ${uiLabelMap.CommonName}:${content.contentName} </td>
<@injectNodeTrailCsv subContentId=content.contentId redo="true" contentAssocTypeId="PUBLISH_LINK">
<td>
<a class="tabButton" href="<@o...@ofbizUrl>" >${uiLabelMap.CommonView}</a>
</td>
- <td class="tabletext">
+ <td>
${uiLabelMap.CommonSubmitted}:
<input type="radio" name="statusId_o_${row}" value="CTNT_IN_PROGRESS" checked="checked" />
</td>
- <td class="tabletext">
+ <td>
${uiLabelMap.CommonPublish}:
<input type="radio" name="statusId_o_${row}" value="CTNT_PUBLISHED"/>
</td>
</tr>
<input type="hidden" name="contentId_o_${row}" value="${content.contentId}"/>
<tr>
- <td colspan="5" class="tabletext">
+ <td colspan="5">
${uiLabelMap.CommonContent}:<br />
<@renderSubContentCache subContentId=content.contentId/>
</td>