fat_free_crm 0.19.2 → 0.20.0

data/app/assets/stylesheets/bootstrap-custom.scss

@@ -0,0 +1,206 @@
+// Custom.scss
+// Option B: Include parts of Bootstrap
+
+// 1. Include functions first (so you can manipulate colors, SVGs, calc, etc)
+@import "bootstrap/functions";
+
+// 2. Include any default variable overrides here
+
+$bg_color1: #05668D;
+$bg_color2: #028090;
+$bg_color3: #00A896;
+$bg_color4: #02C39A;
+$bg_color5: #2A9D8F;
+$bg_color6: #B4A6AB;
+$bg_color7: #946E83;
+$bg_color8: #615055;
+$bg_color9: #FFDD4A;
+
+$theme-colors: (
+  "primary":    #05668D,
+  "secondary":  #028090,
+  "success":    #00A896,
+  "info":       #02C39A,
+  "warning":    #2A9D8F,
+  "danger":     #B4A683,
+  "light":      #615055,
+  "dark":       #FFDD4A
+);
+
+$btn-padding-y:               0.375;
+$btn-padding-x:               0.75;
+$btn-font-size:               '0.9rem';
+
+// 3. Include remainder of required Bootstrap stylesheets
+@import "bootstrap/variables";
+@import "bootstrap/mixins";
+
+// 4. Include any optional Bootstrap components as you like
+
+@import "bootstrap/root";
+// @import "bootstrap/reboot";
+// @import "bootstrap/type";
+
+@import "bootstrap/images";
+@import "bootstrap/containers";
+@import "bootstrap/grid";
+@import "bootstrap/tables";
+@import "bootstrap/forms";
+@import "bootstrap/buttons";
+@import "bootstrap/transitions";
+@import "bootstrap/dropdown";
+@import "bootstrap/button-group";
+@import "bootstrap/nav";
+@import "bootstrap/navbar";
+@import "bootstrap/card";
+@import "bootstrap/accordion";
+@import "bootstrap/breadcrumb";
+@import "bootstrap/pagination";
+@import "bootstrap/badge";
+@import "bootstrap/alert";
+@import "bootstrap/progress";
+@import "bootstrap/list-group";
+@import "bootstrap/close";
+@import "bootstrap/toasts";
+@import "bootstrap/modal";
+@import "bootstrap/tooltip";
+@import "bootstrap/popover";
+@import "bootstrap/carousel";
+@import "bootstrap/spinners";
+@import "bootstrap/offcanvas";
+
+// Helpers
+@import "bootstrap/helpers";
+
+// Utilities
+$utilities: ();
+@import "bootstrap/utilities/api";
+
+
+
+// 5. Add additional custom code here
+
+// Used on tasks#index as the selector component
+.nav-sm .nav-link {
+  padding: 0.25rem 0.5rem;
+}
+
+// Application grid
+#primary-application-pane {
+  @extend .container-fluid;
+  width: auto;
+
+  .sidebar {
+    @extend .col-2;
+    // @extend .g-2;
+
+    .panel {
+    }
+  }
+  .main {
+    // Same as .col=9
+    flex: 0 0 auto;
+    width: 75%;
+  }
+
+  #summary.panel {
+    dl {
+      display: flex;
+      flex-flow: row wrap;
+      align-items: flex-start;
+
+      li {
+        display: flex;
+        width: 12%;
+	margin-right: 1rem;
+        flex-direction: column-reverse;
+
+	vertical-align: top;
+	dt { float: none; width: 100%; }
+	tt { width: 100%; }
+      }
+    }
+  }
+}
+// Navbar
+.navbar-toggler-icon {
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%280, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e");
+}
+button.navbar-toggler:focus {
+  box-shadow: none !important;
+}
+@include media-breakpoint-down(lg) {
+  .navbar.tabs {
+    li {
+     a:link, a:visited {
+       background-color: transparent;
+     }
+     i { display: none; }
+    } 
+  }
+
+  // On mobile, reverse the order of our content
+  #primary-application-pane {
+    .row:first-child {
+      flex-direction: column-reverse !important;
+    }
+ 
+    .main {
+      width: 90%;
+      margin: auto;
+    }
+    .sidebar {
+      width: 90%;
+      margin: auto;
+      display: flex;
+      align-items: stretch;
+    }
+
+    .sidebar #filters, .sidebar #lists, .sidebar #recently, .sidebar #summary {
+      margin-right: 2%;
+      width: 30%;
+    }
+
+    #summary.panel {
+      dl {
+        li {
+	  width: 23%;
+	  font-size: 2rem;
+	  dt {
+	    font-size: inherit;
+          }
+          tt {
+	    font-size: inherit;
+	  }
+	}
+      }	
+    }
+  }
+}
+
+// For now, clip excess page until we tweak the layout properly
+body {
+  overflow-x: clip;
+}
+#search {
+  .tabs { @extend .row; }
+
+  ul {
+    @extend .col;
+  }
+  li {
+    display: inline-block;
+  }
+  #search_results_count {
+    @extend .col;
+    text-align: right;
+    width: 98%;
+  }
+}
+
+// ransack_ui_search renders in older bootstrap, so adding padding fixes a few visual glitches
+#advanced_search {
+  .row {
+    padding-right: 1.5rem;
+  }
+}

