diff --git a/admin-dev/themes/template/layout-ajax.tpl b/admin-dev/themes/template/layout-ajax.tpl index 19937d0ab..902a4f536 100644 --- a/admin-dev/themes/template/layout-ajax.tpl +++ b/admin-dev/themes/template/layout-ajax.tpl @@ -42,7 +42,7 @@ {if count($errors)} {* @todo what is ??? AND $this->_includeContainer *}
- X + X {if count($errors) == 1} {$errors[0]} {else} @@ -78,17 +78,16 @@ X - {if count($warnings) > 1} {l s='There are'} {count($warnings)} {l s='warnings'} + + {l s='Click here to see more'} + + {else} - {l s='There is'} {count($warnings)} {l s='warning'} + {l s='There is'} {count($warnings)} {l s='warning'} : {/if} - - {l s='Click here to see more'} - - -
* {l s='Required field'}
-
 
- - - - - -
-

{l s='Attachments for this product:'}

-

- - {l s='Remove'} >> - -		 -

{l s='Available attachments:'}

-

- - << {l s='Add'} - - -
-
 
- +
 
+ + + + + +
+

{l s='Attachments for this product:'}

+

+ + {l s='Remove'} >> + + 		+

{l s='Available attachments:'}

+

+ + << {l s='Add'} + + +
+
 
+ + + + - - +{/if} diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl index af0a0aef8..f3e12cf12 100644 --- a/admin-dev/themes/template/products/combinations.tpl +++ b/admin-dev/themes/template/products/combinations.tpl @@ -24,26 +24,15 @@ * International Registered Trademark & Property of PrestaShop SA *} - - + -

{l s='Add or modify combinations for this product'}

-
{l s='or go to'} -  combinations_generator{l s='Product combinations generator'} -
- - - -{$list} + + + + + +
+ + + + + + + +
+ + + + {l s='Reference:'} + + + {l s='EAN13:'} + {l s='UPC:'} + {l s='Special characters allowed:'} .-_#  + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + {if $ps_use_ecotax} + + + + + {/if} + + + + + + + + + + + + + + + + + + + + + + + +
+ {l s='Wholesale price:'} + + {if $currency->format % 2 != 0}{$currency->sign}{/if} + + {if $currency->format % 2 == 0} {$currency->sign} {/if}({l s='overrides Wholesale price on Information tab'}) +
{l s='Impact on price:'} + +   {l s='of'}  {if $currency->format % 2 != 0}{$currency->sign} {/if} + {if $currency->format % 2 == 0} {$currency->sign}{/if} + {if $country_display_tax_label} + {l s='(tax excl.)'} + {l s='or'} + {if $currency->format % 2 != 0}{$currency->sign} {/if} + + {if $currency->format % 2 == 0} {$currency->sign}{/if} {l s='(tax incl.)'} + {l s='final product price will be set to'} + {if $currency->format % 2 != 0}{$currency->sign} {/if} + 0.00 + {if $currency->format % 2 == 0}{$currency->sign} {/if} + {/if} + +
{l s='Impact on weight:'} + +   {l s='of'}   + + {$ps_weight_unit} + +
{l s='Impact on unit price :'} + +   {l s='of'}     + {if $currency->format % 2 != 0} {$currency->sign} {/if} + {if $currency->format % 2 == 0} {$currency->sign}{/if} / {$field_value_unity} + +
+ {l s='Eco-tax:'} + {if $currency->format % 2 != 0}{$currency->sign}{/if} + + {if $currency->format % 2 == 0} {$currency->sign}{/if} + ({l s='overrides Eco-tax on Information tab'}) +
+ + + +

{l s='The minimum quantity to buy this product (set to 1 to disable this feature)'}

+
+ + + +

{l s='The available date when this product is out of stock'}

+ +
+
+
{l s='Image:'} +
    + {foreach from=$images key=k item=image} +
  • + + +
    • + {/foreach} +
+ +
{l s='Default:'}

 + +  {l s='Make this the default combination for this product'}

+
  + + + + + +
+ + + {$list} +{/if} diff --git a/admin-dev/themes/template/products/customization.tpl b/admin-dev/themes/template/products/customization.tpl index 2f7e5d05d..65a2ce5c2 100644 --- a/admin-dev/themes/template/products/customization.tpl +++ b/admin-dev/themes/template/products/customization.tpl @@ -23,56 +23,58 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -

{l s='Add or modify customizable properties'}

- -

- - - - - - - - - - - - - {if $has_file_labels} +{if isset($obj->id)} +

{l s='Add or modify customizable properties'}

+ +

+
{l s='File fields:'} - -

{l s='Number of upload file fields displayed'}

-
{l s='Text fields:'} - -

{l s='Number of text fields displayed'}

-
- -
- - - - - + - {/if} - {if $has_text_labels} - - - - - + - {/if} - - - -
{l s='Files fields:'} - {$display_file_labels} + {l s='File fields:'} + +

{l s='Number of upload file fields displayed'}
{l s='Text fields:'} - {$display_text_labels} + {l s='Text fields:'} + +

