diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 40fc5f6..f9048fa 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -32,16 +32,14 @@ body{ left:252px; right:2px; top:0px; - min-height:20%; - max-height:80%; + bottom:0px; background:rgba(250,250,250, 0.9); overflow:auto; z-index:2; - margin-top:-82%; - + display:none; &.active{ - margin-top:0px; + display:block; } diff --git a/app/views/admin/portfolio_images/_form.haml b/app/views/admin/portfolio_images/_form.haml index 92687c0..72f2560 100644 --- a/app/views/admin/portfolio_images/_form.haml +++ b/app/views/admin/portfolio_images/_form.haml @@ -1,8 +1,7 @@ -= semantic_form_for [:admin, @portfolio_image] do |f| += semantic_form_for [:admin, @portfolio_image], :remote => true do |f| =f.inputs :name => "Basic" do - = f.input :title, :label => "Titre" - = f.input :photo, :label => "photo" - + = f.input :title, :label => "Titre", :input_html => { :onchange => "$(this).closest('form').submit();", :onkeyup => "$(this).closest('form').submit();"} + = f.input :portfolios, :collection => Portfolio.all, :as => :check_boxes, :input_html => { :onchange => "$(this).closest('form').submit();"} =f.submit "Sauvegarder" diff --git a/app/views/portfolios/_portfolio_image.haml b/app/views/portfolios/_portfolio_image.haml index b341f1f..01a504c 100644 --- a/app/views/portfolios/_portfolio_image.haml +++ b/app/views/portfolios/_portfolio_image.haml @@ -9,7 +9,11 @@ %br %span.title - =portfolio_image.title + -if current_admin + = form_for [:admin, portfolio_image], :remote => true do |f| + = f.text_field :title, :onchange => "$(this).closest('form').submit();", :onkeyup => "$(this).closest('form').submit();", :style => "display:inline-block !important;width:auto;font-family:courier;", :size => "n" + -else + =portfolio_image.title ="-" =l portfolio_image.shoot_at, :format => :date if portfolio_image.shoot_at -if portfolio_image.exif @@ -26,9 +30,11 @@ -if current_admin .admin + #portfolio_image_form{:id => portfolio_image.id} + = link_to i(:rotate, :gray_light, "12x14"), rotate_admin_portfolio_image_path(:id => portfolio_image.id, :manager => params[:manager], :multiple => params[:multiple]), :remote => true = link_to i(:rotate_right, :gray_light, "12x14"), rotate_admin_portfolio_image_path(:id => portfolio_image.id, :manager => params[:manager], :multiple => params[:multiple], :direction => :right), :remote => true - =link_to "modifier", edit_admin_portfolio_image_path(portfolio_image) + =link_to "modifier", edit_admin_portfolio_image_path(portfolio_image), :remote => true =link_to "supprimer", [:admin, portfolio_image], :method => :delete, :confirm => "Voulez-vous vraiment supprimer cette image ?", :remote => true %br