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

# By Manuel Raynaud (60) and others
# Via Manuel Raynaud (16) and others
* 'master' of https://github.com/thelia/thelia: (113 commits)
  implement process for changing folder position
  allow possibility to change folder visibility
  allow to create folder
  add dispatcher before/after for folder crud management
  icreate folder delete event
  process folder update action
  create folder events
  display info in folders edition template
  push model
  re-add home link in menu
  comment dev menu in layout
  translate some missing string
  fixes order integration
  order process
  change some informations in layou
  fix query in Thelia\Model\Folder::countAllContents
  allow to order products on category page
  Add default language & editing language default field
  Vertical align middle tables
  Fixed translations
  ...

Conflicts:
	core/lib/Thelia/Tools/I18n.php
	templates/admin/default/category-edit.html

templates/admin/default/includes/catalog-breadcrumb.html

@@ -2,11 +2,11 @@
 
 <ul class="breadcrumb">
 	<li><a href="{url path='admin/home'}">Home</a></li>
-	<li><a href="{url path='admin/catalog'}">Catalog</a>
+	<li><a href="{url path='admin/catalog'}">Catalog</a></li>
 
-	{ifloop rel="category_path"}</li>
+	{ifloop rel="category_path"}
 		{loop name="category_path" type="category-path" visible="*" category=$category_id}
-			{if $ID == $category_id}
+			{if $ID == $category_id && $editing_product == false}
 				<li class="active">
 				   {if $editing_category == true}
                        {intl l='Editing %cat' cat="{$TITLE}"}
@@ -20,7 +20,9 @@
 	   {/loop}
 	{/ifloop}
 
-	{elseloop rel="category_path"}
-	    </li>
-	{/elseloop}
+	{if $editing_product == true}
+        {loop name="product_path" type="product" visible="*" id=$product_id}
+            <li>{intl l="Editing %title" title="$TITLE"}</li>
+        {/loop}
+	{/if}
 </ul>

templates/admin/default/includes/folder-breadcrumb.html

@@ -0,0 +1,26 @@
+{* Breadcrumb for folders browsing and editing *}
+
+<ul class="breadcrumb">
+	<li><a href="{url path='admin/home'}">Home</a></li>
+	<li><a href="{url path='admin/folders'}">Folders</a>
+
+	{ifloop rel="folder_path"}</li>
+		{loop name="folder_path" type="folder-path" visible="*" folder=$folder_id}
+			{if $ID == $folder_id}
+				<li class="active">
+				   {if $editing_folder == true}
+                       {intl l='Editing %fold' fold="{$TITLE}"}
+				   {else}
+                       {$TITLE} <a href="{url path='/admin/folders/update' folder_id=$ID}" title="{intl l='Edit this folder'}">{intl l="(edit)"}</a>
+			        {/if}
+				</li>
+			{else}
+			   <li><a href="{url path='/admin/folders' folder_id=" $ID" action='browse'}">{$TITLE}</a></li>
+			{/if}
+	   {/loop}
+	{/ifloop}
+
+	{elseloop rel="folder_path"}
+	    </li>
+	{/elseloop}
+</ul>

templates/admin/default/includes/standard-description-form-fields.html

@@ -25,7 +25,7 @@
         <span class="label-help-block">{intl l="The détailed description."}</span>
     </label>
 
-    <textarea name="{$name}" id="{$label_attr.for}" rows="10" class="form-control">{$value}</textarea>
+    <textarea name="{$name}" id="{$label_attr.for}" rows="10" class="form-control wysiwyg">{$value}</textarea>
 </div>
 {/form_field}