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

Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source
This commit is contained in:
Kevin Granger
2013-11-07 21:49:11 +01:00
parent 9c4ee27f20 2d2445efd4
commit 42af175d22
22 changed files with 391 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/js/jquery.fileupload.js
Vendored
+1
View File
@@ -562,6 +562,7 @@
var options = $.extend({}, this.options, data);
this._initFormSettings(options);
this._initDataSettings(options);
options.url = options.url+'&rand=' + new Date().getTime();
return options;
},
admin-dev/themes/default/template/controllers/search/helpers/view/view.tpl
+1 -1
View File
@@ -29,7 +29,7 @@ $(function() {
});
</script>
{if !$nb_results}
{if !isset($nb_results) || !$nb_results}
<h2>{l s='There are no results matching your query "%s".' sprintf=$query}</h2>
{else}
<h2>
admin-dev/themes/default/template/header.tpl
+4 -2
View File
@@ -71,7 +71,9 @@
var token_admin_customer_threads = '{getAdminToken tab='AdminCustomerThreads'}';
var currentIndex = '{$currentIndex|@addcslashes:'\''}';
var choose_language_translate = '{l s='Choose language' js=1}';
var default_language = '{$default_language|addslashes}';
var default_language = '{$default_language|intval}';
var admin_modules_link = '{$link->getAdminLink("AdminModules")|addslashes}';
var tab_modules_list = '{if isset($tab_modules_list) && $tab_modules_list}{$tab_modules_list|addslashes}{/if}';
</script>
{/if}
{if isset($css_files)}
@@ -111,7 +113,7 @@
<i class="icon-reorder"></i>
</button>
<a id="header_shopname" href="{$link->getAdminLink('AdminDashboard')|escape:'htmlall':'UTF-8'}">
<a id="header_shopname" href="{$default_tab_link|escape:'htmlall':'UTF-8'}">
<img src="{$img_dir}prestashop-avatar.png" height="15" width="15" />
{$shop_name}
</a>
admin-dev/themes/default/template/helpers/list/list_header.tpl
+1 -1
View File
@@ -214,7 +214,7 @@
{$params.title}
{/if}
{if (!isset($params.orderby) || $params.orderby) && !$simple_header}
{if (!isset($params.orderby) || $params.orderby) && !$simple_header && $show_filters}
<a {if isset($order_by) && ($key == $order_by) && ($order_way == 'DESC')}class="active"{/if} href="{$currentIndex}&{$list_id}Orderby={$key|urlencode}&{$list_id}Orderway=desc&token={$token}{if isset($smarty.get.$identifier)}&{$identifier}={$smarty.get.$identifier|intval}{/if}">
<i class="icon-caret-down"></i>
</a>
admin-dev/themes/default/template/helpers/uploader/ajax.tpl
+108 -125
View File
@@ -43,6 +43,18 @@
{/if}
</div>
</div>
{if isset($max_files) && $files|count >= $max_files}
<div class="row">
<div class="alert alert-warning">{l s='You have reached the limit (%s) of files to upload, please remove files to continue uploading' sprintf=$max_files}</div>
</div>
<script type="text/javascript">
$( document ).ready(function() {
{if isset($files) && $files}
$('#{$id}-images-thumbnails').parent().show();
{/if}
});
</script>
{else}
<div class="form-group">
<div class="col-lg-12">
<input id="{$id}" type="file" name="{$name}[]"{if isset($url)} data-url="{$url}"{/if}{if isset($multiple) && $multiple} multiple="multiple"{/if} class="hide" />
@@ -55,167 +67,138 @@
</div>
</div>
<div class="row" style="display:none">
<div class="alert alert-info" id="{$id}-files-list">
<strong>{l s='Files:'}</strong>
<br />
</div>
<div class="alert alert-info" id="{$id}-files-list"></div>
</div>
<div class="row" style="display:none">
<div class="alert alert-success" id="{$id}-success"></div>
</div>
<div class="row" style="display:none">
<div class="alert alert-danger" id="{$id}-errors"></div>
</div>
<script type="text/javascript">
function humanizeSize(bytes)
{
if (typeof bytes !== 'number') {
return '';
}
if (bytes >= 1000000000) {
return (bytes / 1000000000).toFixed(2) + ' GB';
}
if (bytes >= 1000000) {
return (bytes / 1000000).toFixed(2) + ' MB';
}
return (bytes / 1000).toFixed(2) + ' KB';
}
$( document ).ready(function() {
{if isset($multiple) && isset($max_files)}
var {$id}_max_files = {$max_files};
var {$id}_max_files = {$max_files - $files|count};
{/if}
{if isset($files) && $files}
$('#{$id}-images-thumbnails').parent().show();
{/if}
var {$id}_total_files = 0;
var {$id}_upload_button = Ladda.create( document.querySelector('#{$id}-upload-button' ));
var {$id}_total_files = 0;
var data = $('#{$id}').fileupload({
$('#{$id}').fileupload({
dataType: 'json',
autoUpload: false,
singleFileUploads: false,
add: function(e, data) {
if (typeof {$id}_max_files !== 'undefined') {
if ({$id}_total_files >= {$id}_max_files || data.originalFiles.length > {$id}_max_files) {
e.preventDefault();
alert('{l s='You can upload a maximum of %s files'|sprintf:$max_files}');
return;
}
}
{$id}_total_files++;
$('#{$id}-upload-button').show().on('click', function () {
data.submit();
});
},
start: function () {
singleFileUploads: true,
maxFileSize: {$post_max_size},
start: function (e) {
{$id}_upload_button.start();
$('#{$id}-upload-button').unbind('click'); //Important as we bind it for every elements in add function
},
fail: function (e, data) {
$('#{$id}-errors').html(data.errorThrown.message).parent().show();
},
done: function (e, data) {
if (typeof data.result.{$name} !== 'undefined') {
for (var i=0; i<data.result.{$name}.length; i++) {
if (typeof data.result.{$name}[i].image !== 'undefined') {
var template = '<div class="img-thumbnail text-center">';
template += '<p>'+data.result.{$name}[i].image+'</p>';
if (typeof data.result.{$name}[i].delete_url !== 'undefined') {
template += '<p><a class="btn btn-default" href="'+data.result.{$name}[i].delete_url+'"><i class="icon-trash"></i> {l s='Delete'}</a></p>';
}
if (data.result) {
if (typeof data.result.{$name} !== 'undefined') {
for (var i=0; i<data.result.{$name}.length; i++) {
if (data.result.{$name}[i] !== null) {
if (typeof data.result.{$name}[i].image !== 'undefined') {
var template = '<div class="img-thumbnail text-center">';
template += '<p>'+data.result.{$name}[i].image+'</p>';
if (typeof data.result.{$name}[i].delete_url !== 'undefined') {
template += '<p><a class="btn btn-default" href="'+data.result.{$name}[i].delete_url+'"><i class="icon-trash"></i> {l s='Delete'}</a></p>';
}
template += '</div>';
$('#{$id}-images-thumbnails').html($('#{$id}-images-thumbnails').html()+template);
$('#{$id}-images-thumbnails').parent().show();
template += '</div>';
$('#{$id}-images-thumbnails').html($('#{$id}-images-thumbnails').html()+template);
$('#{$id}-images-thumbnails').parent().show();
}
}
}
}
$(data.context).find('button').remove();
$(data.context).appendTo($('#{$id}-success'));
$('#{$id}-success').parent().show();
}
},
always: function (e, data) {
{$id}_upload_button.stop();
}
});
}).on('fileuploadalways', function (e, data) {
{$id}_total_files--;
$('#{$id}-add-button').on('click', function() {
$('#{$id}').trigger('click');
});
});
/**/
/*
var total_files = 0;
var total_uploaded_files = 0;
{if isset($multiple) && isset($max_files)}
var {$id}_max_files = {$max_files};
{/if}
$('#{$id}').fileupload(
{
dataType: 'json',
autoUpload: false,
acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
maxFileSize: 5000000, // 5 MB
// Enable image resizing, except for Android and Opera,
// which actually support image resizing, but fail to
// send Blob objects via XHR requests:
disableImageResize: /Android(?!.*Chrome)|Opera/
.test(window.navigator.userAgent),
previewMaxWidth: 100,
previewMaxHeight: 100,
previewCrop: false,
done: function (e, data) {
$.each(data.result, function (index, file) {
if (file[0].error)
$('#{$id}-errors').append(file[0].error+'<br/>').parent().show();
else
total_uploaded_files ++;
});
if (total_uploaded_files == data.originalFiles.length)
$('#{$id}-upload-button').css('background-color', 'green').children('.icon-cloud-upload').removeClass('icon-cloud-upload').addClass('icon-check');
},
progressall: function (e, data) {
upload_button.setProgress(data.loaded / data.total);
},
add: function (e, data) {
console.log(data.originalFiles.length);
if (typeof {$id}_max_files !== 'undefined')
{
if (data.originalFiles.length > {$id}_max_files) {
if ({$id}_total_files == 0)
{
{$id}_upload_button.stop();
$('#{$id}-upload-button').unbind('click');
$('#{$id}-files-list').parent().hide();
}
}).on('fileuploadadd', function(e, data) {
if (typeof {$id}_max_files !== 'undefined') {
if ({$id}_total_files >= {$id}_max_files) {
e.preventDefault();
alert('{l s='You can upload a maximum of %s files'|sprintf:$max_files}');
return;
}
}
data.context = $('#{$id}-files-list');
data.context.parent().show();
data.context = $('<div/>').addClass('row').appendTo($('#{$id}-files-list'));
var file_name = $('<span/>').append('<strong>'+data.files[0].name+'</strong> ('+humanizeSize(data.files[0].size)+')').appendTo(data.context);
$.each(data.files, function (index, file) {
var node = '<div class="row"><span>'+file.name+'</span><button class="btn btn-default pull-right" type="button"><i class="icon-trash"></i> Remove from list</button></div>';
data.context.append(node);
});
var button = $('<button/>').addClass('btn btn-default pull-right').prop('type', 'button').html('<i class="icon-trash"></i> {l s='Remove file'}').appendTo(data.context).on('click', function() {
{$id}_total_files--;
data.files = null;
var total_elements = $(this).parent().siblings('div.row').length;
$(this).parent().remove();
$('#{$id}-upload-button').show().on('click', function () {
total_files = data.originalFiles.length;
data.submit();
});
},
fail: function (e, data) {
$('#{$id}-errors').html(data.errorThrown.message).parent().show();
},
always: function (e, data) {
total_files--;
if (total_elements == 0) {
$('#{$id}-files-list').html('').parent().hide();
}
});
if (total_files == 0)
upload_button.stop();
}
});*/
$('#{$id}-files-list').parent().show();
$('#{$id}-upload-button').show().bind('click', function () {
if (data.files != null)
data.submit();
});
</script>
{$id}_total_files++;
}).on('fileuploadprocessalways', function (e, data) {
var index = data.index, file = data.files[index];
if (file.error) {
$('#{$id}-errors').append('<div class="row"><strong>'+file.name+'</strong> ('+humanizeSize(file.size)+') : '+file.error+'</div>').parent().show();
$(data.context).find('button').trigger('click');
}
});
$('#{$id}-add-button').on('click', function() {
$('#{$id}-success').html('').parent().hide();
$('#{$id}-errors').html('').parent().hide();
$('#{$id}-files-list').html('').parent().hide();
{$id}_total_files = 0;
$('#{$id}').trigger('click');
});
});
</script>
{/if}
admin-dev/themes/default/template/helpers/uploader/simple.tpl
+8 -3
View File
@@ -50,6 +50,11 @@
</div>
</div>
{/if}
{if isset($max_files) && $files|count >= $max_files}
<div class="row">
<div class="alert alert-warning">{l s='You have reached the limit (%s) of files to upload, please remove files to continue uploading' sprintf=$max_files}</div>
</div>
{else}
<div class="form-group">
<div class="col-lg-12">
<input id="{$id}" type="file" name="{$name}"{if isset($multiple) && $multiple} multiple="multiple"{/if} class="hide" />
@@ -72,10 +77,9 @@
</div>
</div>
</div>
<script type="text/javascript">
{if isset($multiple) && isset($max_files)}
var {$id}_max_files = {$max_files};
var {$id}_max_files = {$max_files - $files|count};
{/if}
$(document).ready(function(){
@@ -116,4 +120,5 @@
});
}
});
</script>
</script>
{/if}