data/app/assets/stylesheets/common.scss

@@ -10,7 +10,7 @@ $sidebar_width: 210px;
 // Common page elements.
 //------------------------------------------------------------------------------
 .title {
-  border-bottom: 1px gray solid;
+  border-bottom: 1px #eee solid;
   color: $color_title;
   font: {
     size: 17px;
@@ -22,7 +22,6 @@ $sidebar_width: 210px;
     top: 2px; } }
 
 .title_tools {
-  font-size: 12px;
   float: right;
   margin: 0;
   margin-top: 4px;
@@ -35,14 +34,14 @@ $sidebar_width: 210px;
 }
 
 .subtitle {
-  border-bottom: 1px silver solid;
+  border-bottom: 1px #eee solid;
   color: #2f2f2f;
   font: {
     size: 14px;
     weight: bold; };
   small {
     font-weight: normal;
-    font-size: 11px;
+    font-size: 0.9em;
     padding-left: 5px; }
   a:link, a:visited {
     color: $color_subtitle;
@@ -56,7 +55,7 @@ $sidebar_width: 210px;
   margin-left: 5px }
 
 .subtitle_tools {
-  font-size: 11px;
+  font-size:  0.9em;
   float: right; }
 
 .radio_box {
@@ -71,7 +70,7 @@ $sidebar_width: 210px;
     position: relative;
     top: -3px; }
   label {
-    font-size: 11px; } }
+    font-size: 0.9em; } }
 
 // Main area (page and form).
 //------------------------------------------------------------------------------
@@ -86,9 +85,7 @@ $sidebar_width: 210px;
   padding: 20px;
   width: 400px;
   -moz-border-radius: 6px;
-  -moz-box-shadow: 5px 5px 15px #bbbbbb, -5px 0px 15px #bbbbbb;
   -webkit-border-radius: 6px;
