Perso du template frontOffice

local/modules/ClickAndCollect/Config/module.xml

@@ -21,6 +21,9 @@
         </author>
     </authors>
     <type>delivery</type>
+    <required>
+        <module>PlanificationLivraison</module>
+    </required>
     <thelia>2.3.x</thelia>
     <stability>beta</stability>
     <mandatory>0</mandatory>

local/modules/PointRetrait/Config/module.xml

@@ -21,6 +21,9 @@
         </author>
     </authors>
     <type>delivery</type>
+    <required>
+        <module>PlanificationLivraison</module>
+    </required>
     <thelia>2.3.x</thelia>
     <stability>beta</stability>
     <mandatory>0</mandatory>

templates/frontOffice/custom/Gruntfile.js

@@ -216,7 +216,7 @@ module.exports = function (grunt) {
                 }
             },
             cssmin: {
-                files: ['assets/src/css/thelia.css'],
+                files: ['assets/src/css/thelia.css', 'assets/src/css/custom.css'],
                 tasks: ['autoprefixer', 'cssmin'],
                 options: {
                     spawn: false,

templates/frontOffice/custom/assets/dist/css/custom.min.css

@@ -1 +1 @@
-@font-face{font-family:sofia_prolight;src:url(../fonts/sofiapro/sofiapro-light-webfont.woff2) format('woff2'),url(../../fonts/sofiapro/sofiapro-light-webfont.woff) format('woff');font-weight:400;font-style:normal}html{font-family:sofia_prolight,sans-serif!important}#products-new .overlay:after,#products-offer .overlay:after,#products-upsell .overlay:after,body{font-family:sofia_prolight,'Open Sans',sans-serif!important}s @media (min-width:1200px){.container{width:1170px}}@media (min-width:992px){.header__main{width:95%}}@media (min-width:768px){.header__content{flex-direction:column}}.header__content{display:flex}.header__main{align-items:center;display:flex;flex-direction:row;justify-content:space-between}.navbar-default{background-color:transparent}.navbar li>a.home:before{display:none}.nav>li{text-transform:uppercase}.header__content .container-fluid{padding-left:0;padding-right:0}.navbar-form .form-control{width:50px}.navbar-form .form-control.large{width:auto}.logo-boutique{width:200px}
+@font-face{font-family:sofia_prolight;src:url(../fonts/sofiapro/sofiapro-light-webfont.woff2) format('woff2'),url(../fonts/sofiapro/sofiapro-light-webfont.woff) format('woff');font-weight:400;font-style:normal}html{font-family:sofia_prolight,sans-serif!important}#products-new .overlay:after,#products-offer .overlay:after,#products-upsell .overlay:after,body{font-family:sofia_prolight,'Open Sans',sans-serif!important}div.container{width:90%!important}@media (min-width:992px){.header__main{width:90%}}@media (min-width:768px){.header__content{flex-direction:column}}.header__content{display:flex}.header__main{align-items:center;display:flex;flex-direction:row;justify-content:space-between}.header__secondary{display:inline-flex}.navbar-default{background-color:transparent}.navbar li>a.home:before{display:none}.nav>li{text-transform:uppercase}.header__content .container-fluid{padding-left:0;padding-right:0}.navbar-form .form-control{width:150px}.logo-boutique{width:160px}.navbar{margin-bottom:0}.glyphicon,a{color:#95c11e}.btn-primary{background-color:#95c11e;border-left:0;border-color:#95c11e}.navbar-default .navbar-nav>li>a{color:#3c3c3b}.nav>li>a:focus,.nav>li>a:hover,.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{background-color:#95c11e;color:#fff}

templates/frontOffice/custom/assets/src/css/custom.css

@@ -1,7 +1,7 @@
 @font-face {
     font-family: 'sofia_prolight';
     src: url('../fonts/sofiapro/sofiapro-light-webfont.woff2') format('woff2'),
-    url('../../fonts/sofiapro/sofiapro-light-webfont.woff') format('woff');
+    url('../fonts/sofiapro/sofiapro-light-webfont.woff') format('woff');
     font-weight: normal;
     font-style: normal;
 }
@@ -16,17 +16,15 @@ html {
 #products-offer .overlay:after,
 body {
     font-family: 'sofia_prolight', 'Open Sans', sans-serif !important;
-}s
-
-
-@media (min-width: 1200px) {
-    .container {
-        width: 1170px;
-    }
 }
+
+div.container {
+     width: 90% !important;
+ }
+
 @media (min-width: 992px) {
     .header__main {
-        width: 95%;
+        width: 90%;
     }
 }
 @media (min-width: 768px) {
@@ -44,6 +42,9 @@ body {
     flex-direction: row;
     justify-content: space-between;
 }
+.header__secondary {
+    display: inline-flex;
+}
 
 .navbar-default {
     background-color: transparent;
@@ -61,11 +62,30 @@ body {
     padding-right: 0;
 }
 .navbar-form .form-control {
-    width: 50px;
-}
-.navbar-form .form-control.large {
-    width: auto;
+    width: 150px;
 }
 .logo-boutique {
-    width: 200px;
+    width: 160px;
+}
+.navbar {
+    margin-bottom: 0;
+}
+.glyphicon, a {
+    color: #95c11e;
+}
+.btn-primary {
+    background-color: #95c11e;
+    border-left: 0;
+    border-color: #95c11e;
+}
+.navbar-default .navbar-nav>li>a {
+    color: #3c3c3b;
+}
+.navbar-default .navbar-nav>.active>a, .navbar-default .navbar-nav>.active>a:focus, .navbar-default .navbar-nav>.active>a:hover, .navbar-default .navbar-nav>li>a:focus, .navbar-default .navbar-nav>li>a:hover {
+    background-color: #95c11e;
+    color: white;
+}
+.nav>li>a:focus, .nav>li>a:hover {
+    background-color: #95c11e;
+    color: white;
 }

templates/frontOffice/custom/assets/src/js/customJS.js

@@ -1,11 +1,5 @@
 (function($) {
 
-    $('#search-icon').hover(function() {
-        $(".navbar-form .form-control").addClass("large");
-    });
 
-    $('#search-icon').mouseleave(function() {
-        $(".navbar-form .form-control").removeClass("large");
-    });
 
 })(jQuery);

templates/frontOffice/custom/layout.tpl

@@ -134,7 +134,9 @@ GNU General Public License : http://www.gnu.org/licenses/
                                 </a>
                             </h1>
                             {hook name="main.navbar-primary"}
-                            {hook name="main.navbar-secondary"}
+                            <div class="header__secondary">
+                                {hook name="main.navbar-secondary"}
+                            </div>
                         </div>
                     </div>
 
@@ -288,22 +290,8 @@ GNU General Public License : http://www.gnu.org/licenses/
 
     <!-- Custom scripts -->
     <script src="{javascript file='assets/dist/js/thelia.min.js'}"></script>
-
     <script src="{javascript file='assets/src/js/customJS.js'}"></script>
 
-    {*    <script>*}
-{*        var header = $(".nav-main");*}
-{*        var sticky = header[0].offsetTop;*}
-
-{*        window.onscroll = function () {*}
-{*            if (window.pageYOffset > sticky) {*}
-{*                header.addClass("sticky");*}
-{*            } else {*}
-{*                header.removeClass("sticky");*}
-{*            }*}
-{*        };*}
-{*    </script>*}
-
     {hook name="main.body-bottom"}
 </body>
 </html>

templates/frontOffice/custom/modules/HookCart/mini-cart.html

@@ -0,0 +1,73 @@
+{ifloop rel="cartloop"}
+    <li class="dropdown pull-right cart-not-empty cart-container">
+        <a href="{url path="/cart"}" rel="nofollow" class="cart">
+        {* {intl l="Cart" d="hookcart.fo.default"} *}<i class="fa fa-cart-plus"></i>&nbsp;<span class="badge">{cart attr="count_item"}</span>
+        </a>
+        <div class="dropdown-menu cart-content">
+            <form id="form-cart-mini" action="{url path="/order/delivery"}" method="post">
+                <table class="table table-cart-mini">
+                    <colgroup>
+                        <col width="70">
+                        <col>
+                        <col width="100">
+                    </colgroup>
+                    <tbody>
+                    {assign "total_price" 0}
+                    {loop type="cart" name="cartloop"}
+                    <tr>
+                        <td class="image">
+                            {ifloop rel="pse-first-image"}
+                                {loop type="product-sale-elements-image" name="pse-first-image" product_sale_elements_id=$PRODUCT_SALE_ELEMENTS_ID limit="1"}
+                                    {loop type="image" name="product-image" id=$PRODUCT_IMAGE_ID product=$PRODUCT_ID limit="1" width="118" height="60"}
+                                        {assign var="product_image_url" value=$IMAGE_URL}
+                                        <img src="{$IMAGE_URL nofilter}" alt="{$TITLE}">
+                                    {/loop}
+                                {/loop}
+                            {/ifloop}
+                            {elseloop rel="pse-first-image"}
+                                {loop type="image" name="product-image" product=$PRODUCT_ID limit="1" width="118" height="60"}
+                                    <img src="{$IMAGE_URL nofilter}" alt="{$TITLE}">
+                                {/loop}
+                            {/elseloop}
+                        </td>
+                        <td class="product">
+                            <h3 class="name" style="margin:0">
+                                {$TITLE}
+                            </h3>
+                            <a href="{token_url path="/cart/delete/$ITEM_ID"}" class="btn btn-remove" data-tip="tooltip" data-title="Delete" data-original-title=""><i class="fa fa-trash"></i> <span>{intl l="Remove" d="hookcart.fo.default"}</span></a>
+                        </td>
+                        <td class="unitprice text-center">
+                            <span class="qty">{$QUANTITY}</span> X <span class="price" style="font-size:1em;">{format_money number=$REAL_TAXED_PRICE}</span>
+                        </td>
+                    </tr>
+                    {/loop}
+                    </tbody>
+                    <tfoot>
+                    <tr>
+                        <td colspan="2" class="empty">
+                            <a href="{url path="/cart"}" role="button" class="btn btn-default btn-sm"><i class="fa fa-eye"></i> {intl l="View Cart" d="hookcart.fo.default"}</a>
+                            <a href="{url path="/order/delivery"}" role="button" class="btn btn-primary btn-sm"><i class="fa fa-chevron-right"></i> {intl l="Checkout" d="hookcart.fo.default"}</a>
+                            {*<button type="submit" name="checkout" class="btn btn-primary btn-sm">{intl l="Checkout" d="hookcart.fo.default"}</button>*}
+                        </td>
+                        <td class="total">
+                            <div class="total-price">
+                                <span class="price">{format_money number={cart attr='total_taxed_price_without_discount'}}</span>
+                            </div>
+                        </td>
+                    </tr>
+                    </tfoot>
+                </table>
+            </form>
+        </div>
+    </li>
+{/ifloop}
+{elseloop rel="cartloop"}
+    <li class="dropdown pull-right cart-container">
+        <a href="{url path="/cart"}" rel="nofollow" class="cart">
+        {* {intl l="Cart" d="hookcart.fo.default"} *}<i class="fa fa-cart-plus"></i>&nbsp;<span class="badge">0</span>
+        </a>
+        <div class="dropdown-menu cart-content">
+            <p>{intl l="You have no items in your shopping cart." d="hookcart.fo.default"}</p>
+        </div>
+    </li>
+{/elseloop}

templates/frontOffice/custom/modules/HookCustomer/main-navbar-secondary.html

@@ -1,4 +1,4 @@
-<ul class="nav navbar-nav navbar-cuqstomer navbar-right">
+<ul class="nav navbar-nav navbar-customer navbar-right">
     {loop type="auth" name="customer_info_block" role="CUSTOMER"}
     <li><a href="{url path="/logout"}" class="logout">{intl l="Log out!" d="hookcustomer.fo.default"}</a></li>
     <li><a href="{url path="/account"}" class="account">{intl l="My Account" d="hookcustomer.fo.default"}</a></li>
@@ -6,7 +6,7 @@
     {elseloop rel="customer_info_block"}
 <!--    <li><a href="{url path="/register"}" class="register">{intl l="Register!" d="hookcustomer.fo.default"}</a></li>-->
     <li class="dropdown">
-        <a href="{url path="/login"}" class="login dropdown-toggle">{intl l="Log In!" d="hookcustomer.fo.default"}</a>
+        <a href="{url path="/login"}" class="login dropdown-toggle">{* {intl l="Log In!" d="hookcustomer.fo.default"} *}<i class="fa fa-user"></i></a>
         <div class="dropdown-menu">
             {form name="thelia.front.customer.login"}
             <form id="form-login-mini" action="{url path="/login"}" method="post" {form_enctype}>