You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2018/02/18 09:18:07 UTC
svn commit: r1824651 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./
ecommerce/template/catalog/ ecommerce/template/customer/
ecommerce/template/shoppinglist/
Author: deepak
Date: Sun Feb 18 09:18:06 2018
New Revision: 1824651
URL: http://svn.apache.org/viewvc?rev=1824651&view=rev
Log:
Applied fix from trunk for revision: 1824650
===
Improved: UI improvement on various pages
1) Improvement of various button UI.
2) Improvement in layout at some screens.
3) Alignment issues of some card-header.
Thanks Nitish for your contribution
Modified:
ofbiz/ofbiz-plugins/branches/release17.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/KeywordSearchBox.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/MiniLastViewedCategories.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/MiniSignUpForContactList.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/ViewProfile.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/shoppinglist/EditShoppingList.ftl
Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 18 09:18:06 2018
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring/plugins:1634077-1635900
/ofbiz/branches/multitenant20100310/plugins:921280-927264
/ofbiz/branches/release13.07/plugins:1547657
-/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391,1822395,1824646,1824648,1824650
Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/KeywordSearchBox.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/KeywordSearchBox.ftl?rev=1824651&r1=1824650&r2=1824651&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/KeywordSearchBox.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/KeywordSearchBox.ftl Sun Feb 18 09:18:06 2018
@@ -52,8 +52,9 @@ under the License.
<label class="form-check-label" for="SEARCH_OPERATOR_AND"><input type="radio" class="form-check-input" name="SEARCH_OPERATOR" id="SEARCH_OPERATOR_AND" value="AND" <#if "AND" == searchOperator>checked="checked"</#if> />${uiLabelMap.CommonAll}</label>
</div>
</div>
- <input type="submit" value="${uiLabelMap.CommonFind}" class="btn btn-outline-secondary" />
-
+ <div class="form-group">
+ <input type="submit" value="${uiLabelMap.CommonFind}" class="btn btn-outline-secondary" />
+ </div>
</form>
<form name="advancedsearchform" id="keywordsearchbox_advancedsearchform" method="post" action="<@o...@ofbizUrl>">
<#if 0 < otherSearchProdCatalogCategories?size>
@@ -70,7 +71,9 @@ under the License.
<#else>
<input type="hidden" name="SEARCH_CATEGORY_ID" value="${searchCategoryId!}" />
</#if>
- <input type="submit" value="${uiLabelMap.ProductAdvancedSearch}" class="btn btn-outline-secondary" />
+ <div class="form-group">
+ <input type="submit" value="${uiLabelMap.ProductAdvancedSearch}" class="btn btn-outline-secondary" />
+ </div>
</form>
</div>
</div>
\ No newline at end of file
Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/MiniLastViewedCategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/MiniLastViewedCategories.ftl?rev=1824651&r1=1824650&r2=1824651&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/MiniLastViewedCategories.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/catalog/MiniLastViewedCategories.ftl Sun Feb 18 09:18:06 2018
@@ -28,7 +28,7 @@ under the License.
<div id="minilastviewedcategories" class="card">
<div class="card-header">
${uiLabelMap.EcommerceLastCategories}
- <a href="<@o...@ofbizUrl>">[${uiLabelMap.CommonClear}]</a>
+ <a href="<@o...@ofbizUrl>" class="float-right">[${uiLabelMap.CommonClear}]</a>
</div>
<div class="card-body">
<ul class="browsecategorylist">
Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/MiniSignUpForContactList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/MiniSignUpForContactList.ftl?rev=1824651&r1=1824650&r2=1824651&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/MiniSignUpForContactList.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/MiniSignUpForContactList.ftl Sun Feb 18 09:18:06 2018
@@ -65,7 +65,7 @@ under the License.
</div>
<div class="form-group">
<label for="preferredContactMechId">${uiLabelMap.CommonEmail} *</label>
- <select id="preferredContactMechId" name="preferredContactMechId" class="selectBox">
+ <select id="preferredContactMechId" name="preferredContactMechId" class="form-control">
<#list partyAndContactMechList as partyAndContactMech>
<option value="${partyAndContactMech.contactMechId}">
<#if partyAndContactMech.infoString?has_content>
@@ -82,9 +82,12 @@ under the License.
</#list>
</select>
</div>
- <input type="submit" class="form-control btn btn-outline-secondary" value="${uiLabelMap.EcommerceSubscribe}"/>
- <input type="button" class="form-control btn btn-outline-secondary" value="${uiLabelMap.EcommerceUnsubscribe}"
+ <div class="form-group">
+ <input type="submit" class="btn btn-outline-secondary" value="${uiLabelMap.EcommerceSubscribe}"/>
+
+ <input type="button" class="btn btn-outline-secondary" value="${uiLabelMap.EcommerceUnsubscribe}"
onclick="javascript:unsubscribeByContactMech();"/>
+ </div>
</form>
<#else>
<#-- Not logged in so ask them to log in and then sign up or clear the user association -->
Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/ViewProfile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/ViewProfile.ftl?rev=1824651&r1=1824650&r2=1824651&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/ViewProfile.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/ViewProfile.ftl Sun Feb 18 09:18:06 2018
@@ -181,7 +181,7 @@ under the License.
<input type="hidden" name="productStoreId" value="${productStoreId}" />
<input type="hidden" name="defaultShipAddr" value="${contactMech.contactMechId}" />
<input type="hidden" name="partyId" value="${party.partyId}" />
- <input type="submit" value="${uiLabelMap.EcommerceSetDefault}" class="button" />
+ <input type="submit" value="${uiLabelMap.EcommerceSetDefault}" class="btn btn-outline-secondary" />
</form>
</#if>
<#else>
@@ -585,6 +585,7 @@ under the License.
<table class="table table-responsive-sm">
<#list surveys as surveyAppl>
<#assign survey = surveyAppl.getRelatedOne("Survey", false) />
+ <tbody>
<tr>
<td>${survey.surveyName!} - ${survey.description!}</td>
<td>
@@ -599,6 +600,7 @@ under the License.
<td><a href="<@o...@ofbizUrl>" class="btn btn-outline-secondary">${surveyLabel}</a></td>
</#if>
</tr>
+ </tbody>
</#list>
</table>
</div>
Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/shoppinglist/EditShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/shoppinglist/EditShoppingList.ftl?rev=1824651&r1=1824650&r2=1824651&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/shoppinglist/EditShoppingList.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/shoppinglist/EditShoppingList.ftl Sun Feb 18 09:18:06 2018
@@ -83,12 +83,10 @@ under the License.
<div class="card">
<div class="card-header">
<strong>${uiLabelMap.EcommerceShoppingLists}</strong>
- <div class="boxlink">
- <form id="createEmptyShoppingList" action="<@o...@ofbizUrl>" method="post">
- <input type="hidden" name="productStoreId" value="${productStoreId!}" />
- <a href="javascript:document.getElementById('createEmptyShoppingList').submit();">${uiLabelMap.CommonCreateNew}</a>
- </form>
- </div>
+ <form id="createEmptyShoppingList" action="<@o...@ofbizUrl>" method="post">
+ <input type="hidden" name="productStoreId" value="${productStoreId!}" />
+ <a href="javascript:document.getElementById('createEmptyShoppingList').submit();" class="float-right">${uiLabelMap.CommonCreateNew}</a>
+ </form>
</div>
<div class="card-body">
<#if shoppingLists?has_content>