fat_free_crm 0.19.2 → 0.20.0

data/app/views/leads/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').replaceWith('#{ j render(partial: "shared/paginate_with_per_page") }');
 - elsif called_from_landing_page?("campaigns")
-  = refresh_sidebar_for(:campaigns, :show, :summary)
+  = refresh_sidebar_for(:campaigns, :show)

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

@@ -6,14 +6,14 @@
   - if called_from_landing_page?
     crm.flip_form('convert_#{entity_name}');
     crm.set_title('convert_#{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 });
     - if called_from_index_page?
-      = refresh_sidebar(:index, :filters)
+      = refresh_sidebar(:index)
     - elsif called_from_landing_page?("campaigns")
-      = refresh_sidebar_for(:campaigns, :show, :summary)
+      = refresh_sidebar_for(:campaigns, :show)
       - if @opportunity.id # Make sure the opportunity has been saved.
         $('#opportunities').prepend('#{ j render(partial: "opportunities/opportunity", collection: [ @opportunity ]) }');
     - else
@@ -22,5 +22,4 @@
 - else  
   $('##{id}').html('#{ j render(partial: "convert") }');
   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();

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

@@ -5,8 +5,8 @@
 $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }');
 $('##{id}').effect("highlight", { duration:1500 });
 - if called_from_index_page?
-  = refresh_sidebar(:index, :filters)
+  = refresh_sidebar(:index)
 - elsif called_from_landing_page?("campaigns")
-  = refresh_sidebar_for(:campaigns, :show, :summary)
+  = refresh_sidebar_for(:campaigns, :show)
 - else
-  = refresh_sidebar(:show, :summary)
+  = refresh_sidebar(:show)

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

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

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

@@ -6,23 +6,22 @@
   - 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 });
     - if called_from_index_page?
-      = refresh_sidebar(:index, :filters)
+      = refresh_sidebar(:index)
     - elsif called_from_landing_page?("campaigns")
-      = refresh_sidebar_for(:campaigns, :show, :summary)
+      = refresh_sidebar_for(:campaigns, :show)
     - else
       $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
 
 - else
   $('##{id}').html('#{ j render(partial: "edit") }');
-  $('##{id}').effect("shake", { duration:250, distance: 6 });
   - if @entity.errors[:first_name].blank? and entity.errors[:last_name].present?
     $('#lead_last_name').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/lists/create.js.haml

@@ -4,6 +4,5 @@
 
 - else # Couldn't create the saved list -- validation failed.
   $form = $('.lists .list_form:visible')
-  $form.effect("shake", { duration:250, distance: 6 });
   $form.find("[name='list[name]']").focus();
   $form.find("[type=submit]").prop('disabled', false);

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

@@ -13,6 +13,6 @@
     = hook(:entity_form, self, {f: f, entity: @opportunity})
 
     .buttonbar
-      = f.submit t(:save_opportunity), onclick: %/$("#account_assigned_to").val($("#opportunity_assigned_to").val());/
+      = f.submit t(:save_opportunity), onclick: %/$("#account_assigned_to").val($("#opportunity_assigned_to").val());/, class: 'btn btn-primary'
       #{t :or}
       = link_to_cancel edit_opportunity_path(@opportunity)

data/app/views/opportunities/_index_brief.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}
 
   %ul.tools
     - if can?(:update, opportunity)

data/app/views/opportunities/_index_long.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}
 
   %ul.tools
     - if can?(:update, opportunity)

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

@@ -13,6 +13,6 @@
   = 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(); }/
+    = f.submit t(:create_opportunity), onclick: %/$("#account_assigned_to").val($("#opportunity_assigned_to").val()); if ($("#account_id").css('display') != 'none') { $("#account_id").enable(); }/, class: 'btn btn-primary'
     #{t :or}
     = link_to_cancel new_opportunity_path

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

@@ -1,13 +1,13 @@
 .filters#filters
   .caption= t :opportunity_stages
   - @stage.each do |value, key|
-    .check_box{style: "border-bottom: 1px silver dotted;"}
+    .check_box
       %div{style: "float:right;"}
         = @opportunity_stage_total[key]
       = opportunity_stage_checkbox(key, @opportunity_stage_total[key])
       = label_tag(key, value)
 
