NoteStar il y a 5 ans
Parent
commit
30de0e705a
100 fichiers modifiés avec 13088 ajouts et 2 suppressions
  1. 0 2
      addons/.gitignore
  2. 0 0
      addons/fecmall/furnilife_theme/LICENSE
  3. 59 0
      addons/fecmall/furnilife_theme/README.md
  4. 53 0
      addons/fecmall/furnilife_theme/administer/Install.php
  5. 33 0
      addons/fecmall/furnilife_theme/administer/Uninstall.php
  6. 49 0
      addons/fecmall/furnilife_theme/administer/Upgrade.php
  7. 93 0
      addons/fecmall/furnilife_theme/app/appfront/modules/Checkout/controllers/CartInfoController.php
  8. 76 0
      addons/fecmall/furnilife_theme/app/appfront/modules/Cms/block/home/Index.php
  9. 28 0
      addons/fecmall/furnilife_theme/app/appfront/modules/Cms/controllers/HomeController.php
  10. 42 0
      addons/fecmall/furnilife_theme/app/appfront/modules/Customer/block/address/Edit.php
  11. 7 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/bootstrap.min.css
  12. 779 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/fec.css
  13. 4 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/font-awesome.min.css
  14. 1 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/helper.css
  15. 11 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/ionicons.min.css
  16. 6739 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/main.css
  17. 163 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/owl.carousel.css
  18. 190 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/plugins.css
  19. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/fontawesome-webfont.eot
  20. 2671 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/fontawesome-webfont.svg
  21. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/fontawesome-webfont.ttf
  22. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/fontawesome-webfont.woff
  23. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/fontawesome-webfont.woff2
  24. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/ionicons.eot
  25. 2090 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/ionicons.svg
  26. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/ionicons.ttf
  27. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/ionicons.woff
  28. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/ionicons.woff2
  29. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/backgrounds/bg1.jpg
  30. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/about-banner.jpg
  31. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner1.jpg
  32. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner10.jpg
  33. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner11.jpg
  34. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner12.jpg
  35. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner13.jpg
  36. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner14.jpg
  37. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner15.jpg
  38. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner16.jpg
  39. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner17.jpg
  40. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner18.jpg
  41. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner19.jpg
  42. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner2.jpg
  43. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner20.jpg
  44. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner21.jpg
  45. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner22.jpg
  46. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner3.jpg
  47. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner4.jpg
  48. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner5.jpg
  49. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner6.jpg
  50. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner7.jpg
  51. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner8.jpg
  52. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner9.jpg
  53. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/home3-banner1.jpg
  54. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/home3-banner2.jpg
  55. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/home3-banner3.jpg
  56. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/home3-banner8.jpg
  57. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/megamenu-banner.jpg
  58. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/01.jpg
  59. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/02.jpg
  60. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/03.jpg
  61. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/comment-icon.png
  62. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/small-01.jpg
  63. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/small-02.jpg
  64. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/small-03.jpg
  65. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/small-04.jpg
  66. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/brands/01.png
  67. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/brands/02.png
  68. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/brands/03.png
  69. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/brands/04.png
  70. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/cur.png
  71. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/favicon.ico
  72. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_0.png
  73. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_1.png
  74. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_2.png
  75. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_3.png
  76. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_4.png
  77. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_5.png
  78. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/cart.gif
  79. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/cur.png
  80. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/i_msg-error.gif
  81. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/i_msg-success.gif
  82. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/paypaltopay.jpg
  83. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/product_rating_big_blank_star.png
  84. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/product_rating_big_full_star.png
  85. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/sign.png
  86. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/validation_advice_bg.gif
  87. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/01.png
  88. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/02.png
  89. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/03.png
  90. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/04.png
  91. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/05.png
  92. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/06.png
  93. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/07.png
  94. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/map-marker.png
  95. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/separator-icon.png
  96. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/sidebar1.png
  97. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/slider-icon.png
  98. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/logo.png
  99. BIN
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/logo2.png
  100. 0 0
      addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/payment.png

+ 0 - 2
addons/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

+ 0 - 0
addons/fecmall/furnilife_theme/LICENSE


+ 59 - 0
addons/fecmall/furnilife_theme/README.md

