Merge branch 'cleanmaster' into modules

Conflicts:
	core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php

templates/backOffice/default/I18n/en_US.php

@@ -5,7 +5,7 @@ return array(
 	'Version %ver' => 'Version %ver',
 	'View site' => 'View site',
 	'View shop' => 'View shop',
-	'Profil' => 'Profil',
+	'Profil' => 'Profile',
 	'Close administation session' => 'Close administation session',
 	'Logout' => 'Logout',
 	'Home' => 'Home',

templates/backOffice/default/admin-layout.tpl

@@ -222,8 +222,8 @@
         <div class="container">
             <p>{intl l='&copy; Thelia 2013'}
             - <a href="http://www.openstudio.fr/" target="_blank">{intl l='Published by OpenStudio'}</a>
-            - <a href="http://forum.thelia.net/" target="_blank">{intl l='Thelia support forum'}</a>
-            - <a href="http://contrib.thelia.net/" target="_blank">{intl l='Thelia contributions'}</a>
+            - <a href="http://thelia.net/forum" target="_blank">{intl l='Thelia support forum'}</a>
+            - <a href="#" target="_blank">{intl l='Thelia contributions'}</a>
             </p>
 
             {module_include location='in_footer'}
@@ -269,4 +269,4 @@
 	{module_include location='footer_js'}
 
 </body>
-</html>
+</html>

templates/backOffice/default/category-edit.html

@@ -308,8 +308,9 @@
     {javascripts file='assets/js/document-upload.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
-
-
+    {javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
 
 <script src="{url file='/tinymce/tinymce.min.js'}"></script>
 <script>

templates/backOffice/default/content-edit.html

@@ -200,6 +200,9 @@ form_content    = {$smarty.capture.delete_folder_dialog nofilter}
     {javascripts file='assets/js/document-upload.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
+    {javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
 
     <script>
         $(function() {

templates/backOffice/default/folder-edit.html

@@ -299,6 +299,9 @@
     {javascripts file='assets/js/document-upload.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
+    {javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
 
     <script>
         $(function() {

templates/backOffice/default/product-edit.html

@@ -135,15 +135,12 @@
     {javascripts file='assets/js/bootstrap-editable/bootstrap-editable.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
-
 	{javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
 	    <script src="{$asset_url}"></script>
 	{/javascripts}
-
     {javascripts file='assets/js/jquery.typewatch.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}
-
     {javascripts file='assets/js/jquery-ui-1.10.3.custom.min.js'}
         <script src="{$asset_url}"></script>
     {/javascripts}

templates/frontOffice/default/product.html

@@ -27,7 +27,7 @@
                 {/loop}
             {/loop}
             {loop name="brand.feature" type="feature" product="{$ID}" title="isbn"}
-                {loop name="brand.value" type="feature_value" feature="{$ID}" product=$product_id}
+                {loop name="brand.value" type="feature_value" feature="{$ID}" product="{product attr="id"}"}
                     <meta itemprop="productID" content="isbn:{$TITLE}">
                 {/loop}
             {/loop}