fat_free_crm 0.19.2 → 0.20.0

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

@@ -1,82 +1,83 @@
 .panel#summary
   .caption #{t :campaign_summary}
-  %li
-    %dt= @campaign.starts_on ? l(@campaign.starts_on, format: :mmdd) : t(:n_a)
-    %tt #{t :start_date}:
-  %li
-    %dt= @campaign.ends_on ? l(@campaign.ends_on, format: :mmdd) : t(:n_a)
-    %tt #{t :end_date}:
-  %li
-    %dt= @campaign.status ? t(@campaign.status) : t(:n_a)
-    %tt #{t :status}:
-  %li.last
-    %dt= number_to_currency(@campaign.budget, precision: 0) || t(:n_a)
-    %tt #{t :budget}:
+  %dl
+    %li
+      %dt= @campaign.starts_on ? l(@campaign.starts_on, format: :mmdd) : t(:n_a)
+      %tt #{t :start_date}:
+    %li
+      %dt= @campaign.ends_on ? l(@campaign.ends_on, format: :mmdd) : t(:n_a)
+      %tt #{t :end_date}:
+    %li
+      %dt= @campaign.status ? t(@campaign.status) : t(:n_a)
+      %tt #{t :status}:
+    %li.last
+      %dt= number_to_currency(@campaign.budget, precision: 0) || t(:n_a)
+      %tt #{t :budget}:
 
   .caption #{t :campaign_targets}
+  %dl
+    -# Target Leads.
+    -#---------------------------------------------------------------------------
+    %li
+      %dt= @campaign.target_leads || t(:n_a)
+      %tt #{t :leads}:
 
-  -# Target Leads.
-  -#---------------------------------------------------------------------------
-  %li
-    %dt= @campaign.target_leads || t(:n_a)
-    %tt #{t :leads}:
-
-  -# Target Conversion Ratio.
-  -#---------------------------------------------------------------------------
-  %li
-    %dt= number_to_percentage(@campaign.target_conversion, precision: 1) || t(:n_a)
-    %tt #{t :conversion}:
+    -# Target Conversion Ratio.
+    -#---------------------------------------------------------------------------
+    %li
+      %dt= number_to_percentage(@campaign.target_conversion, precision: 1) || t(:n_a)
+      %tt #{t :conversion}:
 
-  -# Target Opportunities: calculated based on target number of leads and
-  -# expected conversion ratio.
-  -#---------------------------------------------------------------------------
-  %li
-    - if @campaign.target_leads.to_i > 0 && @campaign.target_conversion.to_i > 0
-      - opportunities = @campaign.target_leads * @campaign.target_conversion / 100
-      %dt= opportunities.to_i
-    - else
-      %dt N/A
-    %tt #{t :opportunities}:
+    -# Target Opportunities: calculated based on target number of leads and
+    -# expected conversion ratio.
+    -#---------------------------------------------------------------------------
+    %li
+      - if @campaign.target_leads.to_i > 0 && @campaign.target_conversion.to_i > 0
+        - opportunities = @campaign.target_leads * @campaign.target_conversion / 100
+        %dt= opportunities.to_i
+      - else
+        %dt N/A
+      %tt #{t :opportunities}:
 
-  -# Target Revenue.
-  -#---------------------------------------------------------------------------
-  %li.last
-    %dt= number_to_currency(@campaign.target_revenue, precision: 0) || t(:n_a)
-    %tt #{t :revenue}:
+    -# Target Revenue.
+    -#---------------------------------------------------------------------------
+    %li.last
+      %dt= number_to_currency(@campaign.target_revenue, precision: 0) || t(:n_a)
+      %tt #{t :revenue}:
 
   .caption #{t :actual_performance}
+  %dl
+    -# Actual Number of Leads.
+    -#---------------------------------------------------------------------------
+    %li
+      %dt= @campaign.leads_count || t(:n_a)
+      %tt== #{t :leads}: #{performance(@campaign.leads_count, @campaign.target_leads)}
 
