[*] BO : New category management with multi shop

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11437 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:36:08 +00:00
parent 2576abc756
commit 6ef2e2cc50
14 changed files with 260 additions and 14 deletions
@@ -261,6 +261,8 @@
 								{include file='helper/assoshop.tpl' input=$input fields_value=$fields_value}
 							{elseif $input.type == 'categories'}
 								{include file='helper/form/form_category.tpl' categories=$input.values}
+							{elseif $input.type == 'categories_select'}
+								{$input.category_tree}
 							{elseif $input.type == 'asso_shop' && isset($asso_shop) && $asso_shop}
 									{$asso_shop}
 							{elseif $input.type == 'color'}
@@ -206,7 +206,16 @@
 					<input type="hidden" name="fakeSubmitAddProductAndPreview" id="fakeSubmitAddProductAndPreview" />
 					<br />
 				</p>
-			 	</div>
+				</div>
+		{/if}
+		{if isset($warning_unavailable_product)}
+			<div class="warn" >
+				<p>
+					<span style="float: left">
+					{l s='This product is active in this shop but it doesn\'t belong to any active category for this shop.'}
+					</span>
+				</p>
+			</div>
 		{/if}
 		{* all input are here *}
 			<div id="product-tab-content-wait" style="display:none" >{l s='loading ...'}</div>