-  -webkit-box-shadow: 5px 5px 15px #bbbbbb, -5px 0px 15px #bbbbbb;
   input[type="text"], input[type="email"], input[type="password"] {
     font-size: 16px;
     padding: 2px;
@@ -103,9 +100,7 @@ $sidebar_width: 210px;
   background: white;
   padding: 8px 15px 15px 15px;
   -moz-border-radius: 4px;
-  -moz-box-shadow: 2px 2px 8px #bbbbbb, -2px 0px 8px #bbbbbb;
-  -webkit-border-radius: 4px;
-  -webkit-box-shadow: 2px 2px 8px #bbbbbb, -2px 0px 8px #bbbbbb; }
+  -webkit-border-radius: 4px; }
 
 .info {
   padding-top: 12px;
@@ -113,9 +108,9 @@ $sidebar_width: 210px;
 
 .sidebar {
   color: #3f3f3f;
-  font-size: 11px;
-  padding: 0px 12px 0px 0px;
-  width: $sidebar_width; }
+  font-size: 0.9em;
+  padding-top: 1rem;
+  }
 
 .form {
   background: white;
@@ -124,7 +119,7 @@ $sidebar_width: 210px;
     height: 30px; } }
 
 .tools {
-  font-size: 10px;
+  font-size: 0.9em;
   float: right;
   padding: 0px 0px 0px 4px;
   &#comment_new_tools {
@@ -132,7 +127,6 @@ $sidebar_width: 210px;
 
 .label {
   color: #3f3f3f;
-  font-size: 12px;
   margin: 8px 0px 0px 0px;
   padding: 0px 8px 0px 0px; }
 
@@ -150,7 +144,6 @@ $sidebar_width: 210px;
 
 .intro {
   color: dimgray;
-  font-size: 12px;
   padding-top: 5px; }
 
 .section {
@@ -243,12 +236,71 @@ $sidebar_width: 210px;
 .black {
   color: black; }
 
-.white {
-  color: white !important; }
-
 .grayed {
   color: silver !important; }
 
+// Default tag colors
+// Override these with your own stylesheets
+// TODO: Improve the dark vs light to be smarter/inherited
+// TODO: Refactor to a better structure
+$dark_strip_text: #111;
+$light_strip_text: #EEE;
+
+$bg_color1: #05668D;
+$bg_color2: #028090;
+$bg_color3: #00A896;
+$bg_color4: #02C39A;
+$bg_color5: #2A9D8F;
+$bg_color6: #B4A6AB;
+$bg_color7: #946E83;
+$bg_color8: #615055;
+$bg_color9: #FFDD4A;
+
+
+.task .call  { background: $bg_color1; color: $light_strip_text; }
+.task .email { background: $bg_color2; color: $light_strip_text; }
+.task .follow_up { background: $bg_color3; color: $light_strip_text; }
+.task .lunch { background: $bg_color4; color: $light_strip_text; }
+.task .meeting { background: $bg_color5; color: $light_strip_text; }
+.task .money { background: $bg_color6; color: $dark_strip_text; }
+.task .presentation { background: $bg_color7; color: $light_strip_text; }
+.task .trip  { background: $bg_color8; color: $light_strip_text; }
+.task .other { background: $bg_color9; color: $dark_strip_text; }
+
+.campaign .planned { background: $bg_color1; color: $light_strip_text; }
+.campaign .started { background: $bg_color9; color: $dark_strip_text; }
+.campaign .completed { background: $bg_color3; color: $light_strip_text; }
+.campaign .on_hold { background: $bg_color6; color: $dark_strip_text; }
+.campaign .called_off { background: $bg_color2; color: $light_strip_text; }
+
+.lead .new { background: $bg_color9; color: $dark_strip_text; }
+.lead .contacted { background: $bg_color3; color: $light_strip_text; }
+.lead .converted { background: $bg_color6; color: $dark_strip_text; }
+.lead .rejected { background: $bg_color1; color: $light_strip_text; }
+
+.account .affiliate { background: $bg_color1; color: $light_strip_text; }
+.account .competitor { background: $bg_color2; color: $light_strip_text; }
+.account .customer { background:$bg_color3; color: $light_strip_text; }
+.account .partner { background: $bg_color4; color: $light_strip_text; }
+.account .reseller { background: $bg_color6; color: $dark_strip_text; }
+.account .vendor { background: $bg_color9; color: $dark_strip_text; }
+
+.opportunity .prospecting { background: $bg_color1; color: $light_strip_text; }
+.opportunity .analysis { background: $bg_color2; color: $light_strip_text; }
+.opportunity .presentation { background:$bg_color3; color: $light_strip_text; }
+.opportunity .proposal { background: $bg_color4; color: $light_strip_text; }
+.opportunity .negotiation { background: $bg_color5; color: $light_strip_text; }
+.opportunity .final_review { background: $bg_color9; color: $dark_strip_text; }
+.opportunity .won { background: $bg_color7; color: $light_strip_text; }
+.opportunity .lost { background: $bg_color1; color: $light_strip_text; }
+
+.user .admin     { background: $bg_color1; color: $light_strip_text; }
+.user .suspended { background: $bg_color3; color: $light_strip_text; }
+.user .active    { background: $bg_color6; color: $dark_strip_text; }
+.user .signed_up { background: $bg_color9; color: $dark_strip_text; }
+
+
+
 .amount {
   background: palegreen;
   color: black;
@@ -275,12 +327,8 @@ $sidebar_width: 210px;
   padding: 1px 4px 1px 3px;
   text-align: right;
   width: 75px;
-  -moz-border-radius: {
-    topleft: 7px;
-    bottomleft: 7px; };
-  -webkit-border: {
-    top-left-radius: 7px;
-    bottom-left-radius: 7px; }; }
+  border-radius: 2px;
+}
 
 // Indentation classes:
 //   - indent: for use with strip (regular indentation).
@@ -408,27 +456,22 @@ $sidebar_width: 210px;
 .log {
   padding: 8px 0px 0px 0px;
   h3 {
-    border-bottom: 1px #2f2f2f dotted;
     color: #2f2f2f;
     margin: 0px 0px 4px 0px;
     padding: 2px 0px 2px 86px;
     &.overdue {
-      color: crimson;
-      border-bottom: 1px crimson dotted; }
+      color: crimson; }
     &.due_asap {
-      color: darkred;
-      border-bottom: 1px darkred dotted; }
+      color: darkred; }
     &.due_today {
-      color: darkgreen;
-      border-bottom: 1px darkgreen dotted; } }
+      color: darkgreen; } }
   li {
     color: #3f3f3f;
-    font-size: 12px;
     list-style: none;
     padding: 3px 0px 3px 0px;
     tt {
       color: dimgray;
-      font-size: 11px; } }
+      font-size: 0.9em; } }
   input[type=checkbox] {
     float: left;
     margin: 0px 4px 0px 0px; } }
