fat_free_crm 0.24.3 → 0.25.0

data/app/assets/stylesheets/common.scss

@@ -87,11 +87,11 @@ $sidebar_width: 210px;
   -moz-border-radius: 6px;
   -webkit-border-radius: 6px;
   input[type="text"], input[type="email"], input[type="password"] {
-    font-size: 16px;
+    font-size: 1.2em;
     padding: 2px;
     width: 355px; }
   input[type="submit"] {
-    font-size: 14px; } }
+    font-size: 1.1em; } }
 
 .tabbed {
   padding: 12px 12px 12px 16px; }
@@ -304,7 +304,6 @@ $bg_color9: #FFDD4A;
 .amount {
   background: palegreen;
   color: black;
-  font-size: 11px;
   text-align: center;
   padding: 0px 3px 0px 3px;
   -moz-border-radius: {
@@ -322,7 +321,7 @@ $bg_color9: #FFDD4A;
   background: gainsboro;
   color: black;
   float: left;
-  font-size: 11px;
+  font-size: 0.85em;
   margin: 0px 6px 0px 0px;
   padding: 1px 4px 1px 3px;
   text-align: right;
@@ -351,8 +350,7 @@ $bg_color9: #FFDD4A;
   margin: 0px 0px 10px 0px; }
 
 .prefix {
-  width: 30px;
-  font-size: 10px; }
+  width: 30px; }
 
 .comment {
   background: #f2f2f2;
@@ -372,7 +370,7 @@ $bg_color9: #FFDD4A;
   input[type=text] {
     border: 1px #cfcfcf solid;
     color: grey;
-    font-size: 11px;
+    font-size: 0.9em;
     margin: 3px 0px 0px 0px;
     padding: 3px;
     width: 500px; }
@@ -381,9 +379,8 @@ $bg_color9: #FFDD4A;
     margin: 3px 10px 3px 3px; }
   .body {
     display: inline;
-    font-size: 11px; }
+    font-size: 0.9em; }
   tt {
-    font-size: 10px;
     color: #666666; }
   dt {
     padding: 0px;
@@ -394,10 +391,10 @@ $bg_color9: #FFDD4A;
     margin-top: 7px;
     margin-left: 4px;
     a {
-      font-size: 11px; } } }
+      font-size: 0.9em; } } }
 
 .comment textarea, textarea#comment_body {
-  font-size: 11px;
+  font-size: 0.9em;
   height: 110px;
   margin: 3px 0px 0px 0px;
   padding: 3px;
@@ -418,9 +415,8 @@ $bg_color9: #FFDD4A;
     color: black; }
   .body {
     display: inline;
-    font-size: 11px; }
+    font-size: 0.9em; }
   tt {
-    font-size: 10px;
     color: #666666; }
   dt {
     padding: 0px;
@@ -432,12 +428,12 @@ $bg_color9: #FFDD4A;
   font-weight: normal; }
 
 #export {
-  font-size: 9px;
+  font-size: 0.8em;
   margin: 12px 0px 0px 0px; }
 
 #paginate {
   float: right;
-  font-size: 10px;
+  font-size: 0.9em;
   margin: 4px 0px 0px 0px; }
 
 #paging {
@@ -447,7 +443,7 @@ $bg_color9: #FFDD4A;
 .confirm {
   background: #cdfecd;
   border-left: 10px palegreen solid;
-  font-size: 11px;
+  font-size: 0.9em;
   margin: 0px 0px 6px 0px;
   padding: 6px; }
 
@@ -544,7 +540,7 @@ $bg_color9: #FFDD4A;
       margin: 4px 0px 4px 0px; } } }
 
 .arrow {
-  font-size: 9px;
+  font-size: 0.8em;
   padding: 0px 2px 3px 0px; }
 
 .left {
@@ -785,6 +781,13 @@ table.asset_attributes {
   }
 }
 
+.web-presence-icons a {
+  font-size: larger;
+  color: black;
+  :hover {
+    color: black;
+  }
+}
 
 // Login page
 .form-group.user_remember_me {

data/app/assets/stylesheets/header.scss

@@ -29,7 +29,7 @@ $color_footer: grey;
     text-decoration: none; }
   #welcome {
     float: right;
