my_profile and admin/ordergroups.

app/views/admin/ordergroups/_form.html.haml

@@ -1,20 +1,7 @@
-- form_for [:admin, @ordergroup] do |@form|
-  - render :layout => 'shared/group_form' do
-    %div{:style => "float:right;width:40%"}
-      %p
-        = @form.label :contact_person
-        %br/
-        = @form.text_field :contact_person, :size => 20
-      %p
-        = @form.label :contact_phone
-        %br/
-        = @form.text_field :contact_phone, :size => 20
-      %p
-        = @form.label :contact_address
-        %br/
-        = @form.text_field :contact_address
-
-  %br{ :style => "clear:both" }
-  = submit_tag "Speichern"
-  |
-  = link_to "Abbrechen", admin_ordergroups_path
+= simple_form_for [:admin, @ordergroup] do |f|
+  = render :layout => 'shared/group_form_fields', :locals => {:f => f} do
+    = f.input :contact_person
+    = f.input :contact_phone
+    = f.input :contact_address
+  = f.submit
+  = link_to "oder abbrechen", admin_ordergroups_path

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

@@ -4,7 +4,7 @@
       %td
         = pagination_links_remote @ordergroups, { :update => "ordergroups" }
       %td{:style => "text-align:right"}
-        - if @total > 20
+        - if @ordergroups.size > 20
           = items_per_page :update => "ordergroups"
 %table.list
   %thead
@@ -22,7 +22,8 @@
         %td= link_to_gmaps ordergroup.contact_address
         %td= ordergroup.users.size
         %td
-          = link_to image_tag('b_users.png', :size => '16x16',  :border => "0", :alt => 'Mitlglieder bearbeiten'), memberships_admin_ordergroup_path(ordergroup)
-          = link_to(image_tag('b_edit.png', :size => "16x16", :border => "0", :alt => 'Gruppe bearbeiten'), edit_admin_ordergroup_path(ordergroup))
-          = link_to(image_tag('b_drop.png', :size => "16x16", :border => "0", :alt => 'Gruppe löschen'), [:admin, ordergroup], |
-                         :confirm => 'Willst du ' + ordergroup.name + ' wirklich löschen?', :method => :delete) |
+          = link_to image_tag('b_users.png', :size => '16x16',  :border => "0", :alt => 'Mitlglieder bearbeiten'),
+            memberships_admin_ordergroup_path(ordergroup)
+          = link_to icon(:edit), edit_admin_ordergroup_path(ordergroup)
+          = link_to icon(:delete), [:admin, ordergroup], :confirm => "Willst du #{ordergroup.name} wirklich löschen?",
+            :method => :delete

app/views/admin/ordergroups/edit.html.haml

@@ -1,4 +1,3 @@
 - title "Bestellgruppe bearbeiten"
 
-.edit_form{:style => "width:50em"}
-  = render :partial => 'form'
+= render :partial => 'form'

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

@@ -18,17 +18,9 @@
     %h2 Gruppenübersicht
   .column_content
     #group_filter
-      %form{:name=>"sform", :action=>"", :style=>"display:inline;"}
-        %label{:for => 'ordergroup_name'} Suche in Name :
-        = text_field_tag("query", params['query'], :size => 10 )
-        
-      = observe_field 'query',  :frequency => 2, |
-        :before => "Element.show('loader')", |
-        :success => "Element.hide('loader')", |
-        :update => "ordergroups", |
-        :url => admin_ordergroups_path, |
-        :with => 'query', |
-        :method => :get |
+      = form_tag admin_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
     #ordergroups
-      = render :partial => "ordergroups"
-  = link_to 'Neue Arbeits', new_admin_ordergroup_path
+      = render :partial => "ordergroups"

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

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

app/views/admin/ordergroups/new.html.haml

@@ -1,4 +1,3 @@
 - title "Bestellgruppe anlegen"
 
-.edit_form{:style => "width:50em"}
-  = render :partial => 'form'
+= render :partial => 'form'