fat_free_crm 0.16.4 → 0.17.1

data/app/views/admin/fields/edit.js.haml

@@ -1,3 +1,3 @@
 - id = dom_id(@field)
-html = $.parseHTML('#{j render(:partial => "admin/fields/form")}')
+html = $.parseHTML('#{j render(partial: "admin/fields/form")}')
 $('##{id}').find('.edit_field').replaceWith( html )

data/app/views/admin/fields/index.html.haml

@@ -12,23 +12,23 @@
   %ul
     - list_of_entities.each do |entity|
       - asset = entity.downcase
-      %li{ "data-tab-class" => asset, :class => ("selected" if entity == 'Contact') }
+      %li{ "data-tab-class" => asset, class: ("selected" if entity == 'Contact') }
         = link_to t(entity), "#"
 
 - list_of_entities.each do |entity|
   - asset = entity.downcase
   - klass = asset.classify.constantize
-  .fields{ :id => "#{asset}_section", :style => ("display: none;" if asset != 'contact') }
+  .fields{ id: "#{asset}_section", style: ("display: none;" if asset != 'contact') }
 
     - create_form_id = "#{asset}_create_field_group"
 
     .title_tools
-      = link_to_inline(create_form_id, new_admin_field_group_path(:klass_name => klass.name), :text => t(:create_field_group))
+      = link_to_inline(create_form_id, new_admin_field_group_path(klass_name: klass.name), text: t(:create_field_group))
 
     .title
       = t(asset)
 
-    .list{ :id => "#{asset}_field_groups", 'data-sortable' =>  sort_admin_field_groups_path(:asset => asset) }
-      = render :partial => "admin/field_groups/field_group", :collection => klass.field_groups, :locals => {:asset => asset, :klass => klass}
+    .list{ id: "#{asset}_field_groups", 'data-sortable' =>  sort_admin_field_groups_path(asset: asset) }
+      = render partial: "admin/field_groups/field_group", collection: klass.field_groups, locals: {asset: asset, klass: klass}
 
-    .remote{ hidden.merge(:id => create_form_id) }
+    .remote{ hidden.merge(id: create_form_id) }

data/app/views/admin/fields/show.html.haml

@@ -2,7 +2,7 @@
 
 #confirm{ hidden }
 .title_tools#menu
-  = link_to_inline(:edit_field, edit_admin_field_path(@field), :text => "Edit") + " | "
+  = link_to_inline(:edit_field, edit_admin_field_path(@field), text: "Edit") + " | "
 .title#edit_field_title= @field.field_label
 
 %div#edit_field{ hidden }

data/app/views/admin/fields/update.js.haml

@@ -2,12 +2,12 @@
 - container_id = "#{@field.klass_name.downcase}_field_groups"
 
 - if @field.errors.empty?
-  html = $.parseHTML('#{ j (render :partial => "field", :collection => [@field]) }');
+  html = $.parseHTML('#{ j (render partial: "field", collection: [@field]) }');
   $('##{id}').replaceWith(html);
   $('##{id}').effect("highlight", { duration:1000 });
   $('##{container_id}').sortable('reset');
 - else
-  html = $.parseHTML('#{ j(render :partial => "form") }');
+  html = $.parseHTML('#{ j(render partial: "form") }');
   $('##{id}').find('.edit_field').replaceWith( html );
   $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('##{id}').find('input[type="text"]').first().focus();

data/app/views/admin/groups/_edit.html.haml

@@ -1,10 +1,10 @@
 .remote
-  = form_for([:admin, @group], :html => one_submit_only.merge({:autocomplete => 'off'}), :remote => true) do |f|
+  = form_for([:admin, @group], html: one_submit_only.merge({autocomplete: 'off'}), remote: true) do |f|
     = link_to_close edit_admin_group_path(@group)
 
-    = f.error_messages :object_name => t('group')
+    = f.error_messages object_name: t('group')
 
-    = render "admin/groups/form", :f => f, :edit => true
+    = render "admin/groups/form", f: f, edit: true
 
     .buttonbar
       = f.submit t(:save_group)

data/app/views/admin/groups/_form.html.haml

@@ -8,4 +8,4 @@
       %td
         .label.top.req #{t :users}:
         %br
-        = f.select :user_ids, User.all.map {|u| [u.full_name, u.id]}, {}, :multiple => true, :class => 'select2'
+        = f.select :user_ids, User.all.map {|u| [u.full_name, u.id]}, {}, multiple: true, class: 'select2'