@@ -0,0 +1,59 @@
+### fecshop theme furni life
+
+fecshop 模板 furnilife
+
+> fecshop 模板 furnilife
+
+### 文件
+
+./feepackage/fect/furnilife_theme
+
+./common/config/fecshop_third_extensions/fecshop_theme_fect_furnilife.php
+
+./appimage/appfront/media/fect/furnilife
+
+### 安装
+
+1.1将文件夹`fect`复制到 `./feepackage` 文件夹下
+
+
+1.2添加配置文件
+
+将 @feepackage/fect/furnilife_theme/config/fecshop_theme_fect_furnilife.php 文件复制到 @common/config/fecshop_third_extensions/fecshop_theme_fect_furnilife.php
+
+1.2store添加模板配置
+
+在@appfront/config/fecshop_local_services/Store.php 文件中的 thirdThemeDir 添加模板路径
+
+'@fectfurnilife/appfront/theme/furnilife',
+
+添加完成的样子为:
+
+'thirdThemeDir'    => [
+    '@fectfurnilife/appfront/theme/furnilife',
+],
+
+如果appfront下面所有的store都想使用该模板,那么,您需要在每一个store配置中的 'thirdThemeDir'添加模板路径配置
+
+当然,您可以每个store使用不同的模板, 如果您本地模板路径下有文件,那么您需要将store的配置参数localThemeDir对应的 值,修改成一个新的文件路径(因为本地的模板路径下的模板文件优先级高, 会覆盖第三方模板的模板文件,因此,您可以设置一个新的本地模板路径)
+
+1.3
+
+将`@fectfurnilife/appfront/config/YiiRewriteMap.php`,里面的内容复制到
+@appfront/config/YiiRewriteMap.php中,用于文件重写。
+
+
+
+
+
+2.添加完成后,就可以访问了
+
+### theme使用说明
+
+
+### file
+
+@appimage/appfront/media/fect/furnilife/*
+@common/config/fecshop_third_extensions/fecshop_theme_fect_furnilife.php
+@feepackage/fect/furnilife_theme/*
+

+ 53 - 0
addons/fecmall/furnilife_theme/administer/Install.php

@@ -0,0 +1,53 @@
+<?php
+namespace fectfurnilife\administer;
+use Yii;
+/**
+ * 应用安装类
+ * 您可以在这里添加类变量,在配置中的值可以注入进来。
+ */
+class Install implements \fecshop\services\extension\InstallInterface
+{
+    
+    public $version = '1.0.0';
+    
+    public $test;
+    
+    /**
+     * @return mixed|void
+     */
+    public function run()
+    {
+        if (!$this->installDbSql()) {
+            return false;
+        }
+        if (!$this->copyImageFile()) {
+            return false;
+        }
+        return true;
+    }
+    /**
+     * 进行数据库的初始化
+     * sql语句执行,多个sql用分号  `;`隔开
+     */
+    public function installDbSql()
+    {
+        // $sql = "";
+        // 执行sql, 创建表结构的时候,这个函数会返回0,因此不能以返回值作为return
+        // Yii::$app->getDb()->createCommand($sql)->execute();
+        
+        return true;
+    }
+    
+    /**
+     * 复制图片文件到appimage/common/addons/{namespace},如果存在,则会被强制覆盖
+     */
+    public function copyImageFile()
+    {
+        $sourcePath = Yii::getAlias('@fectfurnilife/app/appimage/common/addons/fectfurnilife');
+        
+        Yii::$service->extension->administer->copyThemeFile($sourcePath);
+        
+        return true;
+    }
+    
+}

+ 33 - 0
addons/fecmall/furnilife_theme/administer/Uninstall.php

@@ -0,0 +1,33 @@
+<?php
+namespace fectfurnilife\administer;
+use Yii;
+/**
+ * 应用安装类
+ * 您可以在这里添加类变量,在配置中的值可以注入进来。
+ */
+class Uninstall implements \fecshop\services\extension\UninstallInterface
+{
+    
+    /**
+     * @return mixed|void
+     */
+    public function run()
+    {
+        //$sql = "
+        //    DROP TABLE IF EXISTS `rf_addon_article1`;
+        //    DROP TABLE IF EXISTS `rf_addon_article_adv1`;
+        //";
+        // 执行sql, 创建表结构的时候,这个函数会返回0,因此不能以返回值作为return
+        //Yii::$app->getDb()->createCommand($sql)->execute();
+        if (!$this->removeImageFile()) {
+            return false;
+        }
+        
+        return true;
+    }
+    
+    public function removeImageFile()
+    {
+        return Yii::$service->extension->administer->removeThemeFile();
+    }
+}

+ 49 - 0
addons/fecmall/furnilife_theme/administer/Upgrade.php

@@ -0,0 +1,49 @@
+<?php
+namespace fectfurnilife\administer;
+use Yii;
+/**
+ * 应用安装类
+ * 您可以在这里添加类变量,在配置中的值可以注入进来。
+ */
+class Upgrade implements \fecshop\services\extension\UpgradeInterface
+{
+    /**
+     * @var array
+     * 必须按照版本号依次填写,否则升级会导致问题。
+     */
+    public $versions = [
+        '1.0.1',
+        '1.0.2',
+        '1.0.3',
+    ];
+    
+    
+    /**
+    * @param $addon
+    * @return mixed|void
+    * @throws \yii\db\Exception
+    */
+    public function run($version)
+    {
+        switch ($version)
+        {
+            case '1.0.1' :
+                // 增加测试 - 冗余的字段
+                //$sql = "ALTER TABLE rf_addon_article1 ADD COLUMN redundancy_field_5255 varchar(48);";
+                //Yii::$app->getDb()->createCommand($sql)->execute();
+                break;
+            case '1.0.2' :
+                // 删除测试 - 冗余的字段
+                //$sql = "ALTER TABLE rf_addon_article1 ADD COLUMN redundancy_field_566 varchar(48);";
+                //Yii::$app->getDb()->createCommand($sql)->execute();
+                break;
+            case '1.0.3' :
+                // 删除测试 - 冗余的字段
+                //$sql = "ALTER TABLE rf_addon_article1 ADD COLUMN redundancy_field_567 varchar(48);";
+                //Yii::$app->getDb()->createCommand($sql)->execute();
+                break;
+        }
+        
+        return true;
+    }
+}

+ 93 - 0
addons/fecmall/furnilife_theme/app/appfront/modules/Checkout/controllers/CartInfoController.php

