NoteStar 5 gadi atpakaļ
vecāks
revīzija
284c4e4d88
22 mainītis faili ar 4902 papildinājumiem un 30 dzēšanām
  1. 0 1
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/fec.css
  2. 4 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/widgets/footer.php
  3. 7 0
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/css/bootstrap.min.css
  4. 52 1
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/css/fec.css
  5. 4 0
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/css/font-awesome.min.css
  6. 11 0
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/css/ionicons.min.css
  7. BIN
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/fontawesome-webfont.eot
  8. 2671 0
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/fontawesome-webfont.svg
  9. BIN
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/fontawesome-webfont.ttf
  10. BIN
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/fontawesome-webfont.woff
  11. BIN
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/fontawesome-webfont.woff2
  12. BIN
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/ionicons.eot
  13. 2090 0
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/ionicons.svg
  14. BIN
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/ionicons.ttf
  15. BIN
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/ionicons.woff
  16. BIN
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/ionicons.woff2
  17. 2 2
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/cms/home/index.php
  18. 39 0
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/cms/home/index/indexproduct.php
  19. 6 1
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/layouts/home.php
  20. 2 0
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/layouts/main.php
  21. 11 25
      addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/widgets/footer.php
  22. 3 0
      vendor/fancyecommerce/fecshop/app/apphtml5/config/apphtml5.php

+ 0 - 1
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/fec.css

@@ -924,7 +924,6 @@ h2.product-name a {
     display: inline-block;
     padding: 15px 30px;
     border-radius: 3px;
-    color: #363f4d;
     font-weight: 500;
     font-size: 12px;
     border: 1px solid #9acf6a;

+ 4 - 0
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/widgets/footer.php

@@ -61,6 +61,10 @@
                             <ul>
                                 <li><a href="http://www.twitter.com/" class="twitter"  data-tooltip="Twitter"><i class="fa fa-twitter"></i></a></li>
                                 <li><a href="http://www.facebook.com/" class="facebook"  data-tooltip="Facebook"><i class="fa fa-facebook"></i></a></li>
+                                <li><a href="http://www.instagram.com/" class="instagram"  data-tooltip="instagram"><i class="fa fa-instagram"></i></a></li>
+                                <li><a href="http://www.tumblr.com/" class="tumblr"  data-tooltip="tumblr"><i class="fa fa-tumblr"></i></a></li>
+                                <li><a href="http://www.youtube.com/" class="youtube"  data-tooltip="youtube"><i class="fa fa-youtube"></i></a></li>
+                                <li><a href="http://www.youtube.com/" class="google"  data-tooltip="google"><i class="fa fa-google"></i></a></li>
                                 <li><a href="http://www.behance.com/" class="behance" data-tooltip="Behance"><i class="fa fa-behance"></i></a></li>
                                 <li><a href="http://www.pinterest.com/" class="pinterest" data-tooltip="Pinterest"><i class="fa fa-pinterest"></i></a></li>
                                 <li><a href="http://www.rss.com/" class="rss" data-tooltip="RSS"><i class="fa fa-rss"></i></a></li>

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 7 - 0
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/css/bootstrap.min.css


+ 52 - 1
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/css/fec.css

@@ -1153,7 +1153,58 @@ width: 80%;}
 .toptop image{
     width: 100%;
 }
-
+.foot_email_button{
+    line-height: 12px;
+    display: inline-block;
+    padding:10px 10px;
+    border-radius: 3px;
+    font-weight: 500;
+    font-size: 12px;
+    border: 1px solid #9acf6a;
+    background-color: #9acf6a;
+    color: #ffffff;
+    text-transform: uppercase;
+    margin-left: 5%;
+}
+.foot_email_input{
+    background: none;
+    border: none;
+    border-bottom-color: currentcolor;
+    border-bottom-style: none;
+    border-bottom-width: medium;
+    width: 60%;
+    border-bottom: 1px solid #ebebeb;
+    color: #ababab;
+    padding-bottom: 10px;
+    margin-bottom: 5px;
+    margin-left: 10%;
+}
+.html5_foot_title{
+    font-size: 14px;
+    line-height: 19px;
+    font-weight: 700;
+    color: #363f4d;
+    font-style: normal;
+    margin-top: 15px;
+    text-align: center;
+}
+.social-links ul{
+    text-align: center;
+}
+.social-links ul li {
+    display: inline-block;
+}
+.social-links ul li a i.fa {
+    font-size: 24px;
+    line-height: 26px;
+}
+.html5_foot_foot_text{
+    font-size: 12px;
+    line-height: 19px;
+    color: #363f4d;
+    font-style: normal;
+    text-align: center;
+}
 
 
 

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 4 - 0
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/css/font-awesome.min.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 11 - 0
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/css/ionicons.min.css


