fat_free_crm 0.11.0 → 0.11.1

data/app/views/entities/contacts.js.rjs

@@ -0,0 +1,3 @@
+contacts = @entity.contacts.paginate(:page => params[:page], :per_page => 20)
+page['contacts'].replace_html :partial => 'contacts/contact', :collection => contacts
+page['contacts_pagination'].replace_html will_paginate(contacts, :container => false, :params => {:action => :contacts})

data/app/views/entities/leads.js.rjs

@@ -0,0 +1,3 @@
+leads = @entity.leads.paginate(:page => params[:page], :per_page => 20)
+page['leads'].replace_html :partial => 'leads/lead', :collection => leads
+page['leads_pagination'].replace_html will_paginate(leads, :container => false, :params => {:action => :leads})

data/app/views/entities/opportunities.js.rjs

@@ -0,0 +1,3 @@
+opportunities = @entity.opportunities.paginate(:page => params[:page], :per_page => 20)
+page['opportunities'].replace_html :partial => 'opportunities/opportunity', :collection => @opportunities
+page['opportunities_pagination'].replace_html will_paginate(opportunities, :container => false, :params => {:action => :opportunities})

data/app/views/entities/versions.js.rjs

@@ -0,0 +1,3 @@
+versions = Version.history(@entity).paginate(:page => params[:page], :per_page => 10)
+page['versions'].replace_html :partial => 'versions/version', :collection => versions
+page['versions_pagination'].replace_html will_paginate(versions, :container => false, :params => {:action => :versions})

data/app/views/home/_activity.html.haml

@@ -1,22 +1,23 @@
-%li[activity]
-  .tools
-    %small= l(activity.created_at, :format => :short)
-  %tt
-    = link_to avatar_for(activity.user, :size => "16x16"), user_path(activity.user)
+- user = link_to(h(activity.user.full_name), user_path(activity.user)) if activity.user
 
