Ported campaigns, leads and accounts

app/helpers/campaigns_helper.rb

@@ -20,14 +20,7 @@ module CampaignsHelper
   # Sidebar checkbox control for filtering campaigns by status.
   #----------------------------------------------------------------------------
   def campaign_status_checkbox(status, count)
-    checked = (session[:campaigns_filter] ? session[:campaigns_filter].split(",").include?(status.to_s) : count.to_i > 0)
-    onclick = remote_function(
-      :url      => { :action => :filter },
-      :with     => h(%Q/"status=" + $$("input[name='status[]']").findAll(function (el) { return el.checked }).pluck("value")/),
-      :loading  => "$('loading').show()",
-      :complete => "$('loading').hide()"
-    )
-    check_box_tag("status[]", status, checked, :id => status, :onclick => onclick)
+    entity_filter_checkbox(:status, status, count)
   end
 
   #----------------------------------------------------------------------------

app/helpers/leads_helper.rb

@@ -53,14 +53,7 @@ def confirm_reject(lead)
   # Sidebar checkbox control for filtering leads by status.
   #----------------------------------------------------------------------------
   def lead_status_checkbox(status, count)
-    checked = (session[:leads_filter] ? session[:leads_filter].split(",").include?(status.to_s) : count.to_i > 0)
-    onclick = remote_function(
-      :url      => { :action => :filter },
-      :with     => h(%Q/"status=" + $$("input[name='status[]']").findAll(function (el) { return el.checked }).pluck("value")/),
-      :loading  => "$('loading').show()",
-      :complete => "$('loading').hide()"
-    )
-    check_box_tag("status[]", status, checked, :id => status, :onclick => onclick)
+    entity_filter_checkbox(:status, status, count)
   end
 
   # Returns default permissions intro for leads

app/views/accounts/_sidebar_index.html.haml

@@ -1,6 +1,4 @@
 .filters#filters
-  = render "shared/search"
-  = hook(:index_account_sidebar_bottom, self)
   - Setting.account_category.each do |key|
     .check_box{:style => "border-bottom: 1px silver dotted;"}
       %div{:style => "float:right;"}

app/views/accounts/create.js.rjs

@@ -1,6 +1,5 @@
 if @account.valid?
   page[:create_account_arrow].replace_html "►"
-  page[:create_account_title].replace_html t(:accounts)
   page.visual_effect :toggle_blind, :create_account, :duration => 0.3, :afterFinish => 'function(effect) {effect.element.update("")}'
   page.insert_html :top, :accounts, :partial => "account", :collection => [ @account ]
   page[dom_id(@account)].visual_effect :highlight, :duration => 1.5

app/views/accounts/index.html.haml

@@ -1,19 +1,18 @@
 = styles_for :account
 
-.title_tools
-  = link_to_inline(:create_account, new_account_path, :text => t(:create_account)) << " | "
-  = link_to_inline(:advanced_search, advanced_search_accounts_path, :text => t(:advanced_search)) << " | "
-  = link_to_inline(:options, options_accounts_path, :text=> t(:options))
+= image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
+
+#buttons
+  = render 'format_buttons'
+  .create_asset
+    = link_to_inline(:create_account, new_account_path, :text => t(:create_account))
+
+= render 'search'
 
-.title
-  %span#create_account_title #{t :accounts}
-  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
-.remote#options{ hidden }
-.remote#advanced_search{ hidden_if(!params[:q]) }
-  - if params[:q]
-    = render :partial => "advanced_search"
 .remote#create_account{ hidden }
 
+.remote#options{ hidden }
+
 .list#accounts
   - if @accounts.any?
     = render @accounts

app/views/campaigns/_sidebar_index.html.haml

@@ -1,5 +1,4 @@
 .filters#filters
-  = render "shared/search"
   - Setting.campaign_status.each do |key|
     .check_box{:style => "border-bottom: 1px silver dotted;"}
       %div{:style => "float:right;"}

app/views/campaigns/create.js.rjs

@@ -1,6 +1,5 @@
 if @campaign.valid?
   page[:create_campaign_arrow].replace_html "►"
-  page[:create_campaign_title].replace_html t(:campaigns)
   page.visual_effect :toggle_blind, :create_campaign, :duration => 0.3, :afterFinish => 'function(effect) {effect.element.update("")}'
   page.insert_html :top, :campaigns, :partial => "campaign", :collection => [ @campaign ]
   page[dom_id(@campaign)].visual_effect :highlight, :duration => 1.5

app/views/campaigns/index.html.haml

@@ -1,19 +1,18 @@
 = styles_for :campaign
 
-.title_tools
-  = link_to_inline(:create_campaign, new_campaign_path, :text => t(:create_campaign)) << " | "
-  = link_to_inline(:advanced_search, advanced_search_campaigns_path, :text => t(:advanced_search)) << " | "
-  = link_to_inline(:options, options_campaigns_path, :text => t(:options))
+= image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
+
+#buttons
+  = render 'format_buttons'
+  .create_asset
+    = link_to_inline(:create_campaign, new_campaign_path, :text => t(:create_campaign))
+
+= render 'search'
 
-.title
-  %span#create_campaign_title #{t :campaigns}
-  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
-.remote#options{ hidden }
-.remote#advanced_search{ hidden_if(!params[:q]) }
-  - if params[:q]
-    = render :partial => "advanced_search"
 .remote#create_campaign{ hidden }
 
+.remote#options{ hidden }
+
 .list#campaigns
   - if @campaigns.any?
     = render @campaigns

app/views/leads/_sidebar_index.html.haml

@@ -1,5 +1,4 @@
 .filters#filters
-  = render "shared/search"
   - Setting.lead_status.each do |key|
     .check_box{:style => "border-bottom: 1px silver dotted;"}
       %div{:style => "float:right;"}

app/views/leads/create.js.rjs

@@ -1,6 +1,5 @@
 if @lead.valid?
   page[:create_lead_arrow].replace_html "►".html_safe
-  page[:create_lead_title].replace_html t(:leads)
   page.visual_effect :toggle_blind, :create_lead, :duration => 0.3, :afterFinish => 'function(effect) {effect.element.update("")}'
   page.insert_html :top, :leads, :partial => "lead", :collection => [ @lead ]
   page[dom_id(@lead)].visual_effect :highlight, :duration => 1.5

app/views/leads/index.html.haml

@@ -1,19 +1,18 @@
 = styles_for :lead
 
-.title_tools
-  = link_to_inline(:create_lead, new_lead_path, :text => t(:create_lead)) << " | "
-  = link_to_inline(:advanced_search, advanced_search_leads_path, :text => t(:advanced_search)) << " | "
-  = link_to_inline(:options, options_leads_path, :text => t(:options))
+= image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
+
+#buttons
+  = render 'format_buttons'
+  .create_asset
+    = link_to_inline(:create_lead, new_lead_path, :text => t(:create_lead))
+
+= render 'search'
 
-.title
-  %span#create_lead_title #{t :leads}
-  = image_tag("loading.gif", :size => :thumb, :id => "loading", :style => "display: none;")
-.remote#options{ hidden }
-.remote#advanced_search{ hidden_if(!params[:q]) }
-  - if params[:q]
-    = render :partial => "advanced_search"
 .remote#create_lead{ hidden }
 
+.remote#options{ hidden }
+
 .list#leads
   - if @leads.any?
     = render @leads