From 63898c6e6ea3b107e56a0a9c5b247e31b8acb5da Mon Sep 17 00:00:00 2001
From: root <root@iZ942k2d5ezZ.(none)>
Date: Fri, 12 May 2017 10:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/base/html5/assets/css/fec.css       |  50 ++++++++++++++----
 .../theme/base/html5/assets/img/pay.png       | Bin 0 -> 7351 bytes
 .../base/html5/catalog/product/index.php      |   2 +-
 .../theme/base/html5/checkout/cart/index.php  |  34 +++++++-----
 .../theme/base/html5/widgets/header.php       |   6 ++-
 5 files changed, 67 insertions(+), 25 deletions(-)
 create mode 100644 app/apphtml5/theme/base/html5/assets/img/pay.png

diff --git a/app/apphtml5/theme/base/html5/assets/css/fec.css b/app/apphtml5/theme/base/html5/assets/css/fec.css
index 3671a2ebd..8f472e06a 100644
--- a/app/apphtml5/theme/base/html5/assets/css/fec.css
+++ b/app/apphtml5/theme/base/html5/assets/css/fec.css
@@ -264,7 +264,8 @@ a{font-size:0.8em;}
     height: 44px;
     line-height: 44px;
     min-width: 15px;
-    padding: 0 10px;
+    padding: 0px;
+	text-align:center;
 }
 
 
@@ -508,25 +509,56 @@ a.btn-remove {
 
 
 #discount-coupon-form h2{font-size:0.6rem;}
-.cart-collaterals{padding:0.2rem 0.4rem;}
+.cart-collaterals{padding:0.2rem 0.4rem;min-height:17.5rem;}
 .cart_cost{margin-top:1rem;}
 .cart_cost .row.no-gutter .col-80{text-align:right;padding-right:1rem;}
 .cart_cost .row.no-gutter{
 padding-top: 0.2rem;
 }
 
+a.express_paypal{
+	background: #ffc63e;
+	border-color: #ffc63e;
+	display: block;
+    height: 2.17rem;
+    line-height: 2.17rem;
+    overflow: hidden;
+    padding: 0 0.83rem;
+    text-align: center;
+    text-overflow: ellipsis;
+    text-transform: capitalize;
+    white-space: nowrap;
+	padding:0 0.5rem;
+	width:100%;
+	border-radius: 0.17rem;
+}
+a.express_paypal img{max-height:70px;height:100%;width:100%;max-width:260px;}
 
+.cart-totals{margin:1rem 0}
 
 
+.btn-proceed-checkout{
+	  background-color: #f90;
+    border-color: #f90;
+	display: block;
+	font-size:0.7rem;
+    height: 2.17rem;
+    line-height: 2.17rem;
+    overflow: hidden;
+    padding: 0 0.83rem;
+    text-align: center;
+    text-overflow: ellipsis;
+    text-transform: capitalize;
+    white-space: nowrap;
+	padding:0 0.5rem;
+	width:100%;
+	border-radius: 0.17rem;
+	color:#fff;
+}
 
+.proceed_to_checkout .row.no-gutter .col-50{padding:0.2rem}
 
-
-
-
-
-
-
-
+.header_logo img{width:5rem; margin-top: 0.68rem;}
 
 
 
diff --git a/app/apphtml5/theme/base/html5/assets/img/pay.png b/app/apphtml5/theme/base/html5/assets/img/pay.png
new file mode 100644
index 0000000000000000000000000000000000000000..05833a32a2d8f9129dd32267120f47534aac564e
GIT binary patch
literal 7351
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
JS;9EzzW}VVeV70M

literal 0
HcmV?d00001

diff --git a/app/apphtml5/theme/base/html5/catalog/product/index.php b/app/apphtml5/theme/base/html5/catalog/product/index.php
index 089a1d458..da7aa706d 100644
--- a/app/apphtml5/theme/base/html5/catalog/product/index.php
+++ b/app/apphtml5/theme/base/html5/catalog/product/index.php
@@ -29,7 +29,7 @@
 						<span class="average_rating"><?= Yii::$service->page->translate->__('Average rating'); ?> :</span>
 						<span class="review_star review_star_<?= $reviw_rate_star_average ?>" style="font-weight:bold;" itemprop="average"></span>  
 						
