fat_free_crm 0.13.2 → 0.13.3

data/app/views/shared/_select_popup.html.haml

@@ -2,20 +2,18 @@
 
 :plain
   new crm.Popup({
-    trigger     : "select_#{singular}",
-    target      : "jumpbox",
-    under       : "select_#{singular}",
-    appear      : 0.3,
-    fade        : 0.3,
+    trigger     : "#select_#{singular}",
+    target      : "#jumpbox",
+    under       : "#select_#{singular}",
+    appear      : 300,
+    fade        : 300,
     before_show : function() {
-      $("jumpbox_menu").hide();
-      $("jumpbox_label").innerHTML = "#{t(popup)}:"
-      $("jumpbox_label").show();
+      $("#jumpbox_menu").hide();
+      $("#jumpbox_label").html("#{t(popup)}:");
+      $("#jumpbox_label").show();
       crm.auto_complete("#{popup}", "#{related.class.to_s.downcase.pluralize}/#{related.id}");
     },
     after_show  : function() {
-      $("auto_complete_query").focus();
-    },
-    after_hide  : function() {
+      $("#auto_complete_query").focus();
     }
   });

data/app/views/shared/_tags.html.haml

@@ -1,8 +1,9 @@
 - asset = controller_name.singularize
 %tr
   %td{ :valign => :top, :colspan => span }
-    .label Tags:
-    = f.select :tag_list, Tag.all.map{|t| [t.name, t.name] }, {:value => f.object.tags.map{|t| t.name }}, {:multiple => true, :"data-placeholder" => t(:select_or_create_tags), :style => "width: 500px;"}
+    .label= t(:tags) + ":"
 
-    :javascript
-      crm.chosen_taglist('#{asset}', '#{controller_name}', '#{params[:id]}');
+    = f.hidden_field :tag_list,
+    {:class => "select2_tag", :data => {:tags => Tag.all.map{|t| t.name},
+    :url => url_for(action: 'field_group'), :placeholder => t(:select_or_create_tags),
+    :multiple => true, :asset_id => f.object.try(:id) }}

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

@@ -7,7 +7,9 @@
   .tools
     - if shown_on_landing_page?
       = link_to_discard(completed) + (current_user == completed.user ? ' | ' : '')
-    = link_to_task_delete(completed, bucket) if current_user == completed.user
+    - if can?(:manage, completed)
+      = link_to_task_uncomplete(completed, bucket)  + ' | '
+      = link_to_task_delete(completed, bucket)
 
   .indent
     %strike= auto_link h(completed.name)

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

@@ -1,7 +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}
+      #{t(:pending_tab).html_safe}
     %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")}') }

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

@@ -31,4 +31,4 @@
           .label= t(:extra_info).capitalize << ':'
           = f.text_area :background_info, :style =>"width:500px", :rows => 3
 
-    = hook(:task_top_section_bottom, self, :f => f)
+    = hook(:task_top_section_bottom, self, :f => f) {}

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

@@ -1,14 +1,14 @@
 - if called_from_index_page? # Completing from pending tasks view -- fade out task partial and update sidebar.
 
-  jQuery('##{dom_id(@task, :tools)}').hide();
-  jQuery('##{dom_id(@task)}').fadeOut({ duration:500 });
+  $('##{dom_id(@task, :tools)}').hide();
+  $('##{dom_id(@task)}').fadeOut({ duration:500 });
   - if @empty_bucket
-    jQuery('#list_#{@empty_bucket}').fadeOut({ duration:500 });
+    $('#list_#{@empty_bucket}').fadeOut({ duration:500 });
   = refresh_sidebar(:index, :filters)
 
 - else # Completing from the Asset page -- replace task partial with completed one.
 
-  jQuery('##{dom_id(@task)}').hide();
-  jQuery('##{dom_id(@task)}').html('#{ j render(:partial => "tasks/completed", :collection => [ @task ], :locals => { :bucket => nil }) }');
-  jQuery('##{dom_id(@task)}').fadeIn({ duration:500 });
-  jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+  $('##{dom_id(@task)}').hide();
+  $('##{dom_id(@task)}').html('#{ j render(:partial => "tasks/completed", :collection => [ @task ], :locals => { :bucket => nil }) }');
+  $('##{dom_id(@task)}').fadeIn({ duration:500 });
+  $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');

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

@@ -1,39 +1,39 @@
 - if @task.valid?
-  jQuery('#create_task_arrow').html(crm.COLLAPSED);
-  jQuery('#create_task').slideUp(250);
+  $('#create_task_arrow').html(crm.COLLAPSED);
+  $('#create_task').slideUp(250);
 
   - if called_from_index_page?  # "Classic" [Create Task] form requested from the Tasks page.
