fat_free_crm 0.13.3 → 0.13.4

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

@@ -12,4 +12,4 @@
     = link_to(campaign.name, campaign)
     = render "campaigns/status", :campaign => campaign
 
-    = hook(:campaign_bottom, self, :campaign => campaign) {}
+    = hook(:campaign_bottom, self, :campaign => campaign)

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

@@ -17,4 +17,4 @@
       %dt
         .tags= tags_for_index(campaign)
 
-    = hook(:campaign_bottom, self, :campaign => campaign) {}
+    = hook(:campaign_bottom, self, :campaign => campaign)

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

@@ -10,7 +10,7 @@
   = render "campaigns/objectives",  :f => f
   = render "fields/groups",         :f => f
   = render "entities/permissions",  :f => f, :entity => @campaign
-  = hook(:entity_form, self, {f: f, entity: @campaign}) {}
+  = hook(:entity_form, self, {f: f, entity: @campaign})
 
   .buttonbar
     = f.submit t(:create_campaign)

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

@@ -17,4 +17,4 @@
     %div{:style => "float:right;"}
       %b= @campaign_status_total[:all]
     %b #{t :total_campaigns}
-  = hook(:index_campaign_sidebar_bottom, self) {}
+  = hook(:index_campaign_sidebar_bottom, self)

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

@@ -80,7 +80,7 @@
 
   - unless @campaign.background_info.blank?
     .caption #{t :background_info}
-    = auto_link(simple_format @campaign.background_info).html_safe
+    = auto_link(simple_format @campaign.background_info)
 
   = render "fields/sidebar_show", :asset => @campaign
 
@@ -88,4 +88,4 @@
     %dt
       .tags= tags_for_index(@campaign)
 
-  = hook(:show_campaign_sidebar_bottom, self, :campaign => @campaign) {}
+  = hook(:show_campaign_sidebar_bottom, self, :campaign => @campaign)

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

@@ -26,4 +26,4 @@
 
       = render :partial => "/shared/tags", :locals => {:f => f, :span => 5}
 
-      = hook(:campaign_top_section_bottom, self, :f => f) {}
+      = hook(:campaign_top_section_bottom, self, :f => f)

data/app/views/campaigns/update.js.haml

