fat_free_crm 0.12.3 → 0.13.0

data/Procfile

@@ -1 +1 @@
-web: ./bin/unicorn -p $PORT -c config/unicorn.rb
+web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb

data/README.md

@@ -1,4 +1,4 @@
-# Fat Free CRM [![TravisCI][travis-img-url]][travis-ci-url]
+# Fat Free CRM [![TravisCI][travis-img-url]][travis-ci-url]  [![Code Climate](https://codeclimate.com/github/fatfreecrm/fat_free_crm.png)](https://codeclimate.com/github/fatfreecrm/fat_free_crm)
 
 [travis-img-url]: https://secure.travis-ci.org/fatfreecrm/fat_free_crm.png?branch=master
 [travis-ci-url]: http://travis-ci.org/fatfreecrm/fat_free_crm
@@ -14,29 +14,29 @@ contact lists, and opportunity tracking.
 <table>
   <tr>
     <td align="center">
-      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/contact_create.png" target="_blank" title="Create Contacts">
-        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/contact_create_t.png" alt="Create Contacts">
+      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/images/contact_create.png" target="_blank" title="Create Contacts">
+        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/images/contact_create_t.png" alt="Create Contacts">
       </a>
       <br />
       <em>Contacts</em>
     </td>
     <td align="center">
-      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/contact_opportunity.png" target="_blank" title="Manage Opportunities">
-        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/contact_opportunity_t.png" alt="Manage Opportunities">
+      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/images/contact_opportunity.png" target="_blank" title="Manage Opportunities">
+        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/images/contact_opportunity_t.png" alt="Manage Opportunities">
       </a>
       <br />
       <em>Opportunities</em>
     </td>
     <td align="center">
-      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/account_edit.png" target="_blank" title="Edit Accounts">
-        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/account_edit_t.png" alt="Edit Accounts">
+      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/images/account_edit.png" target="_blank" title="Edit Accounts">
+        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/images/account_edit_t.png" alt="Edit Accounts">
       </a>
       <br />
       <em>Accounts</em>
     </td>
     <td align="center">
-      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/task_create.png" target="_blank" title="Create Tasks">
-        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/backup/images/task_create_t.png" alt="Create Tasks">
+      <a href="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/images/task_create.png" target="_blank" title="Create Tasks">
+        <img src="https://github.com/fatfreecrm/fatfreecrm.github.com/raw/master/images/task_create_t.png" alt="Create Tasks">
       </a>
       <br />
       <em>Tasks</em>
@@ -54,8 +54,10 @@ Visit our website at http://www.fatfreecrm.com/
 
 ## System Requirements
 
