-
{foreach from=$module_languages item=language}
-
{$language.name}
+ - {$language.name} {/foreach}
+
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/uploader/ajax.tpl b/admin-dev/themes/default/template/controllers/products/helpers/uploader/ajax.tpl
new file mode 100644
index 000000000..a80ab4b6b
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/products/helpers/uploader/ajax.tpl
@@ -0,0 +1,180 @@
+{*
+* 2007-2013 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-2013 PrestaShop SA
+* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*}
+
- 
+
legend
@@ -129,6 +141,28 @@
var current_shop_id = {$current_shop_id|intval};
{literal}
//Ready Function
+
+ function imageLine(id, path, position, cover, shops, legend)
+ {
+ line = $("#lineType").html();
+ line = line.replace(/image_id/g, id);
+ line = line.replace(/[a-z]{0,2}-default-small_default/g, path+'-small_default');
+ line = line.replace(/image_path/g, path);
+ line = line.replace(/image_position/g, position);
+ line = line.replace(/legend/g, legend);
+ line = line.replace(/icon-check-empty/g, cover);
+ line = line.replace(/ /gi, "");
+ line = line.replace(/<\/tbody>/gi, "");
+ if (shops != false)
+ {
+ $.each(shops, function(key, value){
+ if (value == 1)
+ line = line.replace('id="' + key + '' + id + '"','id="' + key + '' + id + '" checked=checked');
+ });
+ }
+ $("#imageList").append(line);
+ }
+
$(document).ready(function(){
{/literal}
{foreach from=$images item=image}
@@ -165,66 +199,6 @@
updateImagePosition(image_up);
}
});
- var filecheck = 1;
- var params = new Array;
- params['id_product'] = {/literal}{$id_product|intval}{literal};
- params['id_category'] = {/literal}{$id_category_default|intval}{literal};
- params['token'] = "{/literal}{$token}{literal}";
- params['tab'] = "AdminProducts";
- params['action'] = "addImage";
- params['ajax'] = 1;
- uploader = new qq.FileUploader(
- {
- element: document.getElementById("file-uploader"),
- action: "ajax-tab.php",
- debug: false,
- onComplete: function(id, fileName, responseJSON)
- {
- var percent = ((filecheck * 100) / nbfile);
- $("#progressBarImage").progressbar({value: percent});
- if (percent != 100)
- {
- $("#imageUpload").html(parseInt(filecheck));
- $("#imageTotal").html(" / " + parseInt(nbfile) + " {/literal}{l s='Images'}{literal}");
- $("#progressBarImage").show();
- $("#showCounter").show();
- }
- else
- {
- $("#progressBarImage").progressbar({value: 0});
- $("#progressBarImage").hide();
- $("#showCounter").hide();
- nbfile = 0;
- filecheck = 0;
- }
- if (responseJSON.status == 'ok')
- {
- cover = "icon-check-empty";
- if (responseJSON.cover == "1")
- cover = "icon-check-sign";
- imageLine(responseJSON.id, responseJSON.path, responseJSON.position, cover, responseJSON.shops, responseJSON.legend[{/literal}{$default_language|intval}{literal}])
- $("#imageTable tr:last").after(responseJSON.html);
- $("#countImage").html(parseInt($("#countImage").html()) + 1);
- $("#img" + id).remove();
- $("#imageTable").tableDnDUpdate();
- showSuccessMessage(responseJSON.name + " " + success_add);
- }
- else
- showErrorMessage(responseJSON.error);
- filecheck++;
- },
- onSubmit: function(id, filename)
- {
- $('input[id^="legend_"]').each(function()
- {
- id = $(this).prop("id").replace("legend_", "legend[") + "]";
- params[id] = $(this).val();
- });
- uploader.setParams(params);
- $("#imageTable").show();
- $("#listImage").append("![](\"../img/admin/disabled.gif\")
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/uploader/index.php b/admin-dev/themes/default/template/controllers/products/helpers/uploader/index.php
new file mode 100644
index 000000000..c9b153f1b
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/products/helpers/uploader/index.php
@@ -0,0 +1,35 @@
+
+* @copyright 2007-2013 PrestaShop SA
+* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+* International Registered Trademark & Property of PrestaShop SA
+*/
+
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../../../../../../../../');
+exit;
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl
index caa7686c7..dc9458b16 100644
--- a/admin-dev/themes/default/template/controllers/products/images.tpl
+++ b/admin-dev/themes/default/template/controllers/products/images.tpl
@@ -35,40 +35,52 @@
+
+
+
+
+
- {l s='File:'}
-
-
-
-
-
-
- {if Tools::getValue('id_image')}
-
- {/if}
+ {$image_uploader}
-
@@ -95,7 +107,7 @@
- {foreach from=$languages item=language}
-
+ {/if}
+ {/foreach}
+
" + filename + "