BIN
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/fontawesome-webfont.eot


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 2671 - 0
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/fontawesome-webfont.svg


BIN
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/fontawesome-webfont.ttf


BIN
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/fontawesome-webfont.woff


BIN
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/fontawesome-webfont.woff2


BIN
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/ionicons.eot


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 2090 - 0
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/ionicons.svg


BIN
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/ionicons.ttf


BIN
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/ionicons.woff


BIN
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/assets/fonts/ionicons.woff2


+ 2 - 2
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/cms/home/index.php

@@ -47,7 +47,7 @@
 	}
 </style>
 <div style="clear:both;"></div>
-<div style="padding:10px;">      
+<div style="padding:10px;">
     <!-- 添加 class infinite-scroll 和 data-distance  向下无限滚动可不加infinite-scroll-bottom类,这里加上是为了和下面的向上无限滚动区分-->
     <div class=" infinite-scroll infinite-scroll-bottom" data-distance="100">
         <div class="list-block">
@@ -55,7 +55,7 @@
 				<?php
 					$parentThis['products'] = $bestFeaturedProducts;
 					$parentThis['name'] = 'featured';
-                    echo Yii::$service->page->widget->render('cms/productlist', $parentThis);
+                    echo Yii::$service->page->widget->render('cms/indexproductlist', $parentThis);
 				?>
 				
             </div>

+ 39 - 0
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/cms/home/index/indexproduct.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * FecShop file.
+ *
+ * @link http://www.fecshop.com/
+ * @copyright Copyright (c) 2016 FecShop Software LLC
+ * @license http://www.fecshop.com/license/
+ */
+?>
+<?php $i = 0; ?>
+<?php  if(is_array($parentThis['products']) && !empty($parentThis['products'])): ?>
+	<?php foreach($parentThis['products'] as $product): ?>
+		<?php  if(isset($product['sku']) && $product['sku']): ?> 
+            <?php if($i%2 == 0):  ?>
+                <div class="row">
+            <?php endif; ?>
+                <div class="col-50 product_list">
+                    <a href="<?= $product['url'] ?>" external>
+                        <img width="100%" src="<?= Yii::$service->image->getImgUrl('images/lazyload.gif'); ?>"  class="lazy" data-src="<?= Yii::$service->product->image->getResize($product['image'],296,false) ?>"  />
+                    </a> 
+                    <p class="product_name" style="">
+                        <a href="<?= $product['url'] ?>" external>
+                            <?= $product['name'] ?>
+                        </a>
+                    </p>
+
+                </div>
+            <?php $i++; ?>
+            <?php if($i%2 == 0):  ?>
+                </div>
+            <?php endif; ?>
+        <?php endif; ?>
+	<?php  endforeach;  ?>
+    
+	<?php if($i%2 != 0):  ?>
+		</div>
+	<?php endif; ?>
+    
+<?php  endif;  ?>

+ 6 - 1
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/layouts/home.php

