Fixed admin, orders, wiki views. Converted all erb to haml.

app/views/finance/balancing/edit_note.js.erb

@@ -1 +0,0 @@
-$.fancybox('<%= escape_javascript(render("edit_note")) %>');

app/views/finance/balancing/edit_note.js.haml

@@ -0,0 +1 @@
+$.fancybox('#{escape_javascript(render("edit_note"))}');

app/views/finance/balancing/new.js.erb

@@ -1 +0,0 @@
-$('#results').html('<%= escape_javascript(render(partial: balancing_view_partial, locals: {order: @order})) %>');

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

@@ -0,0 +1 @@
+$('#results').html('#{escape_javascript(render(partial: balancing_view_partial, locals: {order: @order}))}');

app/views/finance/balancing/update_note.js.erb

@@ -1,2 +0,0 @@
-$.fancybox.close();
-$('#note').html('<%= escape_javascript(simple_format(@order.note)) %>');

app/views/finance/balancing/update_note.js.haml

@@ -0,0 +1,2 @@
+$.fancybox.close();
+$('#note').html('#{escape_javascript(simple_format(@order.note))}');

app/views/finance/financial_transactions/index.js.erb

@@ -1 +0,0 @@
-$('#transactions').html('<%= escape_javascript(render("transactions")) %>');

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

@@ -0,0 +1 @@
+$('#transactions').html('#{escape_javascript(render("transactions"))}');

app/views/finance/group_order_articles/edit.js.erb

@@ -1 +0,0 @@
-$.fancybox('<%= escape_javascript(render('form')) %>');

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

@@ -0,0 +1 @@
+$.fancybox('#{escape_javascript(render('form'))}');

app/views/finance/group_order_articles/new.js.erb

@@ -1 +0,0 @@
-$.fancybox('<%= escape_javascript(render("form")) %>');

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

@@ -0,0 +1 @@
+$.fancybox('#{escape_javascript(render("form"))}');

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

@@ -1,5 +0,0 @@
-$.fancybox.close();
-$('#order_article_<%= @order_article.id %>').
-        html('<%= escape_javascript(render(partial: 'finance/balancing/order_article', locals: {order_article: @order_article})) %>');
-$('#group_order_articles_<%= @order_article.id %>').
-        html('<%= escape_javascript(render(partial: 'finance/balancing/group_order_articles', locals: {order_article: @order_article})) %>');

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

@@ -0,0 +1,5 @@
+$.fancybox.close();
+$('#order_article_#{@order_article.id}').
+html('#{escape_javascript(render(partial: 'finance/balancing/order_article', locals: {order_article: @order_article}))}');
+$('#group_order_articles_#{@order_article.id}').
+html('#{escape_javascript(render(partial: 'finance/balancing/group_order_articles', locals: {order_article: @order_article}))}');

app/views/finance/invoices/edit.html.erb

@@ -1,6 +0,0 @@
-<% title "Rechnung bearbeiten" %>
-
-<%= render :partial => 'form' %>
-
-<%= link_to "Anzeigen", [:finance, @invoice] %> |
-<%= link_to 'Zurück', finance_invoices_path %>

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

@@ -0,0 +1,5 @@
+- title "Rechnung bearbeiten"
+= render :partial => 'form'
+= link_to "Anzeigen", [:finance, @invoice]
+|
+\#{link_to 'Zurück', finance_invoices_path}

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

@@ -1,40 +0,0 @@
-<% title "Rechnungen" %>
-
-<p><%= will_paginate @invoices %></p>
-
-<table class="list" style="width:70em">
-  <thead>
-    <tr>
-      <th>Nummer</th>
-      <th>Lieferantin</th>
-      <th>Datum</th>
-      <th>Bezahlt am</th>
-      <th>Betrag</th>
-      <th>Lieferung</th>
-      <th>Bestellung</th>
-      <th>Note</th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-  <% for invoice in @invoices %>
-    <tr>
-      <td><%= link_to h(invoice.number), finance_invoice_path(invoice)%></td>
-      <td><%= invoice.supplier.name %></td>
-      <td><%= format_date invoice.date %></td>
-      <td><%= format_date invoice.paid_on %></td>
-      <td><%= number_to_currency invoice.amount %></td>
-      <td><%= link_to "Lieferung", [invoice.supplier,invoice.delivery] if invoice.delivery %></td>
-      <td><%= link_to format_date(invoice.order.ends), new_finance_order_path(order_id: invoice.order_id) if invoice.order %></td>
-      <td><%= truncate(invoice.note) %></td>
-      <td><%= link_to icon(:edit), edit_finance_invoice_path(invoice) %></td>
-      <td><%= link_to icon(:delete), finance_invoice_path(invoice), :confirm => 'Are you sure?', :method => :delete %></td>
-    </tr>
-  <% end %>
-  </tbody>
-</table>
-
-<br />
-
-<%= link_to 'Neue Rechnung anlegen', new_finance_invoice_path %>

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