-  .check_box{style: "border-bottom: 1px silver dotted;"}
+  .check_box
     %div{style: "float:right;"}
       = @opportunity_stage_total[:other]
     = opportunity_stage_checkbox("other", @opportunity_stage_total[:other])

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

@@ -1,52 +1,53 @@
 .panel#summary
   .caption #{t :opportunity_summary}
-  %li
-    %dt= @opportunity.stage ? t(@opportunity.stage) : t(:other)
-    %tt #{t :stage}:
-  %li
-    %dt= @opportunity.closes_on ? l(@opportunity.closes_on, format: :mmdd) : t(:n_a)
-    %tt #{t :close_date}:
-  - if @opportunity.closes_on && @opportunity.stage !~ /lost|won/
-    %li
-      - days_left = (@opportunity.closes_on - Date.today).to_i
-      - if days_left >= 0
-        %dt= days_left
-        %tt #{t :days_left}:
-      - else
-        %dt.warn= t('pluralize.day', count: (days_left * -1))
-        %tt #{t :days_late}:
-  %li
-    %dt= @opportunity.probability ? @opportunity.probability.to_s + "%" : t(:n_a)
-    %tt #{t :probability}:
-  %li
-    %dt= @opportunity.amount ? number_to_currency(@opportunity.amount.to_f, precision: 0) : t(:n_a)
-    %tt #{t :amount}:
-  %li
-    %dt= @opportunity.discount ? number_to_currency(@opportunity.discount.to_f, precision: 0) : t(:n_a)
-    - if @opportunity.amount && @opportunity.discount
-      %tt== Discount (#{number_to_percentage(@opportunity.discount / @opportunity.amount * 100, precision: 1)}):
-    - else
-      %tt #{t :discount}:
-  %li
-    %dt= @opportunity.amount ? number_to_currency(@opportunity.weighted_amount.to_f, precision: 0) : t(:n_a)
-    %tt #{t :weighted_amount}:
-  %li
-    %dt= @opportunity.assigned_to ? truncate(@opportunity.assignee.full_name, length: 16) : nil
-    %tt #{t :assigned_to}:
-  %li
-    %dt
-      - if @opportunity.account
-        = link_to(truncate(@opportunity.account.name, length: 16), @opportunity.account, title: @opportunity.account.name)
-      - else
-        #{t :n_a}
-    %tt #{t :account}:
-  %li.last
-    %dt
-      - if @opportunity.campaign
-        = link_to(truncate(@opportunity.campaign.name, length: 16), @opportunity.campaign, title: @opportunity.campaign.name)
+  %dl
+    %li
+      %dt= @opportunity.stage ? t(@opportunity.stage) : t(:other)
+      %tt #{t :stage}:
+    %li
+      %dt= @opportunity.closes_on ? l(@opportunity.closes_on, format: :mmdd) : t(:n_a)
+      %tt #{t :close_date}:
+    - if @opportunity.closes_on && @opportunity.stage !~ /lost|won/
+      %li
+        - days_left = (@opportunity.closes_on - Date.today).to_i
+        - if days_left >= 0
+          %dt= days_left
+          %tt #{t :days_left}:
+        - else
+          %dt.warn= t('pluralize.day', count: (days_left * -1))
+          %tt #{t :days_late}:
+    %li
+      %dt= @opportunity.probability ? @opportunity.probability.to_s + "%" : t(:n_a)
+      %tt #{t :probability}:
+    %li
+      %dt= @opportunity.amount ? number_to_currency(@opportunity.amount.to_f, precision: 0) : t(:n_a)
+      %tt #{t :amount}:
+    %li
+      %dt= @opportunity.discount ? number_to_currency(@opportunity.discount.to_f, precision: 0) : t(:n_a)
+      - if @opportunity.amount && @opportunity.discount
+        %tt== Discount (#{number_to_percentage(@opportunity.discount / @opportunity.amount * 100, precision: 1)}):
       - else
-        #{t :n_a}
-    %tt #{t :campaign}:
+        %tt #{t :discount}:
+    %li
+      %dt= @opportunity.amount ? number_to_currency(@opportunity.weighted_amount.to_f, precision: 0) : t(:n_a)
+      %tt #{t :weighted_amount}:
+    %li
+      %dt= @opportunity.assigned_to ? truncate(@opportunity.assignee.full_name, length: 16) : nil
+      %tt #{t :assigned_to}:
+    %li
+      %dt
+        - if @opportunity.account
+          = link_to(truncate(@opportunity.account.name, length: 16), @opportunity.account, title: @opportunity.account.name)
+        - else
+          #{t :n_a}
+      %tt #{t :account}:
+    %li.last
+      %dt
+        - if @opportunity.campaign
+          = link_to(truncate(@opportunity.campaign.name, length: 16), @opportunity.campaign, title: @opportunity.campaign.name)
+        - else
+          #{t :n_a}
+      %tt #{t :campaign}:
 
   - unless @opportunity.background_info.blank?
     .caption #{t :background_info}

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

@@ -10,14 +10,14 @@
   $('##{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?("accounts") # Opportunity created on Account landing page: refresh Account summary.
     - @account.reload
-    = refresh_sidebar_for(:accounts, :show, :summary)
+    = refresh_sidebar_for(:accounts, :show)
   - elsif called_from_landing_page?("campaigns") # Opportunity created on Campaign landing page: refresh Campaign summary.
     - @campaign.reload
-    = refresh_sidebar_for(:campaigns, :show, :summary)
+    = refresh_sidebar_for(:campaigns, :show)
   - else # Opportunity created on Contact landing page: refresh recent items list.
     $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
   crm.flick('empty', 'remove');
@@ -25,5 +25,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/opportunities/destroy.js.haml

@@ -3,11 +3,11 @@
 
 $('##{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") }');
 - elsif 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)
 - else
   $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');

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

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

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

@@ -6,22 +6,21 @@
   - 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 });
     - if called_from_index_page?
