fat_free_crm 0.11.0 → 0.11.1

data/app/views/accounts/index.html.haml

@@ -8,7 +8,7 @@
 
 .title
   %span#create_account_title #{t :accounts}
-  = image_tag("loading.gif", :size => "16x16", :id => "loading", :style => "display: none;")
+  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
 .remote#options{ hidden }
 .remote#advanced_search{ hidden_if(!params[:q]) }
   - if @search

data/app/views/accounts/show.html.haml

@@ -13,30 +13,12 @@
 
 = hook(:show_account_bottom, self) do
 
-  = section(@account, :tasks)
-  .log#tasks
-    = render "shared/tasks"
-
-  = section(@account, :contacts)
-  .list#contacts
-    - @contacts = @account.contacts.paginate(:page => 1, :per_page => 20)
-    = render :partial => "contacts/contact", :collection => @contacts
-  = will_paginate @contacts, :id => true, :params => {:action => :contacts}
-
-  = section(@account, :opportunities)
-  .list#opportunities
-    - @opportunities = @account.opportunities.paginate(:page => 1, :per_page => 20)
-    = render :partial => "opportunities/opportunity", :collection => @opportunities
-  = will_paginate @opportunities, :id => true, :params => {:action => :opportunities}
+  = render :partial => "tasks/tasks", :locals => {:object => @account}
 
-  = load_select_popups_for(@account, :tasks, :contacts, :opportunities)
+  = render :partial => "contacts/contacts", :locals => {:object => @account}
+
+  = render :partial => "opportunities/opportunities", :locals => {:object => @account}
 
-  %br( style="clear:both" )
+  = render :partial => "versions/versions", :locals => {:object => @account}
 
-  - if Setting.paper_trail_ui_enabled
-    %br
-    = content_tag(:div, t(:versions), :class => :subtitle)
-    .list#versions
-      - @versions = @account.versions.except(:order).order('created_at DESC').paginate(:page => 1, :per_page => 20)
-      = render :partial => "versions/version", :collection => @versions
-    = will_paginate @versions, :id => true, :params => {:action => :versions}
+  = load_select_popups_for(@account, :tasks, :contacts, :opportunities)

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

@@ -1,15 +1,15 @@
-%li.position[field]{ highlightable(dom_id(field, :tools)) }
+%li.highlight.position[field]
   %span.handle
     %img( src="/assets/sortable.gif" )
-  .tools{ invisible, :id => dom_id(field, :tools) }
+
+  .tools
     %small
       = link_to_edit(field, :url => edit_admin_field_path(field), :klass_name => 'Field') + " | "
       = link_to_delete(field, :url => admin_field_path(field), :klass_name => 'Field')
+
   %tt
