// BO fix product tabs

This commit is contained in:
Kevin Granger committed 2013-08-30 11:51:57 +02:00
1 parent e4d58b7528
commit 0c494912a4
6 files changed
+134 -147

No files matched your search

@@ -6675,9 +6675,6 @@ html, body {
margin: 0 0 -60px 0; margin: 0 0 -60px 0;
background-color: #f8f8f8; } background-color: #f8f8f8; }
.container-fluid, .row-fluid {
width: 100%; }
#content { #content {
padding: 90px 20px 0; padding: 90px 20px 0;
margin-left: 240px; margin-left: 240px;
@@ -140,9 +140,6 @@ html, body
background-color: $bg-content-color background-color: $bg-content-color
//background-image: url('../img/patterns/bedge_grunge.png') // texture //background-image: url('../img/patterns/bedge_grunge.png') // texture
.container-fluid, .row-fluid
width: 100%
#content #content
padding: 90px 20px 0 padding: 90px 20px 0
margin-left: 240px margin-left: 240px
@@ -24,92 +24,84 @@
*} *}
<fieldset> <fieldset>
<input type="hidden" name="submitted_tabs[]" value="Associations" /> <input type="hidden" name="submitted_tabs[]" value="Associations" />
<div class="Associations"> <h3>{l s='Associations'}</h3>
{include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"}
<h3>{l s='Associations'}</h3> <div id="no_default_category" class="alert alert-info">
{l s='Please select a default category.'}
{include file="controllers/products/multishop/check_fields.tpl" product_tab="Associations"} </div>
<div id="no_default_category" class="alert alert-info"> <div class="row">
{l s='Please select a default category.'} {include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
</div> <label class="control-label col-lg-3" for="category_block">{l s='Associated categories:'}</label>
<div class="col-lg-9">
<div class="row"> <div id="category_block">
{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"} {$category_tree}
<label class="control-label col-lg-3" for="category_block">{l s='Associated categories:'}</label>
<div class="col-lg-9">
<div id="category_block">
{$category_tree}
</div>
<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'htmlall':'UTF-8'}&addcategory">
<i class="icon-plus-sign"></i> {l s='Create new category'} <i class="icon-external-link-sign"></i>
</a>
</div> </div>
<a class="btn btn-link bt-icon confirm_leave" href="{$link->getAdminLink('AdminCategories')|escape:'htmlall':'UTF-8'}&addcategory">
<i class="icon-plus-sign"></i> {l s='Create new category'} <i class="icon-external-link-sign"></i>
</a>
</div> </div>
</div>
<div class="row"> <div class="row">
{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"} {include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}
<label class="control-label col-lg-3" for="id_category_default"> <label class="control-label col-lg-3" for="id_category_default">
<span class="label-tooltip" data-toggle="tooltip" <span class="label-tooltip" data-toggle="tooltip"
title="{l s='The default category is the category displayed by default.'}"> title="{l s='The default category is the category displayed by default.'}">
{l s='Default category:'} {l s='Default category:'}
</span> </span>
</label> </label>
<div class="col-lg-5"> <div class="col-lg-5">
<select id="id_category_default" name="id_category_default"> <select id="id_category_default" name="id_category_default">
{foreach from=$selected_cat item=cat} {foreach from=$selected_cat item=cat}
<option value="{$cat.id_category}" {if $id_category_default == $cat.id_category}selected="selected"{/if} >{$cat.name}</option> <option value="{$cat.id_category}" {if $id_category_default == $cat.id_category}selected="selected"{/if} >{$cat.name}</option>
{/foreach}
</select>
</div>
</div>
<div class="row">
<label class="control-label col-lg-3" for="product_autocomplete_input">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Begin typing the first letters of the product name, then select the product from the drop-down list.'}{l s='(Do not forget to save the product afterward)'}">
{l s='Accessories:'}
</span>
</label>
<div class="col-lg-5">
<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'htmlall':'UTF-8'}¤{/foreach}" />
<div id="ajax_choose_product">
<input type="text" value="" id="product_autocomplete_input" />
<div class="help-block">
</div>
</div>
<div id="divAccessories">
{* @todo : donot use 3 foreach, but assign var *}
{foreach from=$accessories item=accessory}
{$accessory.name|escape:'htmlall':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if}
<span class="delAccessory" name="{$accessory.id_product}" style="cursor: pointer;">
<img src="../img/admin/delete.gif" class="middle" alt="" />
</span>
{/foreach} {/foreach}
</select>
</div>
</div>
<div class="row">
<label class="control-label col-lg-3" for="product_autocomplete_input">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Begin typing the first letters of the product name, then select the product from the drop-down list.'}{l s='(Do not forget to save the product afterward)'}">
{l s='Accessories:'}
</span>
</label>
<div class="col-lg-5">
<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|escape:'htmlall':'UTF-8'}¤{/foreach}" />
<div id="ajax_choose_product">
<input type="text" value="" id="product_autocomplete_input" />
<div class="help-block">
</div> </div>
</div> </div>
<div id="divAccessories">
{* @todo : donot use 3 foreach, but assign var *}
{foreach from=$accessories item=accessory}
{$accessory.name|escape:'htmlall':'UTF-8'}{if !empty($accessory.reference)}{$accessory.reference}{/if}
<span class="delAccessory" name="{$accessory.id_product}" style="cursor: pointer;">
<img src="../img/admin/delete.gif" class="middle" alt="" />
</span>
{/foreach}
</div>
</div> </div>
</div>
<div class="row"> <div class="row">
<label class="control-label col-lg-3" for="id_manufacturer">{l s='Manufacturer:'}</label> <label class="control-label col-lg-3" for="id_manufacturer">{l s='Manufacturer:'}</label>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="row"> <div class="row">
<div class="col-lg-7"> <div class="col-lg-7">
<select name="id_manufacturer" id="id_manufacturer"> <select name="id_manufacturer" id="id_manufacturer">
<option value="0">-- {l s='Choose (optional)'} --</option> <option value="0">-- {l s='Choose (optional)'} --</option>
{if $product->id_manufacturer} {if $product->id_manufacturer}
<option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option> <option value="{$product->id_manufacturer}" selected="selected">{$product->manufacturer_name}</option>
{/if} {/if}
<option disabled="disabled">----------</option> <option disabled="disabled">----------</option>
</select> </select>
</div> </div>
<div class="col-lg-5"> <div class="col-lg-5">
<a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer"> <a class="btn btn-link bt-icon confirm_leave" style="margin-bottom:0" href="{$link->getAdminLink('AdminManufacturers')|escape:'htmlall':'UTF-8'}&addmanufacturer">
<i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i> <i class="icon-plus-sign"></i> {l s='Create new manufacturer'} <i class="icon-external-link-sign"></i>
</a> </a>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -63,7 +63,7 @@
{/block} {/block}
{block name="defaultForm"} {block name="defaultForm"}
<div class="row-fluid"> <div class="row">
<div class="productTabs col-lg-2"> <div class="productTabs col-lg-2">
<div class="list-group"> <div class="list-group">
{foreach $product_tabs key=numStep item=tab} {foreach $product_tabs key=numStep item=tab}
@@ -264,7 +264,7 @@
{include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="online_only" type="default"} {include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="online_only" type="default"}
</div> </div>
{/if} {/if}
<div class="row"> <div class="form-group">
<label class="control-label col-lg-3" for="available_for_order">{l s='Options:'}</label> <label class="control-label col-lg-3" for="available_for_order">{l s='Options:'}</label>
<div class="col-lg-5"> <div class="col-lg-5">
<p class="checkbox"> <p class="checkbox">
@@ -281,7 +281,8 @@
</p> </p>
</div> </div>
</div> </div>
<div class="row">
<div class="form-group">
{include file="controllers/products/multishop/checkbox.tpl" field="condition" type="default"} {include file="controllers/products/multishop/checkbox.tpl" field="condition" type="default"}
<label class="control-label col-lg-3" for="condition">{l s='Condition:'}</label> <label class="control-label col-lg-3" for="condition">{l s='Condition:'}</label>
<div class="col-lg-3"> <div class="col-lg-3">
@@ -27,69 +27,69 @@
var msg_select_one = "{l s='Please select at least one product.' js=1}"; var msg_select_one = "{l s='Please select at least one product.' js=1}";
var msg_set_quantity = "{l s='Please set a quantity to add a product.' js=1}"; var msg_set_quantity = "{l s='Please set a quantity to add a product.' js=1}";
</script> </script>
<input type="hidden" name="submitted_tabs[]" value="Pack" />
<h3>{l s='Pack'}</h3>
<div class="alert alert-info">{l s='You cannot add combinations to a pack.'}</div>
<div class="ppack"> <fieldset>
<input type="checkbox" name="ppack" id="ppack" value="1" {if $product_type == Product::PTYPE_PACK}checked="checked"{/if} onclick="$('#ppackdiv').slideToggle();" /> <input type="hidden" name="submitted_tabs[]" value="Pack" />
<label class="t" for="ppack">{l s='Pack'}</label> <h3>{l s='Pack'}</h3>
</div> <div class="alert alert-info">{l s='You cannot add combinations to a pack.'}</div>
<div id="ppackdiv" {if !($product_type == Product::PTYPE_PACK)}style="display: none;"{/if}> <div class="ppack">
<input type="checkbox" name="ppack" id="ppack" value="1" {if $product_type == Product::PTYPE_PACK}checked="checked"{/if} onclick="$('#ppackdiv').slideToggle();" />
<div class="row"> <label class="t" for="ppack">{l s='Pack'}</label>
<label class="control-label col-lg-3" for="curPackItemName">
<span class="label-tooltip" data-toggle="tooltip"
title="{l s='Begin typing the first letters of the product name. Then select the product from the drop-down list:'}">
{l s='Product'}
</span>
</label>
<div class="input-group col-lg-6">
<input type="text" id="curPackItemName" />
<span class="input-group-addon"><i class="icon-search"></i></span>
</div> </div>
</div>
<div id="ppackdiv" {if !($product_type == Product::PTYPE_PACK)}style="display: none;"{/if}>
<div class="row">
<label class="control-label col-lg-3" for="curPackItemQty"> <div class="form-group">
{l s='Quantity'} <label class="control-label col-lg-3" for="curPackItemName">
</label> <span class="label-tooltip" data-toggle="tooltip"
<div class="input-group col-lg-2"> title="{l s='Begin typing the first letters of the product name. Then select the product from the drop-down list:'}">
<span class="input-group-addon">&times;</span> {l s='Product'}
<input type="text" name="curPackItemQty" id="curPackItemQty" value="1"/> </span>
</label>
<div class="input-group col-lg-6">
<input type="text" id="curPackItemName" />
<span class="input-group-addon"><i class="icon-search"></i></span>
</div>
</div> </div>
</div>
<div class="form-group">
<div class="row"> <label class="control-label col-lg-3" for="curPackItemQty">
<div class="col-lg-9 col-lg-offset-3"> {l s='Quantity'}
<button type="button" id="add_pack_item" class="btn btn-default"> </label>
<i class="icon-plus-sign-alt"></i> {l s='Add this product to the pack'} <div class="input-group col-lg-2">
</button> <span class="input-group-addon">&times;</span>
<input type="text" name="curPackItemQty" id="curPackItemQty" value="1"/>
</div>
</div> </div>
</div>
<input type="hidden" name="inputPackItems" id="inputPackItems" value="{$input_pack_items}" /> <div class="form-group">
<input type="hidden" name="namePackItems" id="namePackItems" value="{$input_namepack_items}" /> <div class="col-lg-9 col-lg-offset-3">
<input type="hidden" id="curPackItemId" /> <button type="button" id="add_pack_item" class="btn btn-default">
<i class="icon-plus-sign-alt"></i> {l s='Add this product to the pack'}
<hr/> </button>
</div>
<div class="row">
<label class="control-label col-lg-3 product_description listOfPack" style="display:{if count($pack_items) > 0}block{else}none{/if};">
{l s='List of products for that pack:'}
</label>
<div class="col-lg-9">
<ul id="divPackItems">
{foreach $pack_items as $pack_item}
<li>
<button type="button" class="btn btn-default delPackItem" name="{$pack_item.id}">
<i class="icon-trash"></i>
</button>
{$pack_item.pack_quantity} x {$pack_item.name}
</li>
{/foreach}
</ul>
</div> </div>
</div>
<input type="hidden" name="inputPackItems" id="inputPackItems" value="{$input_pack_items}" />
<input type="hidden" name="namePackItems" id="namePackItems" value="{$input_namepack_items}" />
<input type="hidden" id="curPackItemId" />
<div class="form-group">
<label class="control-label col-lg-3 product_description listOfPack" style="display:{if count($pack_items) > 0}block{else}none{/if};">
{l s='List of products for that pack:'}
</label>
<div class="col-lg-9">
<ul id="divPackItems">
{foreach $pack_items as $pack_item}
<li>
<button type="button" class="btn btn-default delPackItem" name="{$pack_item.id}">
<i class="icon-trash"></i>
</button>
{$pack_item.pack_quantity} x {$pack_item.name}
</li>
{/foreach}
</ul>
</div>
</div>
</fieldset>