-      = refresh_sidebar(:index, :filters)
+      = refresh_sidebar(:index)
     - elsif 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)
     - else
       $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
 - 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/shared/_inline_styles.html.haml

@@ -1,31 +1,5 @@
 -# Generate dynamic styles that get embedded on the page.
 - content_for :styles do
 
-  - if models.include?(:account)
-    - Setting.account_category_color.each do |key, value|
-      li.account .#{key} { background:#{value}; }
-
-  - if models.include?(:campaign)
-    - Setting.campaign_status_color.each do |key, value|
-      li.campaign .#{key} { background:#{value}; }
-
-  - if models.include?(:lead)
-    - Setting.lead_status_color.each do |key, value|
-      li.lead .#{key} { background:#{value}; }
-
-  - if models.include?(:opportunity)
-    - Setting.opportunity_stage_color.each do |key, value|
-      li.opportunity .#{key} { background:#{value}; }
-
-  - if models.include?(:task)
-    - Setting.task_category_color.each do |key, value|
-      li.task .#{key} { background:#{value}; }
-
-  - if models.include?(:user)
-    li.user .admin     { background: lightblue; }
-    li.user .suspended { background: gainsboro; }
-    li.user .active    { background: lightgreen; }
-    li.user .signed_up { background: lightsalmon; }
-
   = hook(:inline_styles, self, local_assigns)
 

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

@@ -2,7 +2,7 @@
   - unless assigned.category.blank?
     .strip{class: assigned.category}= t(assigned.category)
   - else
-    .strip.white #{t :other}
+    .strip.other #{t :other}
 
   .tools
     = link_to_task_edit(assigned, bucket) + " | "

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

@@ -2,7 +2,7 @@
   - unless completed.category.blank?
     .strip{class: completed.category}= t(completed.category)
   - else
-    .strip.white #{t :other}
+    .strip.other #{t :other}
 
   .tools
     - if shown_on_landing_page?

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

@@ -9,7 +9,7 @@
     = render "fields/groups", f: f, edit: true
 
     .buttonbar
-      = f.submit t :save_task
+      = f.submit t :save_task, class: 'btn btn-primary'
       == #{t :or}
       = link_to_cancel edit_task_path(@task)
       == #{t :or} #{t :move_to}

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

@@ -9,6 +9,6 @@
   = render "fields/groups", f: f
 
   .buttonbar
-    = f.submit t :create_task
+    = f.submit t(:create_task), class: 'btn btn-primary'
     #{t :or}
     = link_to_cancel new_task_path + "?view=#{@view}"

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

@@ -2,7 +2,7 @@
   - unless pending.category.blank?
     .strip{class: pending.category}= t(pending.category)
   - else
