From 1ebd4e3ce64b3565ff84fe271c6e46f142be9b3b Mon Sep 17 00:00:00 2001 From: Julius Rapp Date: Sun, 7 Jul 2013 14:18:18 +0200 Subject: [PATCH] Use foodsoft button and table styles (no btn-group, no table-condensed) --- app/views/deliveries/_form.html.haml | 4 ++-- app/views/deliveries/_stock_article_for_adding.html.haml | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/views/deliveries/_form.html.haml b/app/views/deliveries/_form.html.haml index fd61577b..5b8179f9 100644 --- a/app/views/deliveries/_form.html.haml +++ b/app/views/deliveries/_form.html.haml @@ -98,7 +98,7 @@ .btn-toolbar .btn-group %input#new_stock_article{:style => 'width: 500px;'} - %table.table.table-condensed.table-hover#stock_articles_for_adding + %table.table.table-hover#stock_articles_for_adding %thead %tr %th @@ -114,7 +114,7 @@ = render :partial => 'stock_article_for_adding', :locals => {:article => article} %h2= t '.title_fill_quantities' - %table.table.table-condensed#stock_changes + %table.table#stock_changes %thead %tr %th diff --git a/app/views/deliveries/_stock_article_for_adding.html.haml b/app/views/deliveries/_stock_article_for_adding.html.haml index 813a0fd3..bab80ac8 100644 --- a/app/views/deliveries/_stock_article_for_adding.html.haml +++ b/app/views/deliveries/_stock_article_for_adding.html.haml @@ -4,8 +4,7 @@ %td{:data => {:toggle => :tooltip, :title => render(:partial => 'shared/article_price_info', :locals => {:article => article})}} #{number_to_currency article.price}/#{article.unit} %td.sort-by-category= article.article_category.name %td - .btn-group - = link_to t('.action_edit'), edit_stock_article_supplier_deliveries_path(@supplier, :stock_article_id => article.id), remote: true, class: 'btn btn-mini' - = link_to t('.action_other_price'), copy_stock_article_supplier_deliveries_path(@supplier, :old_stock_article_id => article.id), remote: true, class: 'btn btn-mini' - - deliver_button_disabled = ( @delivery and @delivery.includes_article? article ) ? ( 'disabled' ) : ( false ) - = link_to t('.action_add_to_delivery'), add_stock_change_supplier_deliveries_path(@supplier, :stock_article_id => article.id), :method => :post, remote: true, class: 'button-add-stock-change btn btn-mini btn-primary', disabled: deliver_button_disabled + = link_to t('.action_edit'), edit_stock_article_supplier_deliveries_path(@supplier, :stock_article_id => article.id), remote: true, class: 'btn btn-mini' + = link_to t('.action_other_price'), copy_stock_article_supplier_deliveries_path(@supplier, :old_stock_article_id => article.id), remote: true, class: 'btn btn-mini' + - deliver_button_disabled = ( @delivery and @delivery.includes_article? article ) ? ( 'disabled' ) : ( false ) + = link_to t('.action_add_to_delivery'), add_stock_change_supplier_deliveries_path(@supplier, :stock_article_id => article.id), :method => :post, remote: true, class: 'button-add-stock-change btn btn-mini btn-primary', disabled: deliver_button_disabled