Merge branch 'master' of https://github.com/thelia/thelia into coupon

* 'master' of https://github.com/thelia/thelia: (33 commits)
  permissions
  finish contact process
  create contact form
  create example for mail usage
  permission cleanup
  change place where absolute url is create when rewritten url is enabled
  fix issue #43
  fix typo in product breadcrumb
  update countries list
  fix issue #35
  fix cartItem updateQuantity method
  add some verification on country default trigger
  not allowed to delete default country
  WIP : admin profiles
  fiw test suite
  clear cache when a module is removed
  end module removal
  create event object for module delete action
  update insert script
  new model
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/CouponController.php

templates/default/account.html

@@ -1,7 +1,7 @@
 {extends file="layout.tpl"}
 
 {block name="no-return-functions" prepend}
-    {check_auth context="front" roles="CUSTOMER" login_tpl="login"}
+    {check_auth context="front" role="CUSTOMER" login_tpl="login"}
 {/block}
 
 {* Breadcrumb *}

templates/default/address-update.html

@@ -1,7 +1,7 @@
 {extends file="layout.tpl"}
 
 {block name="no-return-functions"}
-    {check_auth context="front" roles="CUSTOMER" login_tpl="login"}
+    {check_auth context="front" role="CUSTOMER" login_tpl="login"}
 {/block}
 
 {* Body Class *}

templates/default/address.html

@@ -1,7 +1,7 @@
 {extends file="layout.tpl"}
 
 {block name="no-return-functions"}
-    {check_auth context="front" roles="CUSTOMER" login_tpl="login"}
+    {check_auth context="front" role="CUSTOMER" login_tpl="login"}
 {/block}
 
 {* Body Class *}

templates/default/layout.tpl

@@ -67,7 +67,7 @@ URL: http://www.thelia.net
             <nav class="navbar-collapse collapse nav-main" role="navigation" aria-label="{intl l="Main Navigation"}">
                 {nocache}
                 <ul class="nav navbar-nav navbar-cart navbar-right">
-                    {loop type="auth" name="customer_info_block" roles="CUSTOMER" context="front"}
+                    {loop type="auth" name="customer_info_block" role="CUSTOMER" context="front"}
                         <li><a href="{url path="/logout"}" class="logout">{intl l="Log out!"}</a></li>
                         <li><a href="{url path="/account"}" class="account">{intl l="My Account"}</a></li>
                     {/loop}
@@ -297,13 +297,17 @@ URL: http://www.thelia.net
                         <div class="block-heading"><h3 class="block-title">{intl l="Newsletter"}</h3></div>
                         <div class="block-content">
                             <p id="newletter-describe">{intl l="Sign up to receive our latest news."}</p>
+                            {form name="thelia.newsletter"}
                             <form id="form-newsletter" action="{url path="/newsletter"}" method="post" role="form">
+                                {form_field form=$form field="email"}
                                 <div class="form-group">
-                                    <label for="email">{intl l="Email address"}</label>
-                                    <input type="email" name="email" id="email" class="form-control" placeholder="{intl l="Your email address"}" aria-describedby="newletter-describe" aria-required="true" required autocomplete="off">
+                                    <label for="{$label_attr.for}">{intl l="Email address"}</label>
+                                    <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="{intl l="Your email address"}" aria-describedby="newletter-describe" {if $required} aria-required="true" required{/if} autocomplete="off">
                                 </div>
+                                {/form_field}
                                 <button type="submit" class="btn btn-subscribe">{intl l="Subscribe"}</button>
                             </form>
+                            {/form}
                         </div>
                     </section>
                 </div>

templates/default/newsletter-success.html

@@ -0,0 +1,15 @@
+{extends file="layout.tpl"}
+
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [['title' => {intl l="Thanks !"}, 'url'=>{url path="/contact/success"}]]}
+{/block}
+
+{block name="main-content"}
+    <div class="main">
+        <article class="col-main" role="main" aria-labelledby="main-label">
+            <h1 id="main-label" class="page-header">{intl l="Thanks for signing up!"}</h1>
+            <p>{intl l="We'll keep you posted whenever we have any new updates. If you ever wish to unsubscribe, you can easily do so via the link that will be in every email."}</p>
+        </article>
+    </div>
+{/block}

templates/default/newsletter.html

@@ -0,0 +1,46 @@
+{extends file="layout.tpl"}
+
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [['title' => {intl l="Newsletter"}, 'url'=>{url path="/newsletter"}]]}
+{/block}
+
+{block name="main-content"}
+    <div class="main">
+        <article class="col-main" role="main" aria-labelledby="main-label">
+            <h1 id="main-label" class="page-header">{intl l="Newsletter"}</h1>
+
+            {form name="thelia.newsletter"}
+                <form id="form-contact" class="form-horizontal" action="{url path="/newsletter"}" method="post" role="form">
+                    {form_hidden_fields form=$form}
+                    <fieldset id="contact-info" class="panel panel">
+                        <div class="panel-heading">
+                            1. {intl l="Personal Informations"}
+                        </div>
+                        <div class="panel-body">
+                            {form_field form=$form field="email"}
+                                <div class="form-group group-firstname {if $error}has-error{elseif $value != "" && !$error}has-success{/if}">
+                                    <label class="control-label" for="{$label_attr.for}">{$label}{if $required} <span class="required">*</span>{/if}</label>
+                                    <div class="control-input">
+                                        <input type="email" name="{$name}" id="{$label_attr.for}" class="form-control" placeholder="johndoe@domain.com" value="{$value}" {if $required} aria-required="true" required{/if}{if !isset($error_focus) && $error} autofocus{/if}>
+                                        {if $error }
+                                            <span class="help-block"><i class="icon-remove"></i> {$message}</span>
+                                            {assign var="error_focus" value="true"}
+                                        {elseif $value != "" && !$error}
+                                            <span class="help-block"><i class="icon-ok"></i></span>
+                                        {/if}
+                                    </div>
+                                </div><!--/.form-group-->
+                            {/form_field}
+                            <div class="form-group group-btn">
+                                <div class="control-btn">
+                                    <button type="submit" class="btn btn-register">{intl l="Subscribe"}</button>
+                                </div>
+                            </div><!--/.form-group-->
+                        </div>
+                    </fieldset>
+                </form>
+            {/form}
+        </article>
+    </div>
+{/block}

templates/default/order-delivery.html

@@ -1,7 +1,7 @@
 {extends file="layout.tpl"}
 
 {block name="no-return-functions"}
-    {check_auth context="front" roles="CUSTOMER" login_tpl="login"}
+    {check_auth context="front" role="CUSTOMER" login_tpl="login"}
     {check_cart_not_empty}
 {/block}
 

templates/default/order-invoice.html

@@ -1,7 +1,7 @@
 {extends file="layout.tpl"}
 
 {block name="no-return-functions"}
-    {check_auth context="front" roles="CUSTOMER" login_tpl="login"}
+    {check_auth context="front" role="CUSTOMER" login_tpl="login"}
     {check_cart_not_empty}
     {check_valid_delivery}
 {/block}