Fixed foodcoop/ordergroups and workgroups views.

app/views/foodcoop/ordergroups/_ordergroups.html.haml

@@ -1,13 +1,8 @@
-%p
-%table{:style => "width:100%"}
-  %tr
-    %td
-      = pagination_links_remote @ordergroups, :update => :ordergroups
-    %td{:style => "text-align:right"}
-      - if @total > 20
-        = items_per_page :update => :ordergroups
+- if Ordergroup.count > 20
+  = items_per_page
+= pagination_links_remote @ordergroups
 
-%table.list
+%table.table.table-striped
   %thead
     %tr
       %th Name
@@ -16,10 +11,9 @@
 
   %tbody
     - for ordergroup in @ordergroups
-      %tr{:class => cycle('even','odd', :name => 'ordergroup')}
-        %td= link_to h(ordergroup.name), new_message_path(:message => {:group_id => ordergroup.id}), :title => "Bestellgruppe eine Nachricht schicken"
+      %tr
+        %td= ordergroup.name
         %td=h ordergroup.users.collect { |u| u.nick }.join(", ")
-        %td
-          - order = ordergroup.orders.first(:order => 'starts DESC')
-          = order ? format_date(order.starts) : "-"
+        %td= format_date ordergroup.orders.order('orders.starts DESC').first.try(:starts)
+        %td= link_to_new_message(message_params: {group_id: ordergroup.id})
 

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

@@ -1,17 +1,13 @@
-%h1 Bestellgruppen der Foodcoop
+- title "Bestellgruppen"
 
-.left_column{:style => "width:100%"}
-  .box_title
-    %h2 Übersicht
-  .column_content
-    #filter{:style => "margin-right:2em;"}
-      = form_tag foodcoop_ordergroups_path, :method => :get, :style=>"display:inline;", :id => 'ordergroup_search',
-      :remote => true, 'data-submit-onchange' => true do
-        %label{:for => 'article_name'} Suche nach Name:
-        = text_field_tag :query, params[:query], :size => 10
-        %label{:for => 'only_active'} Nur aktive:
-        = check_box_tag 'only_active', 1, params[:only_active]
-        %small (mindestens einmal in den letzten 3 Monaten bestellt)
-    
-    #ordergroups
-      = render :partial => "ordergroups"
+.well
+  = form_tag foodcoop_ordergroups_path, :method => :get, :remote => true, 'data-submit-onchange' => true,
+    class: 'form-search' do
+    = text_field_tag :name, params[:name], class: 'input-medium search-query', placeholder: 'Name ...'
+    %label{:for => 'only_active'}
+      = check_box_tag 'only_active', 1, params[:only_active]
+      Nur aktive
+      %small (mindestens einmal in den letzten 3 Monaten bestellt)
+
+#ordergroups
+  = render :partial => "ordergroups"

app/views/foodcoop/users/_users.html.haml

@@ -1,7 +1,6 @@
-- unless params[:sort_by_ordergroups]
-  - if User.count > 20
-    = items_per_page
-  = pagination_links_remote @users
+- if User.count > 20
+  = items_per_page
+= pagination_links_remote @users
 %table.table.table-striped
   %thead
     %tr

app/views/foodcoop/workgroups/_workgroup.html.haml

@@ -1,12 +1,7 @@
-.single_column{:style => "width:55em"}
-  .box_title
-    %h2= workgroup.name
-  .column_content
-    = render :partial => 'shared/group', :locals => { :group => workgroup }
-    %p
-      = link_to "Alle Aufgaben zeigen", workgroup_tasks_path(workgroup_id: workgroup)
-      |
-      = link_to "Mitgliedern eine Nachricht schicken", new_message_path(:message => {:group_id => workgroup.id})
-      - if workgroup.member?(@current_user)
-        |
-        = link_to "Gruppe bearbeiten", edit_foodcoop_workgroup_path(workgroup)
+%section.well
+  %h3= workgroup.name
+  = render :partial => 'shared/group', :locals => { :group => workgroup }
+  = link_to "Alle Aufgaben zeigen", workgroup_tasks_path(workgroup_id: workgroup), class: 'btn'
+  = link_to_new_message message_params: {group_id: workgroup.id}
+  - if workgroup.member?(current_user)
+    = link_to "Gruppe bearbeiten", edit_foodcoop_workgroup_path(workgroup), class: 'btn'

app/views/foodcoop/workgroups/index.html.haml

@@ -1,10 +1,9 @@
-%h1 Arbeitsgruppen
+- title "Arbeitsgruppen"
 
 %p
-  %i
-    Das bearbeiten von Gruppen ist nur für Mitglieder der Gruppe möglich. 
-    %br/
-    Wenn du einer Gruppe beitreten willst, dann schreib doch den Mitgliedern eine Nachricht.
+  Das bearbeiten von Gruppen ist nur für Mitglieder der Gruppe möglich.
+  %br/
+  Wenn du einer Gruppe beitreten willst, dann schreib doch den Mitgliedern eine Nachricht.
       
 = render :partial => "workgroup", :collection => @workgroups