-  -# Actual Number of Leads.
-  -#---------------------------------------------------------------------------
-  %li
-    %dt= @campaign.leads_count || t(:n_a)
-    %tt== #{t :leads}: #{performance(@campaign.leads_count, @campaign.target_leads)}
-
-  -# Actual Conversion Ratio: calculated based on actual number of leads
-  -# and opportunities.
-  -#---------------------------------------------------------------------------
-  %li
-    - if @campaign.opportunities_count.to_i > 0 && @campaign.leads_count.to_i > 0
-      - conversion = @campaign.opportunities_count * 100 / @campaign.leads_count
-      %dt= number_to_percentage(conversion, precision: 1)
-      %tt== #{t :conversion}: #{performance(conversion, @campaign.target_conversion)}
-    - else
-      %dt #{t :n_a}
-      %tt #{t :conversion}:
+    -# Actual Conversion Ratio: calculated based on actual number of leads
+    -# and opportunities.
+    -#---------------------------------------------------------------------------
+    %li
+      - if @campaign.opportunities_count.to_i > 0 && @campaign.leads_count.to_i > 0
+        - conversion = @campaign.opportunities_count * 100 / @campaign.leads_count
+        %dt= number_to_percentage(conversion, precision: 1)
+        %tt== #{t :conversion}: #{performance(conversion, @campaign.target_conversion)}
+      - else
+        %dt #{t :n_a}
+        %tt #{t :conversion}:
 
-  -# Actual Opportunities.
-  -#---------------------------------------------------------------------------
-  %li
-    %dt= @campaign.opportunities_count || t(:n_a)
-    %tt
-      #{t :opportunities}:
-      = performance(@campaign.opportunities_count, opportunities)
+    -# Actual Opportunities.
+    -#---------------------------------------------------------------------------
+    %li
+      %dt= @campaign.opportunities_count || t(:n_a)
+      %tt
+        #{t :opportunities}:
+        = performance(@campaign.opportunities_count, opportunities)
 
-  -# Actual Revenue.
-  -#---------------------------------------------------------------------------
-  %li.last
-    %dt= number_to_currency(@campaign.revenue, precision: 0) || t(:n_a)
-    %tt== #{t :revenue}: #{performance(@campaign.revenue, @campaign.target_revenue)}
+    -# Actual Revenue.
+    -#---------------------------------------------------------------------------
+    %li.last
+      %dt= number_to_currency(@campaign.revenue, precision: 0) || t(:n_a)
+      %tt== #{t :revenue}: #{performance(@campaign.revenue, @campaign.target_revenue)}
 
   - unless @campaign.background_info.blank?
     .caption #{t :background_info}

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