@@ -19,4 +19,4 @@
   - else
     $('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
 
-= hook(:entity_update, self, {entity: @entity}) {}
+= hook(:entity_update, self, {entity: @entity})

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

@@ -5,7 +5,8 @@
   - subscribed_users = commentable.subscribed_users.map{|uid| User.find_by_id(uid) unless uid == current_user.id }.compact
   - if notification_emails_configured? && subscribed_users.any?
     = t(:following_users_will_be_notified) << ":"
-    = subscribed_user_links(subscribed_users)
+    - subscribed_users.each do |user|
+      = link_to user.full_name, user_path(user)
 
   -# 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].

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

@@ -11,7 +11,7 @@
     = render "contacts/web",         :f => f, :edit => true
     = render "fields/groups",        :f => f, :edit => true
     = render "entities/permissions", :f => f, :edit => true, :entity => @contact
-    = hook(:entity_form, self, {f: f, entity: @contact}) {}
+    = hook(:entity_form, self, {f: f, entity: @contact})
 
     .buttonbar
       = f.submit t(:save_contact), :onclick => "crm.save_contact()"

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

@@ -2,7 +2,7 @@
   = avatar_for(contact, :size => "16x16")
 
   %ul.tools
-    = hook(:contact_tools_before, self, :contact => contact) {}
+    = hook(:contact_tools_before, self, :contact => contact)
 
     - if can?(:update, contact)
       %li= link_to_edit(contact)
@@ -22,4 +22,4 @@
         –
         == #{t :referred_by_small} #{lead.referred_by}
 
-    = hook(:contact_bottom, self, :contact => contact) {}
+    = hook(:contact_bottom, self, :contact => contact)

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

@@ -2,7 +2,7 @@
   = avatar_for(contact, :size => "30x30")
 
   %ul.tools
-    = hook(:contact_tools_before, self, :contact => contact {}
+    = hook(:contact_tools_before, self, :contact => contact)
 
     - if can?(:update, contact)
       %li= link_to_edit(contact)
@@ -46,7 +46,7 @@
       %dt
         .tags= tags_for_index(contact)
 
-    = hook(:contact_bottom, self, :contact => contact) {}
+    = hook(:contact_bottom, self, :contact => contact)
 
     %dt{ :style => "padding: 2px 0px 0px 0px" }
       - if can?(:read, contact)

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

@@ -2,7 +2,7 @@
   = avatar_for(contact, :size => "30x30")
 
   %ul.tools
-    = hook(:contact_tools_before, self, :contact => contact) {}
+    = hook(:contact_tools_before, self, :contact => contact)
 
     - if can?(:update, contact)
       %li= link_to_edit(contact)
@@ -41,4 +41,4 @@
       %dt
         .tags= tags_for_index(contact)
 
-    = hook(:contact_bottom, self, :contact => contact) {}
+    = hook(:contact_bottom, self, :contact => contact)

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

@@ -12,7 +12,7 @@
   = render "contacts/web",         :f => f
   = render "fields/groups",        :f => f
   = render "entities/permissions", :f => f, :entity => @contact
-  = hook(:entity_form, self, {f: f, entity: @contact}) {}
+  = hook(:entity_form, self, {f: f, entity: @contact})
 
   .buttonbar
     = f.submit t(:create_contact), :onclick => "crm.create_contact()"

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

@@ -41,7 +41,7 @@
 
   - unless @contact.background_info.blank?
     .caption #{t :background_info}
-    = auto_link(simple_format @contact.background_info).html_safe
+    = auto_link(simple_format @contact.background_info)
 
   = render "fields/sidebar_show", :asset => @contact
 
@@ -49,4 +49,4 @@
     %dt
       .tags= tags_for_index(@contact)
 
-  = hook(:show_contact_sidebar_bottom, self, :contact => @contact) {}
+  = hook(:show_contact_sidebar_bottom, self, :contact => @contact)

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

@@ -42,4 +42,4 @@
 
         = render :partial => "/shared/tags", :locals => {:f => f, :span => 3}
 
-        = hook(:contact_top_section_bottom, self, :f => f) {}
+        = hook(:contact_top_section_bottom, self, :f => f)

data/app/views/contacts/update.js.haml

@@ -21,4 +21,4 @@
   $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
 
-= hook(:entity_update, self, {entity: @entity}) {}
+= hook(:entity_update, self, {entity: @entity})

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

@@ -12,17 +12,23 @@
     - if can?(:read, mediator)
       %tt
         - if email.sent_to.to_s.include?(", ")
-          = "To: ".html_safe << email.sent_to
+          = "To: "
+          = 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")
+          = "To "
+          = link_to_email(email.sent_to)
+        = "from "
+        = link_to_email(email.sent_from)
+        = ", sent on "
+        = l(email.sent_at, :format => :mmddhhss) << " | "
+        = 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= (" - " << truncated).html_safe
+          %tt
+            = " - "
+            = truncated
 
       %dt.textile{ hidden_if(email.collapsed?), :id => dom_id(email, :formatted) }
         .email_content

data/app/views/entities/_basic_search.html.haml

@@ -5,8 +5,7 @@
 %div{ :style => "margin: 0px 0px 6px 0px" }
   = text_field_tag('query', @current_query, :size => 32, :placeholder => "Search #{controller_name}")
   %span.sorting_options
-    -# sort_by_displaying: Sort {{models}} by {{field}} displaying first name {{position}} last name.
-    = t(:sort_by, :models => t(:"#{controller_name}_small"), :field => link_to(current_sort_by, "#", :id => :sort_by)).html_safe
+    = t(:sort_by, :field => link_to(h(current_sort_by), "#", :id => :sort_by)).html_safe
 
 :javascript
   var searchTimeout;

data/app/views/fields/_group_view.html.haml

@@ -4,4 +4,6 @@
     %tr
       - group.each do |field|
         = col(field.label, field.render_value(entity), (i == groups.size - 1) ? :last : nil)
-        = "<th class='last'></th><td class='last'></td>".html_safe if group.size == 1
+        - if group.size == 1
+          %th.last
+          %td.last

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

@@ -26,4 +26,4 @@
       - if account.tags.any?
         %dt
           .tags= tags_for_dashboard(account)
-      = hook(:account_bottom, self, :account => account) {}
+      = hook(:account_bottom, self, :account => account)

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

@@ -1,4 +1,4 @@
-- user = link_to(h(activity.user.full_name), user_path(activity.user)) if activity.user
+- user = link_to(activity.user.full_name, user_path(activity.user)) if activity.user
 
 - subject = if (item = activity.related || activity.item)
   - if item.respond_to?(:full_name)
@@ -22,12 +22,14 @@
         - action = t('action_' + activity.event)
         - type = t('subject_' + activity.item_type.downcase)
         = link_to avatar_for(activity.user, :size => :thumb), user_path(activity.user)
-        = 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'
+        = t("activity_text", :user => h(user), :action => h(action), :type => h(type), :subject => h(subject), :default => "#{h user} #{h action} #{h type} #{h subject}").html_safe # locales optionally can change the word order for activities using 'activity_text'
         - if ((item = activity.item).class == Comment) and Setting.comments_visible_on_dashboard
           = t('action_create_comment', :comment => truncate(h(item.comment), :length => 90)).html_safe
       - else
         - type = t(activity.item_type.downcase)
         - if item.respond_to? :email
           = avatar_for(item, :size => "16x16")
-        = "#{type} #{subject}:".html_safe
-        = auto_link(t(activity.event)).html_safe
+        = type
+        = subject
+        = ":"
+        = auto_link(t(activity.event))

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

@@ -38,4 +38,4 @@
       - if opportunity.tags.any?
         %dt
           .tags= tags_for_dashboard(opportunity)
-      = hook(:opportunity_bottom, self, :opportunity => opportunity) {}
+      = hook(:opportunity_bottom, self, :opportunity => opportunity)

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

@@ -3,7 +3,7 @@
   = 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 => :event), :user => link_to(t(@user), "#", :id => :user), :period => link_to(t(@duration).downcase, "#", :id => :duration)).html_safe