@@ -0,0 +1,30 @@
+- title "Rechnungen"
+%p= will_paginate @invoices
+%table.list{:style => "width:70em"}
+  %thead
+    %tr
+      %th Nummer
+      %th Lieferantin
+      %th Datum
+      %th Bezahlt am
+      %th Betrag
+      %th Lieferung
+      %th Bestellung
+      %th Note
+      %th
+      %th
+  %tbody
+    - for invoice in @invoices
+      %tr
+        %td= link_to h(invoice.number), finance_invoice_path(invoice)
+        %td= invoice.supplier.name
+        %td= format_date invoice.date
+        %td= format_date invoice.paid_on
+        %td= number_to_currency invoice.amount
+        %td= link_to "Lieferung", [invoice.supplier,invoice.delivery] if invoice.delivery
+        %td= link_to format_date(invoice.order.ends), new_finance_order_path(order_id: invoice.order_id) if invoice.order
+        %td= truncate(invoice.note)
+        %td= link_to icon(:edit), edit_finance_invoice_path(invoice)
+        %td= link_to icon(:delete), finance_invoice_path(invoice), :confirm => 'Are you sure?', :method => :delete
+%br/
+= link_to 'Neue Rechnung anlegen', new_finance_invoice_path

app/views/finance/invoices/new.html.erb

@@ -1,4 +0,0 @@
-<% title "Neue Rechnung anlegen" -%>
-
-<%= render :partial => 'form' %>
-<%= link_to 'Zurück', finance_invoices_path %>

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

@@ -0,0 +1,3 @@
+- title "Neue Rechnung anlegen"
+= render :partial => 'form'
+= link_to 'Zurück', finance_invoices_path

app/views/finance/order_articles/create.js.erb

@@ -1,3 +0,0 @@
-$.fancybox.close();
-$('#result_table').
-        prepend('<%= escape_javascript(render(partial: 'finance/balancing/order_article_result', locals: {order_article: @order_article}))%>');

app/views/finance/order_articles/create.js.haml

@@ -0,0 +1,3 @@
+$.fancybox.close();
+$('#result_table').
+prepend('#{escape_javascript(render(partial: 'finance/balancing/order_article_result', locals: {order_article: @order_article}))}');

app/views/finance/order_articles/destroy.js.erb

@@ -1 +0,0 @@
-$('#order_article_<%= @order_article.id %>, #group_order_articles_<%= @order_article.id %>').hide();

app/views/finance/order_articles/destroy.js.haml

@@ -0,0 +1 @@
+$('#order_article_#{@order_article.id}, #group_order_articles_#{@order_article.id}').hide();

app/views/finance/order_articles/edit.js.erb

@@ -1 +0,0 @@
-$.fancybox('<%= escape_javascript(render("edit")) %>');

app/views/finance/order_articles/edit.js.haml

@@ -0,0 +1 @@
+$.fancybox('#{escape_javascript(render("edit"))}');

app/views/finance/order_articles/new.js.erb

@@ -1 +0,0 @@
-$.fancybox('<%= escape_javascript(render("new")) %>');

app/views/finance/order_articles/new.js.haml

@@ -0,0 +1 @@
+$.fancybox('#{escape_javascript(render("new"))}');

app/views/finance/order_articles/update.js.erb

@@ -1,3 +0,0 @@
-$.fancybox.close();
-$('#order_article_<%= @order_article.id %>').
-        html('<%= escape_javascript(render(partial: 'finance/balancing/order_article', locals: {order_article: @order_article})) %>');

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

@@ -0,0 +1,3 @@
+$.fancybox.close();
+$('#order_article_#{@order_article.id}').
+html('#{escape_javascript(render(partial: 'finance/balancing/order_article', locals: {order_article: @order_article}))}');

app/views/finance/ordergroups/index.js.erb

@@ -1 +0,0 @@
-$('#ordergroups').html('<%= escape_javascript(render("ordergroups")) %>');

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

@@ -0,0 +1 @@
+$('#ordergroups').html('#{escape_javascript(render("ordergroups"))}');