Introduced actionbar. Some fixes for balancing page.

app/views/finance/balancing/_edit_results_by_articles.html.haml

@@ -1,5 +1,3 @@
-%h3 Bestellung bearbeiten
-
 %table.ordered-articles.table.table-striped
   %thead
     %tr

app/views/finance/balancing/new.html.haml

@@ -22,28 +22,26 @@
     %h3 Kommentare
     #comments= render :partial => 'shared/comments', locals: {comments: @order.comments}
 
-.well.well-small
-  .btn-toolbar
-    .btn-group
-      - unless @order.invoice or @order.stockit?
-        = link_to "Rechnung anlegen", new_finance_invoice_path(:order_id => @order, :supplier_id => @order.supplier),
-          class: 'btn'
-      - unless @order.closed?
-        = link_to "Bestellung abschließen", confirm_finance_order_path(@order), class: 'btn btn-primary'
+- content_for :actionbar do
+  .btn-group
+    - unless @order.invoice or @order.stockit?
+      = link_to "Rechnung anlegen", new_finance_invoice_path(:order_id => @order, :supplier_id => @order.supplier),
+        class: 'btn'
+    - unless @order.closed?
+      = link_to "Bestellung abschließen", confirm_finance_order_path(@order), class: 'btn btn-primary'
 
-    #editOrderNav.btn-group.pull-right
-      = link_to '#', data: {toggle: 'dropdown'}, class: 'btn dropdown-toggle' do
-        Ansichtsoptionen
-        %span.caret
-      %ul.dropdown-menu
-        %li= link_to 'Bestellung bearbeiten', new_finance_order_path(order_id: @order.id, view: 'edit_results'),
-          remote: true
-        %li= link_to 'Gruppenübersicht', new_finance_order_path(order_id: @order.id, view: 'groups_overview'),
-          remote: true
-        %li= link_to 'Artikelübersicht', new_finance_order_path(order_id: @order.id, view: 'articles_overview'),
-          remote: true
+  #editOrderNav.btn-group.pull-right
+    = link_to '#', data: {toggle: 'dropdown'}, class: 'btn dropdown-toggle' do
+      Ansichtsoptionen
+      %span.caret
+    %ul.dropdown-menu
+      %li= link_to 'Bestellung bearbeiten', new_finance_order_path(order_id: @order.id, view: 'edit_results'),
+        remote: true
+      %li= link_to 'Gruppenübersicht', new_finance_order_path(order_id: @order.id, view: 'groups_overview'),
+        remote: true
+      %li= link_to 'Artikelübersicht', new_finance_order_path(order_id: @order.id, view: 'articles_overview'),
+        remote: true
 
 %section#results
   = render 'edit_results_by_articles'
-%p= link_to_top
-#edit_box{:style => 'display:none'}
+%p= link_to_top

app/views/finance/financial_transactions/index.html.haml

@@ -1,7 +1,9 @@
 - title "Kontoauszug für #{@ordergroup.name}"
 
+- content_for :actionbar do
+  = link_to 'Neue Transaktion anlegen', new_finance_ordergroup_transaction_path(@ordergroup), class: 'btn btn-primary'
+
 - content_for :sidebar do
-  %p= link_to 'Neue Transaktion anlegen', new_finance_ordergroup_transaction_path(@ordergroup), class: 'btn btn-primary'
   .well.well-small
     %strong Kontostand: #{number_to_currency(@ordergroup.account_balance)}
     %br/

app/views/finance/financial_transactions/new.html.haml

@@ -7,5 +7,6 @@
   = f.hidden_field :ordergroup_id
   = f.input :amount
   = f.input :note, :as => :text
-  = f.submit
-  = link_to "oder abbrechen", finance_ordergroup_transactions_path(@ordergroup)
+  .form-actions
+    = f.submit class: 'btn btn-primary'
+    = link_to "oder abbrechen", finance_ordergroup_transactions_path(@ordergroup)

app/views/finance/group_order_articles/update.js.haml

@@ -1,3 +1,4 @@
 $('#modalContainer').modal('hide');
 $('#order_article_#{@order_article.id}').html('#{j(render('finance/balancing/order_article', order_article: @order_article))}');
 $('#group_order_articles_#{@order_article.id}').html('#{j(render('finance/balancing/group_order_articles', order_article: @order_article))}');
+$('#summary').html('#{j(render('finance/balancing/summary', order: @order_article.order))}');

app/views/finance/invoices/index.html.haml

@@ -1,5 +1,6 @@
 - title "Rechnungen"
 
-= link_to 'Neue Rechnung anlegen', new_finance_invoice_path, class: 'btn btn-primary'
+- content_for :actionbar do
+  = link_to 'Neue Rechnung anlegen', new_finance_invoice_path, class: 'btn btn-primary'
 
 #invoicesTable= render 'invoices'

app/views/finance/ordergroups/index.html.haml

@@ -1,9 +1,7 @@
 - title "Konten verwalten"
 
-- content_for :sidebar do
-  .well.well-small
-    Hier kannst du mehrere Transaktionen gleichzeitig anlegen:
-    = link_to "Neue Überweisungen eingeben", finance_new_transaction_collection_path, class: 'btn btn-primary'
+- content_for :actionbar do
+  = link_to "Neue Überweisungen eingeben", finance_new_transaction_collection_path, class: 'btn btn-primary'
 
 .well.well-small
   = form_tag finance_ordergroups_path, :method => :get, :remote => true,