+  = t(:activity_options, :models => link_to(t(h(@asset)).singularize.downcase, "#", :id => :asset), :action_type => link_to(t(h(@action) + "_past_participle").downcase, "#", :id => :event), :user => link_to(t(h(@user)), "#", :id => :user), :period => link_to(t(h(@duration)).downcase, "#", :id => :duration)).html_safe
 
 %script
   = render "assets_menu"

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

@@ -6,10 +6,10 @@
   .indent
     %label{ :id => dom_id(task, :name) }
       - if task.user.id != current_user.id
-        = t(:task_from, link_to(task.user.full_name, user_path(task.user))).html_safe << ':'
-      = link_to(h(task.name), tasks_path)
+        = t(:task_from, link_to(h(task.user.full_name), user_path(task.user))).html_safe << ':'
+      = link_to(task.name, tasks_path)
       - if task.asset_id?
-        == #{t :related} #{link_to(h(task.asset.name), polymorphic_url(task.asset))}
+        == #{t :related} #{link_to(task.asset.name, polymorphic_url(task.asset))}
       &ndash;
     %tt
       - if task.bucket == "due_asap"
@@ -45,4 +45,4 @@
 
     - unless task.background_info.blank?
       %div
-        %dt= h(task.background_info)
+        %dt= auto_link(simple_format task.background_info)

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

@@ -4,5 +4,5 @@
     fade      : 500,
     appear    : 500,
     width     : 180,
-    menu_items: [ #{sort_by_users.join(",")} ]
+    menu_items: [ #{sort_by_users.join(',')} ]
   });

data/app/views/layouts/500.html.haml

@@ -14,7 +14,7 @@
       #welcome
       %h3= link_to("Fat Free CRM", '/')
     %center
-      %p.flash_exception#msg= exception.to_s.html_safe
+      %p.flash_exception#msg= exception
 
   %script
     :plain

data/app/views/layouts/application.html.haml

@@ -17,7 +17,7 @@
       = javascript_include_tag "jquery_ui_datepicker/jquery-ui-timepicker-#{I18n.locale}"
 
     = csrf_meta_tag
-    = hook(:javascript_includes, self) {}
+    = hook(:javascript_includes, self)
 
     :javascript
       crm.language = "#{I18n.locale}"
@@ -45,4 +45,4 @@
       = "crm.base_url = '#{Setting.base_url}';" unless Setting.base_url.blank?
       = get_browser_timezone_offset
       = content_for :javascript_epilogue
-      = hook(:javascript_epilogue, self) {}
+      = hook(:javascript_epilogue, self)

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

@@ -12,7 +12,7 @@
     = render "leads/web",            :f => f, :edit => true
     = render "fields/groups",        :f => f, :edit => true
     = render "entities/permissions", :f => f, :edit => true, :entity => @lead
-    = hook(:entity_form, self, {f: f, entity: @lead}) {}
+    = hook(:entity_form, self, {f: f, entity: @lead})
 
     .buttonbar
       - if Setting.compound_address

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

@@ -38,4 +38,4 @@
         –
         == #{t :referred_by_small} #{lead.referred_by}
 
-    = hook(:lead_bottom, self, :lead => lead) {}
+    = hook(:lead_bottom, self, :lead => lead)

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

@@ -59,4 +59,4 @@
       %dt
         .tags= tags_for_index(lead)
 