-    jQuery('#title').html('#{ j (@view == "assigned" ? t(:assigned_tasks) : t(:tasks)) }');
+    $('#title').html('#{ j (@view == "assigned" ? t(:assigned_tasks) : t(:tasks)) }');
 
     -# Show flash if assigned to somebody else from the [Pending Tasks] page.
     - if @view == "pending" && @task.assigned_to && @task.assigned_to != current_user.id
-      jQuery('#flash').html('#{j t(:task_created)} #{j t(:task_assigned_to, @task.assignee.full_name)} (#{j link_to(t(:view_assigned_tasks), url_for(:view => "assigned"))}).');
+      $('#flash').html('#{j t(:task_created)} #{j t(:task_assigned_to, @task.assignee.full_name)} (#{j link_to(t(:view_assigned_tasks), url_for(:view => "assigned"))}).');
       crm.flash('notice', true);
-      jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+      $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
 
       - # Show flash if assigned to current user from the [Assigned Tasks] page.
     - elsif @view == "assigned" && @task.assigned_to.blank?
-      jQuery('#flash').html('#{j t(:task_created)} (#{j link_to(t(:view_pending_tasks), tasks_url)}).');
+      $('#flash').html('#{j t(:task_created)} (#{j link_to(t(:view_pending_tasks), tasks_url)}).');
       crm.flash('notice', true);
-      jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+      $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
 
     - else # Show newly created task by inserting its div into appropriate bucket; then update tasks sidebar.
       - bucket = @task.computed_bucket
-      jQuery('#list_#{bucket}').show();
-      jQuery('##{bucket}').before('#{ j render(:partial => @view, :collection => [ @task ], :locals => { :bucket => bucket }) }');
-      jQuery('##{dom_id(@task)}').effect("highlight", { duration:1500 });
+      $('#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)
 
     crm.flick('empty', 'remove');
 
   - else # Inline [Create Task] form reqested from any of the core asset landing pages.
-    jQuery('#create_task_title').html('#{ j t(:tasks) }');
+    $('#create_task_title').html('#{ j t(:tasks) }');
     - partial = (@task.assigned_to && @task.assigned_to != current_user.id) ? "assigned" : "pending"
-    jQuery('#tasks').prepend('#{ j render(:partial => "tasks/#{partial}", :collection => [@task], :locals => { :bucket => nil }) }');
-    jQuery('##{dom_id(@task)}').effect("highlight", { duration:1500 });
-    jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+    $('#tasks').prepend('#{ j render(:partial => "tasks/#{partial}", :collection => [@task], :locals => { :bucket => nil }) }');
+    $('##{dom_id(@task)}').effect("highlight", { duration:1500 });
+    $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
 
 - else # Couldn't create the task -- validation failed.
-  jQuery('#create_task').effect("shake", { duration:250, distance: 6 });
-  jQuery('#task_name').focus();
-  jQuery('#new_task input[type=submit]').enable();
+  $('#create_task').effect("shake", { duration:250, distance: 6 });
+  $('#task_name').focus();
+  $('#new_task input[type=submit]').enable();

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

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

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

@@ -1 +1 @@
-jQuery('##{dom_id(@task)}').slideUp(250);
+$('##{dom_id(@task)}').slideUp(250);

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

@@ -3,7 +3,7 @@
 - if params[:cancel].true?     # <----------------- Hide [Edit Task]
 
   - partial = (@task.assigned_to && @task.assigned_to != current_user.id) ? "assigned" : "pending"
-  jQuery('##{id}').html('#{ j render(:partial => partial, :collection => [ @task ], :locals => { :bucket => @task.bucket }) }');
+  $('##{id}').html('#{ j render(:partial => partial, :collection => [ @task ], :locals => { :bucket => @task.bucket }) }');
 
 - else # <----------------------------------------  Show [Edit Task] form.
 
@@ -14,7 +14,7 @@
   - if @previous
     - if @previous.is_a?(Task)
       - partial = (@previous.assigned_to && @previous.assigned_to != current_user.id) ? "assigned" : "pending"
-      jQuery('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => partial, :collection => [ @previous ], :locals => { :bucket => nil }) }');
+      $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => partial, :collection => [ @previous ], :locals => { :bucket => nil }) }');
     - else
       crm.flick('task_#{@previous}', 'remove');
 
@@ -22,5 +22,5 @@
   crm.highlight_off('#{id}');
 
   -# Show [Edit Task] form.
