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 
Conflicts:
	classes/helper/HelperForm.php
	classes/helper/HelperUploader.php
This commit is contained in:
Damien Metzger
2013-10-25 18:58:07 +02:00
parent 03857c0576 8b1f9d0560
commit 39f6a2354a
14 changed files with 238 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/helpers/form/form.tpl
+1 -1
View File
@@ -36,7 +36,7 @@
{if $key == 'legend'}
<h3>
{if isset($field.image)}<img src="{$field.image}" alt="{$field.title|escape:'htmlall':'UTF-8'}" />{/if}
{if isset($field.icon)}<i class="{$field.icon}"/></i>{/if}
{if isset($field.icon)}<i class="{$field.icon}"></i>{/if}
{$field.title}
</h3>
{elseif $key == 'description' && $field}
admin-dev/themes/default/template/helpers/tree/tree_header.tpl
+1 -1
View File
@@ -22,7 +22,7 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
<div class="panel-heading">
<div class="tree-panel-heading-controls">
<!-- <i class="icon-tag"></i>&nbsp;{l s=$title} -->
{if isset($toolbar)}{$toolbar}{/if}
</div>
admin-dev/themes/default/template/helpers/uploader/ajax.tpl
+19 -12
View File
@@ -26,27 +26,33 @@
<div class="form-group">
<div class="col-lg-12">
{foreach $images as $image}
{if isset($image.image)}
<div class="img-thumbnail text-center">
{$image}
{if isset($size)}<p>{l s='File size'} {$size}kb</p>{/if}
{if isset($delete_url)}
<a class="btn btn-default" href="{$delete_url}">
<p>{$image.image}</p>
{if isset($image.size)}<p>{l s='File size'} {$image.size}kb</p>{/if}
{if isset($image.delete_url)}
<p>
<a class="btn btn-default" href="{$image.delete_url}">
<i class="icon-trash"></i> {l s='Delete'}
</a>
</a>
</p>
{/if}
</div>
{/if}
{/foreach}
</div>
</div>
{/if}
<div class="form-group">
<input id="{$id}" type="file" name="{$name}[]"{if isset($url)} data-url="{$url}"{/if}{if isset($multiple) && $multiple} multiple="multiple"{/if} class="hide" />
<button class="btn btn-default" data-style="expand-right" data-size="s" type="button" id="{$id}-add-button">
<i class="icon-plus-sign"></i> {if isset($multiple) && $multiple}{l s='Add files'}{else}{l s='Add file'}{/if}
</button>
<button class="ladda-button" data-style="expand-right" data-size="s" type="button" id="{$id}-upload-button" style="display:none;">
<i class="icon-cloud-upload"></i> <span class="ladda-label">{if isset($multiple) && $multiple}{l s='Upload files'}{else}{l s='Upload file'}{/if}</span>
</button>
<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" />
<button class="btn btn-default" data-style="expand-right" data-size="s" type="button" id="{$id}-add-button">
<i class="icon-plus-sign"></i> {if isset($multiple) && $multiple}{l s='Add files'}{else}{l s='Add file'}{/if}
</button>
<button class="ladda-button" data-style="expand-right" data-size="s" type="button" id="{$id}-upload-button" style="display:none;">
<i class="icon-cloud-upload"></i> <span class="ladda-label">{if isset($multiple) && $multiple}{l s='Upload files'}{else}{l s='Upload file'}{/if}</span>
</button>
</div>
</div>
<div class="row" style="display:none">
<div class="alert alert-info" id="{$id}-files-list">
@@ -81,6 +87,7 @@ $( document ).ready(function() {
previewMaxWidth: 100,
previewMaxHeight: 100,
previewCrop: false,
limitMultiFileUploads: 3,
start: function () {
upload_button.start();
},
admin-dev/themes/default/template/helpers/uploader/simple.tpl
+36 -22
View File
@@ -22,22 +22,26 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{if isset($display_image) && $display_image}
{if isset($image) && $image}
<div class="form-group">
<div class="col-lg-12">
<div class="img-thumbnail text-center">
{$image}
{if isset($size)}<p>{l s='File size'} {$size}kb</p>{/if}
{if isset($delete_url)}
<a class="btn btn-default" href="{$delete_url}">
<i class="icon-trash"></i> {l s='Delete'}
{if isset($images) && $images}
<div class="form-group">
<div class="col-lg-12">
{foreach $images as $image}
{if isset($image.image)}
<div class="img-thumbnail text-center">
<p>{$image.image}</p>
{if isset($image.size)}<p>{l s='File size'} {$image.size}kb</p>{/if}
{if isset($image.delete_url)}
<p>
<a class="btn btn-default" href="{$image.delete_url}">
<i class="icon-trash"></i> {l s='Delete'}
</a>
{/if}
</div>
</p>
{/if}
</div>
{/if}
{/foreach}
</div>
{/if}
</div>
{/if}
{if isset($thumb) && $thumb}
<div class="form-group">
@@ -69,23 +73,33 @@
</div>
</div>
<script>
<script type="text/javascript">
$(document).ready(function(){
$('#{$id}-selectbutton').click(function(e) {
$('#{$id}').trigger('click');
});
$('#{$id}-name').click(function(e) {
$('#{$id}').trigger('click');
});
$('#{$id}').change(function(e) {
var files = $(this)[0].files;
var name = '';
$.each(files, function(index, value) {
name += value.name+', ';
});
$('#{$id}-name').val(name.slice(0, -2));
$('#{$id}').change(function(e) {
if ($(this)[0].files !== undefined)
{
var files = $(this)[0].files;
var name = '';
$.each(files, function(index, value) {
name += value.name+', ';
});
$('#{$id}-name').val(name.slice(0, -2));
}
else // Internet Explorer 9 Compatibility
{
var name = $(this).val().split(/[\\/]/);
$('#{$id}-name').val(name[name.length-1]);
}
});
});
</script>