OFBiz › OFBiz - Commits

svn commit: r1822392 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./ ecommerce/template/customer/ ecommerce/template/request/ ecommerce/webapp/ecommerce/css/

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Deepak Dixit-5

svn commit: r1822392 - in /ofbiz/ofbiz-plugins/branches/release17.12: ./ ecommerce/template/customer/ ecommerce/template/request/ ecommerce/webapp/ecommerce/css/

Author: deepak
Date: Sat Jan 27 11:42:10 2018
New Revision: 1822392

URL: http://svn.apache.org/viewvc?rev=1822392&view=rev
Log:
Applied fix from trunk for revision: 1822391
===

Improved: Improvement in UI of various pages of ecommerce(OFBIZ-10182)
Thanks Nitish Mishra for your contribution

Modified:
ofbiz/ofbiz-plugins/branches/release17.12/ (props changed)
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/AnonContactus.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/NewCustomer.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/request/RequestList.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/request/ViewRequestItemInfo.ftl
ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/webapp/ecommerce/css/custom.css

Propchange: ofbiz/ofbiz-plugins/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 27 11:42:10 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
+/ofbiz/ofbiz-plugins/trunk:1819576,1819580,1819582,1819589,1820962,1820973,1821045,1821049,1821051,1822129,1822133,1822139,1822143,1822145,1822389,1822391

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/AnonContactus.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/AnonContactus.ftl?rev=1822392&r1=1822391&r2=1822392&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/AnonContactus.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/AnonContactus.ftl Sat Jan 27 11:42:10 2018
@@ -41,58 +41,58 @@ under the License.
<input type="hidden" name="emailType" value="CONT_NOTI_EMAIL"/>