@@ -8,12 +8,11 @@
   $('##{create_id}').slideUp(250);
   $('##{entity_name.pluralize}').prepend('#{ j render(partial: entity_name, collection: [ @entity ]) }');
   $('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
-  = refresh_sidebar(:index, :filters)
+  = refresh_sidebar(:index)
   $('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
   crm.flick('empty', 'remove');
 - else
   $('##{create_id}').html('#{ j render(partial: "new") }');
-  $('##{create_id}').effect("shake", { duration:250, distance: 6 });
   - if @entity.errors[:name].blank? and @entity.errors[:ends_on].present?
     $('#campaign_ends_on').focus();
   - else

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

@@ -2,5 +2,5 @@
 - @entity = instance_variable_get("@#{entity_name}")
 
 $('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250)
-= refresh_sidebar(:index, :filters)
+= refresh_sidebar(:index)
 $('#paginate').replaceWith('#{ j render(partial: "shared/paginate_with_per_page") }');

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

@@ -7,6 +7,7 @@
   = styles_for :task, :lead, :opportunity
 
   = render 'campaigns/title_bar', campaign: @campaign
+  = render 'campaigns/sidebar_show', campaign: @campaign
 
   = render "comments/new", commentable: @campaign
   = render partial: "shared/timeline", collection: @timeline

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

@@ -6,17 +6,16 @@
   - if called_from_landing_page?
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
-    = refresh_sidebar(:show, :summary)
+    = refresh_sidebar(:show)
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });
-    = refresh_sidebar(:index, :filters)
+    = refresh_sidebar(:index)
 - else
   $('##{id}').html('#{ j render(partial: "edit") }');
-  $('##{id}').effect("shake", { duration:250, distance: 6 });
   - if @campaign.errors[:name].blank? and @campaign.errors[:ends_on].present?
     $('#campaign_ends_on').focus();
   - 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/_edit.html.haml

@@ -6,6 +6,6 @@
     = hidden_field_tag "comment[commentable_type]", class_name.classify
     = f.text_area :comment, id: dom_id(@comment, :text)
     .buttons
-      = f.submit t(:save_note)
+      = f.submit t(:save_note), class: 'btn btn-primary'
       #{t :or}
       = link_to(t(:cancel), edit_comment_path(@comment, "#{class_name}_id" => commentable.id, cancel: true), remote: true)

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

@@ -25,7 +25,7 @@
       = f.text_area :comment, id: "#{id_prefix}_comment_comment"
       .buttons
         = image_tag("loading.gif", size: :thumb, class: "spinner", style: "display: none;")
-        = f.submit t(:add_note), id: "#{id_prefix}_comment_submit"
+        = f.submit t(:add_note), id: "#{id_prefix}_comment_submit", class: 'btn btn-primary'
         #{t :or}
         = link_to(t(:cancel), '#', class: 'cancel')
   %div{ {id: "#{id_prefix}_ask"}.merge(hidden_if(false))}

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

@@ -5,5 +5,4 @@
   $('##{id}').effect("highlight", { duration:1500 });
 - else
   $('##{id}').html('#{ j render(partial: "edit") }');
-  $('##{id}').effect("shake", { duration:250, distance: 6 });
   $('#comment_comment').focus();

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

@@ -14,6 +14,6 @@
     = hook(:entity_form, self, {f: f, entity: @contact})
 
     .buttonbar
-      = f.submit t(:save_contact), onclick: "crm.save_contact()"
+      = f.submit t(:save_contact), onclick: "crm.save_contact()", class: 'btn btn-primary'
       #{t :or}
       = link_to_cancel edit_contact_path(@contact)

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

@@ -15,6 +15,6 @@
   = hook(:entity_form, self, {f: f, entity: @contact})
 
   .buttonbar
-    = f.submit t(:create_contact), onclick: "crm.create_contact()"
+    = f.submit t(:create_contact), onclick: "crm.create_contact()", class: 'btn btn-primary'
     #{t :or}
     = link_to_cancel new_contact_path

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

@@ -1,6 +1,5 @@
 .panel#summary
   %span{style: "float:right"}= avatar_for(@contact, size: "50x50")
-  %h4= h(@contact.full_name)
   = account_with_title_and_department(@contact)
 
   %div= render "shared/address_show", asset: @contact, type: 'business', title: :address
@@ -21,23 +20,24 @@
   = web_presence_icons(@contact)
 
   .caption #{t :contact_summary}
-  %li
-    %dt= @contact.assigned_to ? truncate(@contact.assignee.full_name, length: 16) : nil
-    %tt #{t :assigned_to}:
-  %li
-    %dt
-      - if @contact.lead
-        = link_to(truncate(@contact.lead.name, length: 16), @contact.lead, title: @contact.lead.name)
-      - else
-        #{t :n_a}
-    %tt #{t :lead}:
-  %li
-    %dt
-      - if @contact.lead.try(:campaign)
-        = link_to(truncate(@contact.lead.campaign.name, length: 16), @contact.lead.campaign, title: @contact.lead.campaign.name)
-      - else
-        #{t :n_a}
-    %tt #{t :campaign}:
+  %dl
+    %li
+      %dt= @contact.assigned_to ? truncate(@contact.assignee.full_name, length: 16) : nil
+      %tt #{t :assigned_to}:
+    %li
+      %dt
+        - if @contact.lead
+          = link_to(truncate(@contact.lead.name, length: 16), @contact.lead, title: @contact.lead.name)
+        - else
+          #{t :n_a}
+      %tt #{t :lead}:
+    %li
+      %dt
+        - if @contact.lead.try(:campaign)
+          = link_to(truncate(@contact.lead.campaign.name, length: 16), @contact.lead.campaign, title: @contact.lead.campaign.name)
+        - else
+          #{t :n_a}
+      %tt #{t :campaign}:
 
   - unless @contact.background_info.blank?
     .caption #{t :background_info}

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

@@ -19,5 +19,4 @@
 - else
   $('##{create_id}').html('#{ j render(partial: "new") }');
   crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
-  $('##{create_id}').effect("shake", { duration:250, distance: 6 });
   $('#new_#{entity_name} input[type!=hidden]').first().focus();

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

@@ -3,7 +3,7 @@
 
 $('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
 - if called_from_index_page?
-  = refresh_sidebar(:index, :filters)
+  = refresh_sidebar(:index)
   $('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
 - else
   $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');

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

@@ -7,6 +7,7 @@
   = styles_for :task, :opportunity
   
   = render 'contacts/title_bar', contact: @contact
+  = render 'contacts/sidebar_show', contact: @contact
 
   = render "comments/new", commentable: @contact
   = render partial: "shared/timeline", collection: @timeline

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

@@ -7,7 +7,7 @@
   - if called_from_landing_page?
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.full_name}');
-    = refresh_sidebar(:show, :summary)
+    = refresh_sidebar(:show)
   - else
     $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
     $('##{id}').effect("highlight", { duration:1500 });
@@ -18,7 +18,6 @@
 - else
   $('##{id}').html('#{ j render(partial: "edit") }');
   crm.create_or_select_account(#{ request.referer =~ /\/accounts\// || @account.id.blank? });
-  $('##{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/entities/_title_bar.html.haml

@@ -5,7 +5,7 @@
   #buttons
     = view_buttons
   .create_asset
-    = link_to_inline("create_#{model_name}".to_sym, send("new_#{model_name}_path"), text: t("create_#{model_name}".to_sym))
+    = link_to_inline("create_#{model_name}".to_sym, send("new_#{model_name}_path"), {text: t("create_#{model_name}".to_sym), class: 'btn-sm btn-primary'})
 
 .title
   %span{id: "create_#{model_name}_title"} #{t controller_name.to_sym}

data/app/views/entities/attach.js.haml

@@ -14,8 +14,8 @@
   - else
     $('##{h params[:assets]}').prepend('#{ j render(partial: "#{params[:assets]}/#{partial}", collection: [ @attachment ]) }');
     - if called_from_landing_page?(:accounts)
-      = refresh_sidebar_for(:accounts, :show, :summary)
+      = refresh_sidebar_for(:accounts, :show)
     - elsif called_from_landing_page?(:campaigns)
-      = refresh_sidebar_for(:campaigns, :show, :summary)
+      = refresh_sidebar_for(:campaigns, :show)
 
 $('##{partial}_#{h params[:asset_id]}').effect("highlight", { duration:1500 });

data/app/views/entities/discard.js.haml

@@ -1,6 +1,6 @@
 $('##{dom_id(@attachment)}').slideUp(250);
 
 - if called_from_landing_page?(:accounts)
-  = refresh_sidebar_for(:accounts, :show, :summary)
+  = refresh_sidebar_for(:accounts, :show)
 - elsif called_from_landing_page?(:campaigns)
-  = refresh_sidebar_for(:campaigns, :show, :summary)
+  = refresh_sidebar_for(:campaigns, :show)

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

@@ -2,7 +2,7 @@
   - if opportunity.stage
     .strip{class: opportunity.stage}= t(opportunity.stage)
   - else
-    .strip.white #{t :other}
+    .strip.other #{t :other}
 
   .indent
     = link_to(h(opportunity.name), opportunity)

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

@@ -2,7 +2,7 @@
   - unless task.category.blank?
     .strip{class: task.category}= t(task.category)
   - else
-    .strip.white #{t :other}
+    .strip.other #{t :other}
   .indent
     %label{ id: dom_id(task, :name) }
       - if task.user.id != current_user.id

data/app/views/home/index.xls.builder

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+xml.Worksheet 'ss:Name' => I18n.t(:tab_dashboard) do
+  xml.Table do
+    unless @activities.empty?
+
+      xml.Row do
+        heads = ["Id",
+                 "Item type",
+                 "Item",
+                 "Event",
+                 "Whodunnit",
+                 "Object",
+                 "Created at",
+                 "Object changes",
+                 "Related",
+                 "Related type",
+                 "Transaction"]
+
+        heads.each do |head|
+          xml.Cell do
+            xml.Data head,
+                     'ss:Type' => 'String'
+          end
+        end
+      end
+
+      @activities.each do |activity|
+        xml.Row do
+          data = [activity.id,
+                  activity.item_type,
+                  activity.item_id,
+                  activity.event,
+                  activity.whodunnit,
+                  activity.object,
+                  activity.created_at,
+                  activity.object_changes,
+                  activity.related_id,
+                  activity.related_type,
+                  activity.transaction_id]
+
+          data.each do |value|
+            xml.Cell do
+              xml.Data value,
+                       'ss:Type' => (value.respond_to?(:abs) ? 'Number' : 'String').to_s
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,11 +1,11 @@
 - view   ||= controller.controller_name
 - action ||= controller.action_name
-- sidebar = "#{view}/sidebar_#{action}"
+- sidebar = "#{view}/sidebar_#{action}" unless action.to_s == 'show'
 - sidebar = "admin/#{sidebar}" if controller.class.to_s.starts_with?("Admin::")
 
 = content_for :sidebar
 - begin
-  = render sidebar
+  = render sidebar if sidebar
   - rescue MissingTemplate
 
 = render "lists/lists"

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

@@ -1,15 +1,18 @@
-.tabs
-  %ul
-    - tabs.each do |tab|
-      %li
-        = link_to(tab[:url], class: tab[:active] ? "active" : nil) do
-          %i.fa{class: tab[:icon]}
-          = t(tab[:text])
+.navbar.navbar-expand-lg.tabs
+  .container-fluid
+    %button{"class" => "navbar-toggler", "type" => "button", "data-bs-toggle" => "collapse", "data-bs-target" => "#navbarNav", "aria-controls" => "navbarNav", "aria-expanded" => "false", "aria-label" => "Toggle navigation"}
+      %span.navbar-toggler-icon
+    %ul.navbar-nav.collapse.navbar-collapse.me-auto.mb-2.mg-lg-0{id:"navbarNav"}
+      - tabs.each do |tab|
+        %li.nav-item
+          = link_to(tab[:url], class: tab[:active] ? "nav-link active" : "nav-link") do
+            %i.fa{class: tab[:icon]}
+            = t(tab[:text])
 
 = show_flash
-%table{ width: "100%", height: "100%", cellpadding: 0, cellspacing: 0, class: :tabbed }
-  %tr
-    %td{ class: :sidebar, id: :sidebar, valign: :top }
+%div{ id: 'primary-application-pane' }
+  %div{ class: 'row' }
+    %div{ class: 'sidebar', id: :sidebar }
       = render "layouts/sidebar"
-    %td{ class: :main, id: :main, valign: :top }
+    %div{ class: 'main', id: :main }
       = yield

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

@@ -13,8 +13,8 @@
     = javascript_include_tag :application
 
     - unless tabless_layout? || %w(en-US en-GB).include?(I18n.locale.to_s)
-      = javascript_include_tag "jquery_ui_datepicker/jquery.ui.datepicker-#{I18n.locale}"
-      = javascript_include_tag "jquery_ui_datepicker/jquery-ui-timepicker-#{I18n.locale}"
+      = javascript_include_tag "vendor/jquery_ui_datepicker/jquery.ui.datepicker-#{I18n.locale}"
+      = javascript_include_tag "vendor/jquery_ui_datepicker/jquery-ui-timepicker-#{I18n.locale}"
 
     = csrf_meta_tag
     = hook(:javascript_includes, self)

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

@@ -16,8 +16,8 @@
 
     .buttonbar
       - if Setting.compound_address
-        = f.submit t(:save_lead), onclick: "crm.clear_all_hints()"
+        = f.submit t(:save_lead), onclick: "crm.clear_all_hints()", class: 'btn btn-primary'
       - else
-        = f.submit t(:save_lead)
+        = f.submit t(:save_lead), class: 'btn btn-primary'
       #{t :or}
       = link_to_cancel edit_lead_path(@lead)

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

@@ -17,8 +17,8 @@
 
   .buttonbar
     - if Setting.compound_address
-      = f.submit t(:create_lead), onclick: "crm.clear_all_hints()"
+      = f.submit t(:create_lead), onclick: "crm.clear_all_hints()", class: 'btn btn-primary'
     - else
-      = f.submit t(:create_lead)
+      = f.submit t(:create_lead), class: 'btn btn-primary'
     #{t :or}
     = link_to_cancel new_lead_path

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

@@ -1,13 +1,13 @@
 .filters#filters
   .caption= t :lead_statuses
   - Setting.lead_status.each do |key|
-    .check_box{style: "border-bottom: 1px silver dotted;"}
+    .check_box
       %div{style: "float:right;"}
         = @lead_status_total[key]
       = lead_status_checkbox(key, @lead_status_total[key])
       = label_tag(key, t(key))
 
-  .check_box{style: "border-bottom: 1px silver dotted;"}
+  .check_box
     %div{style: "float:right;"}
       = @lead_status_total[:other]
     = lead_status_checkbox("other", @lead_status_total[:other])

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

@@ -1,6 +1,5 @@
 .panel#summary
   %span{style: "float:right"}= avatar_for(@lead, size: "50x50")
-  %h4= h(@lead.full_name)
   - if !@lead.title.blank? && !@lead.company.blank?
     -# works_at: "{{job_title}} at {{company}}"
     %div= t(:works_at, job_title: @lead.title, company: @lead.company)
@@ -22,35 +21,36 @@
   = web_presence_icons(@lead)
 
   .caption #{t :lead_summary}
-  %li
-    %dt= t(@lead.status, default: :n_a)
-    %tt #{t :status}:
-  %li
-    %dt= t(@lead.source, default: :n_a)
-    %tt #{t :source}:
-  %li
-    %span{style: "float:right;"}= stars_for(@lead)
-    %tt #{t :rating}:
-  %li
-    %dt= @lead.referred_by ? truncate(@lead.referred_by, length: 16) : t(:n_a)
-    %tt #{t :referred_by}:
-  %li
-    %dt= @lead.assigned_to ? truncate(@lead.assignee.full_name, length: 16) : nil
-    %tt #{t :assigned_to}:
-  %li
-    %dt
-      - if @lead.campaign
-        = link_to(truncate(@lead.campaign.name, length: 16), @lead.campaign, title: @lead.campaign.name)
-      - else
-        #{t :n_a}
-    %tt #{t :campaign}:
-  %li
-    %dt
-      - if @lead.contact
-        = link_to(truncate(@lead.contact.name, length: 16), @lead.contact, title: @lead.contact.name)
-      - else
-        #{t :n_a}
-    %tt #{t :contact}:
+  %dl
+    %li
+      %dt= t(@lead.status, default: :n_a)
+      %tt #{t :status}:
+    %li
+      %dt= t(@lead.source, default: :n_a)
+      %tt #{t :source}:
+    %li
+      %span{style: "float:right;"}= stars_for(@lead)
+      %tt #{t :rating}:
+    %li
+      %dt= @lead.referred_by ? truncate(@lead.referred_by, length: 16) : t(:n_a)
+      %tt #{t :referred_by}:
+    %li
+      %dt= @lead.assigned_to ? truncate(@lead.assignee.full_name, length: 16) : nil
+      %tt #{t :assigned_to}:
+    %li
+      %dt
+        - if @lead.campaign
+          = link_to(truncate(@lead.campaign.name, length: 16), @lead.campaign, title: @lead.campaign.name)
+        - else
+          #{t :n_a}
+      %tt #{t :campaign}:
+    %li
+      %dt
+        - if @lead.contact
+          = link_to(truncate(@lead.contact.name, length: 16), @lead.contact, title: @lead.contact.name)
+        - else
+          #{t :n_a}
+      %tt #{t :contact}:
 
   - unless @lead.background_info.blank?
     .caption #{t :background_info}

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

@@ -9,13 +9,12 @@
   $('##{entity_name.pluralize}').prepend('#{ j render(partial: entity_name, collection: [ @entity ]) }');
   $('##{dom_id(@entity)}').effect("highlight", { duration:1500 });
   - if called_from_index_page?
-    = refresh_sidebar(:index, :filters)
+    = refresh_sidebar(:index)
     $('#paginate').html('#{ j render(partial: "shared/paginate_with_per_page") }');
   - elsif called_from_landing_page?("campaigns")
     - @campaign.reload
-    = refresh_sidebar_for(:campaigns, :show, :summary)
+    = refresh_sidebar_for(:campaigns, :show)
   crm.flick('empty', 'remove');
 - else
   $('##{create_id}').html('#{ j render(partial: "new") }');
-  $('##{create_id}').effect("shake", { duration:250, distance: 6 });
   $('#new_#{entity_name} input[type!=hidden]').first().focus();