{l s='Number of text fields displayed'}
- {if $has_file_labels || $has_text_labels} - - {/if} -
\ No newline at end of file + + + + + + {if $has_file_labels} + +
+ + + {l s='Files fields:'} + + {$display_file_labels} + + + {/if} + {if $has_text_labels} + +
+ + + {l s='Text fields:'} + + {$display_text_labels} + + + {/if} + + + {if $has_file_labels || $has_text_labels} + + {/if} + + + +{/if} \ No newline at end of file diff --git a/admin-dev/themes/template/products/features.tpl b/admin-dev/themes/template/products/features.tpl index 3a718b0c6..50f7ab40e 100644 --- a/admin-dev/themes/template/products/features.tpl +++ b/admin-dev/themes/template/products/features.tpl @@ -1,66 +1,96 @@ -

{l s='Assign features to this product:'}

-
- +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{if isset($product->id)} + +

{l s='Assign features to this product:'}

+
+ + + + +
+ + + +
{l s='Feature'} + {l s='Pre-defined value'} + {l s='or'} {l s='Customized value'} +
+ {foreach from=$available_features item=available_feature} + + + + + -
{$available_feature.name} + {if sizeof($available_feature.featureValues)} + + {else} + + {l s='N/A'} - + {l s='Add pre-defined values first'} + + {/if} + + {foreach from=$languages item=language} +
+ +
+ {/foreach}
-
- - - -
{l s='Feature'} - {l s='Pre-defined value'} - {l s='or'} {l s='Customized value'} -
-{foreach from=$available_features item=available_feature} - - - - - {/foreach} - - + +
{$available_feature.name} - {if sizeof($available_feature.featureValues)} - - {else} - - {l s='N/A'} - - {l s='Add pre-defined values first'} - - {/if} - - {foreach from=$languages item=language} -
- -
+ + {foreachelse} +
{l s='No features defined'}
+
+
+ + new_features {l s='Add a new feature'} + +
+ + -{foreachelse} - {l s='No features defined'} -{/foreach} - - -
-
- - new_features {l s='Add a new feature'} - -
- - +{/if} diff --git a/admin-dev/themes/template/products/form.tpl b/admin-dev/themes/template/products/form.tpl index 1c8ccc8bd..0fd5dacac 100644 --- a/admin-dev/themes/template/products/form.tpl +++ b/admin-dev/themes/template/products/form.tpl @@ -27,279 +27,244 @@ {extends file="helper/form/form.tpl"} {block name="defaultForm"} -
-
-
    - {foreach $product_tabs key=numStep item=tab} -
  • - {$tab.name}{*todo href when nojs*} -
    • - {/foreach} -
+
+
+
    + {foreach $product_tabs key=numStep item=tab} +
  • + {$tab.name}{*todo href when nojs*} +
    • + {/foreach} +
+
-
- -{***********************************************} -{********** TO CHECK !!!!!!!!!!!!!!! ***********} - - + + {***********************************************} + {********** TO CHECK !!!!!!!!!!!!!!! ***********} + + + - -
- - -
-{if !$product->active} -
-

- - {l s='Your product will be saved as draft'} - {l s='Save and preview'} - -
-