-    .strip.white #{t :other}
+    .strip.other #{t :other}
 
   .tools
     = link_to_task_edit(pending, bucket) + " | "

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

@@ -2,7 +2,7 @@
   - unless related.category.blank?
     .strip{class: related.category}= t(related.category)
   - else
-    .strip{style: "color:white"} #{t :other}
+    .strip.other #{t :other}
   %div
     - if related.assigned_to
       = link_to(related.assignee.full_name, user_path(related.assignee))

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

@@ -1,8 +1,7 @@
-%table{ cellpadding: 3, cellspacing: 0, style: "width: 100%; margin: 2px 0px 10px 0px" }
-  %tr
-    %td{ class: "selector left " + (@view == "pending" ? "on" : "off"), width: "33%", onclick: %Q(document.location.href='#{tasks_path}') }
-      = t :pending_tab
-    %td{ class: "selector " + (@view == "assigned" ? "on" : "off"), width: "33%", onclick: %Q(document.location.href='#{url_for(action: :index, view: "assigned")}') }
-      = t :assigned_tab
-    %td{ class: "selector right " + (@view == "completed" ? "on" : "off"), width: "33%", onclick: %Q(document.location.href='#{url_for(action: :index, view: "completed")}') }
-      = t :completed_tab
+%nav{ class: "nav nav-pills nav-sm" }
+  %a{ class: "nav-link " + (@view == "pending" ? "active" : "off"), href: tasks_path }
+    = t :pending_tab
+  %a{ class: "nav-link " + (@view == "assigned" ? "active" : "off"), href: url_for(action: :index, view: "assigned") }
+    = t :assigned_tab
+  %a{ class: "nav-link " + (@view == "completed" ? "active" : "off"), href: url_for(action: :index, view: "completed") }
+    = t :completed_tab

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

@@ -2,13 +2,13 @@
   = render "selector"
   - if @view == "pending" || @view == "assigned"
     - Setting.unroll(:task_bucket).each do |value, key|
-      .check_box{style: "border-bottom: 1px silver dotted;"}
+      .check_box
         %div{style: "float:right;"}
           = @task_total[key]
         = task_filter_checkbox(@view, key, @task_total[key]) + " " + t(value)
   - else # @view == "completed"
     - Setting.unroll(:task_completed).each do |value, key|
-      .check_box{style: "border-bottom: 1px silver dotted;"}
+      .check_box
         %div{style: "float:right;"}
           = @task_total[key]
         = task_filter_checkbox(@view, key, @task_total[key]) + " " + t(value)

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

@@ -1,5 +1,5 @@
 .title_tools
-  = link_to_inline(:create_task, url_for(action: :new, view: @view), text: t(:create_task))
+  = link_to_inline(:create_task, url_for(action: :new, view: @view), text: t(:create_task), class: 'btn-sm btn-primary')
 .title#title
   = (@view == "assigned" ? t(:assigned_tasks) : t(:tasks))
   = image_tag("loading.gif", size: :thumb, id: "loading", style: "display: none;")

data/app/views/tasks/complete.js.haml

@@ -4,7 +4,7 @@
   $('##{dom_id(@task)}').fadeOut({ duration:500 });
   - if @empty_bucket
     $('#list_#{@empty_bucket}').fadeOut({ duration:500 });
-  = refresh_sidebar(:index, :filters)
+  = refresh_sidebar(:index)
 
 - else # Completing from the Asset page -- replace task partial with completed one.
 

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

@@ -22,7 +22,7 @@
       $('#list_#{bucket}').show();
       $('##{bucket}').before('#{ j render(partial: @view, collection: [ @task ], locals: { bucket: bucket }) }');
       $('##{dom_id(@task)}').effect("highlight", { duration:1500 });
-      = refresh_sidebar(:index, :filters)
+      = refresh_sidebar(:index)
 
     crm.flick('empty', 'remove');
 
@@ -34,6 +34,5 @@
     $('#recently').replaceWith('#{ j render(partial: "shared/recently") }');
 
 - else # Couldn't create the task -- validation failed.
-  $('#create_task').effect("shake", { duration:250, distance: 6 });
   $('#task_name').focus();
   $('#new_task input[type=submit]').enable();

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