data/app/views/admin/groups/_group.html.haml

@@ -2,13 +2,13 @@
 
   %ul.tools
     %li= link_to_edit [:admin, group]
-    - count = Permission.where(:group_id => group.id).count
+    - count = Permission.where(group_id: group.id).count
     - confirm = (count.zero? ? nil : "#{t(:confirm_group_delete, count)}")
-    %li= link_to_delete [:admin, group], :confirm => confirm
+    %li= link_to_delete [:admin, group], confirm: confirm
 
   %span
-    =link_to(group.name, {:action => :edit, :id => group.id}, {:remote  => true,
-          :onclick => "this.href = this.href.split('?')[0] + '?previous='+crm.find_form('edit_group');"})
+    = link_to(group.name, {action: :edit, id: group.id}, {remote: true,
+          onclick: "this.href = this.href.split('?')[0] + '?previous='+crm.find_form('edit_group');"})
   %tt
     - if (users = group.users).present?
       == #{t('group_members')}:

data/app/views/admin/groups/_new.html.haml

@@ -1,10 +1,10 @@
 
-= form_for([:admin, @group], :html => one_submit_only.merge({:autocomplete => 'off'}), :remote => true) do |f|
+= form_for([:admin, @group], html: one_submit_only.merge({autocomplete: 'off'}), remote: true) do |f|
   = link_to_close new_admin_group_path
 
-  = f.error_messages :object_name => t('group')
+  = f.error_messages object_name: t('group')
 
-  = render "admin/groups/form", :f => f
+  = render "admin/groups/form", f: f
 
   .buttonbar
     = f.submit t(:create_group)

data/app/views/admin/groups/create.js.haml

@@ -2,9 +2,9 @@
   $('#create_group_arrow').html(crm.COLLAPSED);
   $('#create_group_title').html('#{ j t(:groups) }');
   $('#create_group').slideUp(250);
-  $('#groups').prepend('#{ j (render :partial => "group", :collection => [ @group ]) }');
+  $('#groups').prepend('#{ j (render partial: "group", collection: [ @group ]) }');
   $('##{dom_id(@group)}').effect("highlight", { duration:1500 });
 - else
-  $('#create_group').html('#{ j render(:partial => "new") }');
+  $('#create_group').html('#{ j render(partial: "new") }');
   $('#create_group').effect("shake", { duration:250, distance: 6 });
   $('#group_name').focus();

data/app/views/admin/groups/edit.js.haml

@@ -1,7 +1,7 @@
 - id = dom_id(@group)
 
 - if params[:cancel].true?     # <----------------- Hide [Edit Group]
-  $('##{id}').replaceWith('#{ j (render(:partial => "group", :collection => [ @group ])) }');
+  $('##{id}').replaceWith('#{ j (render(partial: "group", collection: [ @group ])) }');
 
 - else # <----------------------------------------  Show [Edit Group] form.
 
@@ -10,5 +10,5 @@
   -# Hide [Create Group] form if any.
   crm.hide_form('create_group');
   -# Show [Edit Group] form.
-  $('##{id}').html('#{ j render(:partial => "edit") }');
+  $('##{id}').html('#{ j render(partial: "edit") }');
   $('#group_name').focus();

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

@@ -1,17 +1,17 @@
 = 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"
 

data/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") }')

data/app/views/admin/groups/new.js.haml

@@ -1,7 +1,7 @@
 crm.flip_form('create_group');
 
 - unless params[:cancel].true?
-  $('#create_group').html('#{ j render(:partial => "new") }');
+  $('#create_group').html('#{ j render(partial: "new") }');
   $('#empty').html('');
   crm.set_title('create_group', '#{t(:create_group)}');
 

data/app/views/admin/groups/update.js.haml

@@ -1,9 +1,9 @@
 - id = dom_id(@group)
 
 - if @group.errors.empty?
-  $('##{id}').replaceWith('#{ j render(:partial => "group", :collection => [ @group ]) }')
+  $('##{id}').replaceWith('#{ j render(partial: "group", collection: [ @group ]) }')
   $('##{id}').effect("highlight", { duration:1000 });
 - else
-  $('##{id}').html('#{j render(:partial => "edit") }')
+  $('##{id}').html('#{j render(partial: "edit") }')
   $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('#group_name').focus()

data/app/views/admin/plugins/_plugin.html.haml

@@ -2,7 +2,7 @@
   %span.black
     %strong= plugin.name
   %tt