-						<a rel="nofollow" href="#text-reviews">
+						<a external rel="nofollow" href="<?= Yii::$service->url->getUrl('catalog/reviewproduct/lists',['spu'=>$spu,'_id'=>$_id]); ?>">
 							(<span itemprop="count"><?= $review_count ?> <?= Yii::$service->page->translate->__('reviews'); ?></span>)
 						</a>
 					</span>
diff --git a/app/apphtml5/theme/base/html5/checkout/cart/index.php b/app/apphtml5/theme/base/html5/checkout/cart/index.php
index 4bbe826bc..d7153c772 100644
--- a/app/apphtml5/theme/base/html5/checkout/cart/index.php
+++ b/app/apphtml5/theme/base/html5/checkout/cart/index.php
@@ -18,13 +18,13 @@
 						<?php foreach($cart_info['products'] as $product_one){ ?>
 							<div class="row">
 								<div class="col-20">
-									<a href="<?= $product_one['url'] ?>" title="<?= $product_one['name'] ?>" class="product-image">
+									<a external href="<?= $product_one['url'] ?>" title="<?= $product_one['name'] ?>" class="product-image">
 										<img src="<?= Yii::$service->product->image->getResize($product_one['image'],[150,150],false) ?>" alt="<?= $product_one['name'] ?>" width="75" height="75">
 									</a>
 								</div>
 								<div class="col-80">
 									<h2 class="product-name">
-										<a href="<?= $product_one['url'] ?>"><?= $product_one['name'] ?></a>
+										<a external href="<?= $product_one['url'] ?>"><?= $product_one['name'] ?></a>
 									</h2>
 									<?php  if(is_array($product_one['custom_option_info'])){  ?>
 									<ul class="options">
@@ -40,12 +40,12 @@
 										<span class="price"><?=  $currency_info['symbol'];  ?><?= Format::price($product_one['product_price']); ?></span>                
 									</span>
 									<div class="cart_qty">
-										<a href="javascript:void(0)" class="cartqtydown changeitemqty" rel="<?= $product_one['item_id']; ?>" num="<?= $product_one['qty']; ?>">-</a>
+										<a  externalhref="javascript:void(0)" class="cartqtydown changeitemqty" rel="<?= $product_one['item_id']; ?>" num="<?= $product_one['qty']; ?>">-</a>
 										<input name="cart[qty]" size="4" title="Qty" class="input-text qty" rel="<?= $product_one['item_id']; ?>" maxlength="12" value="<?= $product_one['qty']; ?>">
-										<a href="javascript:void(0)" class="cartqtyup changeitemqty" rel="<?= $product_one['item_id']; ?>" num="<?= $product_one['qty']; ?>">+</a>
+										<a externalhref="javascript:void(0)" class="cartqtyup changeitemqty" rel="<?= $product_one['item_id']; ?>" num="<?= $product_one['qty']; ?>">+</a>
 										<div class="clear"></div>
 									</div>
-									<a href="javascript:void(0)"  rel="<?= $product_one['item_id']; ?>" title="Remove item" class="btn-remove btn-remove2"><span class="icon icon-remove"></span></a>
+									<a  externalhref="javascript:void(0)"  rel="<?= $product_one['item_id']; ?>" title="Remove item" class="btn-remove btn-remove2"><span class="icon icon-remove"></span></a>
 									
 								</div>
 							</div>
@@ -67,7 +67,7 @@
 											<div class="ui-input-text ui-body-inherit ui-corner-all ui-shadow-inset"><input style="color:#777;" class="input-text" id="coupon_code" name="coupon_code" value=""></div>
 										</div>
 										<div class="buttons-coupon">
-											<a data-role="button" href="javascript:void(0)" onclick="cartcouponsubmit()" class="submitbutton ui-link ui-btn ui-shadow ui-corner-all" role="button"><span><span>Add Coupon</span></span> </a>
+											<a external data-role="button" href="javascript:void(0)" onclick="cartcouponsubmit()" class="submitbutton ui-link ui-btn ui-shadow ui-corner-all" role="button"><span><span>Add Coupon</span></span> </a>
 											
 										</div>
 									</div>
@@ -86,7 +86,7 @@
 						</div>
 						
 						<div class="row no-gutter">
-							<div class="col-80"><?= Yii::$service->page->translate->__('Shipping Cost');?>  :   </td></div>
+							<div class="col-80"><?= Yii::$service->page->translate->__('Shipping Cost');?>  : </div>
 							<div class="col-20"><?=  $currency_info['symbol'];  ?><?= Format::price($cart_info['shipping_cost']); ?></div>
 						</div>
 						
@@ -105,12 +105,18 @@
 						
 						<div class="proceed_to_checkout">
 							
-							<button onclick="location.href='<?= Yii::$service->url->getUrl('checkout/onepage');  ?>'" type="button" title="Proceed to Checkout" class="button btn-proceed-checkout btn-checkout"><span><span><?= Yii::$service->page->translate->__('Proceed to Pay');?></span></span></button>
+							<div class="row no-gutter">
+								<div class="col-50">
+									<button onclick="location.href='<?= Yii::$service->url->getUrl('checkout/onepage');  ?>'" type="button" title="Proceed to Checkout" class="button btn-proceed-checkout btn-checkout"><span><span><?= Yii::$service->page->translate->__('Proceed to Pay');?></span></span></button>
 							
-							<span class="or">- <?= Yii::$service->page->translate->__('OR');?> - </span>
-							<a class="express_paypal" href="<?= Yii::$service->url->getUrl('payment/paypal/express/start');    ?>">
-							
-							</a>
+								</div>
+								<div class="col-50">
+									<a  external class="express_paypal" href="<?= Yii::$service->url->getUrl('payment/paypal/express/start');    ?>">
+										<img src="<?= Yii::$service->image->getImgUrl('/images/pay.png') ?>"  />
+									</a>
+									
+								</div>
+							</div>
 						</div>
 					</div>
 					<div class="clear"></div>
@@ -121,12 +127,12 @@
 	<?php }else{ ?>
 		<div class="empty_cart">
 		<?php
-			$param = ['urlB' => '<a rel="nofollow" href="'.Yii::$service->url->getUrl('customer/account/login').'">','urlE' =>'</a>'];
+			$param = ['urlB' => '<a  external rel="nofollow" href="'.Yii::$service->url->getUrl('customer/account/login').'">','urlE' =>'</a>'];
 		?>	
 		
 		<div id="empty_cart_info">
 			<?= Yii::$service->page->translate->__('Your Shopping Cart is empty');?>
-			<a href="<?= Yii::$service->url->homeUrl(); ?>"><?= Yii::$service->page->translate->__('Start shopping now!');?></a>
+			<a external href="<?= Yii::$service->url->homeUrl(); ?>"><?= Yii::$service->page->translate->__('Start shopping now!');?></a>
 			<br>
 			<?= Yii::$service->page->translate->__('Please {urlB}log in{urlE} to view the products you have previously added to your Shopping Cart.',$param);?>
 		</div>
diff --git a/app/apphtml5/theme/base/html5/widgets/header.php b/app/apphtml5/theme/base/html5/widgets/header.php
index 0a602de05..e9785cbb1 100644
--- a/app/apphtml5/theme/base/html5/widgets/header.php
+++ b/app/apphtml5/theme/base/html5/widgets/header.php
@@ -9,7 +9,11 @@
 ?>
 <header class="bar bar-nav">
 	<a class="icon icon-menu pull-left open-panel" data-panel="#panel-left-menu"></a>
-	<a href="<?= Yii::$service->url->homeUrl();  ?>"  external><h1 class='title'>FecShop</h1></a>
+	<a href="<?= Yii::$service->url->homeUrl();  ?>"  external>
+		<h1 class='title header_logo'>
+			<img src="<?= Yii::$service->image->getImgUrl('/custom/logo.png','appfront') ?>"  />
+		</h1>
+	</a>
 	<div class="pull-right">
 		<a  style="padding-right:0.4rem" class="icon icon-me open-panel"  data-panel="#panel-left-account"></a>
 		<a  style="padding-right:0.4rem" class="icon icon-cart" href="<?= Yii::$service->url->getUrl('checkout/cart'); ?>" external></a>