@@ -16,6 +16,7 @@ $jsOptions = [
 		//	'condition'=> 'lt IE 9',
 		],
 		'js'	=>[
+            'js/jquery.lazyload.min.js',
 			'js/zepto.min.js',
 			'js/sm.min.js',
 			'js/sm-extend.min.js',
@@ -30,8 +31,9 @@ $cssOptions = [
 	# css config 1.
 	[
 		'css'	=>[
+            'css/font-awesome.min.css',
 			'css/sm.min.css',
-			'css/sm-extend.min.css',
+			'css/sm-extend.css',
 			'css/fec.css',
 		],
 	],
@@ -54,6 +56,7 @@ $cssOptions = [
 	<div class="page-group">
 
 		<div class="page">
+
 			<?= Yii::$service->page->widget->render('base/header',$this); ?>
 			<div class="content" >
 				<?= $content; ?>
@@ -61,9 +64,11 @@ $cssOptions = [
 			</div>
 
 		</div>
+
 		<?= Yii::$service->page->widget->render('base/menu',$this); ?>
         <?= Yii::$service->page->widget->render('base/trace',$this); ?>
 	</div>
+
 <?php $this->endBody() ?>
 </body>
 </html>

+ 2 - 0
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/layouts/main.php

@@ -16,6 +16,7 @@ $jsOptions = [
 		//	'condition'=> 'lt IE 9',
 		],
 		'js'	=>[
+            'js/jquery.lazyload.min.js',
 			'js/zepto.min.js',
 			'js/sm.min.js',
 			'js/sm-extend.min.js',
@@ -30,6 +31,7 @@ $cssOptions = [
 	# css config 1.
 	[
 		'css'	=>[
+            'css/font-awesome.min.css',
 			'css/sm.min.css',
 			'css/sm-extend.min.css',
 			'css/fec.css',

+ 11 - 25
addons/fecmall/furnilife_theme/app/apphtml5/theme/furnilife/widgets/footer.php

@@ -9,14 +9,9 @@
 ?>
 <div class="footer-container">
     <!--=======  footer navigation  =======-->
-
     <div class="container">
-            <div class="row">
-                <div class="col-lg-12">
-                    <!--=======  widget block  =======-->
-
-                    <div class="widget-block">
-                        <h4 class="footer-widget-title mt-sm-20 mb-sm-10 text-xl-center">JOIN OUR NEWSLETTER NOW</h4>
+                    <div class="widget-block text-xl-center">
+                        <h4 class="html5_foot_title">JOIN OUR NEWSLETTER NOW</h4>
                         <!--=======  newsletter formq  =======-->
                         <div class="text-xl-center">
                             <form  class="mc-form" method="get" action="<?=  Yii::$service->url->getUrl('customer/newsletter') ?>">
@@ -25,42 +20,33 @@
                             </form>
                         </div>
                         <!--=======  End of newsletter formq  =======-->
-                        <div class="social-links text-xl-center ">
+                        <div class="social-links">
                             <ul>
                                 <li><a href="http://www.twitter.com/" class="twitter"  data-tooltip="Twitter"><i class="fa fa-twitter"></i></a></li>
                                 <li><a href="http://www.facebook.com/" class="facebook"  data-tooltip="Facebook"><i class="fa fa-facebook"></i></a></li>
+                                <li><a href="http://www.instagram.com/" class="instagram"  data-tooltip="instagram"><i class="fa fa-instagram"></i></a></li>
+                                <li><a href="http://www.tumblr.com/" class="tumblr"  data-tooltip="tumblr"><i class="fa fa-tumblr"></i></a></li>
+                                <li><a href="http://www.youtube.com/" class="youtube"  data-tooltip="youtube"><i class="fa fa-youtube"></i></a></li>
+                                <li><a href="http://www.youtube.com/" class="google"  data-tooltip="google"><i class="fa fa-google"></i></a></li>
                                 <li><a href="http://www.behance.com/" class="behance" data-tooltip="Behance"><i class="fa fa-behance"></i></a></li>
                                 <li><a href="http://www.pinterest.com/" class="pinterest" data-tooltip="Pinterest"><i class="fa fa-pinterest"></i></a></li>
                                 <li><a href="http://www.rss.com/" class="rss" data-tooltip="RSS"><i class="fa fa-rss"></i></a></li>
                             </ul>
                         </div>
                     </div>
-
-                    <!--=======  End of widget block  =======-->
-                </div>
-
-            </div>
     </div>
-    <!--=======  footer copyright  =======-->
-    <div class="container">
-            <div class="row align-items-center">
-                <div class=" text-center  mb-20 mb-md-0">
-                    <!--=======  footer copyright text  =======-->
-                    <div class="footer-copyright-text">
+
+    <div class="container foot_foot_content">
+                <div class="html5_foot_foot_text">
                         <p>Copyright &copy; 2018 <a href="http://www.fecshop.com/">Fecshop</a>, All Rights Reserved.</p>
-                    </div>
-                    <!--=======  End of footer copyright text  =======-->
                 </div>
-                <div class=" text-center ">
+                <div class="text-center">
                     <!--=======  payment logo  =======-->
                     <div class="payment-logo">
                         <img src="<?= Yii::$service->image->getImgUrl('addons/fectfurnilife/payment.png'); ?>" class="img-fluid" alt="">
                     </div>
                     <!--=======  End of payment logo  =======-->
                 </div>
-            </div>
         </div>
 
-
-    <!--=======  End of footer copyright  =======-->
 </div>

+ 3 - 0
vendor/fancyecommerce/fecshop/app/apphtml5/config/apphtml5.php

@@ -178,6 +178,9 @@ $config = [
                             'productlist' => [
                                 'view'  => 'cms/home/index/product.php',
                             ],
+                            'indexproductlist' => [
+                                'view'  => 'cms/home/index/indexproduct.php',
+                            ],
                         ],
                         'category' => [
                             'price' => [