-    %dt{ :style => "padding: 2px 0px 0px 0px" }
+    %dt{ style: "padding: 2px 0px 0px 0px" }
       = t('.author') + ":"
       %strong= plugin.author
       %br

data/app/views/admin/tags/_confirm.html.haml

@@ -1,5 +1,5 @@
 .confirm[@tag, :confirm]
-  #{t :tag_with_taggings_confirm_delete, :value => Tagging.where(:tag_id => @tag).count}
+  #{t :tag_with_taggings_confirm_delete, value: Tagging.where(tag_id: @tag).count}
   #{t :delete} <b>#{@tag.name}</b>?
-  = link_to_confirm_delete(@tag) << " : "
+  = link_to_confirm_delete(@tag) + " : "
   = link_to_function(t(:no_button), "crm.flick('#{dom_id(@tag, :confirm)}', 'remove')")

data/app/views/admin/tags/_edit.html.haml

@@ -1,9 +1,9 @@
 .remote
-  = form_for([:admin, @tag], :as => :tag, :html => one_submit_only.merge(:class => "edit_tag", :id => "edit_tag_#{@tag.id}"), :remote => true) do |f|
+  = form_for([:admin, @tag], as: :tag, html: one_submit_only.merge(class: "edit_tag", id: "edit_tag_#{@tag.id}"), remote: true) do |f|
     = link_to_close edit_admin_tag_path(@tag)
     = f.error_messages
-    = render :partial => "top_section", :locals => { :f => f, :edit => true }
+    = render partial: "top_section", locals: { f: f, edit: true }
     .buttonbar
-      = f.submit t(:save_tag), :id => :tag_submit
+      = f.submit t(:save_tag), id: :tag_submit
       or
       = link_to_cancel edit_admin_tag_path(@tag)

data/app/views/admin/tags/_new.html.haml

@@ -1,10 +1,10 @@
 - path = new_admin_tag_path
 
-= form_for([:admin, @tag], :html => one_submit_only, :remote => true) do |f|
+= form_for([:admin, @tag], html: one_submit_only, remote: true) do |f|
   = link_to_close path
   = f.error_messages
-  = render :partial => "top_section", :locals => { :f => f }
+  = render partial: "top_section", locals: { f: f }
   .buttonbar
-    = f.submit t(:create_tag), :id => :tag_submit
+    = f.submit t(:create_tag), id: :tag_submit
     or
     = link_to_cancel path

data/app/views/admin/tags/_tag.html.haml

@@ -3,14 +3,14 @@
 
 %li.highlight[tag]
   .tools
-    = link_to_edit(tag, :url => edit_admin_tag_path(tag)) << " |"
+    = link_to_edit(tag, url: edit_admin_tag_path(tag)) + " |"
     - if tag_field_groups.any?
-      %span{:style => "color: #777"} Delete
+      %span{style: "color: #777"} Delete
     - else
       - if model_tagging_counts.any?
         = link_to_confirm(tag)
       - else
-        = link_to_delete(tag, :url => url_for([:admin, tag]))
+        = link_to_delete(tag, url: url_for([:admin, tag]))
 
   %span.black= tag.name
   %tt
@@ -19,7 +19,7 @@
       = model_tagging_counts.map {|k, c| t(pluralize(c, k.downcase)) }.join(", ")
 
   - if tag_field_groups.any?
-    %dt{ :style => "padding: 2px 0px 0px 0px" }
+    %dt{ style: "padding: 2px 0px 0px 0px" }
       = t(:field_group_tags) + ":"
       - tag_field_groups.each_with_index do |field_group, i|
         %strong= field_group.label_i18n

data/app/views/admin/tags/confirm.js.haml

@@ -3,5 +3,5 @@
 if ($('##{id}').size() > 0) {
 crm.flick('#{id}', 'remove');
 } else {
-$('##{dom_id(@tag)}').prepend('#{ j (render :partial => "confirm") }');
+$('##{dom_id(@tag)}').prepend('#{ j (render partial: "confirm") }');
 }

data/app/views/admin/tags/create.js.haml

@@ -2,10 +2,10 @@
   $('#create_tag_arrow').html(crm.COLLAPSED);
   $('#create_tag_title').html('#{ j t(:tags) }');
   $('#create_tag').slideUp(250);
