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

app/views/shared/_articles_by_articles.html.haml

@@ -1,15 +1,12 @@
-.legend
-  %table.legend{:style => "margin-bottom:1em"}
-    %tr
-      %th{:colspan => '3'} Legende
+%table.table.table-hover
+  %thead
     %tr
       %th{:style => 'width:70%'} Bestellgruppe
       %th Bestellt (Menge + Toleranz)
       %th Bekommen
       %th Gesamtpreis
 
-- for order_article in order.order_articles.ordered.all(:include => [:article, :article_price])
-  %table{:style => "margin-bottom:1em"}
+  - for order_article in order.order_articles.ordered.all(:include => [:article, :article_price])
     %thead
       %tr
         %th{:colspan => "4"}
@@ -23,4 +20,6 @@
           %td
             %b= goa.result
           %td= number_to_currency(order_article.price.fc_price * goa.result)
+    %tr
+      %td(colspan="4" )
   - reset_cycle('groups')

app/views/shared/_articles_by_groups.html.haml

@@ -1,5 +1,5 @@
-.legend
-  %table.legend{:style => "margin-bottom:1em"}
+%table.table.table-hover
+  %thead
     %tr
       %th{:style => "width:40%"} Name
       %th
@@ -11,11 +11,11 @@
       %th Einheit
       %th Gesamtpreis
 
-- for group_order in order.group_orders.all
-  %table{:style => "margin-bottom:1em"}
+  - for group_order in order.group_orders.all
     %thead
       %tr
-        %th{:colspan => "6"}=h group_order.ordergroup.name
+        %th{:colspan => "6"}
+          %h4= group_order.ordergroup.name
     %tbody
       - total = 0
       - for goa in group_order.group_order_articles.ordered.all(:include => :order_article)
@@ -33,4 +33,6 @@
     %tr{:class => cycle('even', 'odd', :name => 'articles')}
       %th{:colspan => "5"} Summe
       %th= number_to_currency(total)
+    %tr
+      %th(colspan="6")
     - reset_cycle("articles")

app/views/shared/_comments.haml

@@ -1,9 +1,5 @@
-- unless comments.empty?
-  - comments.each do |comment|
-    .comment[comment]
-      .timestamp
-        %b=h "#{comment.user.try(:ordergroup_name)}"
-        = "(#{comment.user.try(:nick)} am #{format_time(comment.created_at)}):"
-      = simple_format(comment.text)
-- else
-  es gibt derzeit keine Kommentare.
+- comments.each do |comment|
+  .comment[comment]
+    %strong= comment.user.try(:ordergroup_name)
+    %small (#{comment.user.try(:nick)} am #{format_time(comment.created_at)}):
+    = simple_format(comment.text)

app/views/shared/_group.html.haml

@@ -1,4 +1,4 @@
-%dl.dl-horizontal
+%dl
   %dt Beschreibung:
   %dd=h group.description
   - if group.is_a?(Ordergroup) and (@current_user.role_admin? or @current_user.role_finance?)
@@ -22,4 +22,4 @@
         kein wöchentlicher Job definiert
   - else
     %dt Äpfel-Bestellbeschränkung
-    %dd= group.ignore_apple_restriction ? 'deaktiviert' : 'aktiviert'
+    %dd= group.ignore_apple_restriction ? 'deaktiviert' : 'aktiviert'

app/views/shared/_open_orders.html.haml

@@ -15,11 +15,11 @@
         - Order.open.each do |order|
           %tr
             %td= link_to_ordering(order)
-            %td=h format_time(order.ends) unless order.ends.nil?
+            %td= format_time(order.ends) unless order.ends.nil?
             - if group_order = order.group_order(ordergroup)
               - total += group_order.price
               %td= "#{group_order.updated_by.nick} (#{format_time(group_order.updated_on)})"
-              %td= number_to_currency(group_order.price)
+              %td.numeric= number_to_currency(group_order.price)
             - else
               %td{:colspan => 2}
       - if total > 0
@@ -27,6 +27,6 @@
           %tr
             %th(colspan="2")
             %th Gesamtsumme:
-            %th= number_to_currency(total)
+            %th.numeric= number_to_currency(total)
   - else
     %i Derzeit gibt es keine laufenden Bestellungen