@@ -4,4 +4,4 @@ $('##{dom_id(@task)}').slideUp(250);
   $('#list_#{@empty_bucket}').fadeOut({ duration:500 });
 
 - if called_from_index_page?
-  = refresh_sidebar(:index, :filters)
+  = refresh_sidebar(:index)

data/app/views/tasks/uncomplete.js.haml

@@ -5,8 +5,7 @@
     $('#list_#{@empty_bucket}').fadeOut({ duration:500 });
 
   - if called_from_index_page?
-    = refresh_sidebar(:index, :filters)
+    = refresh_sidebar(:index)
 - else # Errors
-  $('##{dom_id(@task)}').effect("shake", { duration:250, distance: 6 });
   $('#task_name').focus();
   $('#task_submit').enable();

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

@@ -14,6 +14,5 @@
       = replace_content(@task, @task.bucket)
 
 - else # Errors
-  $('##{dom_id(@task)}').effect("shake", { duration:250, distance: 6 });
   $('#task_name').focus();
   $('#task_submit').enable();

data/app/views/users/change_password.js.haml

@@ -6,7 +6,6 @@
   - flash[:notice] = nil
 - else
   $('#change_password').html('#{ j render(partial: "password") }');
-  $('#change_password').effect("shake", { duration:250, distance: 6 });
   - if @user.errors[:current_password].present?
     $('#current_password').focus();
   - else

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

@@ -7,5 +7,4 @@
   $('#profile').html('#{ j render(partial: "user") }');
 - else
   $('#edit_profile').html('#{ j render(partial: "profile") }');
-  $('#edit_profile').effect("shake", { duration:250, distance: 6 });
   $('#user_email').focus();

data/app/views/users/upload_avatar.js.haml

@@ -4,4 +4,3 @@
   $('#profile').html('#{ j render(partial: "user") }');
 - else
   $('#upload_avatar').html('#{ j render(partial: "avatar") }');
-  $('#upload_avatar').effect("shake", { duration:250, distance: 6 });

data/app/views/versions/_version_item.html.haml

@@ -1,6 +1,6 @@
 - if [first, second].any?(&:present?)
   %br
-  - if first.blank? and second.present?
+  - if first.blank? and second.present? && !second.is_a?(Time)
     = t('version.set_html', attr: label, to: second)
   - elsif first.present? and second.present?
     = t('version.change_html', attr: label, from: first, to: second)

data/bin/setup

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 require 'fileutils'
-include FileUtils
 
 # path to your application root.
 APP_ROOT = File.expand_path('..', __dir__)
@@ -11,24 +10,25 @@ def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
 end
 
-chdir APP_ROOT do
-  # This script is a starting point to setup your application.
+FileUtils.chdir APP_ROOT do
+  # This script is a way to setup or update your development environment automatically.
+  # This script is idempotent, so that you can run it at anytime and get an expectable outcome.
   # Add necessary setup steps to this file.
 
   puts '== Installing dependencies =='
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
 
-  # Install JavaScript dependencies if using Yarn
+  # Install JavaScript dependencies
   # system('bin/yarn')
 
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
-  #   cp 'config/database.yml.sample', 'config/database.yml'
+  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:setup'
+  system! 'bin/rails db:prepare'
 
   puts "\n== Removing old logs and tempfiles =="
   system! 'bin/rails log:clear tmp:clear'

data/config/application.rb

@@ -29,7 +29,7 @@ require 'fat_free_crm/gem_ext/rails/engine'
 module FatFreeCRM
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.0
+    config.load_defaults 6.0
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers

data/config/environment.rb

@@ -9,4 +9,4 @@
 require_relative 'application'
 
 # Initialize the rails application
-FatFreeCRM::Application.initialize!
+Rails.application.initialize!

data/config/initializers/content_security_policy.rb

@@ -12,6 +12,8 @@
 #   policy.object_src  :none
 #   policy.script_src  :self, :https
 #   policy.style_src   :self, :https
+#   # If you are using webpack-dev-server then specify webpack-dev-server host
+#   policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
 
 #   # Specify URI for violation reports
 #   # policy.report_uri "/csp-violation-report-endpoint"
@@ -20,6 +22,9 @@
 # If you are using UJS then enable automatic nonce generation
 # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
 
+# Set the nonce only to specific directives
+# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
+
 # Report CSP violations to a specified URI
 # For further information see the following documentation:
 # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only