-    %b
-      = field.label
-    = "(#{t('field_types.' + field.as)})"
+    %b= field.label
+    == (#{t('field_types.' + field.as)})
 
     == added #{time_ago_in_words(field.created_at)} ago
     = hook(:field_bottom, self, :field => field)
-

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

@@ -1,8 +1,8 @@
 - tag_field_groups = FieldGroup.find_all_by_tag_id(tag)
 - model_tagging_counts = tag.model_tagging_counts
 
-%li[tag]{ highlightable(dom_id(tag, :tools)) }
-  .tools{ invisible, :id => dom_id(tag, :tools) }
+%li.highlight[tag]
+  .tools
     = link_to_edit(tag, :url => edit_admin_tag_path(tag)) << " |"
     - if tag_field_groups.any?
       %span{:style => "color: #777"} Delete

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

@@ -5,7 +5,7 @@
 
 .title
   %span#create_tag_title #{t :tags}
-  = image_tag("loading.gif", :size => "16x16", :id => "loading", :style => "display: none;")
+  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
 .remote#create_tag{ hidden }
 
 .list#tags

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

@@ -1,4 +1,4 @@
-%li[user]{ highlightable(dom_id(user, :tools)) }
+%li.highlight[user]
 
   - if user.awaits_approval?
     .strip.signed_up #{t :user_signed_up}
@@ -9,10 +9,10 @@
   - else
     .strip.active #{t :user_active}
 
-  = avatar_for(user, :size => "30x30")
+  = avatar_for(user, :size => :medium, :width => 30, :height => 30 )
 
   .indentfull
-    .tools{ invisible, :id => dom_id(user, :tools) }
+    .tools
       = link_to_edit(user, :url => edit_admin_user_path(user)) << " | "
 
       - if user.suspended?

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

@@ -5,7 +5,7 @@
 
 .title
   %span#create_user_title #{t :users}
-  = image_tag("loading.gif", :size => "16x16", :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

data/app/views/campaigns/_campaign.html.haml

@@ -1,13 +1,17 @@
-%li[campaign]{ highlightable(dom_id(campaign, :tools)) }
+%li.highlight[campaign]
   .strip{:class => campaign.status}= t(campaign.status)
 
-  .tools{ invisible, :id => dom_id(campaign, :tools) }
-    = link_to_edit(campaign) + " | "
-    = link_to_delete(campaign)
+  %ul.tools
+    - if can?(:update, campaign)
+      %li= link_to_edit(campaign)
+
+    - if can?(:destroy, campaign)
+      %li= link_to_delete(campaign)
 
   .indent
-    = link_to(h(campaign.name), campaign)
+    = link_to(campaign.name, campaign)
     = render "campaigns/status", :campaign => campaign
+
     - unless @current_user.preference[:campaigns_outline] == "brief"
       = render "campaigns/metrics", :campaign => campaign
       - if campaign.tag_list.present?

data/app/views/campaigns/index.html.haml

@@ -8,7 +8,7 @@
 
 .title
   %span#create_campaign_title #{t :campaigns}
-  = image_tag("loading.gif", :size => "16x16", :id => "loading", :style => "display: none;")
+  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
 .remote#options{ hidden }
 .remote#advanced_search{ hidden_if(!params[:q]) }
   - if @search

data/app/views/campaigns/show.html.haml

@@ -13,32 +13,12 @@
 
 = hook(:show_campaign_bottom, self) do
 
-  = section(@campaign, :tasks)
-  .log#tasks
-    = render "shared/tasks"
+  = render :partial => "tasks/tasks", :locals => {:object => @campaign}
 
-  = section(@campaign, :leads)
-  .list#leads
-    - @leads = @campaign.leads.paginate(:page => 1, :per_page => 20)
-    = render :partial => "leads/lead", :collection => @campaign.leads.paginate(:page => 1, :per_page => 20)
-  = will_paginate @leads, :id => true, :params => {:action => :leads}
+  = render :partial => "leads/leads", :locals => {:object => @campaign}
 
-  %br( style="clear:both" )
+  = render :partial => "opportunities/opportunities", :locals => {:object => @campaign}
 
-  = section(@campaign, :opportunities)
-  .list#opportunities
-    - @opportunities = @campaign.opportunities.paginate(:page => 1, :per_page => 20)
-    = render :partial => "opportunities/opportunity", :collection => @campaign.opportunities.paginate(:page => 1, :per_page => 20)
-  = will_paginate @opportunities, :id => true, :params => {:action => :opportunities}
+  = render :partial => "versions/versions", :locals => {:object => @campaign}
 
   = load_select_popups_for(@campaign, :tasks, :leads, :opportunities)
-
-  %br( style="clear:both" )
-
-  - if Setting.paper_trail_ui_enabled
-    %br
-    = content_tag(:div, t(:versions), :class => :subtitle)
-    .list#versions
-      - @versions = @campaign.versions.except(:order).order('created_at DESC').paginate(:page => 1, :per_page => 20)
-      = render :partial => "versions/version", :collection => @versions
-    = will_paginate @versions, :id => true, :params => {:action => :versions}

data/app/views/comments/_comment.html.haml

@@ -1,25 +1,28 @@
 - truncated = simple_format h(truncate(comment.comment.gsub("\n", " "), :length => 125))
 - formatted = defined?(RedCloth) ? RedCloth.new(h(comment.comment)).to_html.html_safe : simple_format(h(comment.comment)).html_safe
 - collapsable = formatted.size > 150
+- commentable = comment.commentable
 
-%li[comment]{ highlightable(dom_id(comment, :tools), :off => "#f2f2f2") }
+%li.comment.highlight[comment]
   .body
-    = link_to avatar_for(comment.user, :size => "25x25"), user_path(comment.user)
-    .tools{ invisible, :id => dom_id(comment, :tools) }
-      = link_to_edit(comment) + " | "
-      = link_to_delete(comment)
+    = link_to avatar_for(comment.user, :size => :small), user_path(comment.user)
+    %ul.tools
+      - if can?(:update, commentable)
+        %li= link_to_edit(comment)
+      - if can?(:destroy, commentable)
+        %li= link_to_delete(comment)
 
     = link_to(comment.user.full_name, user_path(comment.user)) + ","
     %tt
       added note #{t(:time_ago, distance_of_time_in_words(Time.now, comment.created_at))}
-      - if collapsable
+      - if collapsable && can?(:read, commentable)
         = " | ".html_safe + link_to_function(comment.collapsed? ? t(:more) : t(:less), "crm.flip_note_or_email(this, '#{t(:more)}', '#{t(:less)}')", :class => "toggle")
 
-    - if collapsable
-      %dt{ hidden_if(comment.expanded?), :id => dom_id(comment, :truncated) }
-        = truncated
-      %dt.textile{ hidden_if(comment.collapsed?), :id => dom_id(comment, :formatted) }
-        = auto_link(formatted).html_safe
-    - else
-      %dt.textile= auto_link(formatted).html_safe
-
+    - if can?(:read, commentable)
+      - if collapsable
+        %dt{ hidden_if(comment.expanded?), :id => dom_id(comment, :truncated) }
+          = truncated
+        %dt.textile{ hidden_if(comment.collapsed?), :id => dom_id(comment, :formatted) }
+          = auto_link(formatted).html_safe
+      - else
+        %dt.textile= auto_link(formatted).html_safe

data/app/views/comments/_edit.html.haml

@@ -1,6 +1,6 @@
 - class_name = commentable.class.name.downcase
 .comment{:style => "margin: 5px 0px 0px 0px"}
-  = link_to avatar_for(@current_user, :size => "25x25"), user_path(@current_user)
+  = link_to avatar_for(@current_user, :size => :small), user_path(@current_user)
   = form_for(@comment, :remote => true) do |f|
     = hidden_field_tag "comment[user_id]", @comment.user_id || @current_user.id
     = hidden_field_tag "comment[commentable_id]", commentable.id

data/app/views/comments/_new.html.haml

@@ -1,14 +1,14 @@
 - class_name = commentable.class.name.downcase
 - id_prefix = "#{class_name}_#{commentable.id}"
-.comment.new_comment{ {:id => "#{class_name}_#{commentable.id}_comment_new"}.merge(highlightable("#{class_name}_#{commentable.id}_comment_new_tools", :off => "#f2f2f2")) }
+.comment.highlight.new_comment{ :id => "#{id_prefix}_comment_new" }
 
   -# Two hidden fields store the IDs of notes and emails shown for the asset. These IDs are used
   -# by [Expand/Collapse All]. The contents gets updated by actions such as [Add] or [Delete].
   = hidden_field_tag :shown_notes, "#{commentable.comment_ids.join(',')}", :id => "#{id_prefix}_shown_notes"
   = hidden_field_tag :shown_emails, "#{commentable.email_ids.join(',')}", :id => "#{id_prefix}_shown_emails"
 
-  = link_to avatar_for(@current_user, :size => "25x25"), user_path(@current_user)
-  .tools{ {:id => "#{id_prefix}_comment_new_tools"}.merge(invisible) }
+  = link_to avatar_for(@current_user, :size => :small), user_path(@current_user)
+  .tools
     = link_to_function(t(:expand_all), "crm.flip_notes_and_emails('#{t(:expanded)}', '#{t(:more)}', '#{t(:less)}', '#{id_prefix}')") << " | "
     = link_to_function(t(:collapse_all), "crm.flip_notes_and_emails('#{t(:collapsed)}', '#{t(:more)}', '#{t(:less)}', '#{id_prefix}')")
 

data/app/views/contacts/_contact.html.haml

@@ -1,31 +1,49 @@
 - gravatar_size = @current_user.preference[:contacts_outline] == "brief" ? "16x16" : "30x30"
 
-%li[contact]{ highlightable(dom_id(contact, :tools)) }
+%li.highlight[contact]
   = gravatar_for(contact, :size => gravatar_size)
 
-  .tools{ invisible, :id => dom_id(contact, :tools) }
+  %ul.tools
     = hook(:contact_tools_before, self, :contact => contact)
-    = link_to_edit(contact) + " | "
-    = link_to_discard(contact) + " | " if shown_on_landing_page?
-    = link_to_delete(contact)
+
+    - if can?(:update, contact)
+      %li= link_to_edit(contact)
+
+    - if shown_on_landing_page?
+      %li= link_to_discard(contact)
+
+    - if can?(:destroy, contact)
+      %li= link_to_delete(contact)
 
   .indentslim
-    = link_to(h(contact.full_name(@current_user.preference[:contacts_naming])), contact)
+    = link_to_if can?(:read, contact), contact.full_name(@current_user.preference[:contacts_naming]), contact
     %tt
       - if contact.title? && contact.department?
-        = h(contact.title) << ", " << h(contact.department)
+        == #{contact.title}, #{contact.department}
       - else
-        = h(contact.title) if contact.title?
-      - if contact.account && contact.account.name?
-        == #{t :at} #{link_to h(contact.account.name), account_path(contact.account)}
-      - if contact.lead and contact.lead.referred_by?
+        = contact.title if contact.title?
+
+      - if (account = contact.account) and account.name?
+        == #{t :at} #{link_to_if can?(:read, account), account.name, account_path(account)}
+
+      - if (lead = contact.lead) and lead.referred_by?
         &ndash;
-        = #{t :referred_by_small} #{contact.lead.referred_by}"
+        == #{t :referred_by_small} #{lead.referred_by}
+
     - unless @current_user.preference[:contacts_outline] == "brief"
       %dt{ :style => "padding: 2px 0px 0px 0px" }
-        = link_to_email(contact.email) << " | " if contact.email.present?
-        = "#{t :phone_small}: <b>".html_safe + h(contact.phone) << "</b> | ".html_safe if contact.phone.present?
-        = "#{t :mobile_small}: <b>".html_safe + h(contact.mobile) << "</b> | ".html_safe if contact.mobile.present?
+        - if can?(:read, contact)
+          - if contact.email.present?
+            = link_to_email(contact.email)
+            |
+          - if contact.phone.present?
+            == #{t :phone_small}:
+            %b= contact.phone
+            |
+          - if contact.mobile.present?
+            == #{t :mobile_small}:
+            %b= contact.mobile
+            |
         = t(:added_ago, time_ago_in_words(contact.created_at))
       - if contact.tag_list.present?
         %dt

data/app/views/contacts/_contacts.html.haml

@@ -0,0 +1,6 @@
+= section(object, :contacts)
+.list#contacts
+  - contacts = object.contacts.paginate(:page => 1, :per_page => 20)
+  = render :partial => "contacts/contact", :collection => contacts
+
+= will_paginate contacts, :id => 'contacts_pagination', :params => {:action => :contacts}

data/app/views/contacts/_sidebar_show.html.haml

@@ -36,6 +36,6 @@
 
   - if @contact.tag_list.present?
     %dt
-      .tags= tags_for_index(@contact) 
+      .tags= tags_for_index(@contact)
 
   = hook(:show_contact_sidebar_bottom, self, :contact => @contact)

data/app/views/contacts/index.html.haml

@@ -8,7 +8,7 @@
 
 .title
   %span#create_contact_title #{t :contacts}
-  = image_tag("loading.gif", :size => "16x16", :id => "loading", :style => "display: none;")
+  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
 .remote#options{ hidden }
 .remote#advanced_search{ hidden_if(!params[:q]) }
   - if @search

data/app/views/contacts/show.html.haml

@@ -13,26 +13,10 @@
 
 = hook(:show_contact_bottom, self) do
 
-  = section(@contact, :tasks)
-  .log#tasks
-    = render "shared/tasks"
+  = render :partial => "tasks/tasks", :locals => {:object => @contact}
 
-  %br( style="clear:both" )
+  = render :partial => "opportunities/opportunities", :locals => {:object => @contact}
 
-  = section(@contact, :opportunities)
-  .list#opportunities
-    - @opportunities = @contact.opportunities.paginate(:page => 1, :per_page => 20)
-    = render :partial => "opportunities/opportunity", :collection => @contact.opportunities.paginate(:page => 1, :per_page => 20)
-  = will_paginate @opportunities, :id => true, :params => {:action => :opportunities}
+  = render :partial => "versions/versions", :locals => {:object => @contact}
 
   = load_select_popups_for(@contact, :tasks, :opportunities)
-
-  %br( style="clear:both" )
-
-  - if Setting.paper_trail_ui_enabled
-    %br
-    = content_tag(:div, t(:versions), :class => :subtitle)
-    .list#versions
-      - @versions = @contact.versions.except(:order).order('created_at DESC').paginate(:page => 1, :per_page => 20)
-      = render :partial => "versions/version", :collection => @versions
-    = will_paginate @versions, :id => true, :params => {:action => :versions}

data/app/views/emails/_email.html.haml

@@ -1,27 +1,30 @@
-- truncated = h(truncate(email.body_without_textile.to_s.gsub("\n", " "), :length => 125 - email.subject.to_s.size))
+- truncated = truncate(email.body_without_textile.to_s.gsub("\n", " "), :length => 125 - email.subject.to_s.size)
 - formatted = email.body
+- mediator = email.mediator
 
-%li.mail{ highlightable(dom_id(email, :tools), :off => "#f2f2f2"), :id => dom_id(email) }
+%li.mail.highlight[email]
   .body
-    = link_to avatar_for(email.user, :size => "25x25"), user_path(email.user)
-    .tools{ invisible, :id => dom_id(email, :tools) }
-      = link_to_delete(email)
+    = link_to avatar_for(email.user, :size => :small), user_path(email.user)
+    %ul.tools
+      - if can?(:destroy, mediator)
+        %li= link_to_delete(email)
 
-    %tt
-      - if email.sent_to.to_s.include?(", ")
-        = "To: ".html_safe << email.sent_to
-      - else
-        = "To ".html_safe << link_to_email(email.sent_to)
-      = "from ".html_safe << link_to_email(email.sent_from) << ", sent on ".html_safe
-      = l(email.sent_at, :format => :mmddhhss)
-      = " | ".html_safe + link_to_function(email.collapsed? ? t(:more) : t(:less), "crm.flip_note_or_email(this, '#{t(:more)}', '#{t(:less)}')", :class => "toggle")
+    - if can?(:read, mediator)
+      %tt
+        - if email.sent_to.to_s.include?(", ")
+          = "To: ".html_safe << email.sent_to
+        - else
+          = "To ".html_safe << link_to_email(email.sent_to)
+        = "from ".html_safe << link_to_email(email.sent_from) << ", sent on ".html_safe
+        = l(email.sent_at, :format => :mmddhhss)
+        = " | ".html_safe + link_to_function(email.collapsed? ? t(:more) : t(:less), "crm.flip_note_or_email(this, '#{t(:more)}', '#{t(:less)}')", :class => "toggle")
 
-    %dt{ hidden_if(email.expanded?), :id => dom_id(email, :truncated) }
-      %p
-        = h(email.subject)
-        %tt= " - ".html_safe << truncated
-    %dt.textile{ hidden_if(email.collapsed?), :id => dom_id(email, :formatted) }
-      .email_content
-        %p= h(email.subject)
-        = auto_link(formatted)
+      %dt{ hidden_if(email.expanded?), :id => dom_id(email, :truncated) }
+        %p
+          = h(email.subject)
+          %tt= (" - " << truncated).html_safe
 
+      %dt.textile{ hidden_if(email.collapsed?), :id => dom_id(email, :formatted) }
+        .email_content
+          %p= h(email.subject)
+          = auto_link(formatted)