dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix products

Browse Source
This commit is contained in:
Kevin Granger
2013-11-12 18:21:36 +01:00
parent 52abf62ae1
commit 4fbc8deaa8
4 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/images.tpl
+2
View File
@@ -52,6 +52,7 @@
{l s='Legend:'} {l s='Legend:'}
</span> </span>
</label> </label>
<div class="col-lg-9">
{foreach from=$languages item=language} {foreach from=$languages item=language}
{if $languages|count > 1} {if $languages|count > 1}
<div class="translatable-field row lang-{$language.id_lang}"> <div class="translatable-field row lang-{$language.id_lang}">
@@ -81,6 +82,7 @@
</div> </div>
{/if} {/if}
{/foreach} {/foreach}
</div>
</div> </div>
</div> </div>
admin-dev/themes/default/template/controllers/products/informations.tpl
-4
View File
@@ -321,14 +321,12 @@
</span> </span>
</label> </label>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="row">
{include {include
file="controllers/products/textarea_lang.tpl" file="controllers/products/textarea_lang.tpl"
languages=$languages languages=$languages
input_name='description_short' input_name='description_short'
input_value=$product->description_short input_value=$product->description_short
max=$PS_PRODUCT_SHORT_DESC_LIMIT} max=$PS_PRODUCT_SHORT_DESC_LIMIT}
</div>
</div> </div>
</div> </div>
@@ -341,12 +339,10 @@
</span> </span>
</label> </label>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="row">
{include {include
file="controllers/products/textarea_lang.tpl" file="controllers/products/textarea_lang.tpl"
languages=$languages input_name='description' languages=$languages input_name='description'
input_value=$product->description} input_value=$product->description}
</div>
</div> </div>
</div> </div>
admin-dev/themes/default/template/controllers/products/quantities.tpl
+11 -15
View File
@@ -44,7 +44,7 @@
<div class="alert alert-warning" id="available_quantity_ajax_msg" style="display: none;"></div> <div class="alert alert-warning" id="available_quantity_ajax_msg" style="display: none;"></div>
<div class="alert alert-danger" id="available_quantity_ajax_error_msg" style="display: none;"></div> <div class="alert alert-danger" id="available_quantity_ajax_error_msg" style="display: none;"></div>
<div class="alert alert-success" id="available_quantity_ajax_success_msg" style="display: none;"></div> <div class="alert alert-success" id="available_quantity_ajax_success_msg" style="display: none;"></div>
<div class="row" {if $product->is_virtual || $product->cache_is_pack}style="display:none;"{/if} class="row stockForVirtualProduct"> <div class="form-group" {if $product->is_virtual || $product->cache_is_pack}style="display:none;"{/if} class="row stockForVirtualProduct">
<div class="col-lg-9 col-lg-offset-3"> <div class="col-lg-9 col-lg-offset-3">
<p class="checkbox"> <p class="checkbox">
<label for="advanced_stock_management"> <label for="advanced_stock_management">
@@ -107,7 +107,7 @@
<p>{l s='Given the quantities of the products in this pack, the maximum quantity should be:'} {$pack_quantity}</p> <p>{l s='Given the quantities of the products in this pack, the maximum quantity should be:'} {$pack_quantity}</p>
</div> </div>
{/if} {/if}
<div class="row"> <div class="form-group">
<div class="col-lg-9 col-lg-offset-3"> <div class="col-lg-9 col-lg-offset-3">
<table class="table"> <table class="table">
<thead> <thead>
@@ -128,7 +128,7 @@
</table> </table>
</div> </div>
</div> </div>
<div id="when_out_of_stock" class="row"> <div id="when_out_of_stock" class="form-group">
<label class="control-label col-lg-3">{l s='When out of stock:'}</label> <label class="control-label col-lg-3">{l s='When out of stock:'}</label>
<div class="col-lg-9"> <div class="col-lg-9">
<p class="radio"> <p class="radio">
@@ -195,12 +195,10 @@
</span> </span>
</label> </label>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="row"> {include file="controllers/products/input_text_lang.tpl"
{include file="controllers/products/input_text_lang.tpl" languages=$languages
languages=$languages input_value=$product->available_now
input_value=$product->available_now input_name='available_now'}
input_name='available_now'}
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -213,12 +211,10 @@
</label> </label>
<div class="col-lg-9"> <div class="col-lg-9">
<div class="row"> {include file="controllers/products/input_text_lang.tpl"
{include file="controllers/products/input_text_lang.tpl" languages=$languages
languages=$languages input_value=$product->available_later
input_value=$product->available_later input_name='available_later'}
input_name='available_later'}
</div>
</div> </div>
</div> </div>
controllers/admin/AdminProductsController.php
+1
View File
@@ -2414,6 +2414,7 @@ class AdminProductsControllerCore extends AdminController
if ($this->tabAccess['add'] && $this->display != 'add') if ($this->tabAccess['add'] && $this->display != 'add')
$this->page_header_toolbar_btn['duplicate'] = array( $this->page_header_toolbar_btn['duplicate'] = array(
'short' => 'Duplicate', 'short' => 'Duplicate',
'href' => '#',
'desc' => $this->l('Duplicate'), 'desc' => $this->l('Duplicate'),
'confirm' => 1, 'confirm' => 1,
'js' => 'if (confirm(\''.$this->l('Also copy images').' ?\')) document.location = \''.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.(int)$product->id.'&amp;duplicateproduct\'; else document.location = \''.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.(int)$product->id.'&amp;duplicateproduct&amp;noimage=1\';' 'js' => 'if (confirm(\''.$this->l('Also copy images').' ?\')) document.location = \''.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.(int)$product->id.'&amp;duplicateproduct\'; else document.location = \''.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.(int)$product->id.'&amp;duplicateproduct&amp;noimage=1\';'