-
-{/if} -{* all input are here *} - - {if !$newproduct} - {foreach $product_tabs key=numStep item=tab} -
- {if $tab.selected}{$custom_form}{/if} + ); + } + + function uploadFile2() + { + var link = ''; + $.ajaxFileUpload ( + { + url:'./uploadProductFileAttribute.php', + secureuri:false, + fileElementId:'virtual_product_file_attribute', + dataType: 'xml', + success: function (data, status) + { + data = data.getElementsByTagName('return')[0]; + var result = data.getAttribute("result"); + var msg = data.getAttribute("msg"); + var fileName = data.getAttribute("filename"); + if(result == "error") + $("#upload-confirmation2").html('

error: ' + msg + '

'); + else + { + $('#virtual_product_file_attribute').remove(); + $('#virtual_product_file_label').hide(); + $('#file_missing').hide(); + $('#delete_downloadable_product_attribute').show(); + $('#upload-confirmation2').html( + '{l s='The file'} "' + fileName + '" {l s='has successfully been uploaded'}' + + ''); + $('#virtual_product_name_attribute').attr('value', fileName); + + link = $("#delete_downloadable_product_attribute").attr('href'); + $("#delete_downloadable_product_attribute").attr('href', link+"&file="+msg); + } + } + } + ); + } + //]]> + + + + + +
+ {if !$product->active} +
+

+ + {l s='Your product will be saved as draft'} + {l s='Save and preview'} + +
+

+
+ {/if} + {* all input are here *} + + {foreach $product_tabs key=numStep item=tab} +
+ {if $tab.selected}{$custom_form}{/if} +
+ {/foreach}
- {/foreach} - {else} -
{$custom_form}
- {/if} -
- - - -
-
+ + + + +
{/block} -{*a href="{$link->getAdminLink('AdminCatalog')}">{l s='Back to list'}
-*} diff --git a/admin-dev/themes/template/products/images.tpl b/admin-dev/themes/template/products/images.tpl index 8131449ea..ebaf3cc10 100644 --- a/admin-dev/themes/template/products/images.tpl +++ b/admin-dev/themes/template/products/images.tpl @@ -1,7 +1,34 @@ -
+{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +{if isset($id_product) && isset($product)}

2. {l s='Images'} ({$countImages})

{if isset($id_image)}{l s='Edit this product image'}{else}{l s='Add a new image to this product'}{/if}


- + +
@@ -46,253 +73,255 @@
-
- - - - - {if $shops} - {foreach from=$shops item=shop} - - {/foreach} - {/if} - - - - - + + function delQueue(id) + { + $("#img" + id).fadeOut("slow"); + $("#img" + id).remove(); + } + + function imageLine(id, path, position, cover, shops) + { + line = $("#lineType").html(); + line = line.replace(/image_id/g, id); + line = line.replace(/en-default/g, path); + line = line.replace(/image_position/g, position); + line = line.replace(/blank/g, cover); + line = line.replace("", ""); + line = line.replace("", ""); + if (shops != false) + { + tmp = jQuery.parseJSON(shops); + $.each(tmp, function(key, value){ + if (value == 1) + line = line.replace('id="' + key + '' + id + '"','id="' + key + '' + id + '" checked=checked'); + }); + } + $("#imageList").append(line); + } + }); + {/literal} + +{/if} diff --git a/admin-dev/themes/template/products/informations.tpl b/admin-dev/themes/template/products/informations.tpl index def12eedd..64782de3c 100644 --- a/admin-dev/themes/template/products/informations.tpl +++ b/admin-dev/themes/template/products/informations.tpl @@ -1,3 +1,29 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +

1. {l s='Info.'}

{l s='Product global information'}

diff --git a/admin-dev/themes/template/products/input_text_lang.tpl b/admin-dev/themes/template/products/input_text_lang.tpl index 4508c1e96..62ec5c0f5 100644 --- a/admin-dev/themes/template/products/input_text_lang.tpl +++ b/admin-dev/themes/template/products/input_text_lang.tpl @@ -1,3 +1,29 @@ +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
{foreach from=$languages item=language}
diff --git a/admin-dev/themes/template/products/prices.tpl b/admin-dev/themes/template/products/prices.tpl index 958d44992..67dff1a38 100644 --- a/admin-dev/themes/template/products/prices.tpl +++ b/admin-dev/themes/template/products/prices.tpl @@ -1,66 +1,85 @@ - +{* +* 2007-2011 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2011 PrestaShop SA +* @version Release: $Revision$ +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} +
-

{l s='Product price'}

-
- - - - - - - - - - - - - - - - {if $ps_use_ecotax} + + + {if $ps_use_ecotax} - {/if} - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - {* [end] prices *} -
- {$currency->prefix}{$currency->suffix} -

{l s='The wholesale price at which you bought this product'}

-
- {$currency->prefix}{$currency->suffix} * -

{l s='The pre-tax retail price to sell this product'}

-
- + + + + + {l s='Create'} {l s='Create'} + + + {if $tax_exclude_taxe_option} + {l s='Taxes are currently disabled'} ({l s='Tax options'}) + {/if} - {/foreach} - ecotaxTaxRate = {$ecotaxTaxRate / 100}; - - - - - - {l s='Create'} {l s='Create'} - - - {if $tax_exclude_taxe_option} - {l s='Taxes are currently disabled'} ({l s='Tax options'}) - - {/if} -
@@ -68,157 +87,174 @@ var product_prices = new Array(); ({l s='already included in price'})
- {$currency->prefix}{$currency->suffix} -
- {$currency->prefix} {$currency->suffix} - {l s='per'} - {if $ps_tax && $country_display_tax_label} - {l s='or'} - {$currency->prefix}0.00{$currency->suffix} - {l s='per'} {$product->unity} {l s='with tax'} - - {/if} -

{l s='Eg. $15 per Lb'}

-
- on_sale}checked="checked"{/if} value="1" />  -
- - {$currency->prefix}{$currency->suffix} ({l s='tax incl.'}) - - + {/if} +
+ {$currency->prefix}{$currency->suffix} +
+ {$currency->prefix} {$currency->suffix} + {l s='per'} + {if $ps_tax && $country_display_tax_label} + {l s='or'} + {$currency->prefix}0.00{$currency->suffix} + {l s='per'} {$product->unity} {l s='with tax'} + + {/if} +

{l s='Eg. $15 per Lb'}

+
+ on_sale}checked="checked"{/if} value="1" />  +
+ + {$currency->prefix}{$currency->suffix} ({l s='tax incl.'}) + + - {if $country_display_tax_label} - / - {/if} - {$currency->prefix}{$currency->suffix} {if $country_display_tax_label}({l s='tax excl.'}){/if} -
-
{l s='You can define many discounts and specific price rules in the Prices tab'}
-
-
-

{l s='Current specific prices'}

-{l s='Add a new specific price'} -
-