@@ -0,0 +1,93 @@
+<?php
+/**
+ * FecShop file.
+ *
+ * @link http://www.fecshop.com/
+ * @copyright Copyright (c) 2016 FecShop Software LLC
+ * @license http://www.fecshop.com/license/
+ */
+
+namespace fectfurnilife\app\appfront\modules\Checkout\controllers;
+
+use fecshop\app\appfront\modules\AppfrontController;
+use Yii;
+
+/**
+ * @author Terry Zhao <2358269014@qq.com>
+ * @since 1.0
+ */
+class CartInfoController extends AppfrontController
+{
+
+
+
+    public function actionIndex()
+    {
+        $arr = [];
+        $arr['product_total'] = 0;
+        $cartInfos = Yii::$service->cart->quoteItem->getCartProductInfo();
+        if (is_array($cartInfos) && !empty($cartInfos)) {
+            $currency_info = Yii::$service->page->currency->getCurrencyInfo();
+            $arr['symbol'] = $currency_info['symbol'];
+            $product_total = isset($cartInfos['product_total']) ? $cartInfos['product_total'] : 0;
+            $arr['product_total'] =  Yii::$service->helper->format->number_format($product_total);
+            $products = $cartInfos['products'];
+            if (is_array($products) && !empty($products)) {
+                foreach ($products as $product) {
+                    $product_image = isset($product['product_image']['main']['image']) ? $product['product_image']['main']['image'] : '';
+                    $name = $product['name'];
+                    $product_price = $product['product_price'];
+                    $qty = $product['qty'];
+                    $arr['products'][] = [
+                        'product_image' => Yii::$service->product->image->getResize($product_image, [100,100], false)  ,
+                        'name' => $name,
+                        'product_price' => Yii::$service->helper->format->number_format($product_price),
+                        'qty' => $qty,
+                        'product_url' => Yii::$service->url->getUrl($product['product_url']),
+                        'custom_option_info' => $this->getProductOptions($product),
+                    ];
+                }
+            }
+        }
+        echo json_encode($arr); exit;
+    }
+    
+    /**
+     * 将产品页面选择的颜色尺码等显示出来,包括custom option 和spu options部分的数据.
+     */
+    public function getProductOptions($product_one)
+    {
+        
+        $custom_option_info_arr = [];
+        $custom_option = isset($product_one['custom_option']) ? $product_one['custom_option'] : '';
+        $custom_option_sku = $product_one['custom_option_sku'];
+        if (isset($custom_option[$custom_option_sku]) && !empty($custom_option[$custom_option_sku])) {
+            $custom_option_info = $custom_option[$custom_option_sku];
+            foreach ($custom_option_info as $attr=>$val) {
+                if (!in_array($attr, ['qty', 'sku', 'price', 'image'])) {
+                    $attr = str_replace('_', ' ', $attr);
+                    $attr = ucfirst($attr);
+                    $custom_option_info_arr[$attr] = $val;
+                }
+            }
+        }
+
+        $spu_options = $product_one['spu_options'];
+        if (is_array($spu_options) && !empty($spu_options)) {
+            foreach ($spu_options as $label => $val) {
+                $custom_option_info_arr[$label] = $val;
+            }
+        }
+        $str = '';
+        if (is_array($custom_option_info_arr) && !empty($custom_option_info_arr)) {
+            foreach ($custom_option_info_arr as $label => $val) {
+                $str .= '<p>'.Yii::$service->page->translate->__(ucwords($label)).':'.Yii::$service->page->translate->__($val).'</p>';
+                
+            }
+        }
+        
+        return $str;
+    }
+
+    
+}

+ 76 - 0
addons/fecmall/furnilife_theme/app/appfront/modules/Cms/block/home/Index.php

@@ -0,0 +1,76 @@
+<?php
+/**
+ * FecShop file.
+ *
+ * @link http://www.fecshop.com/
+ * @copyright Copyright (c) 2016 FecShop Software LLC
+ * @license http://www.fecshop.com/license/
+ */
+
+namespace fectfurnilife\app\appfront\modules\Cms\block\home;
+
+use Yii;
+use fecshop\app\appfront\modules\Cms\block\home\Index as FecIndex;
+
+/**
+ * @author Terry Zhao <2358269014@qq.com>
+ * @since 1.0
+ */
+class Index extends  FecIndex
+{
+    public function getLastData()
+    {
+        $this->initHead();
+        // change current layout File.
+        //Yii::$service->page->theme->layoutFile = 'home.php';
+        $home_floor_one = Yii::$app->controller->module->params['home_floor_one'];
+        $home_floor_two = Yii::$app->controller->module->params['home_floor_two'];
+        $home_floor_three = Yii::$app->controller->module->params['home_floor_three'];
+        return [
+            'bestFeaturedProducts'     => $this->getFeaturedProduct(),
+            'bestSellerProducts'    => $this->getBestSellerProducts(),
+            
+            'featuredProducts'     => $this->getHomeFeaturedProducts(),
+            'newProducts'     => $this->getHomeNewProducts(),
+            'onSaleProducts'    => $this->getHomeOnSaleProducts(),
+            
+            'floor_one_title' =>  isset($home_floor_one['slider']['title']) ? $home_floor_one['slider']['title'] : '',
+            'floor_one_items' =>  isset($home_floor_one['slider']['items']) ? $home_floor_one['slider']['items'] : '',
+            'floor_one_products' => is_array($home_floor_one['product_skus']) ? $this->getProductBySkus($home_floor_one['product_skus']) : '',
+            'floor_one_banner_text' => isset($home_floor_one['banner-text']) ? $home_floor_one['banner-text'] : '',
+            
+            'floor_two_title' =>  isset($home_floor_two['slider']['title']) ? $home_floor_two['slider']['title'] : '',
+            'floor_two_items' =>  isset($home_floor_two['slider']['items']) ? $home_floor_two['slider']['items'] : '',
+            'floor_two_products' => is_array($home_floor_two['product_skus']) ? $this->getProductBySkus($home_floor_two['product_skus']) : '',
+            'floor_two_banner_text' => isset($home_floor_two['banner-text']) ? $home_floor_two['banner-text'] : '',
+            
+            'floor_three_title' =>  isset($home_floor_three['slider']['title']) ? $home_floor_three['slider']['title'] : '',
+            'floor_three_items' =>  isset($home_floor_three['slider']['items']) ? $home_floor_three['slider']['items'] : '',
+            'floor_three_products' => is_array($home_floor_three['product_skus']) ? $this->getProductBySkus($home_floor_three['product_skus']) : '',
+            'floor_three_banner_text' => isset($home_floor_three['banner-text']) ? $home_floor_three['banner-text'] : '',
+            
+        ];
+    }
+    
+    public function getHomeFeaturedProducts()
+    {
+        $featured_skus = Yii::$app->controller->module->params['home_featured_products'];
+
+        return $this->getProductBySkus($featured_skus);
+    }
+    
+    public function getHomeNewProducts()
+    {
+        $home_new_products = Yii::$app->controller->module->params['home_new_products'];
+
+        return $this->getProductBySkus($home_new_products);
+    }
+    
+    public function getHomeOnSaleProducts()
+    {
+        $home_onsale_products = Yii::$app->controller->module->params['home_onsale_products'];
+
+        return $this->getProductBySkus($home_onsale_products);
+    }
+    
+}