-    font-size: 11px;
+    font-size: 0.9em;
     a {
       color: lightyellow;
       padding: 1px 4px 2px 4px;
@@ -108,6 +108,6 @@ $color_footer: grey;
 
 #footer {
   color: $color_footer;
-  font-size: 10px;
+  font-size: 0.8em;
   padding: 0px 0px 0px 16px;
   text-align: center; }

data/app/assets/stylesheets/rails.scss

@@ -50,7 +50,7 @@ p, div {
   &.flash_exception {
     background: #ddff99;
     border: 5px limegreen solid;
-    font-size: 14px;
+    font-size: 1.1em;
     margin: 50px auto;
     padding: 50px;
     width: 450px;
@@ -94,7 +94,7 @@ div {
 .pagination, .per_page_options {
   background: white;
   float: right;
-  font-size: 11px;
+  font-size: 0.9em;
   margin: 6px 0px 0px 0px;
   a, span, em {
     padding: 0.2em 0.5em;

data/app/controllers/comments_controller.rb

@@ -59,7 +59,7 @@ class CommentsController < ApplicationController
 
   # PUT /comments/1
   # PUT /comments/1.json
-  # PUT /comments/1.xml                                          not implemened
+  # PUT /comments/1.xml                                         not implemented
   #----------------------------------------------------------------------------
   def update
     @comment = Comment.find(params[:id])

data/app/controllers/entities/contacts_controller.rb

@@ -26,7 +26,9 @@ class ContactsController < EntitiesController
     @stage = Setting.unroll(:opportunity_stage)
     @comment = Comment.new
     @timeline = timeline(@contact)
-    respond_with(@contact)
+    respond_with(@contact) do |format|
+      format.vcf { send_data helpers.vcard_for(@contact).to_s, filename: "#{@contact.full_name}.vcf", disposition: 'attachment', type: 'text/x-vcard' }
+    end
   end
 
   # GET /contacts/new

data/app/controllers/entities/leads_controller.rb

@@ -26,7 +26,9 @@ class LeadsController < EntitiesController
   def show
     @comment = Comment.new
     @timeline = timeline(@lead)
-    respond_with(@lead)
+    respond_with(@lead) do |format|
+      format.vcf { send_data helpers.vcard_for(@lead).to_s, filename: "#{@lead.full_name}.vcf", disposition: 'attachment', type: 'text/x-vcard' }
+    end
   end
 
   # GET /leads/new

data/app/controllers/home_controller.rb

@@ -130,7 +130,7 @@ class HomeController < ApplicationController
 
   #----------------------------------------------------------------------------
   # TODO: this is ugly, ugly code. It's being security patched now but urgently
-  # needs refactoring to use user id instead. Permuations based on name or email
+  # needs refactoring to use user id instead. Permutations based on name or email
   # yield incorrect results.
   def activity_user
     return nil if current_user.pref[:activity_user] == "all_users"

data/app/controllers/users_controller.rb

@@ -6,7 +6,7 @@
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
 class UsersController < ApplicationController
-  before_action :set_current_tab, only: %i[show opportunities_overview] # Don't hightlight any tabs.
+  before_action :set_current_tab, only: %i[show opportunities_overview] # Don't highlight any tabs.
 
   check_authorization
 

data/app/helpers/application_helper.rb

@@ -170,6 +170,25 @@ module ApplicationHelper
     end
   end
 
+  # Format a phone number as a tel: hyperlink.
+  #----------------------------------------------------------------------------
+  def link_to_phone(number)
+    return nil if number.blank?
+
+    sanitized_number = number.gsub(/[^0-9+]/, '')
+    link_to number, "tel:#{sanitized_number}"
+  end
+
+  # Render a phone field with an optional pattern for international format.
+  #----------------------------------------------------------------------------
+  def phone_field_with_pattern(form, method, options = {})
+    if Setting.enforce_international_phone_format
+      options[:pattern] ||= '\+[0-9]{1,3}\s?[0-9]{1,14}'
+      options[:placeholder] ||= '+1 123 456 7890'
+    end
+    form.phone_field(method, options)
+  end
+
   #----------------------------------------------------------------------------
   def jumpbox(current)
     tabs = %i[campaigns accounts leads contacts opportunities]
@@ -248,7 +267,15 @@ module ApplicationHelper
   # Display web presence mini-icons for Contact or Lead.
   #----------------------------------------------------------------------------
   def web_presence_icons(person)
-    %i[blog linkedin facebook twitter skype].map do |site|
+    sites = []
+    icon_for_site = {
+      skype: "skype",
+      facebook: "facebook",
+      linkedin: "linkedin",
+      twitter: "twitter",
+      blog: "external-link"
+    }
+    %i[blog linkedin facebook twitter skype].each do |site|
       url = person.send(site)
       next if url.blank?
 
@@ -257,8 +284,19 @@ module ApplicationHelper
       else
         url = "http://" + url unless url.match?(%r{^https?://})
       end
-      link_to(image_tag("#{site}.gif", size: "15x15"), h(url), "data-popup": true, title: t(:open_in_window, h(url)))
-    end.compact.join("\n").html_safe
+      sites << if icon_for_site[site]
+                 link_to(content_tag(:i, "", { class: "fa fa-#{icon_for_site[site]}" }), h(url), "data-popup": true, title: t(:open_in_window, h(url)))
+               else
+                 link_to(image_tag("#{site}.gif", size: "15x15"), h(url), "data-popup": true, title: t(:open_in_window, h(url)))
+               end
+    end
+
+    if person.is_a?(Contact)
+      sites << link_to(content_tag(:i, "", { class: "fa fa-address-card" }), contact_path(person, format: :vcf), title: "VCard")
+    elsif person.is_a?(Lead)
+      sites << link_to(content_tag(:i, "", { class: "fa fa-address-card" }), lead_path(person, format: :vcf), title: "VCard")
+    end
+    content_tag(:span, class: "web-presence-icons") { safe_join(sites, "\n") }
   end
 
   # Ajax helper to refresh current index page once the user selects an option.
@@ -319,7 +357,7 @@ module ApplicationHelper
 
   # Entities can have associated avatars or gravatars. Only calls Gravatar
   # in production env. Gravatar won't serve default images if they are not
-  # publically available: https://en.gravatar.com/site/implement/images
+  # public: https://en.gravatar.com/site/implement/images
   #----------------------------------------------------------------------------
   def avatar_for(model, args = {})
     args = { class: 'gravatar', size: :large }.merge(args)

data/app/helpers/contacts_helper.rb

@@ -18,4 +18,32 @@ module ContactsHelper
     summary << "#{t(:mobile_small)}: #{contact.mobile}" if contact.mobile.present?
     summary.join(', ')
   end
+
+  def vcard_for(contact)
+    card = VCardigan.create
+    card.name contact.last_name, contact.first_name
+    card.fullname "#{contact.first_name} #{contact.last_name}"
+    card.title contact.title if contact.title.present?
+    if contact.respond_to?(:account) # Contact
+      card.org contact.account.name, contact.department if contact.account.present?
+    elsif contact.respond_to?(:company) # Lead
+      card.org contact.company if contact.company.present?
+    end
+    card.email contact.email, type: %w[internet work] if contact.email.present?
+    card.email contact.alt_email, type: %w[internet work] if contact.alt_email.present?
+    card.tel contact.phone, type: 'work' if contact.phone?
+    card.tel contact.mobile, type: %w[cell voice] if contact.mobile.present?
+    card.note "Exported from Fat Free CRM"
+
+    if contact.business_address
+      card.adr contact.business_address.street1,
+               contact.business_address.street2,
+               contact.business_address.city,
+               contact.business_address.state,
+               contact.business_address.zipcode,
+               contact.business_address.country, type: 'work'
+    end
+
+    card
+  end
 end

data/app/mailers/subscription_mailer.rb

@@ -14,7 +14,7 @@ class SubscriptionMailer < ActionMailer::Base
     @comment = comment
     @user = comment.user
 
-    # If entity has tags, join them and wrap in parantheses
+    # If entity has tags, join them and wrap in parentheses
     subject = "RE: [#{@entity_type.downcase}:#{@entity.id}] #{@entity_name}"
     subject += " (#{@entity.tags.join(', ')})" if @entity.tags.any?
 

data/app/models/entities/account.rb

@@ -77,6 +77,8 @@ class Account < ActiveRecord::Base
   validates_uniqueness_of :name, scope: :deleted_at, if: -> { Setting.require_unique_account_names }
   validates :rating, inclusion: { in: 0..5 }, allow_blank: true
   validates :category, inclusion: { in: proc { Setting.unroll(:account_category).map { |s| s.last.to_s } } }, allow_blank: true
+  validates :latitude, numericality: { greater_than_or_equal_to: -90, less_than_or_equal_to: 90, allow_blank: true }
+  validates :longitude, numericality: { greater_than_or_equal_to: -180, less_than_or_equal_to: 180, allow_blank: true }
   validate :users_for_shared_access
 
   before_save :nullify_blank_category

data/app/models/observers/opportunity_observer.rb

@@ -25,7 +25,7 @@ class OpportunityObserver < ActiveRecord::Observer
         update_campaign_revenue(item.campaign, item.amount.to_f - item.discount.to_f)
         item.update_attribute(:probability, 100) # Set probability to 100% if won
         log_activity(item, :won)
-      elsif original.stage == "won" && item.stage != "won" # :won to :other -- substract from total campaign revenue.
+      elsif original.stage == "won" && item.stage != "won" # :won to :other -- subtract from total campaign revenue.
         update_campaign_revenue(original.campaign, -(original.amount.to_f - original.discount.to_f))
       elsif original.stage != "lost" && item.stage == "lost"
         item.update_attribute(:probability, 0) # Set probability to 0% if lost

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

@@ -1,5 +1,5 @@
 - edit ||= false
-- collapsed = session[:account_contact].nil?
+- collapsed = false
 = subtitle :account_contact, collapsed, t(:contact_info)
 .section
   %small#account_contact_intro{ hidden_if(!collapsed) }
@@ -12,23 +12,31 @@
             %tr
               %td
                 .label #{t :phone_toll_free}:
-                = f.text_field :toll_free_phone, style: "width:154px"
+                = phone_field_with_pattern(f, :toll_free_phone, style: "width:154px")
               %td= spacer
               %td
                 .label #{t :phone}:
-                = f.text_field :phone, style: "width:154px"
+                = phone_field_with_pattern(f, :phone, style: "width:154px")
               %td= spacer
               %td
                 .label #{t :fax}:
-                = f.text_field :fax, style: "width:154px"
+                = phone_field_with_pattern(f, :fax, style: "width:154px")
       %tr
         %td
           .label.top #{t :website}:
-          = f.text_field :website
+          = f.url_field :website
         %td= spacer
         %td
           .label.top Email:
-          = f.text_field :email
+          = f.email_field :email
+      %tr
+        %td
+          .label.top Latitude:
+          = f.text_field :latitude, pattern: "^-?\\d+(\\.\\d+)?$"
+        %td= spacer
+        %td
+          .label.top Longitude:
+          = f.text_field :longitude, pattern: "^-?\\d+(\\.\\d+)?$"
       %tr
         %td
           = render "shared/address", f: f, asset: @account, type: :billing, title: :billing_address

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

@@ -33,7 +33,7 @@
       = stars_for(account)
       = " | ".html_safe << link_to(account.website, account.website.to_url) if account.website.present?
       = " | ".html_safe << link_to_email(account.email) if account.email.present?
-      = " | ".html_safe << t(:phone_small) << ": " << (account.toll_free_phone? ? account.toll_free_phone : account.phone) if account.toll_free_phone? || account.phone?
+      = " | ".html_safe << t(:phone_small) << ": " << (account.toll_free_phone? ? link_to_phone(account.toll_free_phone) : link_to_phone(account.phone)) if account.toll_free_phone? || account.phone?
 
     - if account.tags.present?
       %dt

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

@@ -12,16 +12,26 @@
 
   %div
     - if @account.toll_free_phone
-      #{t :phone_toll_free}: <b>#{@account.toll_free_phone}</b><br />
+      == #{t :phone_toll_free}: <b>#{link_to_phone(@account.toll_free_phone)}</b><br />
 
     - if @account.phone
-      #{t :phone}: <b>#{@account.phone}</b><br />
+      == #{t :phone}: <b>#{link_to_phone(@account.phone)}</b><br />
 
     - if @account.fax
-      #{t :fax}: <b>#{@account.fax}</b><br />
+      == #{t :fax}: <b>#{link_to_phone(@account.fax)}</b><br />
 
-  %div= render "shared/address_show", asset: @account, type: 'billing', title: :billing_address
-  %div= render "shared/address_show", asset: @account, type: 'shipping', title: :shipping_address
+    %div= render "shared/address_show", asset: @account, type: 'billing', title: :billing_address
+    %div= render "shared/address_show", asset: @account, type: 'shipping', title: :shipping_address
+
+
+  - if @account.latitude.present? && @account.longitude.present?
+    #map{style: "width: 100%; height: 150px;"}
+
+    %p.text-end
+      %small
+        %b= link_to "Google Maps", "https://www.google.com/maps/search/?api=1&query=#{@account.latitude},#{@account.longitude}", target: "_blank"
+        |
+        %b= link_to "Other", "geo:#{@account.latitude},#{@account.longitude}"
 
   .caption #{t :account_summary}
   %dl
@@ -55,3 +65,11 @@
       .tags= tags_for_index(@account)
 
   = hook(:show_account_sidebar_bottom, self, account: @account)
+
+- if @account.latitude.present? && @account.longitude.present?
+  :javascript
+    var map = L.map('map').setView([#{@account.latitude}, #{@account.longitude}], 18);
+    L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+    }).addTo(map);
+    L.marker([#{@account.latitude}, #{@account.longitude}]).addTo(map);

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

@@ -47,11 +47,13 @@
     %dt{ style: "padding: 2px 0px 0px 0px" }
       = link_to_email(user.email.to_s) + " | "
       - if user.phone?
-        = t(:phone_small) + ":"
-        = content_tag(:b, user.phone) + " | "
+        = (t(:phone_small) + ": ").html_safe
+        %b= link_to_phone(user.phone)
+        = " | ".html_safe
       - if user.mobile?
-        = t(:mobile_small) + ":"
-        = content_tag(:b, user.mobile) + " | "
+        = (t(:mobile_small) + ": ").html_safe
+        %b= link_to_phone(user.mobile)
+        = " | ".html_safe
 
       - if !user.suspended?
         %span #{t(:user_since, l(user.created_at.to_date, format: :mmddyy))}

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

@@ -1,6 +1,6 @@
 - truncated = simple_format(truncate(comment.comment.gsub("\n", " "), length: 125))
 - formatted = defined?(RedCloth) ? RedCloth.new(comment.comment).to_html : simple_format(comment.comment)
-- collapsable = formatted.size > 150
+- collapsible = formatted.size > 150
 - commentable = comment.commentable
 
 %li.comment.highlight[comment]
@@ -15,12 +15,12 @@
     = link_to(comment.user.full_name, user_path(comment.user)) + ","
     %tt
       = t(:added_note, value: timeago(comment.created_at) ).html_safe
-      - if collapsable && can?(:read, commentable)
+      - if collapsible && can?(:read, commentable)
         = " | "
         = link_to_function(comment.collapsed? ? t(:more) : t(:less), "crm.flip_note_or_email(this, '#{t(:more)}', '#{t(:less)}')", class: "toggle")
 
     - if can?(:read, commentable)
-      - if collapsable
+      - if collapsible
         %dt{ hidden_if(comment.expanded?), id: dom_id(comment, :truncated) }
           = truncated
         %dt.textile{ hidden_if(comment.collapsed?), id: dom_id(comment, :formatted) }

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

@@ -18,18 +18,18 @@
         %tr
           %td
             .label #{t :alt_email}:
-            = f.text_field :alt_email
+            = f.email_field :alt_email
           %td= spacer
           %td
             .label #{t :mobile}:
-            = f.text_field :mobile
+            = phone_field_with_pattern(f, :mobile)
         %tr
           %td
             = render "shared/address", f: f, asset: @contact, type: 'business', title: :address
           %td= spacer
           %td
             .label #{t :fax}:
-            = f.text_field :fax
+            = phone_field_with_pattern(f, :fax)
             %div{style: "margin-top:6px"}
               .check_box
                 = f.check_box :do_not_call, {}, true

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

@@ -35,11 +35,11 @@
           |
         - if contact.phone.present?
           == #{t :phone_small}:
-          %b= contact.phone
+          %b= link_to_phone(contact.phone)
           |
         - if contact.mobile.present?
           == #{t :mobile_small}:
-          %b= contact.mobile
+          %b= link_to_phone(contact.mobile)
           |
       = t(:added_ago, value: timeago(contact.created_at)).html_safe
     - if contact.tags.present?

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

@@ -29,11 +29,11 @@
           |
         - if contact.phone.present?
           == #{t :phone_small}:
-          %b= contact.phone
+          %b= link_to_phone(contact.phone)
         |
         - if contact.mobile.present?
           == #{t :mobile_small}:
-          %b= contact.mobile
+          %b= link_to_phone(contact.mobile)
           |
       = t(:added_ago, value: timeago(contact.created_at)).html_safe
 

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

@@ -8,7 +8,7 @@
         = col(t(:last_name), contact.last_name)
       %tr
         = col(t(:email), contact.email, false, true)
-        = col(t(:phone), contact.phone)
+        = col(t(:phone)) { link_to_phone(contact.phone) }
       %tr
         = col(t(:account)) do
           = account_with_url_for(contact)

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

@@ -6,11 +6,11 @@
 
   %div
     - unless @contact.phone.blank?
-      == #{t :phone}: <b>#{@contact.do_not_call ? content_tag(:strike, h(@contact.phone)) : h(@contact.phone)}</b><br />
+      == #{t :phone}: <b>#{@contact.do_not_call ? content_tag(:strike, @contact.phone) : link_to_phone(@contact.phone)}</b><br />
     - unless @contact.mobile.blank?
-      == #{t :mobile}: <b>#{@contact.do_not_call ? content_tag(:strike, h(@contact.mobile)) : h(@contact.mobile)}</b><br />
+      == #{t :mobile}: <b>#{@contact.do_not_call ? content_tag(:strike, @contact.mobile) : link_to_phone(@contact.mobile)}</b><br />
     - unless @contact.fax.blank?
-      == #{t :fax}: <b>#{@contact.do_not_call ? content_tag(:strike, h(@contact.fax)) : h(@contact.fax)}</b><br />
+      == #{t :fax}: <b>#{@contact.do_not_call ? content_tag(:strike, @contact.fax) : link_to_phone(@contact.fax)}</b><br />
   %div
     - unless @contact.email.blank?
       == #{t :email}: <b>#{link_to_email(@contact.email)}</b><br />

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

@@ -13,11 +13,11 @@
       %tr
         %td
           .label #{t :email}:
-          = f.text_field :email
+          = f.email_field :email
         %td= spacer
         %td
           .label #{t :phone}:
-          = f.text_field :phone
+          = f.phone_field :phone
 
     %table
       = fields_for(@account) do |a|

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

@@ -9,7 +9,7 @@
       %tr
         %td
           .label.top #{t :blog}:
-          = f.text_field :blog
+          = f.url_field :blog
         %td= spacer
         %td
           .label.top #{t :twitter}:

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

@@ -20,7 +20,7 @@
       %dt
         = link_to(account.website, account.website.to_url) + " | " if account.website.present?
         = link_to_email(account.email) + " | " if account.email.present?
-        = t(:phone_small) + ": " + (account.toll_free_phone || account.phone) << " | " if account.toll_free_phone? || account.phone?
+        = (t(:phone_small) + ": ").html_safe + link_to_phone(account.toll_free_phone || account.phone) + " | ".html_safe if account.toll_free_phone? || account.phone?
         = t('pluralize.contact', account.contacts_count) + " | "
         = t('pluralize.opportunity', account.opportunities_count)
       - if account.tags.present?

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

@@ -2,6 +2,7 @@
 %html
   %head
     %meta{ "http-equiv" => "Content-Type", content: "text/html; charset=utf-8" }
+    %meta{ name: "viewport", content: "width=device-width, initial-scale=1.0" }
     %title Fat Free CRM
     == <!-- #{controller.controller_name} : #{controller.action_name} -->
     = stylesheet_link_tag :application
@@ -10,6 +11,9 @@
       #{yield :stylesheet_includes}
     %style= yield :styles
 
+    %link{ rel: "stylesheet", href: "https://unpkg.com/leaflet@1.7.1/dist/leaflet.css" }
+    %script{ src: "https://unpkg.com/leaflet@1.7.1/dist/leaflet.js" }
+
     = javascript_include_tag :application
 
     - unless tabless_layout? || %w(en-US en-GB).include?(I18n.locale.to_s)

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

@@ -1,5 +1,5 @@
 - edit ||= false
-- collapsed = session[:lead_contact].nil? # && @lead.errors.empty?
+- collapsed = false
 = subtitle :lead_contact, collapsed, t(:contact_info)
 .section
   %small#lead_contact_intro{ hidden_if(!collapsed) }
@@ -17,11 +17,11 @@
       %tr
         %td
           .label #{t :alt_email}:
-          = f.text_field :alt_email
+          = f.email_field :alt_email
         %td= spacer
         %td
           .label #{t :mobile}:
-          = f.text_field :mobile
+          = phone_field_with_pattern(f, :mobile)
       %tr
         %td
           = render "shared/address", f: f, asset: @lead, type: 'business', title: :address