@@ -438,9 +481,8 @@ $sidebar_width: 210px;
 .list {
   padding: 8px 0px 7px 0px;
   li {
-    border-bottom: 1px silver dotted;
+    border-bottom: 1px #eee dotted;
     color: #3f3f3f;
-    font-size: 12px;
     list-style: none;
     padding: 6px 0px 6px 0px;
     .gravatar {
@@ -448,13 +490,12 @@ $sidebar_width: 210px;
       padding: 0px 8px 0px 0px; }
     tt {
       color: dimgray;
-      font-size: 11px; }
+    }
     dt {
       color: #3f3f3f;
-      font-size: 11px;
       padding: 2px 0px 0px 0px; } } }
 
-// Sidebar, filters, and selectors.
+// Sidebar, filters
 //------------------------------------------------------------------------------
 .filters, .panel {
   background: snow;
@@ -462,14 +503,11 @@ $sidebar_width: 210px;
   padding: 6px 8px 6px 8px;
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
-  -moz-box-shadow: 2px 2px 8px #bbbbbb, -2px 0px 8px #bbbbbb;
-  -webkit-box-shadow: 2px 2px 8px #bbbbbb, -2px 0px 8px #bbbbbb;
 
   .caption {
-    border-bottom: 1px grey solid;
+    border-bottom: 1px #eee solid;
     color: navy;
     font: {
-      size: 12px;
       weight: bold; };
     margin: 4px 0px 5px 0px;
     padding: 2px 0px 2px 0px; }
@@ -487,42 +525,24 @@ $sidebar_width: 210px;
   div {
     margin: 0px 0px 10px 0px; }
   h4 {
-    font-size: 13px;
+    font-size: 1.1em;
     font-weight: bold; }
   li {
-    border-bottom: 1px silver dotted;
-    font-size: 12px;
     list-style: none;
     padding: 2px 0px 3px 0px;
     dt {
       float: right;
-      font-size: 11px;
       font-weight: bold; }
     tt {
-      font-size: 11px; }
+       }
     &.last {
       border-bottom: none; } }
   &#recently {
     background: floralwhite; }
   &#summary {
-    background: oldlace;
     p {
       margin: 4px 0px 4px 0px; } } }
 
-.selector {
-  color: black;
-  cursor: pointer;
-  font-size: 10px;
-  text-align: center; }
-
-.on {
-  background: lightgoldenrodyellow;
-  border: 1px silver inset; }
-
-.off {
-  background: lightgrey;
-  border: 1px silver outset; }
-
 .arrow {
   font-size: 9px;
   padding: 0px 2px 3px 0px; }
@@ -659,7 +679,7 @@ span.handle img {
     padding: 2px 6px 1px 6px;
     margin: 4px 0 3px 4px;
     border: 1px solid #bdbdbd;
-    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eaeaea), color-stop(0.7, #f2f2f2));
+    background-image: -webkit-gradient(linear, to right bottom, to right top, color-stop(0, #eaeaea), color-stop(0.7, #f2f2f2));
     background-image: -webkit-linear-gradient(center bottom, #eaeaea 0%, #f2f2f2 70%);
     background-image: -moz-linear-gradient(center bottom, #eaeaea 0%, #f2f2f2 70%);
     background-image: -o-linear-gradient(bottom, #eaeaea 0%, #f2f2f2 70%);
@@ -691,7 +711,7 @@ ul.tools {
     border-right: 1px black solid;
     border-bottom: none;
     padding: 0 4px;
-    font-size: 10px;
+    font-size: 0.8em;
     float: left;
     clear: none; }
   li:last-child {
@@ -717,7 +737,7 @@ table.asset_attributes {
   width: 100%;
   border-spacing: 4px;
   td, th {
-    border-bottom: 1px dotted silver;
+    border-bottom: 1px dotted #eee;
     vertical-align: top;
     text-align: left;
   }

data/app/assets/stylesheets/header.scss

@@ -72,20 +72,13 @@ $color_footer: grey;
 
 .tabs {
   background: $color_header_background;
-  height: $size_tab_height;
   padding: 0px;
-  text-align: center;
-  width: 100%;
   i.fa { 
     font-size: 130%; 
     vertical-align:text-top; }
   ul {
-    // :margin 0px 25%,  18% for 5th tab
     margin-left: 15px; }
   li {
-    float: left;
-    font-size: 12px;
-    line-height: 16px;
     list-style: none;
     margin: 0px 4px 0px 1px; }
   a:link, a:visited {
@@ -96,7 +89,6 @@ $color_footer: grey;
       margin-right: 7px; }
     background: $color_tab_background;
     color: white;
-    float: left;
     padding: 4px 15px 6px;
     text-align: center;
     text-decoration: none;

data/app/controllers/admin/field_groups_controller.rb

@@ -41,7 +41,7 @@ class Admin::FieldGroupsController < Admin::ApplicationController
   #----------------------------------------------------------------------------
   def update
     @field_group = FieldGroup.find(params[:id])
-    @field_group.update_attributes(field_group_params)
+    @field_group.update(field_group_params)
 
     respond_with(@field_group)
   end

data/app/controllers/admin/fields_controller.rb

@@ -63,7 +63,7 @@ class Admin::FieldsController < Admin::ApplicationController
       @field = CustomFieldPair.update_pair(params).first
     else
       @field = Field.find(params[:id])
-      @field.update_attributes(field_params)
+      @field.update(field_params)
     end
 
     respond_with(@field)

data/app/controllers/admin/groups_controller.rb

@@ -46,7 +46,7 @@ class Admin::GroupsController < Admin::ApplicationController
   # PUT /groups/1
   #----------------------------------------------------------------------------
   def update
-    @group.update_attributes(group_params)
+    @group.update(group_params)
 
     respond_with(@group)
   end

data/app/controllers/admin/tags_controller.rb

@@ -35,7 +35,7 @@ class Admin::TagsController < Admin::ApplicationController
   # POST /admin/tags.xml                                                  AJAX
   #----------------------------------------------------------------------------
   def create
-    @tag.update_attributes(tag_params)
+    @tag.update(tag_params)
 
     respond_with(@tag)
   end
@@ -44,7 +44,7 @@ class Admin::TagsController < Admin::ApplicationController
   # PUT /admin/tags/1.xml                                                 AJAX
   #----------------------------------------------------------------------------
   def update
-    @tag.update_attributes(tag_params)
+    @tag.update(tag_params)
 
     respond_with(@tag)
   end

data/app/controllers/admin/users_controller.rb

@@ -104,8 +104,9 @@ class Admin::UsersController < Admin::ApplicationController
   def user_params
     return {} unless params[:user]
 
-    params[:user][:email].try(:strip!)
     params[:user][:password_confirmation] = nil if params[:user][:password_confirmation].blank?
+    params[:user][:email].try(:strip!)
+    params[:user][:alt_email].try(:strip!)
 
     params[:user].permit(
       :admin,

data/app/controllers/application_controller.rb

@@ -60,6 +60,16 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  # To deal with pre rails 6 users, reset the session and ask them to relogin
+  rescue_from ArgumentError do |exception|
+    if request.format.html? && exception.message == "invalid base64"
+      request.reset_session
+      redirect_to login_path
+    else
+      raise(exception)
+    end
+  end
+
   private
 
   #

data/app/controllers/comments_controller.rb

@@ -63,7 +63,7 @@ class CommentsController < ApplicationController
   #----------------------------------------------------------------------------
   def update
     @comment = Comment.find(params[:id])
-    @comment.update_attributes(comment_params)
+    @comment.update(comment_params)
     respond_with(@comment)
   end
 

data/app/controllers/entities/accounts_controller.rb

@@ -71,7 +71,7 @@ class AccountsController < EntitiesController
     respond_with(@account) do |_format|
       # Must set access before user_ids, because user_ids= method depends on access value.
       @account.access = params[:account][:access] if params[:account][:access]
-      get_data_for_sidebar if @account.update_attributes(resource_params)
+      get_data_for_sidebar if @account.update(resource_params)
     end
   end
 

data/app/controllers/entities/campaigns_controller.rb

@@ -109,7 +109,7 @@ class CampaignsController < EntitiesController
     respond_with(@campaign) do |_format|
       # Must set access before user_ids, because user_ids= method depends on access value.
       @campaign.access = resource_params[:access] if resource_params[:access]
-      get_data_for_sidebar if @campaign.update_attributes(resource_params) && called_from_index_page?
+      get_data_for_sidebar if @campaign.update(resource_params) && called_from_index_page?
     end
   end
 

data/app/controllers/home_controller.rb

@@ -15,7 +15,9 @@ class HomeController < ApplicationController
     @my_tasks = Task.visible_on_dashboard(current_user).includes(:user, :asset).by_due_at
     @my_opportunities = Opportunity.visible_on_dashboard(current_user).includes(:account, :user, :tags).by_closes_on.by_amount
     @my_accounts = Account.visible_on_dashboard(current_user).includes(:user, :tags).by_name
-    respond_with(@activities)
+    respond_with @activities do |format|
+      format.xls { render xls: @activities, layout: 'header' }
+    end
   end
 
   # GET /home/options                                                      AJAX