Ajout du nom du fichier avant upload.

diff --git a/skins/fileupload.js b/skins/fileupload.js
index 980fb4441be02ac7fe279acf499e8e8ac3dd237c..8e09907dcde5b2541e1ff4c3d6abd2623dae48cd 100644 (file)
--- a/skins/fileupload.js
+++ b/skins/fileupload.js
@@ -57,6 +57,7 @@ DDFileUploader.prototype.upload = function(slide) {
        var reader = new FileReader();
        var req = new XMLHttpRequest();
        var file = slide.file;
        var reader = new FileReader();
        var req = new XMLHttpRequest();
        var file = slide.file;

+       this.uploadedSlide = slide;

        this.previewImg = slide.img;
        this.progressBar = slide.progressBar;
        var self = this;
        this.previewImg = slide.img;
        this.progressBar = slide.progressBar;
        var self = this;


@@ -66,12 +67,21 @@ DDFileUploader.prototype.upload = function(slide) {
 
        req.open("PUT", this.uploadUrl + '/' + file.name);
        req.setRequestHeader("Content-Type", file.type);
 
        req.open("PUT", this.uploadUrl + '/' + file.name);
        req.setRequestHeader("Content-Type", file.type);

-       addListener(reader, 'load', function(evt){req.sendAsBinary(evt.target.result);});
+       addListener(reader, 'load',
+               function(evt){
+                       console.info('load');
+                       try {
+                               req.sendAsBinary(evt.target.result);
+                       }
+                       catch(e){}
+               });

        reader.readAsBinaryString(file);
 };
 
 DDFileUploader.prototype.uploadCompleteHandler = function(evt) {
        reader.readAsBinaryString(file);
 };
 
 DDFileUploader.prototype.uploadCompleteHandler = function(evt) {

-       this.progressBar.parentNode.removeChild(this.progressBar);
+       var slide = this.uploadedSlide;
+       this.uploadedSlide.removeChild(slide.label);
+       this.uploadedSlide.removeChild(slide.label);

        this.uploadQueueLoadNext();
 };
 
        this.uploadQueueLoadNext();
 };
 


@@ -161,6 +171,11 @@ DDFileUploader.prototype.createSlide = function(file) {
        };
        a.appendChild(img);
        slide.img = img;
        };
        a.appendChild(img);
        slide.img = img;

+       
+       var label = document.createElement('span');
+       slide.label = label;
+       label.className = 'label';
+       label.innerHTML = file.name;

 
        var progressBar = document.createElement('span');
        progressBar.className = 'upload-progress';
 
        var progressBar = document.createElement('span');
        progressBar.className = 'upload-progress';


@@ -168,6 +183,7 @@ DDFileUploader.prototype.createSlide = function(file) {
 
        slide.appendChild(a);
        slide.appendChild(progressBar);
 
        slide.appendChild(a);
        slide.appendChild(progressBar);

+       slide.appendChild(label);

        this.dropbox.appendChild(slide);
        
        return slide;
        this.dropbox.appendChild(slide);
        
        return slide;

diff --git a/skins/portfolio_style.css.dtml b/skins/portfolio_style.css.dtml
index 7751fbb9a0c7f3f7b87170e024f3eb583d3dfed5..e2aadab3932cdfb1cf7ab694b3f620a356d9f9bd 100755 (executable)
--- a/skins/portfolio_style.css.dtml
+++ b/skins/portfolio_style.css.dtml
@@ -310,6 +310,13 @@ div.lightbox {
   top:208px;
 }
 
   top:208px;
 }
 

+.lightbox span.label {
+  position: relative;
+  padding-left:0.5em;
+  top: -4px;
+/*  border: 1px solid red;*/
+}
+

 .image_toolbar {
   background: url(&dtml-portal_url;/image_toolbar_bg.gif) repeat-x;
   position:relative;
 .image_toolbar {
   background: url(&dtml-portal_url;/image_toolbar_bg.gif) repeat-x;
   position:relative;