+ 28 - 0
addons/fecmall/furnilife_theme/app/appfront/modules/Cms/controllers/HomeController.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * FecShop file.
+ *
+ * @link http://www.fecshop.com/
+ * @copyright Copyright (c) 2016 FecShop Software LLC
+ * @license http://www.fecshop.com/license/
+ */
+
+namespace fectfurnilife\app\appfront\modules\Cms\controllers;
+
+use fecshop\app\appfront\modules\AppfrontController;
+use Yii;
+
+/**
+ * @author Terry Zhao <2358269014@qq.com>
+ * @since 1.0
+ */
+class HomeController extends \fecshop\app\appfront\modules\Cms\controllers\HomeController
+{
+    // 网站信息管理
+    public function actionIndex()
+    {
+        $data = $this->getBlock()->getLastData();
+
+        return $this->render($this->action->id, $data);
+    }
+}

+ 42 - 0
addons/fecmall/furnilife_theme/app/appfront/modules/Customer/block/address/Edit.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * FecShop file.
+ *
+ * @link http://www.fecshop.com/
+ * @copyright Copyright (c) 2016 FecShop Software LLC
+ * @license http://www.fecshop.com/license/
+ */
+
+namespace fectfurnilife\app\appfront\modules\Customer\block\address;
+
+use Yii;
+use fecshop\app\appfront\modules\Customer\block\address\Edit as FecEdit;
+
+/**
+ * @author Terry Zhao <2358269014@qq.com>
+ * @since 1.0
+ */
+class Edit extends  FecEdit
+{
+
+    public function getState($country = '')
+    {
+        $state = isset($this->_address['state']) ? $this->_address['state'] : '';
+        if (!$country) {
+            $country = $this->_country;
+        }
+        $stateHtml = Yii::$service->helper->country->getStateOptionsByContryCode($country, $state);
+        if (!$stateHtml) {
+            $stateHtml = '<input  id="state" name="address[state]" value="'.$state.'" title="State" class="form-control input-text" style="" type="text">';
+        } else {
+            $stateHtml = '<select id="address:state" class="form-control address_state validate-select" title="State" name="address[state]">
+							<option value="">Please select region, state or province</option>'
+                .$stateHtml.'</select>';
+        }
+        $this->_address['stateHtml'] = $stateHtml;
+
+        return $stateHtml;
+    }
+
+
+}

Fichier diff supprimé car celui-ci est trop grand
+ 7 - 0
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/bootstrap.min.css


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

@@ -0,0 +1,779 @@
+/*===== common ======*/
+
+input{
+    padding-left:5px;
+}
+.col-main{
+    margin-bottom:50px;
+}
+.error-msg {
+    margin:-5px 0 20px 0;
+	background: #faebe7 url("../images/fec/i_msg-error.gif") no-repeat scroll 8px 7px;
+    border: 1px solid #f16048;
+    color: #df280a;
+    font-size: 0.8em;
+    padding: 5px 30px;
+}
+.fur_container{
+    margin:20px 0 40px;
+    min-height:400px;
+}
+.fecshop_message{
+    margin-top:15px;
+}
+.correct-msg {
+    margin:-5px 0 20px 0;
+	background: #eff5ea url("../images/fec/i_msg-success.gif") no-repeat scroll 8px 7px;
+    border: 1px solid #95a486;
+    color: #3d6611 ;
+    font-size: 0.8em;
+    padding: 5px 30px;
+}
+.refresh-icon {
+    background-image: url(../images/fec/sign.png);
+    background-position: 3px -138px;
+    background-repeat: no-repeat;
+    border: 1px solid #ddd;
+    display: inline-block;
+    height: 30px;
+    margin-left: 5px;
+    vertical-align: middle;
+    
+    width: 30px;
+    cursor: pointer;
+}
+.login-captcha-img{
+        display: inline-block;
+        vertical-align: middle;
+        margin-left: 5px;
+}
+
+.form-control{
+    display: inline-block;
+}
+
+.validation-failed {
+  background: #faebe7 none repeat scroll 0 0 !important;
+  border: 1px dashed #f00 !important;
+}
+.validation-advice {
+  background: rgba(0, 0, 0, 0) url(../images/fec/validation_advice_bg.gif) no-repeat scroll 2px 1px;
+  clear: both;
+  color: #f00;
+  font-size: 11px;
+  line-height: 13px;
+  margin: 3px 0 0;
+  min-height: 13px;
+  padding-left: 17px;
+}
+.editTable{
+  font-size:15px;
+}
+.editTable i{
+  cursor: pointer;
+}
+#welcome {
+  color: #777;
+  margin: 0 15px 0 0;
+}
+
+.a-left{
+    text-align:left;
+}
+
+.main-container{
+    min-height:400px;
+}
+
+h1{
+    font-size: 20px;
+    font-weight: 100;
+}
+
+@media only screen and (max-width: 1199px) {
+    .breadcrumb-area .breadcrumb-container nav ul li:last-child{
+        overflow: hidden;
+        width: 75%;
+        height: 24px;
+    }
+    
+    .breadcrumb-area .breadcrumb-container nav ul li{
+        vertical-align:top;
+    }
+}    
+
+/*===== common ======*/
+
+
+/*===== Catalog ======*/
+
+
+.fa-fec:before {
+      content: "";
+      display: inline-block;
+      height: 17px;
+      width: 17px;
+      border-radius: 3px;
+      border: 1px solid #ebebeb;
+      margin-right: 10px;
+      vertical-align: middle; }
+      
+.fa-check-square {
+          color: #9acf6a;
+        font-size: 19px;
+      }  
+.fa-times{
+    color: #aaa;
+}
+.attr-filter:hover .fa-times{
+    color:#9acf6a;
+}
+
+a.attr-filter:hover .fa-fec:before{
+    border:1px solid  #9acf6a;
+}
+ 
+
+.refineby-item:hover .fa-times{
+    color:#9acf6a;
+}
+
+.single-sidebar{
+    margin-top:10px;
+}
+.shop-header{
+    padding: 20px 25px 5px;
+}
+
+.toolbar_sort_c{
+    flex-direction: row !important; display: flex!important;
+}
+/*===== Catalog ======*/
+
+
+
+
+/*===== Account ======*/
+
+.is_change_password{
+    display:none;
+}
+.customer-order table {
+    font-size:11px;
+}
+table.account-product-review  tr td.first-td a{
+  margin:9px auto 5px;
+}
+.review_accept {
+  color: green;
+  margin: 10px 0;
+  font-style: italic;
+}
+.review_refuse{
+  color:#cc0000;
+  margin:10px 0;
+  font-style:italic;
+}
+.myaccount-table .f-info-text-left{
+  text-align: left;
+}
+.back-link{margin-top:10px;}
+/*===== Account ======*/
+
+
+
+/*===== furnilife ======*/
+.login-form label.subscribe_label{
+    display:inline
+}
+.header-top-dropdown .single-dropdown .language-currency-list ul li{
+  cursor: pointer;
+}
+.header-top-dropdown .single-dropdown .language-currency-list ul li:hover{
+  color:#9acf6a;
+}
+.social-share-buttons{
+    margin-top: 20px;
+}
+.product-feature-details .social-share-buttons h3{
+    margin-top:20px;
+}
+
+.minicart-section > a h5{
+    line-height: 40px;
+    height: 55px;
+}
+
+.navigation-menu-top{
+    padding-bottom: 28px!important;
+}
+
+/*===== furnilife ======*/
+
+
+
+.product_options li.current b {
+  background: rgba(0, 0, 0, 0) url(../images/fec/cur.png) no-repeat scroll 0 0;
+  bottom: 0;
+  display: block;
+  height: 6px;
+  overflow: hidden;
+  position: absolute;
+  right: 0;
+  width: 8px;
+}
+
+/*=====  product review  ======*/
+.review_lists .product-Reviews {
+  margin-top: 40px;
+}
+.scroll_horizontal {
+  padding: 30px 0 10px;
+  position: relative;
+  width: 100%;
+}
+
+.rate_title{margin-right:15px;}
+.product-Reviews .scroll_horizontal .box {
+  padding: 15px 0 0;
+}
+.scroll_horizontal .box {
+  border-top: 1px solid #ccc;
+  margin: 0 auto;
+  overflow: hidden;
+  padding: 10px 0 0;
+  position: relative;
+}
+.averageWarp {
+  margin-top: 10px;
+}
+
+.pro_commit .writeRiviewTitle, .writeLeft .writeRiviewTitle {
+  margin: 15px 0;
+  padding-bottom: 20px;
+  border-bottom: 1px solid #e2e2e2;
+}
+.lbBox {
+  font-size: 0;
+  *word-spacing: -1px;
+}
+.lineBlock {
+  display: inline-block;
+  zoom: 1;
+  *display: inline;
+  font-size: 13px;
+  letter-spacing: normal;
+  word-spacing: normal;
+  vertical-align: top;
+}
+.pro_commit .writeRiviewTitle .proportionStars li, .writeLeft .writeRiviewTitle .proportionStars li {
+  margin-bottom: 10px;
+}
+
+.fz_blue, .link {
+  color: #4d82b8;
+}
+
+
+.pro_commit .writeRiviewTitle .proportionStars .proportionBox, .writeLeft .writeRiviewTitle .proportionStars .proportionBox {
+  background-color: #e6e6e6;
+  width: 145px;
+  height: 15px;
+  position: relative;
+  margin-left: 10px;
+  margin-right: 10px;
+  border: 1px solid #c4c4c4;
+}
+
+.pro_commit .writeRiviewTitle .proportionStars .proportionBox > div, .writeLeft .writeRiviewTitle .proportionStars .proportionBox > div {
+  position: absolute;
+  left: 0;
+  top: 0;
+  height: 15px;
+  background-color: #f90;
+  font-size: 0;
+  box-shadow: 0 0 0 1px rgba(0,0,0,.25) inset, 0 -1px 0 rgba(0,0,0,.05) inset;
+  width: 0;
+  transition: width .5s ease 0s;
+}
+
+
+.product-Reviews_top {
+  padding: 20px 0 20px 10px;
+  width: auto;
+}
+
+.clear {
+  clear: both;
+}
+
+#review_description li {
+  min-height: 90px;
+  border-bottom: 1px solid #ddd;
+  margin-bottom: 15px;
+  padding-bottom:12px;
+}
+
+.product-Reviews_top .review_description_left {
+  display: inline-block;
+  float: left;
+  padding: 0 10px;
+  width: 170px;
+}
+.review_description_left {
+  display: inline-block;
+  float: left;
+  padding: 0 10px;
+}
+
+.product-Reviews_top a {
+  font-family: Georgia;
+  text-transform: uppercase;
+}
+.review_description_left a {
+  color: #000;
+  text-decoration: none;
+}
+
+.review_star {
+  display: block;
+  height: 15px;
+  width: 69px;
+}
+.review_star_5 {
+  background: rgba(0, 0, 0, 0) url("../images/fec/Star_5.png") no-repeat scroll 0 0;
+}
+.review_star_4 {
+  background: rgba(0, 0, 0, 0) url("../images/fec/Star_4.png") no-repeat scroll 0 0;
+}
+.review_star_3 {
+  background: rgba(0, 0, 0, 0) url("../images/fec/Star_3.png") no-repeat scroll 0 0;
+}
+.review_star_2 {
+  background: rgba(0, 0, 0, 0) url("../images/fec/Star_2.png") no-repeat scroll 0 0;
+}
+.review_star_1 {
+  background: rgba(0, 0, 0, 0) url("../images/fec/Star_1.png") no-repeat scroll 0 0;
+}
+.review_star_0 {
+  background: rgba(0, 0, 0, 0) url("../images/fec/Star_0.png") no-repeat scroll 0 0;
+}
+.review_star {
+  display: block;
+  height: 15px;
+  width: 69px;
+}
+
+.review_description_left p {
+  color: #000;
+  font-size: 14px;
+  margin: 0px 0 5px;
+  padding: 7px 0;
+}
+
+
+.product-Reviews_top .review_description_right {
+  display: inline-block;
+  float: right;
+  padding: 0 10px;
+  width: 730px;
+}
+.review_description_right_span {
+  display: block;
+  margin-bottom: 10px;
+  line-height: 20px;
+}
+
+.review_description_centen {
+  min-height: 20px;
+  word-break: break-all;
+  padding-bottom: 10px;
+}
+
+
+.view_all_review {
+    background: #eee none repeat scroll 0 0;
+    border-bottom: 1px solid #ccc;
+    border-top: 1px solid #ccc;
+    color: #fff;
+    height: 28px;
+    margin: 15px 0;
+    text-align: center;
+}
+.view_all_review a {
+    color: #333;
+    line-height: 20px;
+    font-size:12px;
+}
+    
+.product-feature-details .rating i.active{
+    color:#F9BA48;
+}   
+    
+  
+  
+
+.review_lists .add-to-cart-btn{
+    margin-top: 20px;
+}
+
+.review_lists{
+    padding-top:20px;
+    
+}
+
+.review_lists .product-Reviews{
+    background-color: #ffffff;
+    font-size: 14px;
+    border: 1px solid #eeeeee;
+    padding: 30px;
+    margin:20px 0;
+}
+
+
+.review_lists .product-Reviews h3 {
+    border-bottom: 1px dashed #eeeeee;
+    padding-bottom: 10px;
+    margin-bottom: 25px;
+
+}
+
+.review_star{
+    display: inline-block;
+}
+  
+
+.writeRiviewTitle .writeRiviewBtn{
+    margin-left:20%;
+}  
+  
+.rate_star_avge{
+    margin-right:5px;
+}  
+
+.sg1{margin:10px 0;}
+
+@media only screen and (max-width: 767px) {
+    .writeRiviewTitle .writeRiviewBtn{
+        margin-left:0;
+    }  
+}
+
+.lh30_f {
+    float: left;
+    line-height: 30px;
+}
+
+.product-description_em {
+    color: #cc0000;
+    font: 17px/12px Segoeui,Arial,Verdana,serif;
+    margin: 0 3px;
+}    
+.star_ul {
+    height: 30px;
+    display: inline;
+}
+
+.star_ul li {
+    float: left;
+}
+
+
+
+.star_1, .star_2, .star_3, .star_4, .star_5 {
+    background: rgba(0, 0, 0, 0) url(../images/fec/product_rating_big_blank_star.png) repeat scroll 0 0;
+    display: block;
+    height: 30px;
+    width: 30px;
+}
+
+.full_star {
+    background: rgba(0, 0, 0, 0) url(../images/fec/product_rating_big_full_star.png) repeat scroll 0 0;
+}
+  
+.captcha-container  .login-captcha-input {
+    width:20%;
+     vertical-align: middle;
+}
+
+
+
+/*=====  product review  ======*/
+
+
+
+/*=====  product options  ======*/
+
+.product_options li.current b {
+    background: rgba(0, 0, 0, 0) url(../images/cur.png) no-repeat scroll 0 0;
+    bottom: 0;
+    display: block;
+    height: 6px;
+    overflow: hidden;
+    position: absolute;
+    right: 0;
+    width: 8px;
+}
+.product_info h1{font-size:15px;}
+    .product_qty{margin:20px 0 0}
+    .product_options .pg .rg{width:auto;}
+    .product_options .label{line-height:62px;}
+    .product_options .size-label{line-height:32px;}
+    .product_view{font-size:12px;}
+    ol, ul {
+        list-style: outside none none;
+    }
+    .product_options .rg li{
+        color: #333;
+        cursor: pointer;
+        float: left;
+        margin: 5px;
+        text-align: center;
+        position: relative;
+    }
+    .product_options a.active:hover{border:1px solid #cc0000 }
+    .pg .rg {
+        width: 80px;
+        float: left;
+    }
+    .chose_size .show_as_img a {
+        height: 57px;
+        min-width: 54px;
+    }
+    .product_options a.active, .product_options a.active_v {
+        border: 1px solid #777;
+        min-width: 54px;
+    }
+    .product_options a.current {
+        border: 1px solid #cc0000;
+    }
+    .chose_size a {
+        border: 1px solid #ccc;
+        font-size: 11px;
+        height: 35px;
+        line-height: 35px;
+        min-width: 35px;
+        padding: 0px 5px;
+    }
+    .product_options a.noactive {
+        border: 1px dashed #ccc;
+        cursor: not-allowed;
+    }
+    .clear{clear:both;}
+    .product_options a.noimgshow {
+        font-size: 11px;
+        height: 35px;
+        line-height: 35px;
+        min-width: 35px;
+        padding: 0 5px;
+    }
+    .product_options a.no_active {
+        border: 1px dashed #ccc;
+        cursor: not-allowed;
+    }
+    .product_options a {
+        display: block;
+        float: left;
+    }
+/*=====  product options  ======*/
+
+
+
+/*=====  product  ======*/
+.cart-favorite{
+    margin: 20px 3px 10px 50px;
+    font-size: 30px;
+    color:#da6667;
+}
+.single-product-content-area .product-feature-details .add-to-cart-btn a:hover{
+    background-color: #363f4d;
+}
+
+/*=====  product  ======*/
+
+
+
+
+/*=====  cart  ======*/
+.empty_cart {
+    background: transparent url(../images/fec/cart.gif) no-repeat scroll 0 15px;
+    font-size: 16px;
+    height: 101px;
+    margin: 24px auto 36px;
+    padding: 35px 0 0 116px;
+    max-width: 500px;
+    min-height:400px;
+}
+.cart-table .table tbody tr td{
+    text-align:left;
+}
+
+.cart-table .table thead tr th{
+    font-weight: 700;
+    font-size:14px; 
+    padding: 12px 10px;
+}
+  
+.cart-table .table thead tr th label{
+    margin:0px;
+}  
+    
+
+.cart-table .table thead tr th.pro-thumbnail,   .cart-table .table tbody tr td.pro-remove{
+    text-align: center;
+}
+
+ .add_coupon_submit, .discount-coupon form .add_coupon_submit  {
+    font-weight: 400;
+    text-transform: uppercase;
+    color: #ffffff;
+    background-color: #363f4d;
+    border-color: #363f4d;
+    width: 160px;
+    border-radius: 3px;
+    cursor:pointer;
+}
+
+button.submitbutton{
+    background: #363f4d;
+    color: #fff;
+}
+.submitbutton:hover{
+    background:#9acf6a;
+    
+}    
+
+.discount-coupon form .submitbutton:hover{
+    background:#9acf6a;
+    border-color:#9acf6a;
+}    
+
+.fa-trash-o{
+    font-size:18px;
+}
+
+.img-section img{
+    margin: 10px;
+    max-width:98%;
+}
+.order_remark{
+    margin-bottom: 5px;
+    width: 90%;
+    border: 1px solid #ccc;
+    border-radius: 0;
+    line-height: 24px;
+    padding: 10px 10px;
+    color: #656565;
+    height:100px;
+}
+
+.cart-summary .cart-summary-button button{
+    width:175px;
+}
+
+a.express_paypal {
+    background: rgba(0, 0, 0, 0) url(../images/fec/paypaltopay.jpg) repeat scroll 0 0;
+    display: block;
+    float: right;
+    height: 30px;
+    width: 154px;
+    margin:10px 4px 0 0;
+}
+.cart-summary-button .or {
+    display: block;
+    float: right;
+    font-weight: bold;
+    line-height: 32px;
+    margin: 10px 5px 0 5px;
+}
+.cart-summary-button button.button {
+    display: block;
+    float: right;
+}
+
+.coupon_add_log {
+    font-size: 11px;
+    margin:0 0 20px 0;
+    color: #cc0000;
+    padding-left:15px;
+}
+
+
+.cart-floating-box .fa-spinner{
+    font-size:35px;
+}
+.cart-loading i{
+    margin: 20px auto;
+    text-align: center;
+    display: block;
+}
+.cart-empty{
+    text-align: center;
+    margin: 20px 0;
+}
+.cart-floating-box .cart-float-single-item .cart-float-single-item-image{
+    padding: 2px;
+}
+/*=====  cart  ======*/
+
+
+/*=====  checkout  ======*/
+
+#onestepcheckout-form select{
+    max-width:262px;
+}
+
+h2.product-name a {
+    font-size:12px;
+    font-weight:100;
+    line-height:22px;
+}
+.label_create_account{
+    font-size: 11px;
+    color: #cc0000;
+}
+.onestepcheckout-place-order-loading{
+    display:none;
+}
+.onestepcheckout-place-order.visit .onestepcheckout-place-order-loading {
+    display: block;
+}
+
+.onestepcheckout-place-order.visit #onestepcheckout-place-order {
+    background-color: #ccc;
+}
+
+
+/*=====  checkout  ======*/
+
+
+
+/*=====  cms  ======*/
+.cms-content {
+    background-color: #ffffff;
+    font-size: 14px;
+    border: 1px solid #eeeeee;
+    padding: 30px;
+}
+
+.cms-content h1 {
+    border-bottom: 1px dashed #eeeeee;
+    padding-bottom: 10px;
+    margin-bottom: 25px;
+    font-size: 24px;
+    line-height: 30px;
+}
+
+
+
+/*=====  cms  ======*/
+
+
+@media only screen and (max-width: 479px) {
+    .home-fea a span{
+        display:none;
+    }
+}
+
+
+

Fichier diff supprimé car celui-ci est trop grand
+ 4 - 0
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/font-awesome.min.css


Fichier diff supprimé car celui-ci est trop grand
+ 1 - 0
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/helper.css


Fichier diff supprimé car celui-ci est trop grand
+ 11 - 0
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/ionicons.min.css


Fichier diff supprimé car celui-ci est trop grand
+ 6739 - 0
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/main.css


+ 163 - 0
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/owl.carousel.css

@@ -0,0 +1,163 @@
+/*
+ * 	Core Owl Carousel CSS File
+ *	v1.3.3
+ */
+
+/* clearfix */
+.owl-carousel .owl-wrapper:after {
+    content: ".";
+    display: block;
+    clear: both;
+    visibility: hidden;
+    line-height: 0;
+    height: 0;
+}
+/* display none until init */
+.owl-carousel{
+    display: none;
+    position: relative;
+    width: 100%;
+    -ms-touch-action: pan-y;
+}
+.owl-carousel .owl-wrapper{
+    display: none;
+    position: relative;
+    -webkit-transform: translate3d(0px, 0px, 0px);
+}
+.owl-carousel .owl-wrapper-outer{
+    overflow: hidden;
+    position: relative;
+    width: 100%;
+}
+.owl-carousel .owl-wrapper-outer.autoHeight{
+    -webkit-transition: height 500ms ease-in-out;
+    -moz-transition: height 500ms ease-in-out;
+    -ms-transition: height 500ms ease-in-out;
+    -o-transition: height 500ms ease-in-out;
+    transition: height 500ms ease-in-out;
+}
+
+.owl-carousel .owl-item{
+    float: left;
+}
+.owl-controls .owl-page,
+.owl-controls .owl-buttons div{
+    cursor: pointer;
+}
+.owl-controls {
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+/* mouse grab icon */
+.grabbing {
+    cursor:url(grabbing.png) 8 8, move;
+}
+
+/* fix */
+.owl-carousel  .owl-wrapper,
+.owl-carousel  .owl-item{
+    -webkit-backface-visibility: hidden;
+    -moz-backface-visibility:    hidden;
+    -ms-backface-visibility:     hidden;
+    -webkit-transform: translate3d(0,0,0);
+    -moz-transform: translate3d(0,0,0);
+    -ms-transform: translate3d(0,0,0);
+}
+
+/*
+* 	Owl Carousel Owl Demo Theme
+*	v1.3.3
+*/
+
+.owl-theme .owl-controls{
+    margin-top: 10px;
+    text-align: center;
+}
+
+/* Styling Next and Prev buttons */
+
+.owl-theme .owl-controls .owl-buttons div{
+    background-image: url("../images/bg_direction_nav2.png");
+    background-repeat: no-repeat;
+    cursor: pointer;
+    display: block;
+    height: 58px;
+    margin: -29px 0 0;
+    position: absolute;
+    text-indent: -9999px;
+    top: 50%;
+    width: 28px;
+    z-index: 10;
+}
+.owl-carousel{overflow:hidden}
+
+.owl-theme .owl-controls .owl-buttons div.owl-prev{
+    background-position: 0 0;
+    left: -50px;
+}
+.owl-theme .owl-controls .owl-buttons div.owl-next{
+    background-position: -28px 0;
+    right: -50px;
+}
+.owl-theme:hover .owl-controls .owl-buttons div.owl-prev{left:0}
+
+.owl-theme:hover .owl-controls .owl-buttons div.owl-next{right:0}
+.owl-pagination{margin-top:-40px;}
+/* Clickable class fix problem with hover on touch devices */
+/* Use it for non-touch hover action */
+.owl-theme .owl-controls.clickable .owl-buttons div:hover{
+    filter: Alpha(Opacity=100);/*IE7 fix*/
+    opacity: 1;
+    text-decoration: none;
+}
+
+/* Styling Pagination*/
+
+.owl-theme .owl-controls .owl-page{
+    display: inline-block;
+    zoom: 1;
+    *display: inline;/*IE7 life-saver */
+}
+.owl-theme .owl-controls .owl-page span{
+    display: block;
+    width: 14px;
+    height: 14px;
+    margin: 5px 7px;
+    filter: Alpha(Opacity=50);/*IE7 fix*/
+    opacity: 0.5;
+    -webkit-border-radius: 20px;
+    -moz-border-radius: 20px;
+    border-radius: 20px;
+    background: #aaa;
+}
+
+.owl-theme .owl-controls .owl-page.active span,
+.owl-theme .owl-controls.clickable .owl-page:hover span{
+    background: #fff;
+    width: 14px;
+    height: 14px;
+}
+
+/* If PaginationNumbers is true */
+
+.owl-theme .owl-controls .owl-page span.owl-numbers{
+    height: auto;
+    width: auto;
+    color: #FFF;
+    padding: 2px 10px;
+    font-size: 12px;
+    -webkit-border-radius: 30px;
+    -moz-border-radius: 30px;
+    border-radius: 30px;
+}
+
+/* preloading images */
+.owl-item.loading{
+    min-height: 100px;
+    background: url(../images/AjaxLoader.gif) no-repeat center center
+}

Fichier diff supprimé car celui-ci est trop grand
+ 190 - 0
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/css/plugins.css


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


Fichier diff supprimé car celui-ci est trop grand
+ 2671 - 0
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/fontawesome-webfont.svg


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


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


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


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


Fichier diff supprimé car celui-ci est trop grand
+ 2090 - 0
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/fonts/ionicons.svg


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


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


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


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/backgrounds/bg1.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/about-banner.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner1.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner10.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner11.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner12.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner13.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner14.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner15.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner16.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner17.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner18.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner19.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner2.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner20.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner21.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner22.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner3.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner4.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner5.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner6.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner7.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner8.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/banner9.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/home3-banner1.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/home3-banner2.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/home3-banner3.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/home3-banner8.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/banners/megamenu-banner.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/01.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/02.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/03.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/comment-icon.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/small-01.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/small-02.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/small-03.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/blog-image/small-04.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/brands/01.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/brands/02.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/brands/03.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/brands/04.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/cur.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/favicon.ico


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_0.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_1.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_2.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_3.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_4.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/Star_5.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/cart.gif


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/cur.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/i_msg-error.gif


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/i_msg-success.gif


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/paypaltopay.jpg


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/product_rating_big_blank_star.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/product_rating_big_full_star.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/sign.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/fec/validation_advice_bg.gif


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/01.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/02.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/03.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/04.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/05.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/06.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/featured-category/07.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/map-marker.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/separator-icon.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/sidebar1.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/icons/slider-icon.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/logo.png


BIN
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/logo2.png


+ 0 - 0
addons/fecmall/furnilife_theme/app/appfront/theme/furnilife/assets/images/payment.png


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff