You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/08/18 09:42:37 UTC
svn commit: r1618554 [17/38] - in
/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./
applications/accounting/config/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/invoice/ appli...
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/keywordsearchbox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/keywordsearchbox.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/keywordsearchbox.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/keywordsearchbox.ftl Mon Aug 18 07:42:27 2014
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+<#if (requestAttributes.uiLabelMap)??><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<script type="text/javascript">
//<![CDATA[
@@ -36,19 +36,19 @@ under the License.
<fieldset>
<div>
<label for="keywordSearchString">${uiLabelMap.ProductKeywords}:</label>
- <input type="text" name="SEARCH_STRING" id="keywordSearchString" size="20" maxlength="50" value="${requestParameters.SEARCH_STRING?if_exists}" />
+ <input type="text" name="SEARCH_STRING" id="keywordSearchString" size="20" maxlength="50" value="${requestParameters.SEARCH_STRING!}" />
</div>
<div>
<label for="keywordSearchCategoryId">${uiLabelMap.ProductCategoryId}:</label>
- <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="keywordsearchform" name="SEARCH_CATEGORY_ID" id="keywordSearchCategoryId" fieldFormName="LookupProductCategory"/>
+ <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" formName="keywordsearchform" name="SEARCH_CATEGORY_ID" id="keywordSearchCategoryId" fieldFormName="LookupProductCategory"/>
</div>
<div>
<label for="keywordSearchCointains">${uiLabelMap.CommonNoContains}</label>
- <input type="checkbox" name="SEARCH_CONTAINS" id="keywordSearchCointains" value="N" <#if requestParameters.SEARCH_CONTAINS?if_exists == "N">checked="checked"</#if> />
+ <input type="checkbox" name="SEARCH_CONTAINS" id="keywordSearchCointains" value="N" <#if requestParameters.SEARCH_CONTAINS! == "N">checked="checked"</#if> />
<label for="keywordSearchOperatorOr">${uiLabelMap.CommonAny}</label>
- <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorOr" value="OR" <#if requestParameters.SEARCH_OPERATOR?if_exists != "AND">checked="checked"</#if> />
+ <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorOr" value="OR" <#if requestParameters.SEARCH_OPERATOR! != "AND">checked="checked"</#if> />
<label for="keywordSearchOperatorAnd">${uiLabelMap.CommonAll}</label>
- <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorAnd" value="AND" <#if requestParameters.SEARCH_OPERATOR?if_exists == "AND">checked="checked"</#if> />
+ <input type="radio" name="SEARCH_OPERATOR" id="keywordSearchOperatorAnd" value="AND" <#if requestParameters.SEARCH_OPERATOR! == "AND">checked="checked"</#if> />
</div>
<div>
<input type="submit" name="find" value="${uiLabelMap.CommonFind}" class="buttontext" />
@@ -59,7 +59,7 @@ under the License.
<fieldset>
<div>
<label for="searchCategoryId">${uiLabelMap.ProductCategoryId}:</label>
- <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID?if_exists}" formName="advancedsearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/>
+ <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" formName="advancedsearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/>
</div>
<div>
<a href="javascript:document.getElementById('advancedSearchForm').submit()" class="buttontext">${uiLabelMap.ProductAdvancedSearch}</a>
@@ -70,7 +70,7 @@ under the License.
<fieldset>
<input type="hidden" name="viewSize" value="20" />
<input type="hidden" name="viewIndex" value="1" />
- <@htmlTemplate.lookupField value="${requestParameters.productId?if_exists}" formName="productjumpform" name="productId" id="productJumpFormProductId" fieldFormName="LookupProduct"/>
+ <@htmlTemplate.lookupField value="${requestParameters.productId!}" formName="productjumpform" name="productId" id="productJumpFormProductId" fieldFormName="LookupProduct"/>
<select name="DUMMYPAGE" id="dummyPage" onchange="submitProductJump()">
<option value="<@o...@ofbizUrl>">-${uiLabelMap.ProductProductJump}-</option>
<option value="<@o...@ofbizUrl>">${uiLabelMap.ProductQuickAdmin}</option>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/miniproductlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/miniproductlist.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/miniproductlist.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/miniproductlist.ftl Mon Aug 18 07:42:27 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#if productCategory?exists>
+<#if productCategory??>
<#if productCategoryMembers?has_content>
<#list productCategoryMembers as productCategoryMember>
<#assign product = productCategoryMember.getRelatedOne("Product", true)>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/sidecatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/sidecatalogs.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/sidecatalogs.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/sidecatalogs.ftl Mon Aug 18 07:42:27 2014
@@ -19,9 +19,9 @@ under the License.
<div class="browsecategorylist">
<#assign sortList = Static["org.ofbiz.base.util.UtilMisc"].toList("prodCatalogCategoryTypeId", "sequenceNum", "productCategoryId")>
<#list prodCatalogs as prodCatalog>
- <#if curProdCatalogId?exists && curProdCatalogId == prodCatalog.prodCatalogId>
+ <#if curProdCatalogId?? && curProdCatalogId == prodCatalog.prodCatalogId>
<#assign prodCatalogCategories = prodCatalog.getRelated("ProdCatalogCategory", null, sortList, true)>
- <div class='browsecategorytext'><a href="<@o...@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName?if_exists}</a></div>
+ <div class='browsecategorytext'><a href="<@o...@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName!}</a></div>
<div class="browsecategorylist">
<#list prodCatalogCategories as prodCatalogCategory>
<#assign productCategory = prodCatalogCategory.getRelatedOne("ProductCategory", true)>
@@ -29,7 +29,7 @@ under the License.
</#list>
</div>
<#else>
- <div class='browsecategorytext'><a href="<@o...@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName?if_exists}</a></div>
+ <div class='browsecategorytext'><a href="<@o...@ofbizUrl>" class='browsecategorybutton'>${prodCatalog.catalogName!}</a></div>
</#if>
</#list>
</div>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/sidedeepcategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/sidedeepcategory.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/sidedeepcategory.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/find/sidedeepcategory.ftl Mon Aug 18 07:42:27 2014
@@ -22,31 +22,31 @@ under the License.
<#if parentCategory.productCategoryId != category.productCategoryId>
<#local pStr = "&pcategory=" + parentCategory.productCategoryId>
</#if>
- <#if curCategoryId?exists && curCategoryId == category.productCategoryId>
+ <#if curCategoryId?? && curCategoryId == category.productCategoryId>
<div class="browsecategorytext">
- <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
- <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a>
- <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
- <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a>
+ <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a>
+ <#elseif catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)?if_exists} [${category.productCategoryId}]</a>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybuttondisabled">${category.categoryName?default(category.description)!} [${category.productCategoryId}]</a>
</#if>
</div>
<#else>
<div class="browsecategorytext">
- <#if catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a>
- <#elseif catContentWrappers?exists && catContentWrappers[category.productCategoryId]?exists && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a>
+ <#if catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")?has_content>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("CATEGORY_NAME")} [${category.productCategoryId}]</a>
+ <#elseif catContentWrappers?? && catContentWrappers[category.productCategoryId]?? && catContentWrappers[category.productCategoryId].get("DESCRIPTION")?has_content>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${catContentWrappers[category.productCategoryId].get("DESCRIPTION")} [${category.productCategoryId}]</a>
<#else>
- <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)?if_exists} [${category.productCategoryId}]</a>
+ <a href="<@o...@ofbizUrl>" class="browsecategorybutton">${category.categoryName?default(category.description)!} [${category.productCategoryId}]</a>
</#if>
</div>
</#if>
- <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?exists && curCategoryId == category.productCategoryId)>
+ <#if (Static["org.ofbiz.product.category.CategoryWorker"].checkTrailItem(request, category.getString("productCategoryId"))) || (curCategoryId?? && curCategoryId == category.productCategoryId)>
<#local subCatList = Static["org.ofbiz.product.category.CategoryWorker"].getRelatedCategoriesRet(request, "subCatList", category.getString("productCategoryId"), true)>
- <#if subCatList?exists>
+ <#if subCatList??>
<#list subCatList as subCat>
<div class="browsecategorylist">
<@categoryList parentCategory=category category=subCat/>
@@ -58,15 +58,15 @@ under the License.
<div><a href='<@o...@ofbizUrl>' class='buttontext'>${uiLabelMap.ProductChooseTopCategory}</a></div>
<div class="browsecategorylist">
-<#if currentTopCategory?exists>
- <#if curCategoryId?exists && curCategoryId == currentTopCategory.productCategoryId>
+<#if currentTopCategory??>
+ <#if curCategoryId?? && curCategoryId == currentTopCategory.productCategoryId>
<div style='text-indent: -10px;'><b>${currentTopCategory.categoryName?default("No Name")} [${currentTopCategory.productCategoryId}]</b></div>
<#else>
- <div class='browsecategorytext'><a href="<@o...@ofbizUrl>" class='browsecategorybutton'>${currentTopCategory.categoryName?default(currentTopCategory.description)?if_exists} [${currentTopCategory.productCategoryId}]</a></div>
+ <div class='browsecategorytext'><a href="<@o...@ofbizUrl>" class='browsecategorybutton'>${currentTopCategory.categoryName?default(currentTopCategory.description)!} [${currentTopCategory.productCategoryId}]</a></div>
</#if>
</#if>
<div class="browsecategorylist">
- <#if topLevelList?exists>
+ <#if topLevelList??>
<#list topLevelList as category>
<@categoryList parentCategory=category category=category/>
</#list>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/AddMultipleImages.ftl Mon Aug 18 07:42:27 2014
@@ -28,7 +28,7 @@ under the License.
<td>
<select name="imageResize" >
<#list productFeatures as productFeature>
- <option value="${productFeature.abbrev?if_exists}">${productFeature.description?if_exists}</option>
+ <option value="${productFeature.abbrev!}">${productFeature.description!}</option>
</#list>
<option selected="" value="">Do not resize</option>
</select>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/ImageGallery.ftl Mon Aug 18 07:42:27 2014
@@ -32,8 +32,8 @@ under the License.
<table>
<tbody>
<tr valign="middle">
- <#-- <td align="center"><a href="/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}" target="_blank"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> -->
- <td align="center"><a href="<@o...@ofbizContentUrl>" target="_blank"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td>
+ <#-- <td align="center"><a href="/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}" target="_blank"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> -->
+ <td align="center"><a href="<@o...@ofbizContentUrl>" target="_blank"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td>
</tr>
<tr valign="middle">
<#-- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productContentAndInfo.contentId}&dataResourceId=${productContentAndInfo.dataResourceId}&seoUrl=/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td> -->
@@ -51,8 +51,8 @@ under the License.
<table>
<tbody>
<tr valign="middle">
- <#-- <td align="center"><a href="/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}" target="_blank"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> -->
- <td align="center"><a href="<@o...@ofbizContentUrl>" target="_blank"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td>
+ <#-- <td align="center"><a href="/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}" target="_blank"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td> -->
+ <td align="center"><a href="<@o...@ofbizContentUrl>" target="_blank"><img src="<@o...@ofbizContentUrl>" vspace="5" hspace="5" alt=""/></a></td>
</tr>
<tr valign="middle">
<#-- <td align="center"><a href="javascript:lookup_popup2('ImageShare?contentId=${productContentAndInfo.contentId}&dataResourceId=${productContentAndInfo.dataResourceId}&seoUrl=/catalog/images/${seoUrl}-${product.productId}/${seoUrl}-${contentName}','' ,500,500);" class="buttontext">${uiLabelMap.ImageManagementShare}</a></td> -->
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/imagemanagement/showPeopleApprove.ftl Mon Aug 18 07:42:27 2014
@@ -40,7 +40,7 @@ jQuery(document).ready(function(){
<table>
<#assign userLoginApprovers = delegator.findByAnd("UserLogin",Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", partyRole.partyId))/>
<#assign userLoginApprover = userLoginApprovers[0]>
- <#assign userLoginAndPartyDetails = delegator.findOne("UserLoginAndPartyDetails", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", userLoginApprover.partyId, "userLoginId", userLoginApprover.userLoginId), false)?if_exists>
+ <#assign userLoginAndPartyDetails = delegator.findOne("UserLoginAndPartyDetails", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", userLoginApprover.partyId, "userLoginId", userLoginApprover.userLoginId), false)!>
<#if userLoginAndPartyDetails?has_content>
<#assign partyContentDetail = delegator.findByAnd("ContentApproval",Static["org.ofbiz.base.util.UtilMisc"].toMap("roleTypeId", "IMAGEAPPROVER", "approvalStatusId", "IM_PENDING", "partyId", userLoginAndPartyDetails.partyId))/>
<#assign imageApproveSize = partyContentDetail.size()>
@@ -48,13 +48,13 @@ jQuery(document).ready(function(){
<#if userMap.checkUser == userLoginAndPartyDetails.userLoginId>
<td>
<div>
- <b>${userLoginAndPartyDetails.firstName?if_exists} ${userLoginAndPartyDetails.middleName?if_exists} ${userLoginAndPartyDetails.lastName?if_exists} (${imageApproveSize})</b> |
+ <b>${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</b> |
</div>
</td>
<#else>
<td>
<div>
- <b><a href="<@o...@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName?if_exists} ${userLoginAndPartyDetails.middleName?if_exists} ${userLoginAndPartyDetails.lastName?if_exists} (${imageApproveSize})</a></b> |
+ <b><a href="<@o...@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</a></b> |
</div>
</td>
</#if>
@@ -62,13 +62,13 @@ jQuery(document).ready(function(){
<#if userMap.checkUser == userLoginAndPartyDetails.userLoginId>
<td>
<div>
- <b>${userLoginAndPartyDetails.firstName?if_exists} ${userLoginAndPartyDetails.middleName?if_exists} ${userLoginAndPartyDetails.lastName?if_exists} (${imageApproveSize})</b> |
+ <b>${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</b> |
</div>
</td>
<#else>
<td>
<div>
- <b><a href="<@o...@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName?if_exists} ${userLoginAndPartyDetails.middleName?if_exists} ${userLoginAndPartyDetails.lastName?if_exists} (${imageApproveSize})</a></b> |
+ <b><a href="<@o...@ofbizUrl>" class="text">${userLoginAndPartyDetails.firstName!} ${userLoginAndPartyDetails.middleName!} ${userLoginAndPartyDetails.lastName!} (${imageApproveSize})</a></b> |
</div>
</td>
</#if>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl Mon Aug 18 07:42:27 2014
@@ -16,13 +16,13 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
+<#if (requestAttributes.uiLabelMap)??><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
<br />
<div class="label">[${product.productId}] ${product.internalName}</div>
<br />
<#if searchFeatures?has_content>
+ <form method="post" action="<@o...@ofbizUrl>" name="selectAllForm">
<table cellspacing="0" class="basic-table">
- <form method="post" action="<@o...@ofbizUrl>" name="selectAllForm">
<input type="hidden" name="productId" value="${product.productId}" />
<#list searchFeatures as searchFeature>
<tr>
@@ -43,15 +43,12 @@ under the License.
</#list>
<tr>
<td><input type="submit" value="${uiLabelMap.CommonSearch}" class="smallSubmit" /></td>
- </form>
- <form method="post" action="<@o...@ofbizUrl>" name="">
- <td><input type="submit" value="${uiLabelMap.CommonBack}" class="smallSubmit" /></td>
- </form>
</tr>
</table>
+ </form>
</#if>
<br />
-<#if variantProducts?exists>
+<#if variantProducts??>
<table cellspacing="0" class="basic-table">
<tr class="header-row">
<td><b>${uiLabelMap.ProductProductId}</b></td>
@@ -61,13 +58,13 @@ under the License.
<#list variantProducts as variant>
<tr>
<td><a class="buttontext" href="javascript:set_value('${variant.productId}')">${variant.productId}</a></td>
- <td>${variant.brandName?if_exists}</td>
- <td>${variant.internalName?if_exists}</td>
+ <td>${variant.brandName!}</td>
+ <td>${variant.internalName!}</td>
</tr>
</#list>
</table>
</#if>
-<#if productFeatureIds?exists>
+<#if productFeatureIds??>
<table cellspacing="0" class="basic-table">
<form method="post" action="<@o...@ofbizUrl>" name="createNewVariant">
<input type="hidden" name="productId" value="${product.productId}" />
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/main.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/main.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/main.ftl Mon Aug 18 07:42:27 2014
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#if !sessionAttributes.userLogin?exists>
+<#if !sessionAttributes.userLogin??>
<div class='label'> ${uiLabelMap.ProductGeneralMessage}.</div>
</#if>
<br />
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/price/EditProductPriceRules.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/price/EditProductPriceRules.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/price/EditProductPriceRules.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/price/EditProductPriceRules.ftl Mon Aug 18 07:42:27 2014
@@ -28,7 +28,7 @@ under the License.
<td width="80%"><b>${uiLabelMap.ProductRuleNameFromDateThruDate}</b></td>
<td width="10%"><b> </b></td>
</tr>
- <#if productPriceRule?exists>
+ <#if productPriceRule??>
<#assign productPriceConds = productPriceRule.getRelated("ProductPriceCond", null, null, false)>
<#assign productPriceActions = productPriceRule.getRelated("ProductPriceAction", null, null, false)>
<tr valign="middle">
@@ -37,11 +37,11 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" name="updateProductPriceRule">
<input type="hidden" name="productPriceRuleId" value="${productPriceRule.productPriceRuleId}" />
<input type="text" size="15" name="ruleName" value="${productPriceRule.ruleName}" />
- <input type="text" size="15" name="description" value="${productPriceRule.description?if_exists}" />
- <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.fromDate?if_exists}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
- <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.thruDate?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <input type="text" size="15" name="description" value="${productPriceRule.description!}" />
+ <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.fromDate!}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${productPriceRule.thruDate!}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
- <#assign saleRule = productPriceRule.isSale?exists && productPriceRule.isSale == "Y">
+ <#assign saleRule = productPriceRule.isSale?? && productPriceRule.isSale == "Y">
<div>
<span class="label"><b>${uiLabelMap.ProductNotifySale}</b></span>
<input type="radio" name="isSale" value="Y" <#if saleRule>checked="checked"</#if> />${uiLabelMap.CommonYes}
@@ -83,8 +83,8 @@ under the License.
<input type="hidden" name="productPriceCondSeqId" value="${productPriceCond.productPriceCondSeqId}"/>
<select name="inputParamEnumId" size="1">
<#if productPriceCond.inputParamEnumId?has_content>
- <#assign inputParamEnum = productPriceCond.getRelatedOne("InputParamEnumeration", true)?if_exists>
- <option value="${productPriceCond.inputParamEnumId}"><#if inputParamEnum?exists>${inputParamEnum.get("description",locale)}<#else>[${productPriceCond.inputParamEnumId}]</#if></option>
+ <#assign inputParamEnum = productPriceCond.getRelatedOne("InputParamEnumeration", true)!>
+ <option value="${productPriceCond.inputParamEnumId}"><#if inputParamEnum??>${inputParamEnum.get("description",locale)}<#else>[${productPriceCond.inputParamEnumId}]</#if></option>
<option value="${productPriceCond.inputParamEnumId}"> </option>
<#else>
<option value=""> </option>
@@ -95,8 +95,8 @@ under the License.
</select>
<select name="operatorEnumId" size="1">
<#if productPriceCond.operatorEnumId?has_content>
- <#assign operatorEnum = productPriceCond.getRelatedOne("OperatorEnumeration", true)?if_exists>
- <option value="${productPriceCond.operatorEnumId}"><#if operatorEnum?exists>${operatorEnum.get("description",locale)}<#else>[${productPriceCond.operatorEnumId}]</#if></option>
+ <#assign operatorEnum = productPriceCond.getRelatedOne("OperatorEnumeration", true)!>
+ <option value="${productPriceCond.operatorEnumId}"><#if operatorEnum??>${operatorEnum.get("description",locale)}<#else>[${productPriceCond.operatorEnumId}]</#if></option>
<option value="${productPriceCond.operatorEnumId}"> </option>
<#else>
<option value=""> </option>
@@ -105,7 +105,7 @@ under the License.
<option value="${condOperEnum.enumId}">${condOperEnum.get("description",locale)}<#--[${condOperEnum.enumId}]--></option>
</#list>
</select>
- <input type="text" size="20" name="condValue" value="${productPriceCond.condValue?if_exists}" />
+ <input type="text" size="20" name="condValue" value="${productPriceCond.condValue!}" />
<input type="submit" value="${uiLabelMap.CommonUpdate}" />
</form>
</td>
@@ -167,7 +167,7 @@ under the License.
<select name="productPriceActionTypeId" size="1">
<#if productPriceAction.productPriceActionTypeId?has_content>
<#assign productPriceActionType = productPriceAction.getRelatedOne("ProductPriceActionType", true)>
- <option value="${productPriceAction.productPriceActionTypeId}"><#if productPriceActionType?exists>${productPriceActionType.get("description",locale)}<#else>[${productPriceAction.productPriceActionTypeId}]</#if></option>
+ <option value="${productPriceAction.productPriceActionTypeId}"><#if productPriceActionType??>${productPriceActionType.get("description",locale)}<#else>[${productPriceAction.productPriceActionTypeId}]</#if></option>
<option value="${productPriceAction.productPriceActionTypeId}"> </option>
<#else>
<option value=""> </option>
@@ -176,7 +176,7 @@ under the License.
<option value="${productPriceActionType.productPriceActionTypeId}">${productPriceActionType.get("description",locale)}<#--[${productPriceActionType.productPriceActionTypeId}]--></option>
</#list>
</select>
- <input type="text" size="8" name="amount" value="${productPriceAction.amount?if_exists}" />
+ <input type="text" size="8" name="amount" value="${productPriceAction.amount!}" />
<input type="submit" value="${uiLabelMap.CommonUpdate}" />
</form>
</td>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/AddAdditionalImages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/AddAdditionalImages.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/AddAdditionalImages.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/AddAdditionalImages.ftl Mon Aug 18 07:42:27 2014
@@ -17,13 +17,13 @@ specific language governing permissions
under the License.
-->
<#if product?has_content>
- <#assign productAdditionalImage1 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_1", locale, dispatcher))?if_exists />
- <#assign productAdditionalImage2 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_2", locale, dispatcher))?if_exists />
- <#assign productAdditionalImage3 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_3", locale, dispatcher))?if_exists />
- <#assign productAdditionalImage4 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_4", locale, dispatcher))?if_exists />
+ <#assign productAdditionalImage1 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_1", locale, dispatcher))! />
+ <#assign productAdditionalImage2 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_2", locale, dispatcher))! />
+ <#assign productAdditionalImage3 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_3", locale, dispatcher))! />
+ <#assign productAdditionalImage4 = (Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "ADDITIONAL_IMAGE_4", locale, dispatcher))! />
</#if>
<form id="addAdditionalImagesForm" method="post" action="<@o...@ofbizUrl>" enctype="multipart/form-data">
- <input id="additionalImageProductId" type="hidden" name="productId" value="${productId?if_exists}" />
+ <input id="additionalImageProductId" type="hidden" name="productId" value="${productId!}" />
<table>
<tbody>
<tr>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl Mon Aug 18 07:42:27 2014
@@ -17,10 +17,10 @@ specific language governing permissions
under the License.
-->
-<#if curProductFeatureCategory?exists>
-<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewFeature}</a>
-<#elseif productFeatureGroup?exists>
-<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit} ${productFeatureGroup.description?if_exists}</a>
+<#if curProductFeatureCategory??>
+<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewFeature}</a>
+<#elseif productFeatureGroup??>
+<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit} ${productFeatureGroup.description!}</a>
</#if>
<#if productId?has_content>
<a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReturnToEditProduct}</a>
@@ -28,7 +28,7 @@ under the License.
</#if>
<#if (listSize > 0)>
-<#assign selectedFeatureApplTypeId = selFeatureApplTypeId?if_exists>
+<#assign selectedFeatureApplTypeId = selFeatureApplTypeId!>
<#if productId?has_content>
<#assign productString = "&productId=" + productId>
@@ -39,11 +39,11 @@ under the License.
<span>
<b>
<#if (viewIndex > 0)>
- <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> |
+ <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonPrevious}]</a> |
</#if>
${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize}
<#if (listSize > highIndex)>
- | <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a>
+ | <a href="<@o...@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonNext}]</a>
</#if>
</b>
</span>
@@ -76,7 +76,7 @@ under the License.
<input type="hidden" name="productFeatureId_o_${rowCount}" value="${productFeature.productFeatureId}" />
<td><a href="<@o...@ofbizUrl>" class="buttontext">${productFeature.productFeatureId}</a></td>
<td>${productFeature.description!}</td>
- <td><#if curProductFeatureType?exists>${curProductFeatureType.description!}<#else> [${productFeature.productFeatureTypeId}]</#if></td>
+ <td><#if curProductFeatureType??>${curProductFeatureType.description!}<#else> [${productFeature.productFeatureTypeId}]</#if></td>
<td>
<select name="productFeatureApplTypeId_o_${rowCount}" size="1">
<#list productFeatureApplTypes as productFeatureApplType>
@@ -90,8 +90,8 @@ under the License.
<td>
<@htmlTemplate.renderDateTimeField name="thruDate_o_${rowCount}" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="" size="25" maxlength="30" id="thruDate_o_${rowCount}" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</td>
- <td><input type="text" size="6" name="amount_o_${rowCount}" value="${productFeature.defaultAmount?if_exists}" /></td>
- <td><input type="text" size="5" name="sequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum?if_exists}" /></td>
+ <td><input type="text" size="6" name="amount_o_${rowCount}" value="${productFeature.defaultAmount!}" /></td>
+ <td><input type="text" size="5" name="sequenceNum_o_${rowCount}" value="${productFeature.defaultSequenceNum!}" /></td>
<td align="right">
<input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'productFeatureId_tableRow_${rowCount}');" />
</td>
@@ -106,6 +106,6 @@ under the License.
</#list>
<tr><td colspan="9" align="center"><input type="submit" value="${uiLabelMap.CommonApply}" /></td></tr>
</#if>
-<input type="hidden" name="_rowCount" value="${rowCount?if_exists}"/>
+<input type="hidden" name="_rowCount" value="${rowCount!}"/>
</form>
</table>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductAssoc.ftl Mon Aug 18 07:42:27 2014
@@ -22,22 +22,22 @@ under the License.
</div>
<div class="screenlet-body">
<form action="<@o...@ofbizUrl>" method="post" style="margin: 0;" name="editProductAssocForm">
- <input type="hidden" name="productId" value="${productId?if_exists}" />
+ <input type="hidden" name="productId" value="${productId!}" />
- <#if !(productAssoc?exists)>
- <#if productId?exists && productIdTo?exists && productAssocTypeId?exists && fromDate?exists>
+ <#if !(productAssoc??)>
+ <#if productId?? && productIdTo?? && productAssocTypeId?? && fromDate??>
<div><b><#assign uiLabelWithVar=uiLabelMap.ProductAssociationNotFound?interpret><@uiLabelWithVar/></b></div>
<input type="hidden" name="UPDATE_MODE" value="CREATE" />
<table cellspacing="0" class="basic-table">
<tr>
<td align="right" class="label">${uiLabelMap.ProductProductId}</td>
<td> </td>
- <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId?if_exists}" /></td>
+ <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId!}" /></td>
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.ProductProductIdTo}</td>
<td> </td>
- <td><input type="text" name="PRODUCT_ID_TO" size="20" maxlength="40" value="${productIdTo?if_exists}" /></td>
+ <td><input type="text" name="PRODUCT_ID_TO" size="20" maxlength="40" value="${productIdTo!}" /></td>
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.ProductAssociationTypeId}</td>
@@ -46,13 +46,13 @@ under the License.
<select name="PRODUCT_ASSOC_TYPE_ID" size="1">
<#if productAssocTypeId?has_content>
<#assign curAssocType = delegator.findOne("ProductAssocType", Static["org.ofbiz.base.util.UtilMisc"].toMap("productAssocTypeId", productAssocTypeId), false)>
- <#if curAssocType?exists>
- <option selected="selected" value="${(curAssocType.productAssocTypeId)?if_exists}">${(curAssocType.get("description",locale))?if_exists}</option>
- <option value="${(curAssocType.productAssocTypeId)?if_exists}"></option>
+ <#if curAssocType??>
+ <option selected="selected" value="${(curAssocType.productAssocTypeId)!}">${(curAssocType.get("description",locale))!}</option>
+ <option value="${(curAssocType.productAssocTypeId)!}"></option>
</#if>
</#if>
<#list assocTypes as assocType>
- <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.get("description",locale))?if_exists}</option>
+ <option value="${(assocType.productAssocTypeId)!}">${(assocType.get("description",locale))!}</option>
</#list>
</select>
</td>
@@ -62,7 +62,7 @@ under the License.
<td> </td>
<td>
<div>
- <@htmlTemplate.renderDateTimeField name="FROM_DATE" event="" action="" value="${fromDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ <@htmlTemplate.renderDateTimeField name="FROM_DATE" event="" action="" value="${fromDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
${uiLabelMap.CommonSetNowEmpty}
</div>
</td>
@@ -73,7 +73,7 @@ under the License.
<tr>
<td align="right" class="label">${uiLabelMap.ProductProductId}</td>
<td> </td>
- <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId?if_exists}" /></td>
+ <td><input type="text" name="PRODUCT_ID" size="20" maxlength="40" value="${productId!}" /></td>
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.ProductProductIdTo}</td>
@@ -89,7 +89,7 @@ under the License.
<select name="PRODUCT_ASSOC_TYPE_ID" size="1">
<!-- <option value=""> </option> -->
<#list assocTypes as assocType>
- <option value="${(assocType.productAssocTypeId)?if_exists}">${(assocType.get("description",locale))?if_exists}</option>
+ <option value="${(assocType.productAssocTypeId)!}">${(assocType.get("description",locale))!}</option>
</#list>
</select>
</td>
@@ -99,8 +99,8 @@ under the License.
<td> </td>
<td>
<div>
- ${fromDate?if_exists}
- <@htmlTemplate.renderDateTimeField name="FROM_DATE" event="" action="" value="${fromDate?if_exists}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
+ ${fromDate!}
+ <@htmlTemplate.renderDateTimeField name="FROM_DATE" event="" action="" value="${fromDate!}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="fromDate2" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
${uiLabelMap.CommonSetNowEmpty}
</div>
</td>
@@ -110,30 +110,30 @@ under the License.
<#assign isCreate = false>
<#assign curProductAssocType = productAssoc.getRelatedOne("ProductAssocType", true)>
<input type="hidden" name="UPDATE_MODE" value="UPDATE" />
- <input type="hidden" name="PRODUCT_ID" value="${productId?if_exists}" />
- <input type="hidden" name="PRODUCT_ID_TO" value="${productIdTo?if_exists}" />
- <input type="hidden" name="PRODUCT_ASSOC_TYPE_ID" value="${productAssocTypeId?if_exists}" />
- <input type="hidden" name="FROM_DATE" value="${fromDate?if_exists}" />
+ <input type="hidden" name="PRODUCT_ID" value="${productId!}" />
+ <input type="hidden" name="PRODUCT_ID_TO" value="${productIdTo!}" />
+ <input type="hidden" name="PRODUCT_ASSOC_TYPE_ID" value="${productAssocTypeId!}" />
+ <input type="hidden" name="FROM_DATE" value="${fromDate!}" />
<table cellspacing="0" class="basic-table">
<tr>
<td align="right" class="label">${uiLabelMap.ProductProductId}</td>
<td> </td>
- <td><b>${productId?if_exists}</b> ${uiLabelMap.ProductRecreateAssociation}</td>
+ <td><b>${productId!}</b> ${uiLabelMap.ProductRecreateAssociation}</td>
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.ProductProductIdTo}</td>
<td> </td>
- <td><b>${productIdTo?if_exists}</b> ${uiLabelMap.ProductRecreateAssociation}</td>
+ <td><b>${productIdTo!}</b> ${uiLabelMap.ProductRecreateAssociation}</td>
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.ProductAssociationType}</td>
<td> </td>
- <td><b><#if curProductAssocType?exists>${(curProductAssocType.get("description",locale))?if_exists}<#else> ${productAssocTypeId?if_exists}</#if></b> ${uiLabelMap.ProductRecreateAssociation}</td>
+ <td><b><#if curProductAssocType??>${(curProductAssocType.get("description",locale))!}<#else> ${productAssocTypeId!}</#if></b> ${uiLabelMap.ProductRecreateAssociation}</td>
</tr>
<tr>
<td align="right" class="label">${uiLabelMap.CommonFromDate}</td>
<td> </td>
- <td><b>${fromDate?if_exists}</b> ${uiLabelMap.ProductRecreateAssociation}</td>
+ <td><b>${fromDate!}</b> ${uiLabelMap.ProductRecreateAssociation}</td>
</tr>
</#if>
<tr>
@@ -142,9 +142,9 @@ under the License.
<td width="74%">
<div>
<#if useValues>
- <#assign value = productAssoc.thruDate?if_exists>
+ <#assign value = productAssoc.thruDate!>
<#else>
- <#assign value = (request.getParameter("THRU_DATE"))?if_exists>
+ <#assign value = (request.getParameter("THRU_DATE"))!>
</#if>
<@htmlTemplate.renderDateTimeField name="THRU_DATE" event="" action="" value="${value}" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/>
</div>
@@ -154,23 +154,23 @@ under the License.
<tr>
<td width="26%" align="right" class="label">${uiLabelMap.ProductSequenceNum}</td>
<td> </td>
- <td width="74%"><input type="text" name="SEQUENCE_NUM" <#if useValues>value="${(productAssoc.sequenceNum)?if_exists}"<#else>value="${(request.getParameter("SEQUENCE_NUM"))?if_exists}"</#if> size="5" maxlength="10" /></td>
+ <td width="74%"><input type="text" name="SEQUENCE_NUM" <#if useValues>value="${(productAssoc.sequenceNum)!}"<#else>value="${(request.getParameter("SEQUENCE_NUM"))!}"</#if> size="5" maxlength="10" /></td>
</tr>
<tr>
<td width="26%" align="right" class="label">${uiLabelMap.ProductReason}</td>
<td> </td>
- <td width="74%"><input type="text" name="REASON" <#if useValues>value="${(productAssoc.reason)?if_exists}"<#else>value="${(request.getParameter("REASON"))?if_exists}"</#if> size="60" maxlength="255" /></td>
+ <td width="74%"><input type="text" name="REASON" <#if useValues>value="${(productAssoc.reason)!}"<#else>value="${(request.getParameter("REASON"))!}"</#if> size="60" maxlength="255" /></td>
</tr>
<tr>
<td width="26%" align="right" class="label">${uiLabelMap.ProductInstruction}</td>
<td> </td>
- <td width="74%"><input type="text" name="INSTRUCTION" <#if useValues>value="${(productAssoc.instruction)?if_exists}"<#else>value="${(request.getParameter("INSTRUCTION"))?if_exists}"</#if> size="60" maxlength="255" /></td>
+ <td width="74%"><input type="text" name="INSTRUCTION" <#if useValues>value="${(productAssoc.instruction)!}"<#else>value="${(request.getParameter("INSTRUCTION"))!}"</#if> size="60" maxlength="255" /></td>
</tr>
<tr>
<td width="26%" align="right" class="label">${uiLabelMap.ProductQuantity}</td>
<td> </td>
- <td width="74%"><input type="text" name="QUANTITY" <#if useValues>value="${(productAssoc.quantity)?if_exists}"<#else>value="${(request.getParameter("QUANTITY"))?if_exists}"</#if> size="10" maxlength="15" /></td>
+ <td width="74%"><input type="text" name="QUANTITY" <#if useValues>value="${(productAssoc.quantity)!}"<#else>value="${(request.getParameter("QUANTITY"))!}"</#if> size="10" maxlength="15" /></td>
</tr>
<tr>
@@ -181,7 +181,7 @@ under the License.
</form>
</div>
</div>
-<#if productId?exists && product?exists>
+<#if productId?? && product??>
<div class="screenlet">
<div class="screenlet-title-bar">
<h3>${uiLabelMap.ProductAssociationsFromProduct}</h3>
@@ -204,21 +204,21 @@ under the License.
<#assign listToProduct = assocFromProduct.getRelatedOne("AssocProduct", true)>
<#assign curProductAssocType = assocFromProduct.getRelatedOne("ProductAssocType", true)>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)?if_exists}</a></td>
- <td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if> </td>
- <td <#if (assocFromProduct.getTimestamp("fromDate"))?exists && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> style="color: red;"</#if>>
- ${(assocFromProduct.fromDate)?if_exists} </td>
- <td <#if (assocFromProduct.getTimestamp("thruDate"))?exists && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> style="color: red;"</#if>>
- ${(assocFromProduct.thruDate)?if_exists} </td>
- <td> ${(assocFromProduct.sequenceNum)?if_exists}</td>
- <td> ${(assocFromProduct.quantity)?if_exists}</td>
- <td><#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else>${(assocFromProduct.productAssocTypeId)?if_exists}</#if></td>
+ <td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocFromProduct.productIdTo)!}</a></td>
+ <td><#if listToProduct??><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)!}</a></#if> </td>
+ <td <#if (assocFromProduct.getTimestamp("fromDate"))?? && nowDate.before(assocFromProduct.getTimestamp("fromDate"))> style="color: red;"</#if>>
+ ${(assocFromProduct.fromDate)!} </td>
+ <td <#if (assocFromProduct.getTimestamp("thruDate"))?? && nowDate.after(assocFromProduct.getTimestamp("thruDate"))> style="color: red;"</#if>>
+ ${(assocFromProduct.thruDate)!} </td>
+ <td> ${(assocFromProduct.sequenceNum)!}</td>
+ <td> ${(assocFromProduct.quantity)!}</td>
+ <td><#if curProductAssocType??> ${(curProductAssocType.get("description",locale))!}<#else>${(assocFromProduct.productAssocTypeId)!}</#if></td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonDelete}</a>
</td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonEdit}</a>
</td>
</tr>
@@ -251,13 +251,13 @@ under the License.
<#assign listToProduct = assocToProduct.getRelatedOne("MainProduct", true)>
<#assign curProductAssocType = assocToProduct.getRelatedOne("ProductAssocType", true)>
<tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocToProduct.productId)?if_exists}</a></td>
- <td><#if listToProduct?exists><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)?if_exists}</a></#if></td>
- <td>${(assocToProduct.getTimestamp("fromDate"))?if_exists} </td>
- <td>${(assocToProduct.getTimestamp("thruDate"))?if_exists} </td>
- <td><#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else> ${(assocToProduct.productAssocTypeId)?if_exists}</#if></td>
+ <td><a href="<@o...@ofbizUrl>" class="buttontext">${(assocToProduct.productId)!}</a></td>
+ <td><#if listToProduct??><a href="<@o...@ofbizUrl>" class="buttontext">${(listToProduct.internalName)!}</a></#if></td>
+ <td>${(assocToProduct.getTimestamp("fromDate"))!} </td>
+ <td>${(assocToProduct.getTimestamp("thruDate"))!} </td>
+ <td><#if curProductAssocType??> ${(curProductAssocType.get("description",locale))!}<#else> ${(assocToProduct.productAssocTypeId)!}</#if></td>
<td>
- <a href="<@o...@ofbizUrl>" class="buttontext">
+ <a href="<@o...@ofbizUrl>" class="buttontext">
${uiLabelMap.CommonDelete}</a>
</td>
</tr>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductContent.ftl?rev=1618554&r1=1618553&r2=1618554&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductContent.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/webapp/catalog/product/EditProductContent.ftl Mon Aug 18 07:42:27 2014
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<#if product?exists>
+<#if product??>
<script language="JavaScript" type="text/javascript">
function insertNowTimestamp(field) {
eval('document.productForm.' + field + '.value="${nowTimestampString}";');
@@ -31,50 +31,50 @@ under the License.
<#if !(clientFileName?has_content)>
<div>${uiLabelMap.ProductNoFileSpecifiedForUpload}.</div>
<#else>
- <div>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName?if_exists}</b></div>
- <div>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse?if_exists}</b></div>
- <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div>
- <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@o...@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div>
+ <div>${uiLabelMap.ProductTheFileOnYourComputer}: <b>${clientFileName!}</b></div>
+ <div>${uiLabelMap.ProductServerFileName}: <b>${fileNameToUse!}</b></div>
+ <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath!}</b></div>
+ <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@o...@ofbizContentUrl>">${imageUrl!}</a></b></div>
</#if>
<br />
</#if>
<form action="<@o...@ofbizUrl>" method="post" style="margin: 0;" name="productForm">
- <input type="hidden" name="productId" value="${productId?if_exists}"/>
+ <input type="hidden" name="productId" value="${productId!}"/>
<table cellspacing="0" class="basic-table">
<tr>
<td width="20%" align="right" valign="top"><b>${uiLabelMap.ProductProductName}</b></td>
<td> </td>
<td width="80%" colspan="4" valign="top">
- <input type="text" name="productName" value="${(product.productName?html)?if_exists}" size="30" maxlength="60"/>
+ <input type="text" name="productName" value="${(product.productName?html)!}" size="30" maxlength="60"/>
</td>
</tr>
<tr>
<td width="20%" align="right" valign="top"><b>${uiLabelMap.ProductProductDescription}</b></td>
<td> </td>
<td width="80%" colspan="4" valign="top">
- <textarea name="description" cols="60" rows="2">${(product.description)?if_exists}</textarea>
+ <textarea name="description" cols="60" rows="2">${(product.description)!}</textarea>
</td>
</tr>
<tr>
<td width="20%" align="right" valign="top"><b>${uiLabelMap.ProductLongDescription}</b></td>
<td> </td>
<td width="80%" colspan="4" valign="top">
- <textarea class="dojo-ResizableTextArea" name="longDescription" cols="60" rows="7">${(product.longDescription)?if_exists}</textarea>
+ <textarea class="dojo-ResizableTextArea" name="longDescription" cols="60" rows="7">${(product.longDescription)!}</textarea>
</td>
</tr>
<tr>
<td width="20%" align="right" valign="top"><b>${uiLabelMap.ProductDetailScreen}</b></td>
<td> </td>
<td width="80%" colspan="4" valign="top">
- <input type="text" name="detailScreen" value="${(product.detailScreen)?if_exists}" size="60" maxlength="250"/>
+ <input type="text" name="detailScreen" value="${(product.detailScreen)!}" size="60" maxlength="250"/>
<br /><span class="tooltip">${uiLabelMap.ProductIfNotSpecifiedDefaultsIsProductdetail} "productdetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#productdetail"</span>
</td>
</tr>
<tr>
<td width="20%" align="right" valign="top">
<div><b>${uiLabelMap.ProductSmallImage}</b></div>
- <#if (product.smallImageUrl)?exists>
- <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Small Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall"/></a>
+ <#if (product.smallImageUrl)??>
+ <a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Small Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall"/></a>
</#if>
</td>
<td> </td>
@@ -93,7 +93,7 @@ under the License.
<tr>
<td width="20%" align="right" valign="top">
<div><b>${uiLabelMap.ProductMediumImage}</b></div>
- <#if (product.mediumImageUrl)?exists>
+ <#if (product.mediumImageUrl)??>
<a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Medium Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall"/></a>
</#if>
</td>
@@ -113,7 +113,7 @@ under the License.
<tr>
<td width="20%" align="right" valign="top">
<div><b>${uiLabelMap.ProductLargeImage}</b></div>
- <#if (product.largeImageUrl)?exists>
+ <#if (product.largeImageUrl)??>
<a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Large Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall"/></a>
</#if>
</td>
@@ -133,7 +133,7 @@ under the License.
<tr>
<td width="20%" align="right" valign="top">
<div><b>${uiLabelMap.ProductDetailImage}</b></div>
- <#if (product.detailImageUrl)?exists>
+ <#if (product.detailImageUrl)??>
<a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Detail Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall"/></a>
</#if>
</td>
@@ -153,7 +153,7 @@ under the License.
<tr>
<td width="20%" align="right" valign="top">
<div><b>${uiLabelMap.ProductOriginalImage}</b></div>
- <#if (product.originalImageUrl)?exists>
+ <#if (product.originalImageUrl)??>
<a href="<@o...@ofbizContentUrl>" target="_blank"><img alt="Original Image" src="<@o...@ofbizContentUrl>" class="cssImgSmall"/></a>
</#if>
</td>