-  jQuery('##{id}').html('#{ j render(:partial => "edit") }');
-  jQuery('#task_name').focus();
+  $('##{id}').html('#{ j render(:partial => "edit") }');
+  $('#task_name').focus();

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

@@ -1,4 +1,4 @@
 - if params[:checked] == 'true'
-  jQuery('#list_#{j params[:filter]}').show();
+  $('#list_#{j params[:filter]}').show();
 - else
-  jQuery('#list_#{j params[:filter]}').hide();
+  $('#list_#{j params[:filter]}').hide();

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

@@ -2,7 +2,7 @@ crm.flick('empty', 'toggle');
 crm.flip_form('create_task');
 
 - unless params[:cancel].true?
-  jQuery('#create_task').html('#{ j render(:partial => "new") }');
+  $('#create_task').html('#{ j render(:partial => "new") }');
   crm.set_title('create_task', '#{j t(:create_task) }');
 - else
   crm.set_title('create_task', '#{ @view == "assigned" ? t(:assigned_tasks) : t(:tasks) }');

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

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

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

@@ -4,7 +4,7 @@
     -# If it's not Tasks tab then we just reload appropriate
     -# partial with the new task, and update recent items.
     = replace_content(@task)
-    jQuery('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
+    $('#recently').replaceWith('#{ j render(:partial => "shared/recently") }');
   - else
     - if @task.assigned_to != @task_before_update.assigned_to
       = reassign(@task)
@@ -14,6 +14,6 @@
       = replace_content(@task, @task.bucket)
 
 - else # Errors
-  jQuery('##{dom_id(@task)}').effect("shake", { duration:250, distance: 6 });
-  jQuery('#task_name').focus();
-  jQuery('#task_submit').enable();
+  $('##{dom_id(@task)}').effect("shake", { duration:250, distance: 6 });
+  $('#task_name').focus();
+  $('#task_submit').enable();

data/app/views/users/_avatar.html.haml

@@ -1,5 +1,5 @@
 .remote
-  = form_for(@user, :url => upload_avatar_user_path(@user, :format => "js"), :html => { :multipart => true, :target => "uploading", :onsubmit => "$('user_avatar_submit').disabled = true" }) do |f|
+  = form_for(@user, :url => upload_avatar_user_path(@user, :format => "js"), :html => { :multipart => true, :target => "uploading", :onsubmit => "$('#user_avatar_submit').disabled = true" }) do |f|
     = link_to_close avatar_user_path(@user)
     = error_messages_for :avatar, :object => @user.avatar, :object_name => t('avatar')
 

data/app/views/users/_languages.html.haml

@@ -1,9 +1,9 @@
 :plain
   new crm.Menu({
-    trigger   : "locale",
+    trigger   : "#locale",
     align     : "right",
-    appear    : 0.5,
-    fade      : 0.5,
+    appear    : 500,
+    fade      : 500,
     width     : 160,
     menu_items: [ #{sort_by_language.join(",")} ]
   });

data/app/views/users/_profile.html.haml

@@ -63,5 +63,5 @@
       #{t :or}
       = link_to_cancel edit_user_path(@user)
 
-  = hook(:profile_user_bottom, self)
+  = hook(:profile_user_bottom, self) {}
 %br

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

@@ -2,7 +2,7 @@
   crm.flip_form('upload_avatar');
   crm.set_title('upload_avatar', '#{j t(:my_profile)}');
 - else
-  jQuery('#upload_avatar').html('#{ j render(:partial => "avatar") }');
+  $('#upload_avatar').html('#{ j render(:partial => "avatar") }');
   crm.hide_form('edit_profile');
   crm.hide_form('change_password');
   crm.flip_form('upload_avatar');

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

@@ -1,13 +1,13 @@
 - if @user.errors.empty?
   crm.flip_form('change_password');
   crm.set_title('change_password', '#{ j t(:my_profile) }');
-  jQuery('#flash').html('#{ j flash[:notice] }');
+  $('#flash').html('#{ j flash[:notice] }');
   crm.flash('notice')
   - flash[:notice] = nil
 - else
-  jQuery('#change_password').html('#{ j render(:partial => "password") }');
-  jQuery('#change_password').effect("shake", { duration:250, distance: 6 });
+  $('#change_password').html('#{ j render(:partial => "password") }');
+  $('#change_password').effect("shake", { duration:250, distance: 6 });
   - if @user.errors[:current_password].present?
-    jQuery('#current_password').focus();
+    $('#current_password').focus();
   - else
-    jQuery('#user_password').focus();
+    $('#user_password').focus();

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

@@ -2,7 +2,7 @@
   crm.flip_form('edit_profile');
   crm.set_title('edit_profile', '#{ j t(:my_profile) }');
 - else
-  jQuery('#edit_profile').html('#{ j render(:partial => "profile") }');
+  $('#edit_profile').html('#{ j render(:partial => "profile") }');
   crm.hide_form('upload_avatar');
   crm.hide_form('change_password');
   crm.flip_form('edit_profile');

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

@@ -2,9 +2,9 @@
   crm.flip_form('change_password');
   crm.set_title('change_password', '#{t(:my_profile)}');
 - else
-  jQuery('#change_password').html('#{ j render(:partial => "password") }');
+  $('#change_password').html('#{ j render(:partial => "password") }');
   crm.hide_form('edit_profile');
   crm.hide_form('upload_avatar');
   crm.flip_form('change_password');
   crm.set_title('change_password', '#{t(:change_password)}');
-  jQuery('#current_password').focus();
+  $('#current_password').focus();

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

@@ -10,6 +10,6 @@
 
 .list#profile= render "user"
 
-= hook(:show_user_bottom, self)
+= hook(:show_user_bottom, self) {}
 
 %iframe#uploading{ :name => "uploading", :style => "width:100px; height:10px; border:5px" }

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

@@ -1,9 +1,9 @@
 - if @user.errors.empty?
   crm.flip_form('edit_profile');
   crm.set_title('edit_profile', '#{j t(:my_profile)}');
-  jQuery('#welcome_username').html('#{j current_user.name}');
-  jQuery('#profile').html('#{ j render(:partial => "user") }');
+  $('#welcome_username').html('#{j current_user.name}');
+  $('#profile').html('#{ j render(:partial => "user") }');
 - else
-  jQuery('#edit_profile').html('#{ j render(:partial => "profile") }');
-  jQuery('#edit_profile').effect("shake", { duration:250, distance: 6 });
-  jQuery('#user_email').focus();
+  $('#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

@@ -1,7 +1,7 @@
 - if @user.avatar.nil? || @user.avatar.errors.empty?
   crm.flip_form('upload_avatar');
   crm.set_title('upload_avatar', '#{j t(:my_profile)}');
-  jQuery('#profile').html('#{ j render(:partial => "user") }');
+  $('#profile').html('#{ j render(:partial => "user") }');
 - else
-  jQuery('#upload_avatar').html('#{ j render(:partial => "avatar") }');
-  jQuery('#upload_avatar').effect("shake", { duration:250, distance: 6 });
+  $('#upload_avatar').html('#{ j render(:partial => "avatar") }');
+  $('#upload_avatar').effect("shake", { duration:250, distance: 6 });

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

@@ -8,4 +8,4 @@
         - versions = Version.history(object).paginate(:page => 1, :per_page => 20)
         = render :partial => "versions/version", :collection => versions
 
-      = will_paginate versions, :id => 'versions_pagination', :params => {:action => :versions}
+      = paginate( collection: versions, id: 'versions_pagination', params: { action: 'versions' } )

data/config/application.rb

@@ -81,6 +81,9 @@ module FatFreeCRM
     # Don't initialize Rails environment
     config.assets.initialize_on_precompile = false
 
+    # Which extra assets to precompile
+    config.assets.precompile += %w(print.css)
+
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
   end

data/config/environments/production.rb

@@ -15,7 +15,7 @@ if defined?(FatFreeCRM::Application)
     config.action_controller.perform_caching = true
 
     # Disable Rails's static asset server (Apache or nginx will already do this)
-    config.serve_static_assets = false
+    config.serve_static_assets = true
 
     # Compress JavaScripts and CSS
     config.assets.compress = true

data/config/environments/staging.rb

@@ -3,17 +3,62 @@
 # 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
 #------------------------------------------------------------------------------
-if defined?(FatFreeCRM::Application)
-  require FatFreeCRM.root.join('config', 'environments', 'production')
-  FatFreeCRM::Application.configure do
-    # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-    # the I18n.default_locale when a translation can not be found)
-    config.i18n.fallbacks = false
-
-    # See everything in the log (default is :info)
-    config.log_level = :debug
-
-    # Full error reports
-    config.consider_all_requests_local = true
-  end
+
+FatFreeCRM::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on.
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = true
+
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = true
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
+
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
+
+  # Specifies the header that your server uses for sending files
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
+
+  # See everything in the log (default is :info)
+  config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+  config.assets.precompile += ['print.css', 'jquery_ui_datepicker/*.js']
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
 end