amélioration topic

This commit is contained in:
Nico 2013-01-12 21:16:30 +01:00
parent f4d2e650f5
commit 98fe1dcff5
71 changed files with 30 additions and 25 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

BIN
app/assets/images/admin/file_types/ai.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 450 KiB

BIN
app/assets/images/admin/file_types/bmp.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 453 KiB

BIN
app/assets/images/admin/file_types/eps.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 452 KiB

BIN
app/assets/images/admin/file_types/gif.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 450 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 454 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 454 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 450 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 453 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 452 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 450 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 454 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 454 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 452 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 450 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 453 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 447 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 452 KiB

BIN
app/assets/images/admin/file_types/jpg.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 452 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
app/assets/images/admin/file_types/mpg.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
app/assets/images/admin/file_types/pdf.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
app/assets/images/admin/file_types/png.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 453 KiB

BIN
app/assets/images/admin/file_types/psd.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
app/assets/images/admin/file_types/sql.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/assets/images/admin/file_types/tiff.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 447 KiB

BIN
app/assets/images/admin/file_types/zip.png Executable file → Normal file

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -44,8 +44,8 @@ function init_note_upload_fields(note_id){
$(document).ready(function () { $(document).ready(function () {
$(".note .add_file").live("click",function(){ $(".note .add_files").live("click",function(){
alert('test');
$(this).next('input').click(); $(this).next('input').click();
return false; return false;
}); });

View File

@ -109,15 +109,18 @@
@include border-radius(0px 0px 3px 0px); @include border-radius(0px 0px 3px 0px);
@include box-shadow(0px 0px 2px rgba(0,0,0,0.3),-1px -1px 5px rgba(0,0,0,0.2) inset); @include box-shadow(0px 0px 2px rgba(0,0,0,0.3),-1px -1px 5px rgba(0,0,0,0.2) inset);
padding:10px; padding:10px;
min-height:1em; padding-top:2px;
min-height:75px;
.note_file{ .note_file{
margin:8px 0px; margin:8px 0px;
.icon{
height:20px;
position:relative; position:relative;
top:4px; top:-4px;
.icon{
height:28px;
position:relative;
top:8px;
} }
} }
@ -136,23 +139,25 @@
} }
.fileupload{ .fileupload{
.add_file{ .upload{
background:black;
color:white;
padding:5px 10px;
position:absolute;
right:10px;
top:5px;
}
.progress{
position:absolute; position:absolute;
right:10px; right:10px;
top:30px; top:10px;
z-index:1000;
.add_files{
background:black;
color:white;
padding:5px 10px;
}
.progress{
}
} }
input[type=file]{ input[type=file]{
display:none; display:none;

View File

@ -1,13 +1,13 @@
%form.fileupload{:action => note_files_path(:note_id => note.id), :enctype => "multipart/form-data", :method => "POST"} %form.fileupload{:action => note_files_path(:note_id => note.id), :enctype => "multipart/form-data", :method => "POST"}
.upload
%button.add_files ajouter des fichiers
%button.add_file ajouter des fichiers %input{:multiple => "", :name => "files[]", :type => "file", :style => "float:right;"}
%input{:multiple => "", :name => "files[]", :type => "file", :style => "float:right;"}
.progress .progress
.bar{:style => "height:1em;"} .bar{:style => "height:1em;"}
.note_file_queue#note_file_queue .note_file_queue#note_file_queue

View File

@ -1,6 +1,6 @@
.note_file#note_file{:id => note_file.id} .note_file#note_file{:id => note_file.id}
-ext = File.extname(note_file.file.path)[1..-1] -ext = File.extname(note_file.file.path)[1..-1]
=image_tag "admin/file_types/"+ext+".png", :class => "icon" %div{:style => "display:inline-block;text-align:center;width:30px;"}=image_tag "admin/file_types/"+ext+".png", :class => "icon"
=l note_file.created_at, :format => :short =l note_file.created_at, :format => :short
=note_file.name =note_file.name
=link_to "supprimer", note_file_path(note_file), :remote => true, :method => :delete, :confirm => "Voulez-vous vraiment supprimer ce fichier ?" =link_to "supprimer", note_file_path(note_file), :remote => true, :method => :delete, :confirm => "Voulez-vous vraiment supprimer ce fichier ?"