From efc0e595e6a98f00036e045e1141086d4b672b49 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Wed, 20 Jun 2012 10:07:49 +0200 Subject: [PATCH] sanitize manager --- app/assets/images/admin/pbar-ani.gif | Bin 0 -> 7970 bytes app/assets/javascripts/admin/data_files.js | 21 +- app/assets/javascripts/admin/image_files.js | 21 +- app/assets/javascripts/admin/manager.js | 4 +- app/assets/javascripts/admin/uploads.js | 4 +- app/assets/stylesheets/admin.css.scss | 2 +- app/assets/stylesheets/admin/qi_cms.css.scss | 428 ++++++++++-------- app/assets/stylesheets/admin/uploads.css.scss | 2 +- app/models/data_file.rb | 4 +- .../admin/data_files/_index_block.html.haml | 5 - .../admin/image_files/_index_block.html.haml | 4 +- 11 files changed, 260 insertions(+), 235 deletions(-) create mode 100755 app/assets/images/admin/pbar-ani.gif diff --git a/app/assets/images/admin/pbar-ani.gif b/app/assets/images/admin/pbar-ani.gif new file mode 100755 index 0000000000000000000000000000000000000000..cb59a04f909a30094fc0f1c15271cf1eeacc6bd2 GIT binary patch literal 7970 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 GZ~qHVLrA>< literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/admin/data_files.js b/app/assets/javascripts/admin/data_files.js index 01be7fe..887110d 100644 --- a/app/assets/javascripts/admin/data_files.js +++ b/app/assets/javascripts/admin/data_files.js @@ -2,7 +2,7 @@ function data_files_load() { update_data_multiple_selection_text(); - set_data_files_big_container_size(); + @@ -101,18 +101,7 @@ function close_data_file_container(data_file_id) } -function set_data_files_big_container_size(){ - - if($("#data_files_big_container").parent().attr("id") == "manager_box") - { - $("#data_files_big_container").css("height",( $("#manager_box").height())+"px"); - $("#data_files_big_container").css("top","0px"); - } - else - { - $("#data_files_big_container").css("height",( $(window).height() - 36)+"px"); - } -} + function delete_multiple_files(){ @@ -185,9 +174,7 @@ create : $(document).ready(function ($) { - $(window).bind("resize", function() { - set_data_files_big_container_size(); - }) + $("#left_buttons").live("click", function() { @@ -254,7 +241,7 @@ $(document).ready(function ($) { }); - set_data_files_big_container_size(); + diff --git a/app/assets/javascripts/admin/image_files.js b/app/assets/javascripts/admin/image_files.js index eb6ce79..c06d9dd 100644 --- a/app/assets/javascripts/admin/image_files.js +++ b/app/assets/javascripts/admin/image_files.js @@ -4,7 +4,7 @@ function image_files_load() { update_multiple_selection_text(); - set_image_files_big_container_size(); + set_image_files_img_size(); if(!slider_enabled){ @@ -116,19 +116,6 @@ function close_image_file_container(image_file_id) } -function set_image_files_big_container_size(){ - - if($("#image_files_big_container").parent().attr("id") == "manager_box") - { - $("#image_files_big_container").css("height",( $("#manager_box").height())+"px"); - $("#image_files_big_container").css("top","0px"); - } - else - { - $("#image_files_big_container").css("height",( $(window).height() - 36)+"px"); - //alert($("#breadcrumb").outerHeight()); - } -} function delete_multiple_images(){ @@ -201,10 +188,6 @@ create : $(document).ready(function ($) { - $(window).bind("resize", function() { - set_image_files_big_container_size(); - }) - $("#left_buttons").live("click", function() { multiple_selection_ids(); @@ -269,7 +252,7 @@ $(document).ready(function ($) { }); - set_image_files_big_container_size(); + diff --git a/app/assets/javascripts/admin/manager.js b/app/assets/javascripts/admin/manager.js index 4e43cb9..eea43e9 100644 --- a/app/assets/javascripts/admin/manager.js +++ b/app/assets/javascripts/admin/manager.js @@ -150,9 +150,9 @@ function manager_send_cible(cible_id, cible_type, cible_name){ function manager_send_data_file(data_file_id){ - var image_file_id_file_div = $('#data_file_'+data_file_id); + var data_file_div = $('#data_file_'+data_file_id); - manager_send_response({data_file_id : image_file_div.data("id"), name : image_file_div.data("name")}); + manager_send_response({data_file_id : data_file_div.data("id"), name : data_file_div.data("name")}); } diff --git a/app/assets/javascripts/admin/uploads.js b/app/assets/javascripts/admin/uploads.js index bad7b35..2da0939 100644 --- a/app/assets/javascripts/admin/uploads.js +++ b/app/assets/javascripts/admin/uploads.js @@ -34,7 +34,7 @@ function initialize_uploads() return $('' + files[index].name + '<\/td>' + '
<\/div><\/td>' + '' + - 'Pen_alt_stroke_16x16' + + 'Pen_alt_stroke_16x16' + '<\/td><\/tr>'); } @@ -73,7 +73,7 @@ function initialize_uploads() return $('' + files[index].name + '<\/td>' + '
<\/div><\/td>' + '' + - 'Pen_alt_stroke_16x16' + + 'Pen_alt_stroke_16x16' + '<\/td><\/tr>'); } diff --git a/app/assets/stylesheets/admin.css.scss b/app/assets/stylesheets/admin.css.scss index 93d528e..643f954 100644 --- a/app/assets/stylesheets/admin.css.scss +++ b/app/assets/stylesheets/admin.css.scss @@ -8,7 +8,7 @@ @import "shared/formtastic"; -@import "shared/jquery-ui-1.8.11.custom.css"; +@import "shared/jquery-ui-1.8.11.custom"; @import "shared/ui.timepickr"; @import "admin/portlets"; diff --git a/app/assets/stylesheets/admin/qi_cms.css.scss b/app/assets/stylesheets/admin/qi_cms.css.scss index 3b14494..a38a3d4 100644 --- a/app/assets/stylesheets/admin/qi_cms.css.scss +++ b/app/assets/stylesheets/admin/qi_cms.css.scss @@ -334,10 +334,20 @@ float:right; background:red; position:absolute; - top:36px; + top:34px; left:0px; + right:0px; + bottom:0px; + } + + +#manager_box #data_files_big_container{ + top:0px; +} + + #data_files_big_container #sidebar{ width:209px; border-right:1px solid #adb5ba; @@ -413,6 +423,14 @@ background:RGB(217,233,245); right:0px; overflow:auto; padding-bottom:34px; + + table{ + margin:0px; + + td{ + border:0px; + } + } } @@ -741,9 +759,12 @@ background:RGB(217,233,245); transition: 0.4s ease-in-out; } +#data_files_big_container #right_bar #data_file_queue #files{ + margin:0px; +} #data_files_big_container #right_bar #data_file_queue #files td{ - + color:#eff2f2; padding:5px; } @@ -772,7 +793,7 @@ background:RGB(217,233,245); #data_files_big_container #right_bar #multiple_selection #multiple_menu{ position:absolute; left:0px; - bottom:33px; + bottom:31px; height:0px; width:216px; background:rgba(0,0,0,0.9); @@ -833,10 +854,21 @@ height:auto; background:red; position:absolute; - top:36px; + top:34px; left:0px; + right:0px; + bottom:0px; } + +#manager_box #image_files_big_container{ + top:0px; +} + + + + + #image_files_big_container #sidebar{ width:209px; border-right:1px solid #adb5ba; @@ -1162,9 +1194,6 @@ background:RGB(217,233,245); } - - - #image_files_big_container #right_bar{ background:rgba(0,0,0,0.8); @@ -1174,171 +1203,199 @@ background:RGB(217,233,245); left:210px; right:0px; -} + + + #image_file_form{ + + position:absolute; + top:0px; + left:240px; + + + + .file_upload { + position: relative; + overflow: hidden; + + + padding:9px; + width:250px; + + + cursor:pointer; + + /* webkit */ + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.4s; + + /* Firefox */ + -moz-transition-property: background-color; + -moz-transition-duration: 0.4s; + + /* standardisé */ + transition-property: background-color; + transition-duration: 0.4s; + + + + direction: ltr; + cursor: pointer; + text-align: left; + color:#eff2f2; + } + + + .file_upload:hover { + background-color:rgba(131,131,131,0.3); + + } + + .file_upload_highlight { + background-color: rgba(106,191,6,0.2); + } + + + + } + -#image_files_big_container #right_bar #image_file_form{ - position:absolute; - top:0px; - left:240px; + #image_file_queue{ + position:absolute; + left:240px; + bottom:33px; + color:#eff2f2; + width:50%; + + background:rgba(0,0,0,0.9); + border:1px solid #444444; + border-top:0px; + + -webkit-transition: 0.4s ease-in-out; + -moz-transition: 0.4s ease-in-out; + -o-transition: 0.4s ease-in-out; + transition: 0.4s ease-in-out; + + #files { + margin:0px; + td{ + color:#eff2f2; + padding:5px; + } + + } + + + + } + + + #grid_slider{ + position:absolute; + right:20px; + top:15px; + width:150px; + height:3px; + background:#191919; + border:1px solid #444444; + border-radius:2px; + } + + #grid_slider{ + + .ui-slider-handle{ + + border-radius:6px; + height:10px; + width:10px; + cursor:pointer; + background:#838383; + + } + + } + + + #multiple_selection { + + &:hover{ + #multiple_menu{ + height:auto; + + } + } + + + + #multiple_menu{ + position:absolute; + left:0px; + bottom:31px; + height:0px; + width:216px; + background:rgba(0,0,0,0.9); + border:1px solid #444444; + border-top:0px; + overflow:hidden; + -webkit-transition: 0.4s ease-in-out; + -moz-transition: 0.4s ease-in-out; + -o-transition: 0.4s ease-in-out; + transition: 0.4s ease-in-out; + + + + a{ + + display:block; + padding:9px; + border-top:1px solid #444444; + color:#eff2f2; + + + + cursor:pointer; + + /* webkit */ + -webkit-transition-property: background-color; + -webkit-transition-duration: 0.4s; + + /* Firefox */ + -moz-transition-property: background-color; + -moz-transition-duration: 0.4s; + + /* standardisé */ + transition-property: background-color; + transition-duration: 0.4s; + + &:hover{ + + background-color:rgba(131,131,131,0.3); + + } + + + + } + + + + + + } + + + } } -#image_files_big_container #right_bar #image_file_form .file_upload { - position: relative; - overflow: hidden; - - - padding:9px; - width:250px; - - - cursor:pointer; - - /* webkit */ - -webkit-transition-property: background-color; - -webkit-transition-duration: 0.4s; - - /* Firefox */ - -moz-transition-property: background-color; - -moz-transition-duration: 0.4s; - - /* standardisé */ - transition-property: background-color; - transition-duration: 0.4s; - - - - direction: ltr; - cursor: pointer; - text-align: left; - color:#eff2f2; -} - -#image_files_big_container #right_bar #image_file_form .file_upload:hover { - background-color:rgba(131,131,131,0.3); - - - - -} - - - -.file_upload_highlight { - background-color: rgba(106,191,6,0.2); -} - - -#image_files_big_container #right_bar #image_file_queue{ - position:absolute; - left:240px; - bottom:33px; - color:#eff2f2; - width:50%; - - background:rgba(0,0,0,0.9); - border:1px solid #444444; - border-top:0px; - - -webkit-transition: 0.4s ease-in-out; - -moz-transition: 0.4s ease-in-out; - -o-transition: 0.4s ease-in-out; - transition: 0.4s ease-in-out; - -} - -#image_files_big_container #right_bar #image_file_queue #files td{ - - padding:5px; -} - - -#image_files_big_container #right_bar #grid_slider{ - position:absolute; - right:20px; - top:15px; - width:150px; - height:3px; - background:#191919; - border:1px solid #444444; - border-radius:2px; -} - -#image_files_big_container #right_bar #grid_slider .ui-slider-handle{ - - border-radius:6px; - height:10px; - width:10px; - cursor:pointer; - background:#838383; - -} - -#image_files_big_container #right_bar #multiple_selection #multiple_menu{ - position:absolute; - left:0px; - bottom:33px; - height:0px; - width:216px; - background:rgba(0,0,0,0.9); - border:1px solid #444444; - border-top:0px; - overflow:hidden; - -webkit-transition: 0.4s ease-in-out; - -moz-transition: 0.4s ease-in-out; - -o-transition: 0.4s ease-in-out; - transition: 0.4s ease-in-out; - -} - -#image_files_big_container #right_bar #multiple_selection #multiple_menu a{ - - display:block; - padding:9px; - border-top:1px solid #444444; - color:#eff2f2; - - - - cursor:pointer; - - /* webkit */ - -webkit-transition-property: background-color; - -webkit-transition-duration: 0.4s; - - /* Firefox */ - -moz-transition-property: background-color; - -moz-transition-duration: 0.4s; - - /* standardisé */ - transition-property: background-color; - transition-duration: 0.4s; - -} - -#image_files_big_container #right_bar #multiple_selection #multiple_menu a:hover{ - - background-color:rgba(131,131,131,0.3); - -} - - - -#image_files_big_container #right_bar #multiple_selection:hover #multiple_menu{ -height:auto; - - -} - #menu_items_breadcrumbs{ margin-top:10px; @@ -1346,36 +1403,41 @@ height:auto; background : #F0F0F0; border-radius:10px; -} -#menu_items_breadcrumbs *{ - color:#505B66; -} -#menu_items_breadcrumbs .receptable{ - float:left; - padding:5px 10px 5px 10px; + + + *{ + color:#505B66; + } + + .receptable{ + float:left; + padding:5px 10px 5px 10px; - width:auto; + width:auto; - /*background : url("/images/quartz_admin/icons_receptable.png") no-repeat right center;*/ -} - -#menu_items_breadcrumbs .separate{ - float:left; - padding:5px; + + } + + .separate{ + float:left; + padding:5px; - width:auto; + width:auto; - /*background : url("/images/quartz_admin/icons_receptable.png") no-repeat right center;*/ -} - -#menu_items_breadcrumbs .actual{ - float:left; - padding:5px; - padding-right:20px; - margin-right:5px; - width:auto; + /*background : url("/images/quartz_admin/icons_receptable.png") no-repeat right center;*/ + } + + .actual{ + float:left; + padding:5px; + padding-right:20px; + margin-right:5px; + width:auto; + } + + } diff --git a/app/assets/stylesheets/admin/uploads.css.scss b/app/assets/stylesheets/admin/uploads.css.scss index 7756e77..602cc7b 100644 --- a/app/assets/stylesheets/admin/uploads.css.scss +++ b/app/assets/stylesheets/admin/uploads.css.scss @@ -29,7 +29,7 @@ } .file_upload_progress .ui-progressbar-value { - background: url(pbar-ani.gif); + background: url('/assets/admin/pbar-ani.gif'); } .file_upload_progress div { diff --git a/app/models/data_file.rb b/app/models/data_file.rb index 6b212d9..fb7ab70 100644 --- a/app/models/data_file.rb +++ b/app/models/data_file.rb @@ -23,11 +23,11 @@ class DataFile < ActiveRecord::Base end def abstract_file_name - self.name+File.extname(self.file.to_s) + self.name+File.extname(self.attributes['file']) end def abstract_file_name_slug - self.name.to_slug+File.extname(self.file.to_s) + self.name.to_slug+File.extname(self.attributes['file']) end end diff --git a/app/views/admin/data_files/_index_block.html.haml b/app/views/admin/data_files/_index_block.html.haml index 0fc1321..7a614e0 100644 --- a/app/views/admin/data_files/_index_block.html.haml +++ b/app/views/admin/data_files/_index_block.html.haml @@ -51,8 +51,3 @@ - - -:javascript - set_data_files_big_container_size(); - diff --git a/app/views/admin/image_files/_index_block.html.haml b/app/views/admin/image_files/_index_block.html.haml index 4a01cf0..5d9088d 100644 --- a/app/views/admin/image_files/_index_block.html.haml +++ b/app/views/admin/image_files/_index_block.html.haml @@ -57,6 +57,4 @@ -:javascript - set_image_files_big_container_size(); - +