-* Ruby v1.9.3 recommended (1.9.2 also works, ruby 2.0.0 does NOT)
-  * Note that Ruby v1.8.7 was supported until v0.11.4 (see https://github.com/fatfreecrm/fat_free_crm/tree/ruby1.8)
+* Ruby v2.0.0 recommended (it's faster!)
+  * Ruby 1.9.3 is also compatible
+  * Ruby 1.9.2 should be compatible but is not longer supported
+  * Ruby v1.8.7 was supported until v0.11.4 (see https://github.com/fatfreecrm/fat_free_crm/tree/ruby1.8)
 * MySQL v4.1.1 or later (v5+ is recommended), SQLite v3.4 or later, or Postgres 8.4.8 or later.
 * ImageMagick (optional, only needed if you would like to use avatars)
 
@@ -81,7 +83,7 @@ Installing Fat Free CRM on Microsoft Windows
 ### [Running Fat Free CRM as a Rails Engine](http://guides.fatfreecrm.com/Running-as-a-Rails-Engine.html)
 
 Run the Fat Free CRM gem within a separate Rails application.
-This is the best way to deploy Fat Free CRM if you need to add plugins or make any customizations.
+This is the best way to deploy Fat Free CRM if you need to add plugins or make any customizations. Note that it is not yet simple to 'bolt' Fat Free CRM into your existing rails project, but we're heading in that direction.
 
 
 ## Upgrading from previous versions of Fat Free CRM
@@ -108,20 +110,18 @@ Please read the [Release Notes](http://guides.fatfreecrm.com/Release-Notes.html)
 
 ## For Developers
 
-Fat Free CRM can be customized by implementing callback hooks and extended by
-creating Rails Engines plugins. Check out these sample repositories demonstrating
-the concepts:
+Fat Free CRM is released under the MIT license and is freely available for you to use for your own purposes. We do encourage contributions to make Fat Free CRM even better. Send us a pull-request and we'll do our best to accomodate your needs.
+
+Specific features that are not 'Fat Free' in nature, can be added by creating Rails Engines. See the [wiki](http://github.com/fatfreecrm/fat_free_crm/wiki) for information on how to do this.
+
+Tests can easily be run by typing 'rake' but please note that they do take a while to run! Alternatively, you can see the test build status over at our [travis page](http://travis-ci.org/fatfreecrm/fat_free_crm)
 
-* http://github.com/michaeldv/crm_sample_plugin/tree/master
-* http://github.com/michaeldv/crm_sample_tabs/tree/master
-* http://github.com/michaeldv/crm_web_to_lead/tree/master
-* http://github.com/michaeldv/crm_tags/tree/master
 
 ## Main contributors
 
 * [Michael Dvorkin (@michaeldv)](https://github.com/michaeldv) - Founding creator
+* [Steve Kenworthy (@steveyken)](https://github.com/steveyken) - Maintainer
 * [Nathan Broadbent (@ndbroadbent)](https://github.com/ndbroadbent)
-* [Steve Kenworthy (@steveyken)](https://github.com/steveyken)
 
 See the [contributors graph](https://github.com/fatfreecrm/fat_free_crm/graphs/contributors) and the [contributors file](https://github.com/fatfreecrm/fat_free_crm/blob/master/CONTRIBUTORS) for further details.
 

data/app/assets/javascripts/admin/fields.js.coffee

@@ -20,14 +20,14 @@
     $('.edit_field').hide()
     field_group = $(this).closest('.field_group')
     field_group.find('.empty').hide()
-    field_group.find('.arrow').html(crm.EXPANDED)
+    field_group.find('.create .arrow').html(crm.EXPANDED)
     field_group.find('.create_field').slideDown().find('input[name="field[label]"]').focus()
     false
 
   $('.create_field a.close, .create_field a.cancel').live 'click', ->
     $(this).closest('.create_field').hide()
     $(this).closest('.field_group').find('.empty').show()
-    $(this).closest('.field_group').find('.arrow').html(crm.COLLAPSED)
+    $(this).closest('.field_group').find('.create .arrow').html(crm.COLLAPSED)
     false
 
   $('.fields a.edit').live 'click', ->
@@ -39,7 +39,7 @@
           $(this).replaceWith(data).first().focus()
     )
     false
-    
+
   $('.edit_field a.close, .edit_field a.cancel').live 'click', ->
     $(this).closest('.edit_field').hide()
     false

data/app/assets/javascripts/application.js.erb

@@ -32,6 +32,9 @@
 //= require jquery_ui_datepicker/jquery-ui-timepicker-addon
 //= require admin/fields
 //= require format_buttons
+//= require crm_comments
+//= require jquery_timeago
+//= require timeago
 //= require_self
 
 <%

data/app/assets/javascripts/crm.js

@@ -10,6 +10,7 @@ var crm = {
   searchRequest : null,
   autocompleter : null,
   base_url      : "",
+  language      : 'en-US',
 
   //----------------------------------------------------------------------------
   find_form: function(class_name) {

data/app/assets/javascripts/crm_comments.js.coffee

@@ -0,0 +1,66 @@
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
+#
+# Fat Free CRM is freely distributable under the terms of MIT license.
+# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
+#------------------------------------------------------------------------------
+
+# When comments are added to an entity, disable the add button
+# and add a spinner to indicate request is processing
+(($j) ->
+
+  addSpinnerToComments = ->
+    $j('div.new_comment').each ->
+      container = $j(this)
+      unless container.hasClass('withSpinner')
+        container.find('form').on 'submit', ->
+          container.find('form [type=submit]').attr("disabled", "disabled")
+          container.find('.spinner').show()
+        container.addClass("withSpinner")
+
+  toggleComment = (container) ->
+    baseId  = container.attr('id').replace('_comment_new', '')
+    post    = container.find('#' + baseId + '_post')
+    ask     = container.find('#' + baseId + '_ask')
+    comment = container.find('#' + baseId + '_comment_comment')
+    post.toggle()
+    ask.toggle()
+    if comment.is(":visible")
+      container.find('form [type=submit]').removeAttr("disabled")
+      container.find('.spinner').hide()
+      comment.focus()
+
+  addOpenCloseToComments = ->
+    $j('div.new_comment').each ->
+      container = $j(this)
+      unless container.hasClass('withOpenClose')
+        baseId = container.attr('id').replace('_comment_new', '')
+        post   = container.find('#' + baseId + '_post')
+        ask    = container.find('#' + baseId + '_ask')
+        container.find('.cancel').on 'click', (event) ->
+          toggleComment(container)
+          false
+        new_comment = container.find('#' + baseId + '_post_new_note')
+        new_comment.on 'click', ->
+          toggleComment(container)
+        crm.textarea_user_autocomplete(baseId + '_comment_comment')
+        container.addClass("withOpenClose")
+
+  # Apply when document is loaded
+  $j(document).ready ->
+    addSpinnerToComments()
+    addOpenCloseToComments()
+
+  # Apply when jquery event (e.g. search) occurs
+  $j(document).ajaxComplete ->
+    addSpinnerToComments()
+    addOpenCloseToComments()
+
+  # Apply when protoype event (e.g. cancel edit) occurs
+  Ajax.Responders.register({
+    onComplete: ->
+      addSpinnerToComments()
+      addOpenCloseToComments()
+
+  })
+
+)(jQuery)

data/app/assets/javascripts/lists.js.coffee

@@ -11,9 +11,16 @@
       $(".save_list").show()
       $('.save_list #list_name').focus()
 
+    show_save_personal_form: ->
+      $(".save_peronal_list").show()
+      $('.save_peronal_list #list_name').focus()
+
     hide_save_form: ->
       $(".save_list").hide()
 
+    hide_save_personal_form: ->
+      $(".save_peronal_list").hide()
+
   $(document).ready ->
     lists = new Lists()
 
@@ -22,22 +29,58 @@
       $(".show_lists_save_form").hide()
       false
 
+    $(".show_personal_lists_save_form").live "click", ->
+      lists.show_save_personal_form()
+      $(".show_personal_lists_save_form").hide()
+      false
+
     $(".hide_lists_save_form").live "click", ->
       lists.hide_save_form()
       $(".show_lists_save_form").show()
       false
 
+    $(".hide_lists_save_personal_form").live "click", ->
+      lists.hide_save_personal_form()
+      $(".show_personal_lists_save_form").show()
+      false
+
     $("input#save_list").live "click", ->
       # Set value of hidden list_url field to serialized search form
       $("#list_url").val(window.location.pathname + '?' + $('form.ransack_search').serialize())
       true
 
+    $("input#save_personal_list").live "click", ->
+      # Set value of hidden list_url field to serialized search form
+      $("#personal_list_url").val(window.location.pathname + '?' + $('form.ransack_search').serialize())
+      true
+
+    # When mouseover on li, change asset icons to delete buttons
+    $("#lists li, #personal_lists li").live "mouseover", ->
+      icon = $(this).find('.delete_on_hover i.fa')
+      iconText = getIcon(icon.attr('data-controller'))
+      icon.removeClass(iconText).addClass('fa-times-circle')
+    $("#lists li, #personal_lists li").live "mouseout", ->
+      icon = $(this).find('.delete_on_hover i.fa')
+      iconText = getIcon(icon.attr('data-controller'))
+      icon.removeClass('fa-times-circle').addClass(iconText)
+
+    getIcon = (listType) ->
+      switch (listType) 
+        when "tasks" then "fa-check-square-o"
+        when "campaigns" then "fa-bar-chart-o"
+        when "leads" then "fa-tasks"
+        when "accounts" then "fa-users"
+        when "contacts" then "fa-user"
+        when "opportunities" then "fa-money"
+        when "team" then "fa-globe"
+
     # When mouseover on li, change asset icons to delete buttons
-    $("#lists li").live "mouseover", ->
+    $("#personal_lists li").live "mouseover", ->
       img_el = $(this).find('.delete_on_hover img')
       img_el.attr('src', "/assets/delete.png")
-    $("#lists li").live "mouseout", ->
+    $("#personal_lists li").live "mouseout", ->
       img_el = $(this).find('.delete_on_hover img')
       img_el.attr('src', "/assets/tab_icons/" + img_el.data('controller') + "_active.png")
 
 ) jQuery
+

data/app/assets/javascripts/search.js.coffee

@@ -42,6 +42,7 @@
       switch search_form
         when 'basic_search'
           $('#lists .show_lists_save_form').hide()
+          $('#personal_lists .show_personal_lists_save_form').hide()
           query_input = $('#basic_search input#query')
           if !query_input.is('.defaultTextActive')
             value = query_input.val()
@@ -52,6 +53,7 @@
 
         when 'advanced_search'
           $('#lists .show_lists_save_form').show()
+          $('#personal_lists .show_personal_lists_save_form').show()
           $("#advanced_search form input:submit").click()
           $('#filters').disable() # Disable filters panel (if present)
 

data/app/assets/javascripts/timeago.js

@@ -0,0 +1,17 @@
+// Run function on page load
+jQuery(document).ready(function() {
+  jQuery.timeago.settings.allowFuture = true;
+  // our modification to choose correct language
+  jQuery.timeago.settings.strings = jQuery.timeago.settings.locales[crm.language]
+  jQuery("span.timeago").timeago();
+  // update every minute
+  setInterval(function(){ jQuery("span.timeago").timeago(); }, 60000);
+});
+
+// Run after jQuery ajax event
+jQuery(document).ajaxComplete( function() { jQuery("span.timeago").timeago(); } );
+
+// Run after prototype ajax event
+Ajax.Responders.register( {
+  onComplete: function(response) { jQuery("span.timeago").timeago(); }
+})

data/app/assets/stylesheets/advanced_search.css.scss

@@ -7,31 +7,31 @@
 
   margin-top: 15px;
 
-	.tabs {
-		background: none;
-
-		li {
-			a:link, a:visited {
-				background-color: #ddd;
-				color: #222;
-				font-weight: normal;
-			  font-size: 11px;
-			}
-			a:hover {
-				background-color: #ccc;
-			}
-			a.active {
-				background-color: #eee;
+  .tabs {
+    background: none;
+
+    li {
+      a:link, a:visited {
+        background-color: #ddd;
+        color: #222;
+        font-weight: normal;
+        font-size: 11px;
+      }
+      a:hover {
+        background-color: #ccc;
+      }
+      a.active {
+        background-color: #eee;
         color: black;
-			}
-		}
-	}
+      }
+    }
+  }
 
-	.search_form {
-		border: none;
-		background-color: #eee;
-		padding: 10px;
-	}
+  .search_form {
+    border: none;
+    background-color: #eee;
+    padding: 10px;
+  }
 
   .options {
     float: right;
@@ -52,8 +52,32 @@
     margin-bottom: 7px;
     margin-top: 3px;
   }
-  
-  #advanced_search .fields.sort { float:right; }
+
+  #advanced_search {
+    .combinator {
+      margin-top: 15px;
+    }
+
+    .filters {
+      margin-top: 15px;
+    }
+
+    .fields.condition {
+      margin: 10px 0;
+    }
+
+    .fields.sort {
+      float:right;
+    }
+
+    .submit-search {
+      margin-top: 20px;
+    }
+  }
+
+  .pull-right {
+    float: none;
+  }
 
 }
 

data/app/assets/stylesheets/application.css.erb

@@ -23,7 +23,10 @@
  *= require admin/fields
  *= require advanced_search
  *= require format_buttons
+ *= require font-awesome
+ *= require lists
  *= require_self
+
  */
 
 <%

data/app/assets/stylesheets/common.scss

@@ -687,6 +687,19 @@ span.handle img {
   input#save_list {
     margin-top: 6px; } }
 
+#personal_lists {
+  .show_personal_lists_save_form {
+    text-align: right; }
+  .show_personal_lists_save_form, .save_list {
+    margin: 10px 0 0; }
+  .list_icon {
+    opacity: 0.5;
+    width: 12px; }
+  img.input_info {
+    vertical-align: middle; }
+  input#save_list {
+    margin-top: 6px; } }
+
 .fields .subtitle {
   cursor: move; }
 

data/app/assets/stylesheets/format_buttons.css.scss

@@ -20,16 +20,21 @@
 
 ul.format-buttons li {
   display: inline;
-  margin: 0 3px;
-
+  margin: 3px;
   a {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-    opacity: 0.3;
+    color: gray;
+    i.fa {
+      font-size: 160%;
+      opacity: 0.3;
+    }
+  }
+  a.active i.fa { opacity: 1; }
+  a:hover i.fa {
+    opacity: 1;
+  }
+  a:active i.fa { opacity: 1; }
+  a:hover {
+    background:none;
+    color:gray;
   }
-  a.active { opacity: 1; }
-  a:hover { opacity: 0.6; }
-  a:active { opacity: 1; }
-
 }