<div class="form-group row">
- <label for="${uiLabelMap.EcommerceSubject}" class="col-1 col-form-label">${uiLabelMap.EcommerceSubject}</label>
- <div class="col-11">
+ <label for="${uiLabelMap.EcommerceSubject}" class="col-2 col-form-label">${uiLabelMap.EcommerceSubject}</label>
+ <div class="col-10">
<input type="text" name="subject" id="subject" class="required form-control form-control-sm" value="${requestParameters.subject!}"/>
</div>
</div>
<div class="form-group row">
- <label for="${uiLabelMap.CommonMessage}" class="col-1 col-form-label">${uiLabelMap.CommonMessage}</label>
- <div class="col-11">
+ <label for="${uiLabelMap.CommonMessage}" class="col-2 col-form-label">${uiLabelMap.CommonMessage}</label>
+ <div class="col-10">
<textarea name="content" id="message" class="required form-control form-control-sm" rows="4">
${requestParameters.content!}
</textarea>
</div>
</div>
<div class="form-group row">
- <label for="${uiLabelMap.FormFieldTitle_emailAddress}" class="col-1 col-form-label">${uiLabelMap.FormFieldTitle_emailAddress}</label>
- <div class="col-11">
+ <label for="${uiLabelMap.FormFieldTitle_emailAddress}" class="col-2 col-form-label">${uiLabelMap.FormFieldTitle_emailAddress}</label>
+ <div class="col-10">
<input type="email" name="emailAddress" id="emailAddress" class="required form-control form-control-sm" value="${requestParameters.emailAddress!}"/>
</div>
</div>
<div class="row">
<div class="col-6">
<div class="form-group row">
- <label for="${uiLabelMap.PartyFirstName}" class="col-2 col-form-label">${uiLabelMap.PartyFirstName}</label>
- <div class="col-10">
+ <label for="${uiLabelMap.PartyFirstName}" class="col-4 col-form-label">${uiLabelMap.PartyFirstName}</label>
+ <div class="col-8">
<input type="text" name="firstName" id="firstName" class="required form-control form-control-sm" value="${requestParameters.firstName!}"/>
</div>
</div>
</div>
<div class="col-6">
<div class="form-group row">
- <label for="${uiLabelMap.PartyLastName}" class="col-2 col-form-label">${uiLabelMap.PartyLastName}</label>
- <div class="col-10">
+ <label for="${uiLabelMap.PartyLastName}" class="col-4 col-form-label">${uiLabelMap.PartyLastName}</label>
+ <div class="col-8">
<input type="text" name="lastName" id="lastName" class="required form-control form-control-sm" value="${requestParameters.lastName!}"/>
</div>
</div>
</div>
</div>
<div class="form-group row">
- <label for="${uiLabelMap.CommonCaptchaCode}" class="col-1 col-form-label">${uiLabelMap.CommonCaptchaCode}</label>
- <div class="col-11">
+ <label for="${uiLabelMap.CommonCaptchaCode}" class="col-2 col-form-label">${uiLabelMap.CommonCaptchaCode}</label>
+ <div class="col-10">
<img id="captchaImage" src="<@ofbizUrl>captcha.jpg?captchaCodeId=captchaImage&unique=${nowTimestamp.getTime()}</@ofbizUrl>" alt=""/>
</div>
</div>
<div class="row">
- <div class="col-1"></div>
- <div class="col-11">
+ <div class="col-2"></div>
+ <div class="col-10">
<a href="javascript:reloadCaptcha('captchaImage');">${uiLabelMap.CommonReloadCaptchaCode}</a>
</div>
</div>
<div class="form-group row">
- <label for="${uiLabelMap.CommonVerifyCaptchaCode}" class="col-1 col-form-label">${uiLabelMap.CommonVerifyCaptchaCode}</label>
- <div class="col-11">
+ <label for="${uiLabelMap.CommonVerifyCaptchaCode}" class="col-2 col-form-label">${uiLabelMap.CommonVerifyCaptchaCode}</label>
+ <div class="col-10">
<input type="text" autocomplete="off" maxlength="30" size="23" name="captcha" class="form-control form-control-sm"/>
</div>
</div>

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/NewCustomer.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/NewCustomer.ftl?rev=1822392&r1=1822391&r2=1822392&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/NewCustomer.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/customer/NewCustomer.ftl Sat Jan 27 11:42:10 2018
@@ -405,13 +405,10 @@ will generally always be reserved for th
<#if getUsername>
<@fieldErrors fieldName="USERNAME"/>
<#if !requestParameters.preferredUsername?has_content>
- <div class="row">
- <div class="form-check col-12">
- <label class="form-check-label">
+ <div class="form-check">
+ <label class="form-check-label"></label>
<input type="checkbox" name="UNUSEEMAIL" class="checkbox form-check-input" id="UNUSEEMAIL" value="on"
onclick="setEmailUsername();" onfocus="setLastFocused(this);"/> ${uiLabelMap.EcommerceUseEmailAddress}
- </label>
- </div>
</div>
</#if>

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/request/RequestList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/request/RequestList.ftl?rev=1822392&r1=1822391&r2=1822392&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/request/RequestList.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/request/RequestList.ftl Sat Jan 27 11:42:10 2018
@@ -22,8 +22,8 @@ under the License.
<strong>${uiLabelMap.EcommerceRequestHistory}</strong>
</div>
<div class="card-body">
- <table class="table">
- <thead>
+ <table class="table table-responsive-sm">
+ <thead class="thead-light">
<tr>
<th>
${uiLabelMap.OrderRequest} ${uiLabelMap.CommonNbr}

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/request/ViewRequestItemInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/request/ViewRequestItemInfo.ftl?rev=1822392&r1=1822391&r2=1822392&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/request/ViewRequestItemInfo.ftl (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/template/request/ViewRequestItemInfo.ftl Sat Jan 27 11:42:10 2018
@@ -22,8 +22,8 @@ under the License.
<strong>${uiLabelMap.OrderRequestItems}</strong>
</div>
<div class="card-body">
- <table class="table">
- <thead>
+ <table class="table table-responsive-sm">
+ <thead class="thead-light">
<tr>
<th>${uiLabelMap.ProductItem}</th>
<th>${uiLabelMap.OrderProduct}</th>

Modified: ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/webapp/ecommerce/css/custom.css
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/webapp/ecommerce/css/custom.css?rev=1822392&r1=1822391&r2=1822392&view=diff
==============================================================================
--- ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/webapp/ecommerce/css/custom.css (original)
+++ ofbiz/ofbiz-plugins/branches/release17.12/ecommerce/webapp/ecommerce/css/custom.css Sat Jan 27 11:42:10 2018
@@ -16,10 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-
+body {
+ font-size: 0.9rem;
+}
+a,.btn-link{
+ color: #158ae2;
+}
+a.btn-primary {
+ color: white!important;
+}
#ecom-mainarea{
padding:10px;
- background: #FFF;
margin-top: 20px;
position: relative;
text-align: left;