-  $('#tags').prepend('#{ j (render :partial => "tag", :collection => [ @tag ]) }');
+  $('#tags').prepend('#{ j (render partial: "tag", collection: [ @tag ]) }');
   $('##{dom_id(@tag)}').effect("highlight", { duration:1500 });
   crm.flick('empty', 'remove');
 - else
-  $('#create_tag').html('#{ j render(:partial => 'new') }');
+  $('#create_tag').html('#{ j render(partial: 'new') }');
   $('#create_tag').effect("shake", { duration:250, distance: 6 });
   $('#tag_name').focus();

data/app/views/admin/tags/edit.js.haml

@@ -1,13 +1,13 @@
 - id = dom_id(@tag)
 
 - if params[:cancel].true?     # <----------------- Hide [Edit Tag]
-  $('##{id}').replaceWith('#{ j render(:partial => "tag", :collection => [ @tag ]) }');
+  $('##{id}').replaceWith('#{ j render(partial: "tag", collection: [ @tag ]) }');
 
 - else # <----------------------------------------  Show [Edit Tag] form.
 
   - if @previous                                    # Hide open [Edit Tag] form if any.
     - if @previous.is_a?(Tag)                       # Previous tag still exists?
-      $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => "tag", :collection => [ @previous ]) }');
+      $('##{dom_id(@previous)}').replaceWith('#{ j render(partial: "tag", collection: [ @previous ]) }');
     - else
       crm.flick('tag_#{@previous}', 'remove');
 
@@ -16,5 +16,5 @@
   -# Show [Edit Tag] form.
   crm.highlight_off('#{id}');
   crm.hide_form('create_tag');
-  $('##{id}').html('#{ j render(:partial => "edit") }');
+  $('##{id}').html('#{ j render(partial: "edit") }');
   $('#tag_name').focus();

data/app/views/admin/tags/index.html.haml

@@ -1,16 +1,16 @@
 = styles_for :tag
 
 .title_tools
-  = link_to_inline(:create_tag, new_admin_tag_path, :text => t(:create_tag))
+  = link_to_inline(:create_tag, new_admin_tag_path, text: t(:create_tag))
 
 .title
   %span#create_tag_title #{t :tags}
-  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
+  = image_tag("loading.gif", size: :thumb, id: "loading", style: "display: none;")
 .remote#create_tag{ hidden }
 
 .list#tags
   - if @tags.any?
-    = render :partial => "admin/tags/tag", :collection => @tags
+    = render partial: "admin/tags/tag", collection: @tags
   - else
     = render "shared/empty"
 

data/app/views/admin/tags/new.js.haml

@@ -1,7 +1,7 @@
 crm.flip_form('create_tag');
 
 - unless params[:cancel].true?
-  $('#create_tag').html('#{ j render(:partial => "new") }');
+  $('#create_tag').html('#{ j render(partial: "new") }');
   crm.set_title('create_tag', '#{t(:create_tag)}');
 - else
   crm.set_title('create_tag', '#{t(:tags)}');

data/app/views/admin/tags/update.js.haml

@@ -1,9 +1,9 @@
 - id = dom_id(@tag)
 
 - if @tag.errors.empty?
-  $('##{id}').replaceWith('#{ j render(:partial => "tag", :collection => [ @tag ]) }');
+  $('##{id}').replaceWith('#{ j render(partial: "tag", collection: [ @tag ]) }');
   $('##{id}').effect('highlight', { duration: 1000 });
 - else
-  $('##{id}').html('#{ j render(:partial => "edit") }');
+  $('##{id}').html('#{ j render(partial: "edit") }');
   $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('#tag_tagname').focus();

data/app/views/admin/users/_confirm.html.haml

@@ -1,5 +1,5 @@
 .confirm[@user, :confirm]
   #{t :user_confirm_delete}
   #{t :delete} <b>#{@user.full_name}</b>?
-  = link_to_confirm_delete(@user) << " : "
+  = link_to_confirm_delete(@user) + " : "
   = link_to_function(t(:no_button), "crm.flick('#{dom_id(@user, :confirm)}', 'remove')")

data/app/views/admin/users/_edit.html.haml

@@ -1,10 +1,10 @@
 .remote
-  = form_for([:admin, @user], :html => one_submit_only.merge({:autocomplete => 'off'}), :remote => true) do |f|
+  = form_for([:admin, @user], html: one_submit_only.merge({autocomplete: 'off'}), remote: true) do |f|
     = link_to_close edit_admin_user_path(@user)
 
-    = f.error_messages :object_name => t('user')
+    = f.error_messages object_name: t('user')
 