-    - user = link_to(h(activity.user.full_name), user_path(activity.user))
-    - action = t('action_' + activity.action)
-    - type = t('subject_' + activity.subject_type.downcase)
-    - subject = if activity.subject
-      - if activity.subject.respond_to?(:full_name)
-        - link_to(h(activity.subject.full_name), polymorphic_url(activity.subject))
-      - elsif activity.subject_type != "Task"
-        - link_to(h(activity.subject.name), polymorphic_url(activity.subject))
-      - else
-        - %Q{<span style="color:black;">#{h(activity.subject.name)}</span>} # Individual tasks have no landing pages where we could link to.
-    - else
-      - activity.info # Use info if the subject has been deleted.
+- subject = if (item = activity.related || activity.item)
+  - if item.respond_to?(:full_name)
+    - link_to item.full_name, polymorphic_url(item)
 
-    = t("activity_text", :user => user, :action => action, :type => type, :subject => subject, :default => "#{user} #{action} #{type} #{subject}").html_safe # locales optionally can change the word order for activities using 'activity_text'
+  - elsif [Account, Campaign, Contact, Lead, Opportunity].include?(item.class)
+    - link_to item.name, polymorphic_url(item)
 
+  - elsif item.respond_to?(:name)
+    - content_tag :span, item.name, :style => "color:black;" # Individual tasks have no landing pages where we could link to.
 
+- if user.present? and subject.present?
+  %li[activity]
+    .tools
+      %small
+        = l(activity.created_at, :format => :short)
+    %tt
+      = link_to avatar_for(activity.user, :size => :thumb), user_path(activity.user)
+
+      - action = t('action_' + activity.event)
+      - type = t('subject_' + activity.item_type.downcase)
+      = t("activity_text", :user => user, :action => action, :type => type, :subject => subject, :default => "#{user} #{action} #{type} #{subject}").html_safe # locales optionally can change the word order for activities using 'activity_text'

data/app/views/home/_events_menu.html.haml

@@ -0,0 +1,8 @@
+:plain
+  new crm.Menu({
+    trigger   : "event",
+    fade      : 0.5,
+    appear    : 0.5,
+    menu_items: [ #{sort_by_events.join(",")} ]
+  });
+

data/app/views/home/_options.html.haml

@@ -3,12 +3,11 @@
   = hidden_field_tag "account[user_id]", @current_user.id
 
   -# activity_options: Show %{models} %{action_type} performed by %{user} in the past %{period}
-  = t(:activity_options, :models => link_to(t(@asset).singularize.downcase, "#", :id => :asset), :action_type => link_to(t(@action + "_past_participle").downcase, "#", :id => :action_type), :user => link_to(t(@user), "#", :id => :user), :period => link_to(t(@duration).downcase, "#", :id => :duration)).html_safe
+  = t(:activity_options, :models => link_to(t(@asset).singularize.downcase, "#", :id => :asset), :action_type => link_to(t(@action + "_past_participle").downcase, "#", :id => :event), :user => link_to(t(@user), "#", :id => :user), :period => link_to(t(@duration).downcase, "#", :id => :duration)).html_safe
 %p
 
 %script
   = render "assets_menu"
-  = render "actions_menu"
+  = render "events_menu"
   = render "users_menu"
   = render "duration_menu"
-

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

@@ -3,7 +3,7 @@
 
 .title
   %span#title #{t :recent_activity}
-  = 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 }
 
 .list#activities

data/app/views/leads/_lead.html.haml

@@ -1,40 +1,59 @@
-%li[lead]{ highlightable(dom_id(lead, :tools)) }
+%li.highlight[lead]
   - if lead.status
-    .strip{:class => lead.status} #{t(lead.status)}
+    .strip{:class => lead.status}= t lead.status
   - else
-    .strip{:style => "color: gray;"} #{t :other}
-
-  .tools{ invisible, :id => dom_id(lead, :tools) }
-    = link_to_edit(lead) + " | "
-    - unless %w(converted rejected).include?(lead.status)
-      = link_to_convert(lead) + " | "
-    - else
-      = "<font color='silver'>#{t :convert}</font> | ".html_safe
-    - if lead.status != "rejected"
-      = link_to_reject(lead) + " | "
-    - else
-      = "<font color='silver'>#{t :reject}</font> | ".html_safe
-    = link_to_discard(lead) + " | " if shown_on_landing_page?
-    = link_to_delete(lead)
+    .strip{:style => "color: gray;"}= t :other
+
+  %ul.tools
+    - if can?(:update, lead)
+      %li= link_to_edit(lead)
+
+    - if %w(converted rejected).include?(lead.status)
+      %li
+        %font{ :color => 'silver' }= t :convert
+    - elsif can?(:update, lead)
+      %li= link_to_convert(lead)
+
+    - if lead.status == "rejected"
+      %li
+        %font{ :color => 'silver' }= t :reject
+    - elsif can?(:update, lead)
+      %li= link_to_reject(lead)
+
+    - if shown_on_landing_page?
+      %li= link_to_discard(lead)
+
+    - if can?(:destroy, lead)
+      %li= link_to_delete(lead)
 
   .indent
-    = link_to(h(lead.full_name(@current_user.preference[:leads_naming])), lead)
+    = link_to_if can?(:read, lead), lead.full_name(@current_user.preference[:leads_naming]), lead
     %tt
       - if lead.company? && lead.title?
         = t(:works_at, :job_title => lead.title, :company => lead.company)
       - else
         = lead.company if lead.company?
         = lead.title if lead.title?
-      -#= link_to(h(lead.campaign.name), lead.campaign) if lead.campaign_id
       - if lead.referred_by?
         &ndash;
-        = "#{t :referred_by_small} #{lead.referred_by}"
+        == #{t :referred_by_small} #{lead.referred_by}
+
     - unless @current_user.preference[:leads_outline] == "brief"
       %dt
-        = stars_for(lead) + " | "
-        = link_to_email(lead.email) << " | " if lead.email.present?
-        = "#{t :phone_small}: " + lead.phone  << " | " if lead.phone.present?
-        = "#{t :mobile_small}: " + lead.mobile << " | " if lead.mobile.present?
+        = stars_for(lead)
+        |
+        - if can?(:read, lead)
+          - if lead.email.present?
+            = link_to_email(lead.email)
+            |
+          - if lead.phone.present?
+            == #{t :phone_small}:
+            %b= lead.phone
+            |
+          - if lead.mobile.present?
+            == #{t :mobile_small}:
+            %b= lead.mobile
+            |
         = t(:added_ago, time_ago_in_words(lead.created_at))
       - if lead.tag_list.present?
         %dt

data/app/views/leads/_leads.html.haml

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

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

@@ -50,7 +50,7 @@
     = auto_link(simple_format @lead.background_info).html_safe
 
   = render "fields/sidebar_show", :asset => @lead
-  
+
   - if @lead.tag_list.present?
     %dt
       .tags= tags_for_index(@lead)

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

@@ -8,7 +8,7 @@
 
 .title
   %span#create_lead_title #{t :leads}
-  = 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/leads/show.html.haml

@@ -18,18 +18,8 @@
 
 = hook(:show_lead_bottom, self) do
 
-  = section(@lead, :tasks)
-  .log#tasks
-    = render "shared/tasks"
+  = render :partial => "tasks/tasks", :locals => {:object => @lead}
 
-  = load_select_popups_for(@lead, :tasks)
-
-  %br( style="clear:both" )
+  = render :partial => "versions/versions", :locals => {:object => @lead}
 
-  - if Setting.paper_trail_ui_enabled
-    %br
-    = content_tag(:div, t(:versions), :class => :subtitle)
-    .list#versions
-      - @versions = @lead.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(@lead, :tasks)

data/app/views/opportunities/_opportunities.html.haml

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

data/app/views/opportunities/_opportunity.html.haml

@@ -1,29 +1,40 @@
-%li[opportunity]{ highlightable(dom_id(opportunity, :tools)) }
+%li.highlight[opportunity]
   - if opportunity.stage
     .strip{:class => opportunity.stage}= t(opportunity.stage)
   - else
     .strip.white #{t :other}
 
-  .tools{ invisible, :id => dom_id(opportunity, :tools) }
-    = link_to_edit(opportunity) + " | "
-    = link_to_discard(opportunity) + " | " if shown_on_landing_page?
-    = link_to_delete(opportunity)
+  %ul.tools
+    - if can?(:update, opportunity)
+      %li= link_to_edit(opportunity)
+
+    - if shown_on_landing_page?
+      %li= link_to_discard(opportunity)
+
+    - if can?(:destroy, opportunity)
+      %li= link_to_delete(opportunity)
 
   .indent
-    = link_to(h(opportunity.name), opportunity)
-    - if opportunity.account && opportunity.account.id
-      == #{t :from} #{link_to(h(opportunity.account.name), account_path(opportunity.account))}
+    = link_to_if can?(:read, opportunity), opportunity.name, opportunity
+    - if (account = opportunity.account) && account.id
+      == #{t :from} #{link_to_if can?(:read, account), account.name, account_path(account)}
     %tt
       –
-      = t(:added_by, :time_ago => time_ago_in_words(opportunity.created_at), :user => (opportunity.user.id == @current_user.id ? t(:me) : h(opportunity.user.full_name)))
+      - user_name = opportunity.user_id == @current_user.id ? t(:me) : opportunity.user.full_name
+      = t(:added_by, :time_ago => time_ago_in_words(opportunity.created_at), :user => user_name)
+
     - unless @current_user.preference[:opportunities_outline] == "brief"
       %dt
         %b= number_to_currency(opportunity.weighted_amount, :precision => 0) + " | "
         - won_or_lost = %w(won lost).include?(opportunity.stage)
         - unless won_or_lost
-          == #{number_to_currency(opportunity.amount || 0, :precision => 0)}
-          == #{opportunity.discount ? t(:discount_number, number_to_currency(opportunity.discount, :precision => 0)) : t(:no_discount)}
+          = number_to_currency(opportunity.amount || 0, :precision => 0)
+          - if opportunity.discount
+            = t(:discount_number, number_to_currency(opportunity.discount, :precision => 0))
+          - else
+            = t(:no_discount)
           = t(:probability_number, (opportunity.probability || 0).to_s + '%') + " | "
+
         - if opportunity.closes_on
           - if won_or_lost
             - if opportunity.closes_on >= Date.today
@@ -38,6 +49,7 @@
             %span.warn= t(:past_due, distance_of_time_in_words(opportunity.closes_on, Date.today))
         - else
           = t(:no_closing_date)
+
       - if opportunity.tag_list.present?
         %dt
           .tags= tags_for_index(opportunity)

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

@@ -8,7 +8,7 @@
 
 .title
   %span#create_opportunity_title #{t :opportunities}
-  = 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/opportunities/show.html.haml

@@ -13,24 +13,10 @@
 
 = hook(:show_opportunity_bottom, self) do
 
-  = section(@opportunity, :tasks)
-  .log#tasks
-    = render "shared/tasks"
+  = render :partial => "tasks/tasks", :locals => {:object => @opportunity}
 
-  = section(@opportunity, :contacts)
-  .list#contacts
-    - @contacts = @opportunity.contacts.paginate(:page => 1, :per_page => 20)
-    = render :partial => "contacts/contact", :collection => @opportunity.contacts.paginate(:page => 1, :per_page => 20)
-  = will_paginate @contacts, :id => true, :params => {:action => :contacts}
+  = render :partial => "contacts/contacts", :locals => {:object => @opportunity}
 
-  = load_select_popups_for(@opportunity, :tasks, :contacts)
-
-  %br( style="clear:both" )
+  = render :partial => "versions/versions", :locals => {:object => @opportunity}
 
-  - if Setting.paper_trail_ui_enabled
-    %br
-    = content_tag(:div, t(:versions), :class => :subtitle)
-    .list#versions
-      - @versions = @opportunity.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(@opportunity, :tasks, :contacts)

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

@@ -1,7 +1,7 @@
-%li[comment]{ highlightable(dom_id(comment, :tools)) }
-  = link_to avatar_for(comment.user, :size => "25x25"), user_path(comment.user)
+%li.highlight[comment]
+  = link_to avatar_for(comment.user, :size => :small), user_path(comment.user)
 
-  .tools{ invisible, :id => dom_id(comment, :tools) }
+  .tools
     = link_to_edit(comment) + " | "
     = link_to_delete(comment)
 

data/app/views/shared/_edit_comment.html.haml

@@ -1,6 +1,6 @@
 - class_name = commentable.class.name.downcase
 .comment#comment_edit{: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)
   #post
     = form_for(@comment, :remote => true) do |f|
       = hidden_field_tag "comment[user_id]", @current_user.id

data/app/views/shared/_recent.html.haml

@@ -1,4 +1,4 @@
-- title = (recent.subject.respond_to?(:full_name) ? h(recent.subject.full_name) : h(recent.subject.name))
-%li{ :class => recent != @recent.last ? "" : "last" }
-  %dt= link_to(truncate(title, :length => 19), polymorphic_url(recent.subject), :title => title)
-  %tt= t(recent.subject_type.downcase) + ":"
+- title = (recent.item.respond_to?(:full_name) ? recent.item.full_name : recent.item.name)
+%li{ :class => recent != @versions.last ? "" : "last" }
+  %dt= link_to(truncate(title, :length => 19), polymorphic_url(recent.item), :title => title)
+  %tt= t(recent.item_type.downcase) + ":"

data/app/views/shared/_recently.html.haml

@@ -1,7 +1,7 @@
-- @recent = Activity.for(@current_user).recent
+- @versions = Version.recent_for_user(@current_user)
 .panel#recently
   .caption #{t :recent_items}
-  - unless @recent.empty?
-    = render :partial => "shared/recent", :collection => @recent
+  - if @versions.present?
+    = render :partial => "shared/recent", :collection => @versions
   - else
     %div #{t :no_recent_items}

data/app/views/shared/_timeline.html.haml

@@ -1,3 +1,2 @@
-- type = timeline.class.to_s.downcase
-- template = "#{type.pluralize}/#{type}"
-= render template, :"#{type}" => timeline
+- type = timeline.class.name.downcase
+= render "#{type.pluralize}/#{type}", type.to_sym => timeline

data/app/views/tasks/_assigned.html.haml

@@ -1,10 +1,10 @@
-%li[assigned]{ highlightable(dom_id(assigned, :tools)) }
+%li.highlight[assigned]
   - unless assigned.category.blank?
     .strip{:class => assigned.category}= t(assigned.category)
   - else
     .strip.white #{t :other}
 
-  .tools{ invisible, :id => dom_id(assigned, :tools) }
+  .tools
     = link_to_task_edit(assigned, bucket) + " | "
     = link_to_discard(assigned) + " | " if shown_on_landing_page?
     = link_to_task_delete(assigned, bucket)
@@ -26,7 +26,7 @@
         - if assigned.at_specific_time?
           - if assigned.due_at < Time.now
             %span.warn= distance_of_time_in_words(assigned.due_at, Time.now)
-            = t(:task_overdue) 
+            = t(:task_overdue)
             = l(assigned.due_at.localtime, :format => :mmddhhss)
           - else
             = t(:task_due_in, distance_of_time_in_words(Time.now, assigned.due_at))
@@ -34,7 +34,7 @@
 
         - else
           - if assigned.due_at < Date.today
-            %span.warn= distance_of_time_in_words(assigned.due_at, Time.now) 
+            %span.warn= distance_of_time_in_words(assigned.due_at, Time.now)
             = t(:task_overdue)
             = l(assigned.due_at.localtime.to_date, :format => :mmdd)
           - elsif assigned.due_at > Date.today

data/app/views/tasks/_completed.html.haml

@@ -1,10 +1,10 @@
-%li[completed]{ highlightable(dom_id(completed, :tools)) }
+%li.highlight[completed]
   - unless completed.category.blank?
     .strip{:class => completed.category}= t(completed.category)
   - else
     .strip.white #{t :other}
 
-  .tools{ invisible, :id => dom_id(completed, :tools) }
+  .tools
     - if shown_on_landing_page?
       = link_to_discard(completed) + (@current_user == completed.user ? ' | ' : '')
     = link_to_task_delete(completed, bucket) if @current_user == completed.user

data/app/views/tasks/_pending.html.haml

@@ -1,10 +1,10 @@
-%li[pending]{ highlightable(dom_id(pending, :tools)) }
+%li.highlight[pending]
   - unless pending.category.blank?
     .strip{:class => pending.category}= t(pending.category)
   - else
     .strip.white #{t :other}
 
-  .tools{ invisible, :id => dom_id(pending, :tools) }
+  .tools
     = link_to_task_edit(pending, bucket) + " | "
     = link_to_discard(pending) + " | " if shown_on_landing_page?
     = link_to_task_delete(pending, bucket)

data/app/views/tasks/_related.html.haml

@@ -1,10 +1,9 @@
-%li[related]{ highlightable(dom_id(related, :tools)) }
+%li.highlight[related]
   - unless related.category.blank?
     .strip{:class => related.category}= t(related.category)
   - else
     .strip{:style => "color:white"} #{t :other}
   %div
-    .tools{ invisible, :id => dom_id(related, :tools) }
     - if related.assigned_to
       = link_to(related.assignee.full_name, user_path(related.assignee))
     - else
@@ -18,16 +17,16 @@
         %span.cool
           = t(:task_completed_ago, distance_of_time_in_words(related.completed_at, Time.now))
       - elsif related.bucket == "due_asap"
-        %span.urgent 
+        %span.urgent
         == #{t :due_now}.
       - elsif related.bucket == "due_later"
         == #{t :due_later}.
       - elsif related.due_at < Date.today
-        %span.warn= distance_of_time_in_words(related.due_at, Date.today) 
+        %span.warn= distance_of_time_in_words(related.due_at, Date.today)
         == #{t :overdue} #{related.due_at.strftime('%b %e')}
       - elsif related.due_at > Date.today
         = t(:task_due_in, distance_of_time_in_words(Time.now, related.due_at.end_of_day))
       - else
         %span.cool
         == #{t :due_today}.
-      
+