Skip to content
GitLab
Commit a5ccdef7 authored by Guillaume Perréal's avatar Guillaume Perréal
Browse files

Style "contrôle".

parent 657a2836
master 0.1.x 1.x 3.x 4.x 5-migration-vers-la-nouvelle-architecture-basee-sur-webpack-npm 6-supprimer-isdevtools 8-enrichir-le-dossier-test-sur-la-base-de-la-nouvelle-architecture 8-enrichir-le-dossier-test-sur-la-base-de-la-nouvelle-architecture-2 remplacer_assetic_par_webpack symfony3.4_ramsey_compatibility 2.1.0 2.0.2 2.0.1 2.0.0 1.0.1 1.0.0 0.1.5 0.1.4 0.1.3 0.1.2 0.1.1 0.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 97 additions and 50 deletions
+97 -50
DependencyInjection/IrsteaFileUploadExtension.php
+ 1
− 0
View file @ a5ccdef7
......@@ -48,6 +48,7 @@ class IrsteaFileUploadExtension extends Extension implements PrependExtensionInt
'inputs' => [
"$pluginDir/css/jquery.fileupload.css",
"$pluginDir/css/jquery.fileupload-ui.css",
'@IrsteaFileUploadBundle/Resources/less/file_upload.less'
],
],
],
......
Resources/js/widget/file_upload.js
+ 32
− 22
View file @ a5ccdef7
......@@ -4,22 +4,25 @@
*/
(function($) {
var formatSize = function(size) {
var formatFileSize = function(size) {
if(size > 1000000000) {
return (size/1000000000).toFixed(2) + ' Gio';
return (size/1000000000).toFixed(2) + ' Gio';
}
if(size > 1000000) {
return (size/1000000).toFixed(2) + ' Mio';
return (size/1000000).toFixed(2) + ' Mio';
}
if(size > 1000) {
return (size/1000).toFixed(2)+ ' Kio';
return (size/1000).toFixed(2)+ ' Kio';
}
return size + ' o';
return size + ' o';
},
formatBitrate = function(rate) {
return formatSize(rate) + '/s';
return formatFileSize(rate) + '/s';
};
$.blueimp.fileupload.prototype._formatFileSize = formatFileSize;
$.blueimp.fileupload.prototype._formatBitrate = formatBitrate;
/** Plugin irsteaFileUpload.
*/
$.fn.irsteaFileUpload = function(options) {
......@@ -39,17 +42,23 @@
options.acceptFileTypes = new RegExp('^' + options.acceptFileTypes + '$');
}
var updateButtonVisibility = function() {
if($entries.children().length > 0 && !options.multiple) {
$button.hide();
} else {
$button.show();
}
var updateDisplay = function() {
var hasEntry = false;
$entries.find('.fileinput-entry').each(function() {
var data = $(this).data('data'),
inError = !!(data && data.files.error);
$(this).toggleClass('alert alert-danger', inError);
$(this).find('.error').toggle(inError);
hasEntry = true;
});
$button.toggle(options.multiple || !hasEntry);
};
$this.find('.template-download .size').each(function() { $(this).html(formatSize($(this).text())); });
$this.find('.template-download .size').each(function() {
$(this).text(formatFileSize($(this).text()));
});
updateButtonVisibility();
updateDisplay();
// Activation
$button.fileupload($.extend(
......@@ -67,7 +76,7 @@
$.each(data.files, function (index, file) {
var row = $(uploadPrototype);
row.find('.name').text(file.name);
row.find('.size').html(formatSize(file.size));
row.find('.size').text(formatFileSize(file.size));
if (file.error) {
row.find('.error').text(file.error);
}
......@@ -79,7 +88,7 @@
var rows = $();
$.each(data.files, function (index, file) {
var row = $(downloadPrototype);
row.find('.size').html(formatSize(file.size));
row.find('.size').text(formatFileSize(file.size));
if (file.error) {
row.find('.name').text(file.name);
row.find('.error').text(file.error);
......@@ -125,8 +134,9 @@
var percent = data.loaded / data.total * 100,
percentText = percent.toFixed(1);
data.context.each(function () {
$this.find('.progress').show().attr('aria-valuenow', percentText);
$this.find('.progress-bar').css('width', percent + '%');
var $this = $(data.context);
$this.find('.progress').show();
$this.find('.progress-bar').css('width', percent + '%').attr('aria-valuenow', percentText);
$this.find('.progress-text').show().html(percentText + '% ('+formatBitrate(data.bitrate)+')');
});
}
......@@ -137,10 +147,10 @@
$.ajax(data.delete_url, { type: data.delete_type });
}
},
fileuploadadded: updateButtonVisibility,
fileuploadfinished: updateButtonVisibility,
fileuploaddestroyed: updateButtonVisibility,
fileuploadprocessalways: updateButtonVisibility
fileuploadadded: updateDisplay,
fileuploadfinished: updateDisplay,
fileuploaddestroyed: updateDisplay,
fileuploadprocessalways: updateDisplay
});
if(options.disabled || options.readonly) {
......
Resources/less/file_upload.less 0 → 100644
+ 33
− 0
View file @ a5ccdef7
/*
Copyright (C) 2015 IRSTEA
All rights reserved.
*/
@import "variables.less";
@import "bootstrap/less/mixins.less";
.fileinput-entry {
.cancel, .delete {
margin-left: 0.5em;
}
.progress {
height: (@line-height-computed / 2);
margin: (@line-height-computed / 4) 0;
}
.progress-text {
float: right;
}
&.alert {
padding: @padding-xs-vertical @padding-xs-horizontal;
margin-bottom: 0;
}
}
.fileinput-multiple .fileinput-entry {
margin-bottom: (@line-height-computed / 2);
}
.fileinput-multiple, .fileinput-single {
height: auto !important;
min-height: @input-height-base;
}
Resources/views/Form/file_upload.html.twig
+ 31
− 28
View file @ a5ccdef7
{% block file_upload_progress_prototype %}
<div class="template-upload">
<p>
<span class="progress-text pull-right" style="display: none"></span>
<button class="btn btn-xs btn-danger cancel" title="{% trans %}button.cancel{% endtrans %}">
{{ irstea_icon('remove') }}
</button>&nbsp;<span class="name"></span>&nbsp;(<span class="size"></span>)
<span class="error danger"></span>
</p>
<p class="progress" style="display: none">
<div class="progress-bar" role="progressbar" aria-valuemin="0" aria-valuemax="100"></div>
</p>
<div class="template-upload fileinput-entry">
<div class="progress-text" style="display: none"></div>
<span class="name">Monfichier.com</span>&nbsp;(<span class="size">1.5 Gio</span>)
<span class="error" style="display: none"></span>
<a href="#" class="danger cancel" title="{% trans %}button.cancel{% endtrans %}">
{{- irstea_icon('remove') -}}
</a>
<div class="progress" style="display: none">
<div class="progress-bar" role="progressbar" aria-valuemin="0" aria-valuemax="100" style="width: 0%"></div>
</div>
</div>
{% endblock %}
{%- block file_upload_entry_prototype %}
{%- set file = file|default([]) %}
<div class="template-download fileinput-entry">
<input type="hidden" name="{{ full_name }}{% if multiple %}[]{% endif %}" value="{{ file.id|default }}"/>
<span class="name">
<a{% if file %} href="{{ path('file_upload_get_content', {id: file.id, token: csrfToken}) }}"{% endif %}>{{ file.originalFilename|default }}</a>
</span>
(<span class="size">
{{- file.size|default -}}
</span>)
<span class="error danger" style="display: none">ERROR</span>
<a href="#" class="danger delete {%- if disabled or read_only %} disabled{% endif -%}" title="{% trans %}button.delete{% endtrans %}">
{{- irstea_icon('remove') -}}
</a>
</div>
{% endblock -%}
{% block file_upload_widget %}
<div id="{{ id }}" {{ block('widget_container_attributes') }} {{ block('widget_only_attributes') }}
<div id="{{ id }}" class="form-control fileinput-{{ multiple ? "multiple" : "single" }}" {{ block('widget_container_attributes') }} {{ block('widget_only_attributes') }}
data-download-prototype="{{ block('file_upload_entry_prototype')|e }}"
data-upload-prototype="{{ block('file_upload_progress_prototype')|e }}"
{% if disabled %}data-disabled="disabled"{% endif -%}
......@@ -29,29 +45,16 @@
{% endfor %}
{%- else %}
{%- set file = value %}
{%- block file_upload_entry_prototype %}
{%- set file = file|default([]) %}
<p class="template-download">
<input type="hidden" name="{{ full_name }}{% if multiple %}[]{% endif %}" value="{{ file.id|default }}"/>
<button class="btn btn-xs btn-danger delete" title="{% trans %}button.delete{% endtrans %}" {%- if disabled or read_only %} disabled="disabled"{% endif -%}>
{{- irstea_icon('trash') -}}
</button>&nbsp;<span class="name">
<a{% if file %} href="{{ path('file_upload_get_content', {id: file.id, token: csrfToken}) }}"{% endif %}>{{ file.originalFilename|default }}</a>
</span>&nbsp;(<span class="size">
{{- file.size|default -}}
</span>)
<span class="error danger"></span>
</p>
{% endblock -%}
{{- block('file_upload_entry_prototype') -}}
{% endif -%}
{% endif -%}
</div>
<span class="btn btn-primary fileinput-button">
<div class="fileinput-button btn btn-default btn-xs">
<span>{{ irstea_icon('upload') }}&nbsp;{% trans %}button.upload{% endtrans %}</span>
<input type="file" name="_hack_{{ full_name }}"
{%- if multiple %} multiple="multiple"{% endif -%}
{%- if disabled or read_only %} disabled="disabled"{% endif -%}
/>
</span>
</div>
</div>
{% endblock file_upload_widget %}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment