Merge branch 'master' of https://github.com/Andrew987/fat_free_crm in…

…to Andrew987-master

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

@@ -1,18 +1,18 @@
 = styles_for :group
 
 .title_tools
-  = link_to_inline(:create_group, new_admin_group_path, :text => t(:create_group))
+  = link_to_inline(:create_group, new_admin_group_path, text: t(:create_group))
 
 .title
   %span#create_group_title #{t :groups}
-  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
+  = image_tag("loading.gif", size: :thumb, id: "loading", style: "display: none;")
 
 .remote#create_group{ hidden }
 
 %ul.list#groups
   - if @groups.any?
-    = render :partial => "group", :collection => @groups
+    = render partial: "group", collection: @groups
   - else
     = render "shared/empty"
 
-#paginate= render "shared/paginate"
+#paginate= render "shared/paginate_simple"

app/views/admin/groups/index.js.haml

@@ -1,2 +1,2 @@
-$('#groups').html('#{ j render(:partial => "admin/groups/group", :collection => @groups) }');
-$('#paginate').html('#{ j render(:partial => "shared/paginate") }')
+$('#groups').html('#{ j render(partial: "admin/groups/group", collection: @groups) }');
+$('#paginate').html('#{ j render(partial: "shared/paginate_simple") }')

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

@@ -1,13 +1,13 @@
 = styles_for :user
 
 .title_tools
-  = link_to_inline(:create_user, new_admin_user_path, :text => t(:create_user))
+  = link_to_inline(:create_user, new_admin_user_path, text: t(:create_user))
 
 .title
   %span#create_user_title #{t :users}
-  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
+  = image_tag("loading.gif", size: :thumb, id: "loading", style: "display: none;")
 .remote#create_user{ hidden }
 
-.list#users= render :partial => "admin/users/user", :collection => @users
-#paginate= render "shared/paginate"
+.list#users= render partial: "admin/users/user", collection: @users
+#paginate= render "shared/paginate_simple"
 #export= render "shared/export"

app/views/admin/users/index.js.haml

@@ -1,2 +1,2 @@
-$('#users').html('#{ j render(:partial => "admin/users/user", :collection => @users) }');
-$('#paginate').html('#{ j render(:partial => "shared/paginate") }')
+$('#users').html('#{ j render(partial: "admin/users/user", collection: @users) }');
+$('#paginate').html('#{ j render(partial: "shared/paginate_simple") }')

app/views/home/index.js.haml

@@ -1,7 +1,7 @@
 - unless @activities.blank?
-  $('#activities').html('#{ j render(:partial => "activity", :collection => @activities) }');
+  $('#activities').html('#{ j render(partial: "activity", collection: @activities) }');
 - else
   $('#activities').html('#{ j t(:no_activity_records) }');
 
--# $('#paginate').html('#{ j render(:partial => "shared/paginate") }');
-$('#export').html('#{ j render(:partial => "shared/export") }');
+-# $('#paginate').html('#{ j render(partial: "shared/paginate_simple") }');
+$('#export').html('#{ j render(partial: "shared/export") }');

app/views/shared/_paginate.haml → app/views/shared/_paginate_simple.haml

@@ -1,2 +1,4 @@
 = image_tag("loading.gif", size: 'thumb', class: "spinner", style: "display: none;")
 = paginate
+
+

spec/views/admin/users/index.haml_spec.rb

@@ -7,15 +7,15 @@
 
 describe "/admin/users/index" do
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
   end
 
   it "renders a list of users" do
     assign(:users, [ FactoryGirl.create(:user) ].paginate)
 
     render
-    view.should render_template(:partial => "_user")
-    view.should render_template(:partial => "shared/_paginate")
+    view.should render_template(partial: "_user")
+    view.should render_template(partial: "shared/_paginate_simple")
   end
 end