Refactored items_per_page. Start on admin/workgroups.

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

@@ -21,8 +21,7 @@
         %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 icon(:members), 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/workgroups/_workgroups.html.haml

@@ -2,10 +2,9 @@
   %table{:style => "width:100%"}
     %tr
       %td
-        = pagination_links_remote @workgroups, { :update => "workgroups" }
+        = pagination_links_remote @workgroups
       %td{:style => "text-align:right"}
-        - if @total.size > 20
-          = items_per_page :update => "workgroups"
+        = items_per_page
 %table.list
   %thead
     %tr
@@ -20,7 +19,7 @@
         %td= workgroup.users.size
         %td= format_roles(workgroup)
         %td
-          = link_to image_tag('b_users.png', :size => '16x16',  :border => "0", :alt => 'Mitlglieder bearbeiten'), memberships_admin_workgroup_path(workgroup)
-          = link_to(image_tag('b_edit.png', :size => "16x16", :border => "0", :alt => 'Gruppe bearbeiten'), edit_admin_workgroup_path(workgroup))
-          = link_to(image_tag('b_drop.png', :size => "16x16", :border => "0", :alt => 'Gruppe löschen'), [:admin, workgroup], |
-                         :confirm => 'Willst du ' + workgroup.name + ' wirklich löschen?', :method => :delete) |
+          = link_to icon(:members), memberships_admin_workgroup_path(workgroup)
+          = link_to icon(:edit), edit_admin_workgroup_path(workgroup)
+          = link_to icon(:delete), [:admin, workgroup], :confirm => 'Willst du ' + workgroup.name + ' wirklich löschen?',
+            :method => :delete

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

@@ -18,17 +18,9 @@
     %h2 Gruppenübersicht
   .column_content
     #group_filter
-      %form{:name=>"sform", :action=>"", :style=>"display:inline;"}
-        %label{:for => 'workgroup_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 => "workgroups", |
-        :url => admin_workgroups_path, |
-        :with => 'query', |
-        :method => :get |
+      = form_tag admin_workgroups_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
     #workgroups
-      = render :partial => "workgroups"
-  = link_to 'Neue Arbeits', new_admin_workgroup_path
+      = render :partial => "workgroups"

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

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