From 7b0f2ee4bc9e9e0fc96d920736bc3f635b21b77f Mon Sep 17 00:00:00 2001
From: gmorel <gmorel@openstudio.fr>
Date: Wed, 4 Sep 2013 16:12:22 +0200
Subject: [PATCH] Merge branch 'master' of https://github.com/thelia/thelia
 into coupon

# By mespeche
# Via mespeche
* 'master' of https://github.com/thelia/thelia:
  WIP : Comment of route url-rewriting.check
  Working : Fix script reset
  Working : Cleanup admin new version bootstrap v3
  Working : Finish renaming class for bootstrap migration
  Working : Major class changes migration from bootstrap 2.x to 3.0

Conflicts:
	reset_install.sh
	templates/admin/default/assets/css/admin.less
---
 core/lib/Thelia/Config/Resources/routing/front.xml | 8 ++++----
 templates/admin/default/coupon/form.html           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/lib/Thelia/Config/Resources/routing/front.xml b/core/lib/Thelia/Config/Resources/routing/front.xml
index 69bd2c6eb..d696a3411 100755
--- a/core/lib/Thelia/Config/Resources/routing/front.xml
+++ b/core/lib/Thelia/Config/Resources/routing/front.xml
@@ -50,9 +50,9 @@
         <default key="_view">cart</default>
     </route>
 
-    <route id="url-rewriting.check" path="/{rewritten_url}" methods="GET">
-        <default key="_controller">Thelia\Controller\Front\UrlRewritingController::check</default>
-        <requirement key="rewritten_url">.*</requirement>
-    </route>
+    <!--<route id="url-rewriting.check" path="/{rewritten_url}" methods="GET">-->
+        <!--<default key="_controller">Thelia\Controller\Front\UrlRewritingController::check</default>-->
+        <!--<requirement key="rewritten_url">.*</requirement>-->
+    <!--</route>-->
     
 </routes>
diff --git a/templates/admin/default/coupon/form.html b/templates/admin/default/coupon/form.html
index b715cd741..1bd18a6a8 100644
--- a/templates/admin/default/coupon/form.html
+++ b/templates/admin/default/coupon/form.html
@@ -72,7 +72,7 @@
                     <label for="expiration-date">Expiration date :</label>
                     <div class="input-append date" data-date="12/02/2012" data-date-format="dd/mm/yyyy">
                         {form_field form=$form field='expirationDate'}
-                            <input type="text" id="expiration-date" name="{$name}" value="{$value}">
+                            <input type="text" id="expiration-date" name="expiration-date" value="{$value}">
                             {if $error}{$message}{/if}
                         {/form_field}
                         <span class="add-on"><span class="icon-th"></span></span>