-    = render "admin/users/profile", :f => f, :edit => true
+    = render "admin/users/profile", f: f, edit: true
     .buttonbar
       = f.submit t(:save_user)
       #{t :or}

data/app/views/admin/users/_new.html.haml

@@ -1,10 +1,10 @@
 
-= form_for([:admin, @user], :html => one_submit_only.merge({:autocomplete => 'off'}), :remote => true) do |f|
+= form_for([:admin, @user], html: one_submit_only.merge({autocomplete: 'off'}), remote: true) do |f|
   = link_to_close new_admin_user_path
 
-  = f.error_messages :object_name => t('user')
+  = f.error_messages object_name: t('user')
 
-  = render "admin/users/profile", :f => f
+  = render "admin/users/profile", f: f
   .buttonbar
     = f.submit t(:create_user)
     #{t :or}

data/app/views/admin/users/_profile.html.haml

@@ -21,8 +21,8 @@
       %td(colspan=3)
         .check_box(style="margin-top:6px")
           -# Sorry, you can't revoke Admin rights from yourself.
-          = f.check_box(:admin, { :disabled => edit && @user == current_user })
-          %label{:for => 'user_admin'}
+          = f.check_box(:admin, { disabled: edit && @user == current_user })
+          %label{for: 'user_admin'}
             = t(:user_is_admin)
 
 .subtitle #{t :personal_information}
@@ -51,4 +51,4 @@
     %tr
       %td
         .label #{t :groups}:
-        = f.select :group_ids, Group.all.map {|g| [g.name, g.id]}, {}, :multiple => true, :class => 'select2'
+        = f.select :group_ids, Group.all.map {|g| [g.name, g.id]}, {}, multiple: true, class: 'select2'

data/app/views/admin/users/_user.html.haml

@@ -13,12 +13,12 @@
 
   .indentfull
     .tools
-      = link_to_edit(user, :url => edit_admin_user_path(user)) << " | "
+      = link_to_edit(user, url: edit_admin_user_path(user)) + " | "
 
       - if user.suspended?
-        = link_to_reactivate(user) << " | "
+        = link_to_reactivate(user) + " | "
       - elsif user != current_user
-        = link_to_suspend(user) << " | "
+        = link_to_suspend(user) + " | "
       - else
         %span.grayed #{t :suspend}!
         = " | "
@@ -39,28 +39,28 @@
         %span.black= "|"
 
       - if user.awaits_approval?
-        %b.cool #{t :user_awaits_approval}
+        %b.cool= t(:user_awaits_approval)
       - elsif user.current_login_at
         %span.cool= t(:last_logged_in, timeago(user.current_login_at)).html_safe
       - else
-        %span.warn #{t :user_never_logged_in}
-    %dt{ :style => "padding: 2px 0px 0px 0px" }
-      = link_to_email(user.email.to_s) << " | "
+        %span.warn= t(:user_never_logged_in)
+    %dt{ style: "padding: 2px 0px 0px 0px" }
+      = link_to_email(user.email.to_s) + " | "
       - if user.phone?
-        = t(:phone_small) << ":"
-        = content_tag(:b, user.phone) << " | "
+        = t(:phone_small) + ":"
+        = content_tag(:b, user.phone) + " | "
       - if user.mobile?
-        = t(:mobile_small) << ":"
-        = content_tag(:b, user.mobile) << " | "
+        = t(:mobile_small) + ":"
+        = content_tag(:b, user.mobile) + " | "
 
       - if !user.suspended?
-        %span #{t(:user_since, l(user.created_at.to_date, :format => :mmddyy))}
+        %span #{t(:user_since, l(user.created_at.to_date, format: :mmddyy))}
       - elsif user.awaits_approval?
-        %b.cool #{t(:user_signed_up_on, l(user.created_at, :format => :mmddhhss))}
+        %b.cool #{t(:user_signed_up_on, l(user.created_at, format: :mmddhhss))}
       - else
-        %span.warn #{t(:user_suspended_on, l(user.created_at.to_date, :format => :mmddyy))}
+        %span.warn #{t(:user_suspended_on, l(user.created_at.to_date, format: :mmddyy))}
     - groups = user.groups
     - unless groups.count.zero?
-      %dt{ :style => "padding: 2px 0px 0px 0px" }
-        = t(:groups) << ":"
+      %dt{ style: "padding: 2px 0px 0px 0px" }
+        = t(:groups) + ":"
         = groups.map(&:name).join(', ')