From 234d74b9eb2104e977231e5997c8874b2c73d642 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 18 Jun 2013 12:02:20 +0200
Subject: [PATCH 1/3] modify .htaccess

---
 web/.htaccess | 1 -
 1 file changed, 1 deletion(-)
 mode change 100644 => 100755 web/.htaccess

diff --git a/web/.htaccess b/web/.htaccess
old mode 100644
new mode 100755
index a7acb85e6..0632b28c1
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -5,6 +5,5 @@ AddDefaultCharset UTF-8
 <IfModule mod_rewrite.c>
 	RewriteEngine on
 
-	RewriteBase /thelia2
 	RewriteRule ^admin(/.*)?$ index_dev.php/admin/$1 [L,QSA]
 </IfModule>
\ No newline at end of file

From 0502879c0de7f9d6af95d2225cc7c80e193f2a52 Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 18 Jun 2013 12:08:38 +0200
Subject: [PATCH 2/3] ignore web/assets directory

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 21985710e..b2dc20145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ coverage
 .settings/
 local/cache/*
 composer.lock
+web/assets/*

From fa69e6e7f028cc6e650c80ba6e7f43664a0960bb Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Tue, 18 Jun 2013 12:24:45 +0200
Subject: [PATCH 3/3] change rule in .htaccess and fix link for asset

---
 core/lib/Thelia/Admin/Templating/Template.class.php | 2 +-
 web/.htaccess                                       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/lib/Thelia/Admin/Templating/Template.class.php b/core/lib/Thelia/Admin/Templating/Template.class.php
index 9cb99d89d..1f41f7459 100644
--- a/core/lib/Thelia/Admin/Templating/Template.class.php
+++ b/core/lib/Thelia/Admin/Templating/Template.class.php
@@ -41,7 +41,7 @@ class Template extends Smarty
         if (! is_dir($cache_dir)) @mkdir($cache_dir, 0777, true);
 
         $web_root  = THELIA_WEB_DIR;
-        $asset_dir_from_web_root = 'assets/admin/default';
+        $asset_dir_from_web_root = '/assets/admin/default';
 
         $this->asset_manager = new AssetsManager($web_root, $asset_dir_from_web_root);
 
diff --git a/web/.htaccess b/web/.htaccess
index 0632b28c1..4336ad269 100755
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -5,5 +5,8 @@ AddDefaultCharset UTF-8
 <IfModule mod_rewrite.c>
 	RewriteEngine on
 
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+
 	RewriteRule ^admin(/.*)?$ index_dev.php/admin/$1 [L,QSA]
 </IfModule>
\ No newline at end of file