-    = hook(:lead_bottom, self, :lead => lead) {}
+    = hook(:lead_bottom, self, :lead => lead)

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

@@ -13,7 +13,7 @@
   = render "leads/web",            :f => f
   = render "fields/groups",        :f => f
   = render "entities/permissions", :f => f, :entity => @lead
-  = hook(:entity_form, self, {f: f, entity: @lead}) {}
+  = hook(:entity_form, self, {f: f, entity: @lead})
 
   .buttonbar
     - if Setting.compound_address

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

@@ -17,4 +17,4 @@
     %div{:style => "float:right;"}
       %b= @lead_status_total[:all]
     %b #{t :total_leads}
-  = hook(:index_lead_sidebar_bottom, self) {}
+  = hook(:index_lead_sidebar_bottom, self)

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

@@ -54,7 +54,7 @@
 
   - unless @lead.background_info.blank?
     .caption #{t :background_info}
-    = auto_link(simple_format @lead.background_info).html_safe
+    = auto_link(simple_format @lead.background_info)
 
   = render "fields/sidebar_show", :asset => @lead
 
@@ -62,4 +62,4 @@
     %dt
       .tags= tags_for_index(@lead)
 
-  = hook(:show_lead_sidebar_bottom, self, :lead => @lead) {}
+  = hook(:show_lead_sidebar_bottom, self, :lead => @lead)

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

@@ -27,4 +27,4 @@
 
       = render :partial => "/shared/tags", :locals => {:f => f, :span => 3}
 
-      = hook(:lead_top_section_bottom, self, :f => f) {}
+      = hook(:lead_top_section_bottom, self, :f => f)

data/app/views/leads/update.js.haml

@@ -25,4 +25,4 @@
   - else
     $('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
 
-= hook(:entity_update, self, {entity: @entity}) {}
+= hook(:entity_update, self, {entity: @entity})

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

@@ -10,7 +10,7 @@
     = render "fields/edit_custom_field_group", :f => f, :edit => true
     = render "fields/groups",             :f => f, :edit => true
     = render "entities/permissions",      :f => f, :edit => true, :entity => @opportunity
-    = hook(:entity_form, self, {f: f, entity: @opportunity}) {}
+    = hook(:entity_form, self, {f: f, entity: @opportunity})
 
     .buttonbar
       = f.submit t(:save_opportunity), :onclick => %/$("#account_assigned_to").val($("#opportunity_assigned_to").val());/

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

@@ -26,4 +26,4 @@
       - else
         = t(:added_ago, :value => timeago(opportunity.created_at)).html_safe
 
-    = hook(:opportunity_bottom, self, :opportunity => opportunity) {}
+    = hook(:opportunity_bottom, self, :opportunity => opportunity)

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

@@ -56,4 +56,4 @@
         %dt
           .tags= tags_for_index(opportunity)
 
-    = hook(:opportunity_bottom, self, :opportunity => opportunity) {}
+    = hook(:opportunity_bottom, self, :opportunity => opportunity)

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

@@ -10,7 +10,7 @@
   = render "shared/add_comment",        :f => f
   = render "fields/groups",             :f => f
   = render "entities/permissions",      :f => f, :entity => @opportunity
-  = hook(:entity_form, self, {f: f, entity: @opportunity}) {}
+  = hook(:entity_form, self, {f: f, entity: @opportunity})
 
   .buttonbar
     = f.submit t(:create_opportunity), :onclick => %/$("#account_assigned_to").val($("#opportunity_assigned_to").val()); if ($("#account_id").css('display') != 'none') { $("#account_id").enable(); }/

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

@@ -17,4 +17,4 @@
     %div{:style => "float:right;"}
       %b= @opportunity_stage_total[:all]
     %b #{t :total_opportunities}
-  = hook(:index_opportunity_sidebar_bottom, self) {}
+  = hook(:index_opportunity_sidebar_bottom, self)

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

@@ -50,12 +50,12 @@
 
   - unless @opportunity.background_info.blank?
     .caption #{t :background_info}
-    = auto_link(simple_format @opportunity.background_info).html_safe
+    = auto_link(simple_format @opportunity.background_info)
 
   = render "fields/sidebar_show", :asset => @opportunity
-  
+
   - if @opportunity.tag_list.present?
     %dt
       .tags= tags_for_index(@opportunity)
 
-  = hook(:show_opportunity_sidebar_bottom, self, :opportunity => @opportunity) {}
+  = hook(:show_opportunity_sidebar_bottom, self, :opportunity => @opportunity)