svn commit: r1761135 [1/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/template/customer/ ecommerce/template/customer/pr
Locked
svn commit: r1761135 [1/13] - in /ofbiz/trunk/specialpurpose: ebay/template/find/ ecommerce/template/blog/ ecommerce/template/cart/ ecommerce/template/catalog/ ecommerce/template/content/ ecommerce/template/customer/ ecommerce/template/customer/pr
 
|
Author: pranayp
Date: Sat Sep 17 07:17:15 2016 New Revision: 1761135 URL: http://svn.apache.org/viewvc?rev=1761135&view=rev Log: Improved: E-commerce : FTL formatting. (OFBIZ-7949) For improved FTL code readability. Here is the first patch for the effort. There are still files which are required to be formatted. Thanks: Vaibhav Jain for the contribution. Modified: ofbiz/trunk/specialpurpose/ebay/template/find/EbayAdvancedSearch.ftl ofbiz/trunk/specialpurpose/ebay/template/find/EbayExportLink.ftl ofbiz/trunk/specialpurpose/ebay/template/find/EbayKeywordSearch.ftl ofbiz/trunk/specialpurpose/ebay/template/find/ProductsExportToEbay.ftl ofbiz/trunk/specialpurpose/ecommerce/template/blog/BlogContentAltLink.ftl ofbiz/trunk/specialpurpose/ecommerce/template/blog/Blogs.ftl ofbiz/trunk/specialpurpose/ecommerce/template/blog/TextImage.ftl ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl ofbiz/trunk/specialpurpose/ecommerce/template/cart/MiniPromoText.ftl ofbiz/trunk/specialpurpose/ecommerce/template/cart/ShowCart.ftl ofbiz/trunk/specialpurpose/ecommerce/template/cart/UpdateCart.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AdvancedSearch.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/AjaxBreadCrumbs.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ChooseCatalog.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ConfigProductDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/DetailImage.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/LastViewedProducts.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/LayeredCategoryDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/LayeredNavBar.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniAssocProds.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniLastProductSearches.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniLastViewedCategories.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniLastViewedProducts.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniProductSummary.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/MiniReOrderProds.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/PopularTags.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductCategories.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductCategoryLink.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ProductReview.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/ShowBestSellingCategory.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/SideDeepCategory.ftl ofbiz/trunk/specialpurpose/ecommerce/template/catalog/TellAFriend.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/BlogLib.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/ContentCategories.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/MiniPoll.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/RecentlyViewed.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/SearchContent.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/ShowContentTree.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/TplMbContent.ftl ofbiz/trunk/specialpurpose/ecommerce/template/content/ViewContent.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/AnonContactus.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/ChangePassword.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/CustomerSurvey.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductEdit.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/DigitalProductList.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditContactMech.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditCreditCard.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditEftAccount.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditGiftCard.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/EditPerson.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/FinAccountDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardBalance.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/GiftCardLink.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageDetail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/MessageList.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/MiniSignUpForContactList.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewCustomer.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/NewMsg.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/SerializedInventorySummary.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/SubscriptionSummary.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditBillToAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditPostalAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditProfile.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/EditShipToAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/ManageAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/NewCustomer.ftl ofbiz/trunk/specialpurpose/ecommerce/template/customer/profile/ViewProfile.ftl ofbiz/trunk/specialpurpose/ecommerce/template/data/Content.ftl ofbiz/trunk/specialpurpose/ecommerce/template/data/Topic.ftl ofbiz/trunk/specialpurpose/ecommerce/template/data/Tree.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListEmailTemplate.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListSubscribeEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactListVerifyEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/ContactUsEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/EmailPayRetry.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardPurchase.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/GiftCardReload.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/OrderNoticeEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/ReturnAccept.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/ShipmentNotificationEmail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/email/TellAFriend.ftl ofbiz/trunk/specialpurpose/ecommerce/template/forum/BlogLib.ftl ofbiz/trunk/specialpurpose/ecommerce/template/forum/ForumPaging.ftl ofbiz/trunk/specialpurpose/ecommerce/template/forum/Forums.ftl ofbiz/trunk/specialpurpose/ecommerce/template/forum/MessageDisplay.ftl ofbiz/trunk/specialpurpose/ecommerce/template/forum/ShowForum.ftl ofbiz/trunk/specialpurpose/ecommerce/template/forum/ShowForumResponse.ftl ofbiz/trunk/specialpurpose/ecommerce/template/forum/ViewComboResponse.ftl ofbiz/trunk/specialpurpose/ecommerce/template/includes/Footer.ftl ofbiz/trunk/specialpurpose/ecommerce/template/includes/Header.ftl ofbiz/trunk/specialpurpose/ecommerce/template/includes/HeaderHead.ftl ofbiz/trunk/specialpurpose/ecommerce/template/includes/Language.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/AnonymousCheckoutLinks.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/AnonymousTrail.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/BillSettings.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/CcInfo.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutReview.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/CheckoutShippingOptions.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/CustSettings.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/EftInfo.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/GcInfo.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/GenericAddress.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/OnePageCheckoutProcess.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/OptionSettings.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHeader.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderHistory.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderItems.ftl ofbiz/trunk/specialpurpose/ecommerce/template/order/OrderStatus.ftl Modified: ofbiz/trunk/specialpurpose/ebay/template/find/EbayAdvancedSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/template/find/EbayAdvancedSearch.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/template/find/EbayAdvancedSearch.ftl (original) +++ ofbiz/trunk/specialpurpose/ebay/template/find/EbayAdvancedSearch.ftl Sat Sep 17 07:17:15 2016 @@ -18,47 +18,51 @@ under the License. --> <script type="text/javascript"> -//<![CDATA[ - function selectChange(formId, elementId) { - if (elementId.id == 'searchProductStoreId') { - document.getElementById('searchCatalogId')[document.getElementById('searchCatalogId').selectedIndex].value = ""; - if (document.getElementById('searchCategoryId').selectedIndex) { - document.getElementById('searchCategoryId')[document.getElementById('searchCategoryId').selectedIndex].value = ""; - } else { - document.getElementById('searchCategoryId').value = ""; - } + //<![CDATA[ + function selectChange(formId, elementId) { + if (elementId.id == 'searchProductStoreId') { + document.getElementById('searchCatalogId')[document.getElementById('searchCatalogId') + .selectedIndex].value = ""; + if (document.getElementById('searchCategoryId').selectedIndex) { + document.getElementById('searchCategoryId')[document.getElementById('searchCategoryId') + .selectedIndex].value = ""; + } else { + document.getElementById('searchCategoryId').value = ""; + } + } + if (elementId.id == 'searchCatalogId') { + if (document.getElementById('searchCategoryId').selectedIndex) { + document.getElementById('searchCategoryId')[document.getElementById('searchCategoryId') + .selectedIndex].value = ""; + } else { + document.getElementById('searchCategoryId').value = ""; + } + } + formId.action = "<@ofbizUrl>main</@ofbizUrl>"; + formId.submit(); } - if (elementId.id == 'searchCatalogId') { - if (document.getElementById('searchCategoryId').selectedIndex) { - document.getElementById('searchCategoryId')[document.getElementById('searchCategoryId').selectedIndex].value = ""; - } else { - document.getElementById('searchCategoryId').value = ""; - } + function submit(id) { + var formId = id; + if (!jQuery('#searchCatalogId').is(":empty") && !jQuery('#searchProductStoreId').is(":empty")) { + document.getElementById(formId).submit(); + } else { + if (jQuery('#searchProductStoreId').is(":empty")) { + jQuery('#productStoreErrorMessage').fadeIn('fast'); + } + if (jQuery('#searchCatalogId').is(":empty")) { + jQuery('#catalogErrorMessage').fadeIn('fast'); + } + } } - formId.action="<@ofbizUrl>main</@ofbizUrl>"; - formId.submit(); - } - function submit (id) { - var formId = id; - if(!jQuery('#searchCatalogId').is(":empty") && !jQuery('#searchProductStoreId').is(":empty")){ - document.getElementById(formId).submit(); - } else { - if(jQuery('#searchProductStoreId').is(":empty")) { - jQuery('#productStoreErrorMessage').fadeIn('fast'); - } - if(jQuery('#searchCatalogId').is(":empty")) { - jQuery('#catalogErrorMessage').fadeIn('fast'); - } - } - } -//]]> + //]]> </script> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductAdvancedSearchInCategory}</h3> </div> <div class="screenlet-body"> - <form id="advToKeywordSearchform" name="advToKeywordSearchform" method="post" action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;"> + <form id="advToKeywordSearchform" name="advToKeywordSearchform" method="post" + action="<@ofbizUrl>keywordsearch</@ofbizUrl>" style="margin: 0;"> <fieldset> <input type="hidden" name="VIEW_SIZE" value="25"/> <input type="hidden" name="PAGING" value="Y"/> @@ -72,9 +76,17 @@ under the License. </td> <td valign="middle"> <div> - <b>"${(searchCategory.description)!}" [${(searchCategory.productCategoryId)!}]</b> ${uiLabelMap.ProductIncludeSubCategories} - <label>${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked"/></label> - <label>${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N"/></label> + <b> + "${(searchCategory.description)!}"[${(searchCategory.productCategoryId)!}] + </b> ${uiLabelMap.ProductIncludeSubCategories} + <label> + ${uiLabelMap.CommonYes} + <input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked"/> + </label> + <label> + ${uiLabelMap.CommonNo} + <input type="radio" name="SEARCH_SUB_CATEGORIES" value="N"/> + </label> </div> </td> </tr> @@ -84,19 +96,27 @@ under the License. ${uiLabelMap.ProductProductStore}: </td> <td valign="middle"> - <select name="productStoreId" id="searchProductStoreId" onchange="javascript:selectChange(document.getElementById('advToKeywordSearchform'), document.getElementById('searchProductStoreId'));"> + <select name="productStoreId" id="searchProductStoreId" + onchange="javascript:selectChange(document.getElementById('advToKeywordSearchform'), + document.getElementById('searchProductStoreId'));"> <#if ebayConfigList?has_content> <#list ebayConfigList as ebayConfig> - <#assign productStore = delegator.findOne("ProductStore", {"productStoreId" : ebayConfig.productStoreId}, true) /> + <#assign productStore = delegator.findOne("ProductStore", + {"productStoreId" : ebayConfig.productStoreId}, true) /> <#assign displayDesc = productStore.storeName?default("${uiLabelMap.ProductNoDescription}") /> <#if (18 < displayDesc?length)> - <#assign displayDesc = displayDesc[0..15] + "..."> - </#if> - <option value="${productStore.productStoreId}" <#if productStoreId! == productStore.productStoreId> selected="selected"</#if>>${displayDesc} [${productStore.productStoreId}]</option> - </#list> + <#assign displayDesc = displayDesc[0..15] + "..."> + </#if> + <option value="${productStore.productStoreId}" + <#if productStoreId! == productStore.productStoreId> selected="selected"</#if>> + ${displayDesc} [${productStore.productStoreId}] + </option> + </#list> </#if> </select> - <span id="productStoreErrorMessage" style="display:none;" class="errorMessage">${uiLabelMap.CommonRequired}</span> + <span id="productStoreErrorMessage" style="display:none;" class="errorMessage"> + ${uiLabelMap.CommonRequired} + </span> </td> </tr> <tr> @@ -105,16 +125,23 @@ under the License. </td> <td valign="middle"> <div> - <select name="SEARCH_CATALOG_ID" id="searchCatalogId" onchange="javascript:selectChange(document.getElementById('advToKeywordSearchform'), document.getElementById('searchCatalogId'));" class="required"> + <select name="SEARCH_CATALOG_ID" id="searchCatalogId" + onchange="javascript:selectChange(document.getElementById('advToKeywordSearchform'), + document.getElementById('searchCatalogId'));" class="required"> <#list prodCatalogList as prodCatalog> <#assign displayDesc = prodCatalog.catalogName?default("${uiLabelMap.ProductNoDescription}") /> <#if (18 < displayDesc?length)> <#assign displayDesc = displayDesc[0..15] + "..."> </#if> - <option value="${prodCatalog.prodCatalogId}" <#if searchCatalogId! == prodCatalog.prodCatalogId> selected="selected"</#if>>${displayDesc} [${prodCatalog.prodCatalogId}]</option> + <option value="${prodCatalog.prodCatalogId}" <#if searchCatalogId! == prodCatalog.prodCatalogId> + selected="selected"</#if>> + ${displayDesc} [${prodCatalog.prodCatalogId}] + </option> </#list> </select> - <span id="catalogErrorMessage" style="display:none;" class="errorMessage">${uiLabelMap.CommonRequired}</span> + <span id="catalogErrorMessage" style="display:none;" class="errorMessage"> + ${uiLabelMap.CommonRequired} + </span> </div> </td> </tr> @@ -128,23 +155,41 @@ under the License. <select name="SEARCH_CATEGORY_ID" id="searchCategoryId"> <option value="">- ${uiLabelMap.ProductAnyCategory} -</option> <#list categoryIds as categoryId> - <#assign productCategory = delegator.findOne("ProductCategory", {"productCategoryId" : categoryId}, true) /> - <#assign displayDesc = productCategory.categoryName?default("${uiLabelMap.ProductNoDescription}") /> + <#assign productCategory = delegator.findOne("ProductCategory", + {"productCategoryId" : categoryId}, true) /> + <#assign displayDesc = + productCategory.categoryName?default("${uiLabelMap.ProductNoDescription}") /> <#if (18 < displayDesc?length)> <#assign displayDesc = displayDesc[0..15] + "..."> </#if> - <option value="${productCategory.productCategoryId}">${displayDesc} [${productCategory.productCategoryId}]</option> + <option value="${productCategory.productCategoryId}"> + ${displayDesc} [${productCategory.productCategoryId}] + </option> </#list> </select> <#else> - <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" formName="advToKeywordSearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CATEGORY_ID!}" + formName="advToKeywordSearchform" name="SEARCH_CATEGORY_ID" id="searchCategoryId" + fieldFormName="LookupProductCategory"/> </#if> ${uiLabelMap.ProductIncludeSubCategories} - <label>${uiLabelMap.CommonYes}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked" /></label> - <label>${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N" /></label> - <label>${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_CATEGORY_EXC" value="" checked="checked" /></label> - <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_CATEGORY_EXC" value="Y" /></label> - <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_CATEGORY_EXC" value="N" /></label> + <label> + ${uiLabelMap.CommonYes} + <input type="radio" name="SEARCH_SUB_CATEGORIES" value="Y" checked="checked"/> + </label> + <label> + ${uiLabelMap.CommonNo}<input type="radio" name="SEARCH_SUB_CATEGORIES" value="N"/> + </label> + <label> + ${uiLabelMap.CommonInclude} + <input type="radio" name="SEARCH_CATEGORY_EXC" value="" checked="checked"/> + </label> + <label> + ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_CATEGORY_EXC" value="Y"/> + </label> + <label> + ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_CATEGORY_EXC" value="N"/> + </label> </div> </td> </tr> @@ -155,7 +200,8 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PRODUCT_NAME" size="20" value="${requestParameters.SEARCH_PRODUCT_NAME!}" /> + <input type="text" name="SEARCH_PRODUCT_NAME" size="20" + value="${requestParameters.SEARCH_PRODUCT_NAME!}"/> </div> </td> </tr> @@ -165,7 +211,8 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_INTERNAL_PROD_NAME" size="20" value="${requestParameters.SEARCH_INTERNAL_PROD_NAME!}" /> + <input type="text" name="SEARCH_INTERNAL_PROD_NAME" size="20" + value="${requestParameters.SEARCH_INTERNAL_PROD_NAME!}"/> </div> </td> </tr> @@ -175,9 +222,17 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}" /> - <label>${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if> /></label> - <label>${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if> /></label> + <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}"/> + <label> + ${uiLabelMap.CommonAny} + <input type="radio" name="SEARCH_OPERATOR" + value="OR" <#if searchOperator == "OR">checked="checked"</#if>/> + </label> + <label> + ${uiLabelMap.CommonAll} + <input type="radio" name="SEARCH_OPERATOR" + value="AND" <#if searchOperator == "AND">checked="checked"</#if>/> + </label> </div> </td> </tr> @@ -187,22 +242,51 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT1!}" /> - <label>${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="" checked="checked" /></label> - <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="Y" /></label> - <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="N" /></label> - </div> - <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT2!}" /> - <label>${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="" checked="checked" /></label> - <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="Y" /></label> - <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="N" /></label> - </div> - <div> - <input type="text" name="SEARCH_PROD_FEAT_CAT3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_CAT3!}" /> - <label>${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="" checked="checked" /></label> - <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="Y" /></label> - <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="N" /></label> + <input type="text" name="SEARCH_PROD_FEAT_CAT1" size="15" + value="${requestParameters.SEARCH_PROD_FEAT_CAT1!}"/> + <label> + ${uiLabelMap.CommonInclude} + <input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="" checked="checked"/> + </label> + <label> + ${uiLabelMap.CommonExclude} + <input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="Y"/> + </label> + <label> + ${uiLabelMap.CommonAlwaysInclude} + <input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC1" value="N"/> + </label> + </div> + <div> + <input type="text" name="SEARCH_PROD_FEAT_CAT2" size="15" + value="${requestParameters.SEARCH_PR23OD_FEAT_CAT2!}"/> + <label> + ${uiLabelMap.CommonInclude} + <input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="" + checked="checked"/></label> + <label> + ${uiLabelMap.CommonExclude} + <input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="Y"/></label> + <label> + ${uiLabelMap.CommonAlwaysInclude} + <input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC2" value="N"/> + </label> + </div> + <div> + <input type="text" name="SEARCH_PROD_FEAT_CAT3" size="15" + value="${requestParameters.SEARCH_PROD_FEAT_CAT3!}"/> + <label> + ${uiLabelMap.CommonInclude} + <input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="" checked="checked"/> + </label> + <label> + ${uiLabelMap.CommonExclude} + <input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="Y"/> + </label> + <label> + ${uiLabelMap.CommonAlwaysInclude} + <input type="radio" name="SEARCH_PROD_FEAT_CAT_EXC3" value="N"/> + </label> </div> </td> </tr> @@ -212,22 +296,52 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP1" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP1!}" /> - <label>${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="" checked="checked" /></label> - <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="Y" /></label> - <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="N" /></label> - </div> - <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP2" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP2!}" /> - <label>${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="" checked="checked" /></label> - <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="Y" /></label> - <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="N" /></label> - </div> - <div> - <input type="text" name="SEARCH_PROD_FEAT_GRP3" size="15" value="${requestParameters.SEARCH_PROD_FEAT_GRP3!}" /> - <label>${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="" checked="checked" /></label> - <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="Y" /></label> - <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="N" /></label> + <input type="text" name="SEARCH_PROD_FEAT_GRP1" size="15" + value="${requestParameters.SEARCH_PROD_FEAT_GRP1!}"/> + <label> + ${uiLabelMap.CommonInclude} + <input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="" checked="checked"/> + </label> + <label> + ${uiLabelMap.CommonExclude} + <input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="Y"/> + </label> + <label> + ${uiLabelMap.CommonAlwaysInclude} + <input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC1" value="N"/> + </label> + </div> + <div> + <input type="text" name="SEARCH_PROD_FEAT_GRP2" size="15" + value="${requestParameters.SEARCH_PROD_FEAT_GRP2!}"/> + <label> + ${uiLabelMap.CommonInclude} + <input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="" checked="checked"/> + </label> + <label> + ${uiLabelMap.CommonExclude} + <input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="Y"/> + </label> + <label> + ${uiLabelMap.CommonAlwaysInclude} + <input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC2" value="N"/> + </label> + </div> + <div> + <input type="text" name="SEARCH_PROD_FEAT_GRP3" size="15" + value="${requestParameters.SEARCH_PROD_FEAT_GRP3!}"/> + <label> + ${uiLabelMap.CommonInclude} + <input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="" checked="checked"/> + </label> + <label> + ${uiLabelMap.CommonExclude} + <input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="Y"/> + </label> + <label> + ${uiLabelMap.CommonAlwaysInclude} + <input type="radio" name="SEARCH_PROD_FEAT_GRP_EXC3" value="N"/> + </label> </div> </td> </tr> @@ -237,22 +351,33 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="SEARCH_FEAT1" size="15" value="${requestParameters.SEARCH_FEAT1!}" /> - <label>${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="" checked="checked" /></label> - <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="Y" /></label> - <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="N" /></label> - </div> - <div> - <input type="text" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT2!}" /> - <label>${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="" checked="checked" /></label> - <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="Y" /></label> - <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="N" /></label> - </div> - <div> - <input type="text" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT3!}" /> - <label>${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="" checked="checked" /></label> - <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="Y" /></label> - <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="N" /></label> + <input type="text" name="SEARCH_FEAT1" size="15" value="${requestParameters.SEARCH_FEAT1!}"/> + <label> + ${uiLabelMap.CommonInclude} + <input type="radio" name="SEARCH_FEAT_EXC1" value="" checked="checked"/> + </label> + <label> + ${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="Y"/> + </label> + <label> + ${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC1" value="N"/> + </label> + </div> + <div> + <input type="text" name="SEARCH_FEAT2" size="15" value="${requestParameters.SEARCH_FEAT2!}"/> + <label> + ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="" checked="checked"/> + </label> + <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="Y"/></label> + <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC2" value="N"/></label> + </div> + <div> + <input type="text" name="SEARCH_FEAT3" size="15" value="${requestParameters.SEARCH_FEAT3!}"/> + <label> + ${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="" checked="checked"/> + </label> + <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="Y"/></label> + <label>${uiLabelMap.CommonAlwaysInclude}<input type="radio" name="SEARCH_FEAT_EXC3" value="N"/></label> </div> </td> </tr> @@ -262,13 +387,15 @@ under the License. </td> <td valign="middle"> <div> - <input type="text" name="LIST_PRICE_LOW" size="8" value="${requestParameters.LIST_PRICE_LOW!}" /> - <input type="text" name="LIST_PRICE_HIGH" size="8" value="${requestParameters.LIST_PRICE_HIGH!}" /> + <input type="text" name="LIST_PRICE_LOW" size="8" value="${requestParameters.LIST_PRICE_LOW!}"/> + <input type="text" name="LIST_PRICE_HIGH" + size="8" value="${requestParameters.LIST_PRICE_HIGH!}"/> </div> </td> </tr> <#list productFeatureTypeIdsOrdered as productFeatureTypeId> - <#assign findPftMap = Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("productFeatureTypeId", productFeatureTypeId) /> + <#assign findPftMap = Static["org.apache.ofbiz.base.util.UtilMisc"].toMap( + "productFeatureTypeId", productFeatureTypeId) /> <#assign productFeatureType = delegator.findOne("ProductFeatureType", findPftMap, true) /> <#assign productFeatures = productFeaturesByTypeMap[productFeatureTypeId] /> <tr> @@ -280,7 +407,10 @@ under the License. <select name="pft_${productFeatureTypeId}"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list productFeatures as productFeature> - <option value="${productFeature.productFeatureId}">${productFeature.description?default("${uiLabelMap.ProductNoDescription}")} [${productFeature.productFeatureId}]</option> + <option value="${productFeature.productFeatureId}"> + ${productFeature.description?default("${uiLabelMap.ProductNoDescription}")} + [${productFeature.productFeatureId}] + </option> </#list> </select> </div> @@ -296,7 +426,10 @@ under the License. <select name="SEARCH_SUPPLIER_ID"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list supplerPartyRoleAndPartyDetails as supplerPartyRoleAndPartyDetail> - <option value="${supplerPartyRoleAndPartyDetail.partyId}">${supplerPartyRoleAndPartyDetail.groupName!} ${supplerPartyRoleAndPartyDetail.firstName!} ${supplerPartyRoleAndPartyDetail.lastName!} [${supplerPartyRoleAndPartyDetail.partyId}]</option> + <option value="${supplerPartyRoleAndPartyDetail.partyId}"> + ${supplerPartyRoleAndPartyDetail.groupName!} ${supplerPartyRoleAndPartyDetail.firstName!} + ${supplerPartyRoleAndPartyDetail.lastName!} [${supplerPartyRoleAndPartyDetail.partyId}] + </option> </#list> </select> </div> @@ -312,7 +445,9 @@ under the License. <option value="SortKeywordRelevancy">${uiLabelMap.ProductKeywordRelevancy}</option> <option value="SortProductField:productName">${uiLabelMap.ProductProductName}</option> <option value="SortProductField:internalName">${uiLabelMap.ProductInternalName}</option> - <option value="SortProductField:totalQuantityOrdered">${uiLabelMap.ProductPopularityByOrders}</option> + <option value="SortProductField:totalQuantityOrdered"> + ${uiLabelMap.ProductPopularityByOrders} + </option> <option value="SortProductField:totalTimesViewed">${uiLabelMap.ProductPopularityByViews}</option> <option value="SortProductField:averageCustomerRating">${uiLabelMap.ProductCustomerRating}</option> <option value="SortProductPrice:LIST_PRICE">${uiLabelMap.ProductListPrice}</option> @@ -321,8 +456,12 @@ under the License. <option value="SortProductPrice:MINIMUM_PRICE">${uiLabelMap.ProductMinimumPrice}</option> <option value="SortProductPrice:MAXIMUM_PRICE">${uiLabelMap.ProductMaximumPrice}</option> </select> - <label>${uiLabelMap.ProductLowToHigh}<input type="radio" name="sortAscending" value="Y" checked="checked" /></label> - <label>${uiLabelMap.ProductHighToLow}<input type="radio" name="sortAscending" value="N" /></label> + <label> + ${uiLabelMap.ProductLowToHigh}<input type="radio" name="sortAscending" value="Y" checked="checked"/> + </label> + <label> + ${uiLabelMap.ProductHighToLow}<input type="radio" name="sortAscending" value="N"/> + </label> </div> </td> </tr> @@ -331,7 +470,9 @@ under the License. ${uiLabelMap.ProductPrioritizeProductsInCategory}: </td> <td valign="middle"> - <@htmlTemplate.lookupField value="${requestParameters.PRIORITIZE_CATEGORY_ID!}" formName="advToKeywordSearchform" name="PRIORITIZE_CATEGORY_ID" id="PRIORITIZE_CATEGORY_ID" fieldFormName="LookupProductCategory"/> + <@htmlTemplate.lookupField value="${requestParameters.PRIORITIZE_CATEGORY_ID!}" + formName="advToKeywordSearchform" name="PRIORITIZE_CATEGORY_ID" id="PRIORITIZE_CATEGORY_ID" + fieldFormName="LookupProductCategory"/> </td> </tr> <tr> @@ -342,7 +483,10 @@ under the License. <select name="SEARCH_GOOD_IDENTIFICATION_TYPE"> <option value="">- ${uiLabelMap.CommonSelectAny} -</option> <#list goodIdentificationTypes as goodIdentificationType> - <option value="${goodIdentificationType.goodIdentificationTypeId}">${goodIdentificationType.get("description")!}</option> + <option + value="${goodIdentificationType.goodIdentificationTypeId}"> + ${goodIdentificationType.get("description")!} + </option> </#list> </select> </td> @@ -352,9 +496,16 @@ under the License. ${uiLabelMap.ProductGoodIdentificationValue}: </td> <td> - <input type="text" name="SEARCH_GOOD_IDENTIFICATION_VALUE" size="60" maxlength="60" value="${requestParameters.SEARCH_GOOD_IDENTIFICATION_VALUE!}" /> - <label>${uiLabelMap.CommonInclude}<input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="Y" checked="checked" /></label> - <label>${uiLabelMap.CommonExclude}<input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="N" /></label> + <input type="text" name="SEARCH_GOOD_IDENTIFICATION_VALUE" size="60" maxlength="60" + value="${requestParameters.SEARCH_GOOD_IDENTIFICATION_VALUE!}"/> + <label> + ${uiLabelMap.CommonInclude} + <input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="Y" checked="checked"/> + </label> + <label> + ${uiLabelMap.CommonExclude} + <input type="radio" name="SEARCH_GOOD_IDENTIFICATION_INCL" value="N"/> + </label> </td> </tr> <#if searchConstraintStrings?has_content> @@ -368,15 +519,20 @@ under the License. </#list> <span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString} <div> - <label>${uiLabelMap.ProductNewSearch}<input type="radio" name="clearSearch" value="Y" checked="checked" /></label> - <label>${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N" /></label> + <label> + ${uiLabelMap.ProductNewSearch} + <input type="radio" name="clearSearch" value="Y" checked="checked"/> + </label> + <label> + ${uiLabelMap.CommonRefineSearch}<input type="radio" name="clearSearch" value="N"/> + </label> </div> </td> </tr> </#if> <tr> <td align="center" colspan="2"> - <hr /> + <hr/> <a href="javascript:submit('advToKeywordSearchform');" class="buttontext">${uiLabelMap.CommonFind}</a> </td> </tr> Modified: ofbiz/trunk/specialpurpose/ebay/template/find/EbayExportLink.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/template/find/EbayExportLink.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/template/find/EbayExportLink.ftl (original) +++ ofbiz/trunk/specialpurpose/ebay/template/find/EbayExportLink.ftl Sat Sep 17 07:17:15 2016 @@ -29,11 +29,11 @@ under the License. </script> <#if productIds?has_content> - <table cellspacing="0" class="basic-table"> - <tr> - <td align="center" colspan="2"> - <a href="javascript:exportToEbay();" class="buttontext">${uiLabelMap.EbayExportToEbay}</a> - </td> - </tr> - </table> + <table cellspacing="0" class="basic-table"> + <tr> + <td align="center" colspan="2"> + <a href="javascript:exportToEbay();" class="buttontext">${uiLabelMap.EbayExportToEbay}</a> + </td> + </tr> + </table> </#if> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/ebay/template/find/EbayKeywordSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/template/find/EbayKeywordSearch.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/template/find/EbayKeywordSearch.ftl (original) +++ ofbiz/trunk/specialpurpose/ebay/template/find/EbayKeywordSearch.ftl Sat Sep 17 07:17:15 2016 @@ -22,10 +22,17 @@ under the License. </div> <div class="screenlet-body"> <#list searchConstraintStrings as searchConstraintString> - <div><a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" class="buttontext">X</a>${searchConstraintString}</div> + <div> + <a href="<@ofbizUrl>keywordsearch?removeConstraint=${searchConstraintString_index}&clearSearch=N</@ofbizUrl>" + class="buttontext">X</a> + ${searchConstraintString} + </div> </#list> <span class="label">${uiLabelMap.CommonSortedBy}:</span>${searchSortOrderString} - <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> + <div> + <a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)!}</@ofbizUrl>" + class="buttontext">${uiLabelMap.CommonRefineSearch}</a> + </div> <#if !productIds?has_content> <div><h2>${uiLabelMap.ProductNoResultsFound}.</h2></div> @@ -52,22 +59,29 @@ under the License. </script> <#macro paginationPanel> <div class="clearfix"> - <div class="lefthalf margin-left"><input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);"/> <strong>${uiLabelMap.ProductProduct}</strong></div> + <div class="lefthalf margin-left"> + <input type="checkbox" name="selectAll" value="0" onclick="javascript:toggleAll(this);"/> + <strong>${uiLabelMap.ProductProduct}</strong> + </div> <div class="right"> <strong> <#if 0 < viewIndex?int> - <a href="<@ofbizUrl>keywordsearch/~VIEW_INDEX=${viewIndex-1}/~VIEW_SIZE=${viewSize}/~clearSearch=N/~PAGING=${paging}/~noConditionFind=${noConditionFind}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPrevious}</a> | + <a href="<@ofbizUrl>keywordsearch/~VIEW_INDEX=${viewIndex-1}/~VIEW_SIZE=${viewSize}/~clearSearch=N/~PAGING=${paging}/~noConditionFind=${noConditionFind}</@ofbizUrl>" + class="buttontext">${uiLabelMap.CommonPrevious}</a> | </#if> <#if 0 < listSize?int> ${lowIndex+1} - ${highIndex} ${uiLabelMap.CommonOf} ${listSize} </#if> <#if highIndex?int < listSize?int> - | <a href="<@ofbizUrl>keywordsearch/~VIEW_INDEX=${viewIndex+1}/~VIEW_SIZE=${viewSize}/~clearSearch=N/~PAGING=${paging}/~noConditionFind=${noConditionFind}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonNext}</a> + | <a href="<@ofbizUrl>keywordsearch/~VIEW_INDEX=${viewIndex+1}/~VIEW_SIZE=${viewSize}/~clearSearch=N/~PAGING=${paging}/~noConditionFind=${noConditionFind}</@ofbizUrl>" + class="buttontext">${uiLabelMap.CommonNext}</a> </#if> <#if paging == "Y"> - <a href="<@ofbizUrl>keywordsearch/~VIEW_INDEX=0/~VIEW_SIZE=99999/~clearSearch=N/~PAGING=N/~noConditionFind=${noConditionFind}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPagingOff}</a> + <a href="<@ofbizUrl>keywordsearch/~VIEW_INDEX=0/~VIEW_SIZE=99999/~clearSearch=N/~PAGING=N/~noConditionFind=${noConditionFind}</@ofbizUrl>" + class="buttontext">${uiLabelMap.CommonPagingOff}</a> <#else> - <a href="<@ofbizUrl>keywordsearch/~VIEW_INDEX=0/~VIEW_SIZE=${previousViewSize}/~clearSearch=N/~PAGING=Y/~noConditionFind=${noConditionFind}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonPagingOn}</a> + <a href="<@ofbizUrl>keywordsearch/~VIEW_INDEX=0/~VIEW_SIZE=${previousViewSize}/~clearSearch=N/~PAGING=Y/~noConditionFind=${noConditionFind}</@ofbizUrl>" + class="buttontext">${uiLabelMap.CommonPagingOn}</a> </#if> </strong> </div> @@ -87,7 +101,8 @@ under the License. <tr <#if altRow> class="alternate-row"</#if>> <td> <input type="checkbox" name="selectResult" value="${productId}"/> - <a href="<@ofbizUrl>EditProduct?productId=${productId}</@ofbizUrl>" class="buttontext">[${productId}] ${(product.internalName)!}</a> + <a href="<@ofbizUrl>EditProduct?productId=${productId}</@ofbizUrl>" + class="buttontext">[${productId}] ${(product.internalName)!}</a> </td> </tr> </#list> @@ -97,4 +112,4 @@ under the License. <@paginationPanel /> </#if> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/specialpurpose/ebay/template/find/ProductsExportToEbay.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/template/find/ProductsExportToEbay.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/template/find/ProductsExportToEbay.ftl (original) +++ ofbiz/trunk/specialpurpose/ebay/template/find/ProductsExportToEbay.ftl Sat Sep 17 07:17:15 2016 @@ -17,10 +17,11 @@ specific language governing permissions under the License. --> <script language="JavaScript" type="text/javascript"> - function changeEbayCategory(categ) { - document.forms["ProductsExportToEbay"].action = "<@ofbizUrl>ProductsExportToEbay?categoryCode="+categ+"</@ofbizUrl>"; - document.forms["ProductsExportToEbay"].submit(); - } + function changeEbayCategory(categ) { + document.forms["ProductsExportToEbay"].action = + "<@ofbizUrl>ProductsExportToEbay?categoryCode="+categ+"</@ofbizUrl>"; + document.forms["ProductsExportToEbay"].submit(); + } function changeWebSite(Id) { var formId = Id ; @@ -28,171 +29,218 @@ under the License. formId.submit(); } - function activateSubmitButton() { - categ = document.forms["ProductsExportToEbay"].ebayCategory.value; - if (document.forms["ProductsExportToEbay"].submitButton) { - if (categ != null && (categ.substring(0, 1) == 'Y' || categ == '')) { - document.forms["ProductsExportToEbay"].submitButton.disabled = false; - } else { - document.forms["ProductsExportToEbay"].submitButton.disabled = true; - document.forms["ProductsExportToEbay"].submitButton.value = "Please select a category"; - } - } + function activateSubmitButton() { + categ = document.forms["ProductsExportToEbay"].ebayCategory.value; + if (document.forms["ProductsExportToEbay"].submitButton) { + if (categ != null && (categ.substring(0, 1) == 'Y' || categ == '')) { + document.forms["ProductsExportToEbay"].submitButton.disabled = false; + } else { + document.forms["ProductsExportToEbay"].submitButton.disabled = true; + document.forms["ProductsExportToEbay"].submitButton.value = "Please select a category"; + } + } } </script> <div> - <form id="ProductsExportToEbay" method="post" action="<@ofbizUrl>PostProductsToEbay</@ofbizUrl>" name="ProductsExportToEbay"> - <input type="hidden" name="productStoreId" value="${productStoreId!}" /> - <table border="0" cellpadding="2" cellspacing="0"> - <tr> - <td align="right" class="label">${uiLabelMap.FormFieldTitle_ebayCategory}</td> - <td> </td> - <td> - <input type="hidden" name="selectResult" value="${selectResult!}"/> - <select name="ebayCategory" onchange="changeEbayCategory(this.value)"> - <option value=""> </option> - <#if categories??> - <#list categories as category> - <option value="${category.CategoryCode}" <#if categoryCode?? && categoryCode == category.CategoryCode>selected="selected"</#if>>${category.CategoryName}</option> - </#list> - </#if> - </select> - </td> - </tr> - <#if hideExportOptions?has_content && hideExportOptions == "N"> - <tr> - <td align="right" class="label">${uiLabelMap.CommonCountry}</td> - <td> </td> - <td> - <select name="country"> - <#if countries??> - <#list countries as country> - <option value="${country.geoCode}" <#if countryCode?? && countryCode == country.geoCode>selected="selected"</#if>>${country.get("geoName",locale)}</option> - </#list> - </#if> - </select> - </td> - </tr> - <tr> - <td align="right" class="label">${uiLabelMap.FormFieldTitle_location}</td> - <td> </td> - <td> - <input type="text" name="location" size="50" maxlength="50" value="${parameters.location!}" /> - </td> - </tr> - <tr> - <td align="right" class="label">${uiLabelMap.FormFieldTitle_listingDuration}</td> - <td> </td> - <td> - <select name="listingDuration"> - <option value="Days_1">1 ${uiLabelMap.CommonDay}</option> - <option value="Days_3">3 ${uiLabelMap.CommonDays}</option> - <option value="Days_7">7 ${uiLabelMap.CommonDays}</option> - </select> - </td> - </tr> - <tr> - <td align="right" class="label">${uiLabelMap.FormFieldTitle_startPrice}</td> - <td> </td> - <td> - <input type="text" name="startPrice" size="12" maxlength="12" value="${parameters.startPrice!}" /> - </td> - </tr> - <tr> - <td align="right" class="label">${uiLabelMap.CommonQuantity}</td> - <td> </td> - <td> - <input type="text" name="quantity" size="12" maxlength="12" value="<#if parameters.quantity??>${parameters.quantity!}<#else>1</#if>" /> - </td> - </tr> - <tr> - <td align="right" class="label">${uiLabelMap.CommonWebsite}</td> - <td> </td> - <td> - <select name="webSiteId" onchange="javascript:changeWebSite(document.getElementById('ProductsExportToEbay'));"> - <#list webSiteList as webSite> - <#assign displayDesc = webSite.siteName?default("${uiLabelMap.ProductNoDescription}")> - <#if (18 < displayDesc?length)> - <#assign displayDesc = displayDesc[0..15] + "..."> - </#if> - <option value="${webSite.webSiteId}" <#if selectedWebSiteId! == webSite.webSiteId> selected="selected"</#if>>${displayDesc} [${webSite.webSiteId}]</option> - </#list> - </select> - </td> - </tr> - <tr> - <td align="right" class="label">${uiLabelMap.FormFieldTitle_webSiteUrl}</td> - <td> </td> - <td> - <input type="text" name="webSiteUrl" size="100" value="${webSiteUrl!}"/> - </td> - </tr> - <tr> - <td align="center" colspan="3"><b><u>${uiLabelMap.FormFieldTitle_paymentMethodsAccepted}</u></b></td> - </tr> - <tr> - <td> </td> - </tr> - <tr> - <td colspan="3"> - <table class="basic-table" cellspacing="0"> - <tr> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentPayPal}</td> - <td width="2%"><input type="checkbox" name="paymentPayPal" <#if parameters.paymentPayPal??>checked="checked"</#if> /></td> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentVisaMC}</td> - <td width="2%"><input type="checkbox" name="paymentVisaMC" <#if parameters.paymentVisaMC??>checked="checked"</#if> /></td> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentAmEx}</td> - <td width="2%"><input type="checkbox" name="paymentAmEx" <#if parameters.paymentAmEx??>checked="checked"</#if> /></td> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentDiscover}</td> - <td width="2%"><input type="checkbox" name="paymentDiscover" <#if parameters.paymentDiscover??>checked="checked"</#if> /></td> - </tr> - <tr> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentMOCC}</td> - <td width="2%"><input type="checkbox" name="paymentMOCC" <#if parameters.paymentMOCC??>checked="checked"</#if> /></td> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentPersonalCheck}</td> - <td width="2%"><input type="checkbox" name="paymentPersonalCheck" <#if parameters.paymentPersonalCheck??>checked="checked"</#if> /></td> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCCAccepted}</td> - <td width="2%"><input type="checkbox" name="paymentCCAccepted" <#if parameters.paymentCCAccepted??>checked="checked"</#if> /></td> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCashInPerson}</td> - <td width="2%"><input type="checkbox" name="paymentCashInPerson" <#if parameters.paymentCashInPerson??>checked="checked"</#if> /></td> - </tr> - <tr> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCashOnPickup}</td> - <td width="2%"><input type="checkbox" name="paymentCashOnPickup" <#if parameters.paymentCashOnPickup??>checked="checked"</#if> /></td> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCOD}</td> - <td width="2%"><input type="checkbox" name="paymentCOD" <#if parameters.paymentCOD??>checked="checked"</#if> /></td> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCODPrePayDelivery}</td> - <td width="2%"><input type="checkbox" name="paymentCODPrePayDelivery" <#if parameters.paymentCODPrePayDelivery??>checked="checked"</#if> /></td> - <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentMoneyXferAccepted}</td> - <td width="2%"><input type="checkbox" name="paymentMoneyXferAccepted" <#if parameters.paymentMoneyXferAccepted??>checked="checked"</#if> /></td> - </tr> - </table> - </td> - </tr> - <tr> - <td align="right" class="label">${uiLabelMap.FormFieldTitle_payPalEmail}</td> - <td> </td> - <td> - <input type="text" name="payPalEmail" size="50" maxlength="50" value="${parameters.payPalEmail!}" /> - </td> - </tr> - <tr> - <td align="right" class="label">${uiLabelMap.FormFieldTitle_customXml}</td> - <td> </td> - <td> - <textarea cols="60" rows="6" wrap="soft" name="customXml">${customXml!}</textarea> - </td> - </tr> - <tr> - <td colspan=2> </td> - <td> - <input type="submit" value="${uiLabelMap.EbayExportToEbay}" name="submitButton" class="smallSubmit" /> - </td> - </tr> + <form id="ProductsExportToEbay" method="post" action="<@ofbizUrl>PostProductsToEbay</@ofbizUrl>" + name="ProductsExportToEbay"> + <input type="hidden" name="productStoreId" value="${productStoreId!}"/> + <table border="0" cellpadding="2" cellspacing="0"> + <tr> + <td align="right" class="label">${uiLabelMap.FormFieldTitle_ebayCategory}</td> + <td> </td> + <td> + <input type="hidden" name="selectResult" value="${selectResult!}"/> + <select name="ebayCategory" onchange="changeEbayCategory(this.value)"> + <option value=""></option> + <#if categories??> + <#list categories as category> + <option value="${category.CategoryCode}" + <#if categoryCode?? && categoryCode == category.CategoryCode>selected="selected"</#if>> + ${category.CategoryName} + </option> + </#list> </#if> - </table> - </form> - <script language="JavaScript" type="text/javascript"> - activateSubmitButton(); - </script> + </select> + </td> + </tr> + <#if hideExportOptions?has_content && hideExportOptions == "N"> + <tr> + <td align="right" class="label">${uiLabelMap.CommonCountry}</td> + <td> </td> + <td> + <select name="country"> + <#if countries??> + <#list countries as country> + <option value="${country.geoCode}" + <#if countryCode?? && countryCode == country.geoCode>selected="selected"</#if>> + ${country.get("geoName",locale)} + </option> + </#list> + </#if> + </select> + </td> + </tr> + <tr> + <td align="right" class="label">${uiLabelMap.FormFieldTitle_location}</td> + <td> </td> + <td> + <input type="text" name="location" size="50" maxlength="50" value="${parameters.location!}"/> + </td> + </tr> + <tr> + <td align="right" class="label">${uiLabelMap.FormFieldTitle_listingDuration}</td> + <td> </td> + <td> + <select name="listingDuration"> + <option value="Days_1">1 ${uiLabelMap.CommonDay}</option> + <option value="Days_3">3 ${uiLabelMap.CommonDays}</option> + <option value="Days_7">7 ${uiLabelMap.CommonDays}</option> + </select> + </td> + </tr> + <tr> + <td align="right" class="label">${uiLabelMap.FormFieldTitle_startPrice}</td> + <td> </td> + <td> + <input type="text" name="startPrice" size="12" maxlength="12" value="${parameters.startPrice!}"/> + </td> + </tr> + <tr> + <td align="right" class="label">${uiLabelMap.CommonQuantity}</td> + <td> </td> + <td> + <input type="text" name="quantity" size="12" maxlength="12" + value="<#if parameters.quantity??>${parameters.quantity!}<#else>1</#if>"/> + </td> + </tr> + <tr> + <td align="right" class="label">${uiLabelMap.CommonWebsite}</td> + <td> </td> + <td> + <select name="webSiteId" + onchange="javascript:changeWebSite(document.getElementById('ProductsExportToEbay'));"> + <#list webSiteList as webSite> + <#assign displayDesc = webSite.siteName?default("${uiLabelMap.ProductNoDescription}")> + <#if (18 < displayDesc?length)> + <#assign displayDesc = displayDesc[0..15] + "..."> + </#if> + <option value="${webSite.webSiteId}" <#if selectedWebSiteId! == webSite.webSiteId> + selected="selected"</#if>> + ${displayDesc} [${webSite.webSiteId}] + </option> + </#list> + </select> + </td> + </tr> + <tr> + <td align="right" class="label">${uiLabelMap.FormFieldTitle_webSiteUrl}</td> + <td> </td> + <td> + <input type="text" name="webSiteUrl" size="100" value="${webSiteUrl!}"/> + </td> + </tr> + <tr> + <td align="center" colspan="3"><b><u>${uiLabelMap.FormFieldTitle_paymentMethodsAccepted}</u></b></td> + </tr> + <tr> + <td> </td> + </tr> + <tr> + <td colspan="3"> + <table class="basic-table" cellspacing="0"> + <tr> + <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentPayPal}</td> + <td width="2%"> + <input type="checkbox" name="paymentPayPal" <#if parameters.paymentPayPal??>checked="checked"</#if>/> + </td> + <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentVisaMC}</td> + <td width="2%"> + <input type="checkbox" name="paymentVisaMC" <#if parameters.paymentVisaMC??>checked="checked"</#if>/> + </td> + <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentAmEx}</td> + <td width="2%"> + <input type="checkbox" name="paymentAmEx" <#if parameters.paymentAmEx??>checked="checked"</#if>/> + </td> + <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentDiscover}</td> + <td width="2%"> + <input type="checkbox" + name="paymentDiscover" <#if parameters.paymentDiscover??>checked="checked"</#if>/> + </td> + </tr> + <tr> + <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentMOCC}</td> + <td width="2%"> + <input type="checkbox" name="paymentMOCC" <#if parameters.paymentMOCC??>checked="checked"</#if>/> + </td> + <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentPersonalCheck}</td> + <td width="2%"> + <input type="checkbox" + name="paymentPersonalCheck" <#if parameters.paymentPersonalCheck??>checked="checked"</#if>/> + </td> + <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCCAccepted}</td> + <td width="2%"> + <input type="checkbox" + name="paymentCCAccepted" <#if parameters.paymentCCAccepted??>checked="checked"</#if>/> + </td> + <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCashInPerson}</td> + <td width="2%"> + <input type="checkbox" + name="paymentCashInPerson" <#if parameters.paymentCashInPerson??>checked="checked"</#if>/> + </td> + </tr> + <tr> + <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCashOnPickup}</td> + <td width="2%"> + <input type="checkbox" + name="paymentCashOnPickup" <#if parameters.paymentCashOnPickup??>checked="checked"</#if>/> + </td> + <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentCOD}</td> + <td width="2%"> + <input type="checkbox" name="paymentCOD" <#if parameters.paymentCOD??>checked="checked"</#if>/> + </td> + <td align="right" width="23%" class="label"> + ${uiLabelMap.FormFieldTitle_paymentCODPrePayDelivery} + </td> + <td width="2%"> + <input type="checkbox" + name="paymentCODPrePayDelivery" + <#if parameters.paymentCODPrePayDelivery??>checked="checked"</#if>/> + </td> + <td align="right" width="23%" class="label">${uiLabelMap.FormFieldTitle_paymentMoneyXferAccepted}</td> + <td width="2%"> + <input type="checkbox" + name="paymentMoneyXferAccepted" + <#if parameters.paymentMoneyXferAccepted??>checked="checked"</#if>/> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td align="right" class="label">${uiLabelMap.FormFieldTitle_payPalEmail}</td> + <td> </td> + <td> + <input type="text" name="payPalEmail" size="50" maxlength="50" value="${parameters.payPalEmail!}"/> + </td> + </tr> + <tr> + <td align="right" class="label">${uiLabelMap.FormFieldTitle_customXml}</td> + <td> </td> + <td> + <textarea cols="60" rows="6" wrap="soft" name="customXml">${customXml!}</textarea> + </td> + </tr> + <tr> + <td colspan=2> </td> + <td> + <input type="submit" value="${uiLabelMap.EbayExportToEbay}" name="submitButton" class="smallSubmit"/> + </td> + </tr> + </#if> + </table> + </form> + <script language="JavaScript" type="text/javascript"> + activateSubmitButton(); + </script> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/blog/BlogContentAltLink.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/blog/BlogContentAltLink.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/blog/BlogContentAltLink.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/blog/BlogContentAltLink.ftl Sat Sep 17 07:17:15 2016 @@ -17,5 +17,7 @@ specific language governing permissions under the License. --> -<a href="<@OfbizContentAltUrl contentId=blog.contentId viewContent='ViewBlogArticle'/>" >${blog.contentName} [${blog.contentId}]</a> +<a href="<@OfbizContentAltUrl contentId=blog.contentId viewContent='ViewBlogArticle'/>" > + ${blog.contentName} [${blog.contentId}] +</a> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/blog/Blogs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/blog/Blogs.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/blog/Blogs.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/blog/Blogs.ftl Sat Sep 17 07:17:15 2016 @@ -28,7 +28,9 @@ under the License. <ul class="browsecategorylist"> <#list blogs as blog> <li class="browsecategorytext"> - <a href="<@ofbizUrl>MainBlog?blogContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton">${blog.contentName!}</a> + <a href="<@ofbizUrl>MainBlog?blogContentId=${blog.contentId}</@ofbizUrl>" class="browsecategorybutton"> + ${blog.contentName!} + </a> </li> </#list> </ul> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/blog/TextImage.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/blog/TextImage.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/blog/TextImage.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/blog/TextImage.ftl Sat Sep 17 07:17:15 2016 @@ -26,30 +26,31 @@ <#-- This code sets the checkboxes based on existing data --> <#assign text_check=""/> <#assign img_check=""/> -<#if (imageContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED") || drMimeTypeId?default("")?starts_with("image"))> - <#assign img_check="checked='checked'"/> +<#if (imageContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED") + || drMimeTypeId?default("")?starts_with("image"))> + <#assign img_check="checked='checked'"/> </#if> <#if (textContent?has_content && drMimeTypeId?default("")?starts_with("text")) - || (textContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED")) - || !img_check?has_content> - <#assign text_check="checked='checked'"/> + || (textContent?has_content && (drDataTemplateTypeId?default("") == "SCREEN_COMBINED")) + || !img_check?has_content> + <#assign text_check="checked='checked'"/> </#if> <#-- Sets one of the two templates --> <#assign topleft_check=""/> <#assign topcenter_check=""/> <#if view.drDataResourceId?has_content && view.drDataResourceId == "BLOG_TPL_TOPLEFT"> - <#assign topleft_check="checked='checked'"/> + <#assign topleft_check="checked='checked'"/> <#else> - <#assign topcenter_check="checked='checked'"/> + <#assign topcenter_check="checked='checked'"/> </#if> <#-- Fills in existing text --> <#assign textData=""/> <#if electronicText?has_content > - <#if electronicText.textData?has_content > - <#assign textData=electronicText.textData/> - </#if> + <#if electronicText.textData?has_content > + <#assign textData=electronicText.textData/> + </#if> </#if> <#-- Stores the ids for existing data --> @@ -57,20 +58,20 @@ <#assign textDataResourceId=""/> <#if textContent?has_content > - <#assign textContentId=textContent.contentId!/> - <#assign textDataResourceId=textContent.drDataResourceId!/> + <#assign textContentId=textContent.contentId!/> + <#assign textDataResourceId=textContent.drDataResourceId!/> </#if> <#if textElectronicText?has_content && textElectronicText.textData?has_content > - <#assign textData=textElectronicText.textData/> + <#assign textData=textElectronicText.textData/> </#if> <#assign imageContentId=""/> <#assign imageDataResourceId=""/> <#if imageContent?has_content > - <#assign imageContentId=imageContent.contentId!/> - <#assign imageDataResourceId=imageContent.drDataResourceId!/> + <#assign imageContentId=imageContent.contentId!/> + <#assign imageDataResourceId=imageContent.drDataResourceId!/> </#if> <input type="hidden" name="textContentId" value="${textContentId}"/> @@ -79,45 +80,56 @@ <input type="hidden" name="imageDataResourceId" value="${imageDataResourceId}"/> <table> - <tr> - <td width="10%" align="right"> - <span class="treeHeader"> </span> - </td> - <td> </td> - <td width="5%" valign="top"> - <div class="inputBox"><input type="checkBox" ${text_check} name="drMimeTypeId_TEXT" value="Y"/>Text</div> - </td> - <td> </td> - <td width="60%"> - <textarea class="textAreaBox" class="inputBox" name="textData" cols="60" rows="24">${textData!}</textarea> - </td> - <td width="10%" align="right"> - <span class="treeHeader"> </span> - </td> - </tr> - - <tr> - <td width="10%" align="right"> - <span class="treeHeader"> </span> - </td> - <td> </td> - <td width="5%" valign="top"> - <div class="inputBox"><input type="checkbox" ${img_check} name="drMimeTypeId_IMAGE" value="Y"/>Image</div> - </td> - <td> </td> - <td width="60%"> - <div class="inputBox">Existing file name: <#if imageContent?has_content && imageContent.drObjectInfo?has_content>${imageContent.drObjectInfo}</#if></div> - <br /> - <input type="file" class="inputBox" name="uploadedFile" size="25"/> - <#-- - Force: <input type="checkbox" value="true" name="forceElectronicText"/> - --> - <br /> - Top-left:<input type="radio" ${topleft_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPLEFT"/> - Top-center:<input type="radio" ${topcenter_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPCENTER"/> - </td> - <td width="10%" align="right"> - <span class="treeHeader"> </span> - </td> - </tr> + <tr> + <td width="10%" align="right"> + <span class="treeHeader"> </span> + </td> + <td> </td> + <td width="5%" valign="top"> + <div class="inputBox"> + <input type="checkBox" ${text_check} name="drMimeTypeId_TEXT" value="Y"/> + Text + </div> + </td> + <td> </td> + <td width="60%"> + <textarea class="textAreaBox" class="inputBox" name="textData" cols="60" rows="24"> + ${textData!} + </textarea> + </td> + <td width="10%" align="right"> + <span class="treeHeader"> </span> + </td> + </tr> + <tr> + <td width="10%" align="right"> + <span class="treeHeader"> </span> + </td> + <td> </td> + <td width="5%" valign="top"> + <div class="inputBox"><input type="checkbox" ${img_check} name="drMimeTypeId_IMAGE" value="Y"/> + Image + </div> + </td> + <td> </td> + <td width="60%"> + <div class="inputBox"> + Existing file name: + <#if imageContent?has_content && imageContent.drObjectInfo?has_content> + ${imageContent.drObjectInfo} + </#if> + </div> + <br /> + <input type="file" class="inputBox" name="uploadedFile" size="25"/> + <#-- + Force: <input type="checkbox" value="true" name="forceElectronicText"/> + --> + <br /> + Top-left:<input type="radio" ${topleft_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPLEFT"/> + Top-center:<input type="radio" ${topcenter_check} class="inputBox" name="templateId" value="BLOG_TPL_TOPCENTER"/> + </td> + <td width="10%" align="right"> + <span class="treeHeader"> </span> + </td> + </tr> </table> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/cart/MicroCart.ftl Sat Sep 17 07:17:15 2016 @@ -18,41 +18,66 @@ under the License. --> <#assign shoppingCart = sessionAttributes.shoppingCart!> <#if shoppingCart?has_content> - <#assign shoppingCartSize = shoppingCart.size()> + <#assign shoppingCartSize = shoppingCart.size()> <#else> - <#assign shoppingCartSize = 0> + <#assign shoppingCartSize = 0> </#if> <div id="microcart"> - <#if (shoppingCartSize > 0)> - <p id="microCartNotEmpty"> - ${uiLabelMap.EcommerceCartHas} <strong id="microCartQuantity">${shoppingCart.getTotalQuantity()}</strong> - <#if shoppingCart.getTotalQuantity() == 1>${uiLabelMap.OrderItem}<#else>${uiLabelMap.OrderItems}</#if>, - <strong id="microCartTotal"><@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/></strong> - </p> - <span id="microCartEmpty" style="display:none">${uiLabelMap.OrderShoppingCartEmpty}</span> + <#if (shoppingCartSize > 0)> + <p id="microCartNotEmpty"> + ${uiLabelMap.EcommerceCartHas} + <strong id="microCartQuantity"> + ${shoppingCart.getTotalQuantity()} + </strong> + <#if shoppingCart.getTotalQuantity() == 1> + ${uiLabelMap.OrderItem} + <#else> + ${uiLabelMap.OrderItems} + </#if>, + <strong id="microCartTotal"> + <@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/> + </strong> + </p> + <span id="microCartEmpty" style="display:none">${uiLabelMap.OrderShoppingCartEmpty}</span> + <#else> + <p>${uiLabelMap.OrderShoppingCartEmpty}</p> + </#if> + <ul> + <li> + <a href="<@ofbizUrl>view/showcart</@ofbizUrl>">[${uiLabelMap.OrderViewCart}]</a> + </li> + <#if (shoppingCartSize > 0)> + <#if !initialLocaleComplete?? || initialLocaleComplete?length == 2 > + <#if initialLocaleComplete?? && initialLocaleComplete?length == 2 && initialLocaleComplete == "fr"> + <#assign initialLocaleComplete = "fr_FR"><#-- same idea can be used with other default locale --> <#else> - <p>${uiLabelMap.OrderShoppingCartEmpty}</p> + <#assign initialLocaleComplete = "en_US"> </#if> - <ul> - <li><a href="<@ofbizUrl>view/showcart</@ofbizUrl>">[${uiLabelMap.OrderViewCart}]</a></li> - <#if (shoppingCartSize > 0)> - <#if !initialLocaleComplete?? || initialLocaleComplete?length == 2 > - <#if initialLocaleComplete?? && initialLocaleComplete?length == 2 && initialLocaleComplete == "fr"> - <#assign initialLocaleComplete = "fr_FR"><#-- same idea can be used with other default locale --> - <#else> - <#assign initialLocaleComplete = "en_US"> - </#if> - </#if> - <li id="quickCheckoutEnabled"><a href="<@ofbizUrl>quickcheckout</@ofbizUrl>">[${uiLabelMap.OrderCheckoutQuick}]</a></li> - <li id="quickCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</li> - <li id="onePageCheckoutEnabled"><a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>">[${uiLabelMap.EcommerceOnePageCheckout}]</a></li> - <li id="onePageCheckoutDisabled" style="display:none" class="disabled">[${uiLabelMap.EcommerceOnePageCheckout}]</li> - <#if shoppingCart?has_content && (shoppingCart.getGrandTotal() > 0)> - <li id="microCartPayPalCheckout"><a href="<@ofbizUrl>setPayPalCheckout</@ofbizUrl>"><img src="https://www.paypal.com/${initialLocaleComplete}/i/btn/btn_xpressCheckout.gif" alt="[PayPal Express Checkout]" onError="this.onerror=null;this.src='https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif'"/></a></li> - </#if> - <#else> - <li class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</li> - <li class="disabled">[${uiLabelMap.EcommerceOnePageCheckout}]</li> </#if> - </ul> + <li id="quickCheckoutEnabled"> + <a href="<@ofbizUrl>quickcheckout</@ofbizUrl>">[${uiLabelMap.OrderCheckoutQuick}]</a> + </li> + <li id="quickCheckoutDisabled" style="display:none" class="disabled"> + [${uiLabelMap.OrderCheckoutQuick}] + </li> + <li id="onePageCheckoutEnabled"> + <a href="<@ofbizUrl>onePageCheckout</@ofbizUrl>">[${uiLabelMap.EcommerceOnePageCheckout}]</a> + </li> + <li id="onePageCheckoutDisabled" style="display:none" class="disabled"> + [${uiLabelMap.EcommerceOnePageCheckout}] + </li> + <#if shoppingCart?has_content && (shoppingCart.getGrandTotal() > 0)> + <li id="microCartPayPalCheckout"> + <a href="<@ofbizUrl>setPayPalCheckout</@ofbizUrl>"> + <img src="https://www.paypal.com/${initialLocaleComplete}/i/btn/btn_xpressCheckout.gif" + alt="[PayPal Express Checkout]" + onError="this.onerror=null;this.src='https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif'"/> + </a> + </li> + </#if> + <#else> + <li class="disabled">[${uiLabelMap.OrderCheckoutQuick}]</li> + <li class="disabled">[${uiLabelMap.EcommerceOnePageCheckout}]</li> + </#if> + </ul> </div> Modified: ofbiz/trunk/specialpurpose/ecommerce/template/cart/MiniPromoText.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/template/cart/MiniPromoText.ftl?rev=1761135&r1=1761134&r2=1761135&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/template/cart/MiniPromoText.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/template/cart/MiniPromoText.ftl Sat Sep 17 07:17:15 2016 @@ -18,29 +18,31 @@ under the License. --> <#if showPromoText> -<div id="minipromotext" class="screenlet"> - <div class="screenlet-title-bar"> - <ul> - <li class="h3">${uiLabelMap.OrderSpecialOffers}</li> - </ul> - <br class="clear"/> - </div> - - <div class="screenlet-body"> - <#-- show promotions text --> - <ul> - <#list productPromos as productPromo> + <div id="minipromotext" class="screenlet"> + <div class="screenlet-title-bar"> + <ul> + <li class="h3">${uiLabelMap.OrderSpecialOffers}</li> + </ul> + <br class="clear"/> + </div> + <div class="screenlet-body"> + <#-- show promotions text --> + <ul> + <#list productPromos as productPromo> + <li> + <p> + <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" + class="linktext">${uiLabelMap.CommonDetails}</a> + ${StringUtil.wrapString(productPromo.promoText!)} + </p> + </li> + </#list> <li> - <p> - <a href="<@ofbizUrl>showPromotionDetails?productPromoId=${productPromo.productPromoId}</@ofbizUrl>" class="linktext">${uiLabelMap.CommonDetails}</a> - ${StringUtil.wrapString(productPromo.promoText!)} - </p> + <a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="button"> + ${uiLabelMap.OrderViewAllPromotions} + </a> </li> - </#list> - <li> - <a href="<@ofbizUrl>showAllPromotions</@ofbizUrl>" class="button">${uiLabelMap.OrderViewAllPromotions}</a> - </li> - </ul> + </ul> </div> -</div> + </div> </#if> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |