Merge pull request #108 from thelia/frontend

Frontend

templates/frontOffice/default/assets/less/thelia/account.less

@@ -49,6 +49,7 @@
 }
 
 // Message if no order or no address
+.deliveries-warning,
 .address-warning,
 .orders-warning {
     clear: both;

templates/frontOffice/default/index.html

@@ -12,13 +12,13 @@
             <div class="carousel-wrapper">
                 <div class="carousel-inner">
                     <figure class="item active">
-                        {images file='assets/img/carousel/slider1.png'}<img src="{$asset_url}" alt="img1">{/images}
+                        {images file='assets/img/carousel/slider1.jpg'}<img src="{$asset_url}" alt="Slider image 1">{/images}
                     </figure>
                     <figure class="item">
-                        {images file='assets/img/carousel/slider2.png'}<img src="{$asset_url}" alt="img2">{/images}
+                        {images file='assets/img/carousel/slider2.jpg'}<img src="{$asset_url}" alt="Slider image 2">{/images}
                     </figure>
                     <figure class="item">
-                        {images file='assets/img/carousel/slider3.png'}<img src="{$asset_url}" alt="img3">{/images}
+                        {images file='assets/img/carousel/slider3.jpg'}<img src="{$asset_url}" alt="Slider image 3">{/images}
                     </figure>
                 </div>
             </div>

templates/frontOffice/default/order-delivery.html

@@ -139,6 +139,7 @@
                             {/form_field}
                         </div>
                         {/loop}
+                        {elseloop rel="deliveries"}<div class="deliveries-warning">{intl l="<strong>Sorry!</strong> We are not able to give you a delivery method for your order."}</div>{/elseloop}
                     </div>
                 </div>