e9_crm 0.1.33 → 0.1.34

data/app/views/e9_crm/campaign_groups/_header.html.haml

@@ -1,3 +1,3 @@
-.toolbar
-  .toolbar-right
+- content_for :toolbar_right do
+  = toolbar_actions do
     = link_to_new_resource(CampaignGroup)

data/app/views/e9_crm/campaigns/_header.html.haml

@@ -1,21 +1,23 @@
-.toolbar
-  .toolbar-left
-  .toolbar-middle
+- content_for :toolbar_middle do
+  = toolbar_filters do
     = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
-      %fieldset
-        %legend= t(:form_legend_filter_campaigns)
-        %select{:name => 'type'}
+      .field
+        = label_tag 'campaign-type', t(:filter_by, :attribute => resource_class.human_attribute_name(:type))
+        %select{:name => 'type', :id => 'campaign-type'}
           = campaign_type_select_options
-        %select{:name => 'group'}
+      .field
+        = label_tag 'campaign-group', t(:filter_by, :attribute => resource_class.human_attribute_name(:group))
+        %select{:name => 'group', :id => 'campaign-group'}
           = campaign_group_select_options
-        %select{:name => 'active'}
+      .field
+        = label_tag 'campaign-active', t(:filter_by, :attribute => resource_class.human_attribute_name(:active))
+        %select{:name => 'active', :id => 'campaign-active'}
           = campaign_active_select_options
 
-  .toolbar-right
+- content_for :toolbar_right do
+  = toolbar_forms do
     = form_tag new_campaign_path, :method => :get, :id => 'new_campaign_form' do
-      %fieldset
-        %legend= t(:form_legend_manage)
-        = label_tag 'new_campaign_type_select', t('activerecord.links.new', :model => Campaign.model_name.human)
-        %select{:name => 'type', :id => 'new_campaign_type_select'}
-          = campaign_type_select_options(false)
-        = submit_tag t(:go), :name => nil
+      = label_tag 'new_campaign_type_select', t('activerecord.links.new', :model => Campaign.model_name.human)
+      %select{:name => 'type', :id => 'new_campaign_type_select'}
+        = campaign_type_select_options(false)
+      = submit_tag t(:go), :name => nil

data/app/views/e9_crm/campaigns/reports.html.haml

@@ -1,19 +1,30 @@
 = title (@index_title || e9_t(:index_title, :scope => 'e9_crm.reports'))
 
-.toolbar
-  .toolbar-left
+- content_for :toolbar_middle do
+  = toolbar_filters do
     = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
-      %select{:name => 'type'}
-        = campaign_type_select_options
-      %select{:name => 'group'}
-        = campaign_group_select_options
-      %select{:name => 'from'}
-        = deal_date_select_options
-      %select{:name => 'until'}
-        = deal_date_select_options(:type => :until)
+      .field
+        = label_tag 'campaign-type', t(:filter_by, :attribute => resource_class.human_attribute_name(:type))
+        %select{:name => 'type', :id => 'campaign-type'}
+          = campaign_type_select_options
+      .field
+        = label_tag 'campaign-group', t(:filter_by, :attribute => resource_class.human_attribute_name(:group))
+        %select{:name => 'group', :id => 'campaign-group'}
+          = campaign_group_select_options
+      .field
+        = label_tag 'campaign-from', t(:filter_by, :attribute => resource_class.human_attribute_name(:from))
+        %select{:name => 'from', :id => 'campaign-from'}
+          = deal_date_select_options
+      .field
+        = label_tag 'campaign-until', t(:filter_by, :attribute => resource_class.human_attribute_name(:until))
+        %select{:name => 'until', :id => 'campaign-until'}
+          = deal_date_select_options(:type => :until)
 
-  .toolbar-right
+- content_for :toolbar_right do
+  = toolbar_actions do
     = link_to_collection(Campaign)
 
+= render 'shared/admin/toolbar'
+
 %div#records_table
   = render 'reports_table'

data/app/views/e9_crm/companies/_header.html.haml

@@ -1,10 +1,4 @@
-.toolbar
-  .toolbar-left
-  .toolbar-middle
-  .toolbar-right
-    %fieldset
-      %legend= t(:form_legend_manage)
-      .manage-company
-        = link_to_new_resource(Company)
-      .manage-contacts
-        = link_to_collection(Contact)
+- content_for :toolbar_right do
+  = toolbar_actions do
+    = link_to_collection(Contact)
+    = link_to_new_resource(Company)

data/app/views/e9_crm/contacts/_sidebar_search_form.html.haml

@@ -4,7 +4,7 @@
 
   = form_tag(resource_class, :method => :get, :class => 'field', :id => 'contact_search_form') do
     = label_tag 'contact_search_field', t(:search)
-    = text_field_tag 'search', params[:search], :id => 'contact_search_field', :placeholder => t(:contact_search_placeholder)
+    = text_field_tag 'search', params[:search], :class => 'keyup-submit', :placeholder => t(:contact_search_placeholder)
 
   = form_tag(resource_class, :method => :get, :class => 'scope-selects field', :id => 'company_search_form') do
     = label_tag 'contact_company_select', Company.model_name.human

data/app/views/e9_crm/contacts/edit.html.haml

@@ -1,6 +1,8 @@
 = title @edit_title || e9_t(:edit_title)
 
-.actions
-  = link_to 'View Contact', resource
+- content_for :toolbar_right do
+  = toolbar_actions do
+    = link_to 'View Contact', resource
 
+= render 'shared/admin/toolbar'
 = render 'form'

data/app/views/e9_crm/contacts/index.html.haml

@@ -1,22 +1,17 @@
 = title (@index_title || e9_t(:index_title))
 
-.toolbar
-  .toolbar-left
-    #sidebar-email-form
-      = render 'sidebar_email_form'
-  
-  .toolbar-middle
-    #sidebar-search-form
-      = render 'sidebar_search_form'
-      
-  .toolbar-right
-    #sidebar-actions
-      %fieldset
-        %legend= "Manage"
-        .manage-contacts
-          = link_to_new_resource(Contact)
-        .manage-company
-          = link_to_collection(Company)
+- content_for :toolbar_middle do
+  = toolbar_filters do
+    = render 'sidebar_search_form'
+
+- content_for :toolbar_right do
+  = toolbar_actions do
+    = link_to_new_resource(Contact)
+    = link_to_collection(Company)
+  = toolbar_forms do
+    = render 'sidebar_email_form'
+
+= render 'shared/admin/toolbar'
         
 #records_table
   = render 'table', :resources => collection

data/app/views/e9_crm/deals/_header.html.haml

@@ -1,22 +1,24 @@
-.toolbar
-  .toolbar-left
-  .toolbar-middle
+- content_for :toolbar_middle do
+  = toolbar_filters do
     = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
-      %fieldset
-        %legend= t(:form_legend_filter_campaigns)
-        %select{:name => 'status'}
+      .field
+        = label_tag 'deal-status', t(:filter_by, :attribute => resource_class.human_attribute_name(:status))
+        %select{:name => 'status', :id => 'deal-status'}
           = deal_status_select_options
-        %select{:name => 'category'}
+      .field
+        = label_tag 'deal-category', t(:filter_by, :attribute => resource_class.human_attribute_name(:category))
+        %select{:name => 'category', :id => 'deal-category'} 
           = deal_category_select_options 
-        %select{:name => 'owner'}
+      .field
+        = label_tag 'deal-owner', t(:filter_by, :attribute => resource_class.human_attribute_name(:owner))
+        %select{:name => 'owner', :id => 'deal-owner'}
           = deal_owner_select_options 
-        %select{:name => 'closed'}
+      .field
+        = label_tag 'deal-closed', t(:filter_by, :attribute => resource_class.human_attribute_name(:closed))
+        %select{:name => 'closed', :id => 'deal-closed'}
           = deal_date_select_options(:type => :in_month)
 
-  .toolbar-right
-    %fieldset
-      %legend= t(:form_legend_manage)
-      .manage-leads
-      = link_to I18n.t('activerecord.links.index', :models => 'Leads'), leads_path
-      .manage-new-deals
-      = link_to_new_resource(Deal)
+- content_for :toolbar_right do
+  = toolbar_actions do
+    = link_to I18n.t('activerecord.links.index', :models => 'Leads'), leads_path
+    = link_to_new_resource(Deal)

data/app/views/e9_crm/deals/_leads_header.html.haml

@@ -1,18 +1,21 @@
-.toolbar
-  .toolbar-left
-  .toolbar-middle
+- content_for :toolbar_middle do
+  = toolbar_filters do
     = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
-      %fieldset
-        %legend= t(:form_legend_filter_campaigns)
-        %select{:name => 'offer'}
+      .field
+        = label_tag 'lead-offer', t(:filter_by, :attribute => resource_class.human_attribute_name(:offer))
+        %select{:name => 'offer', :id => 'lead-offer'}
           = deal_offer_select_options 
-        %select{:name => 'from'}
+      .field
+        = label_tag 'lead-from', t(:filter_by, :attribute => resource_class.human_attribute_name(:from))
+        %select{:name => 'from', :id => 'lead-from'}
           = deal_date_select_options
-        %select{:name => 'until'}
+      .field
+        = label_tag 'lead-until', t(:filter_by, :attribute => resource_class.human_attribute_name(:until))
+        %select{:name => 'until', :id => 'lead-until'}
           = deal_date_select_options(:type => :until)
 
-  .toolbar-right
-    %fieldset
-      %legend= t(:form_legend_manage)
-      .manage-deals
-        = link_to_collection(Deal)
+- content_for :toolbar_right do
+  = toolbar_actions do
+    = link_to_collection(Deal)
+
+= render 'shared/admin/toolbar'

data/app/views/e9_crm/offers/_header.html.haml

@@ -1,3 +1,3 @@
-.toolbar
-  .toolbar-right
+- content_for :toolbar_right do
+  = toolbar_actions do
     = link_to_new_resource(Offer)

data/app/views/e9_crm/page_views/_header.html.haml

@@ -1,15 +1,22 @@
-.toolbar
-  .toolbar-left
+- content_for :toolbar_middle do
+  = toolbar_filters do
     = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
-      %select{:name => 'campaign'}
-        = page_view_campaign_select_options
-      %select{:name => 'new_visits'}
-        = page_view_new_visit_select_options
-      %select{:name => 'month'}
-        = page_view_date_select_options(:type => :in_month)
-
-      %input.contact-autocomplete{:type => :text, :style => @contact.blank? && '' || 'display:none', :placeholder => 'Enter Contact...'}
-      .contact-select{:style => @contact.blank? && 'display:none' || ''}
-        %span.content= @contact.try(:name_with_email)
-        %input{:type => :hidden, :name => "contact", :value => @contact.try(:id)}
-        %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove
+      .field
+        = label_tag 'pageview-campaign', t(:filter_by, :attribute => resource_class.human_attribute_name(:campaign))
+        %select{:name => 'campaign', :id => 'pageview-campaign'}
+          = page_view_campaign_select_options
+      .field
+        = label_tag 'pageview-events', t(:filter_by, :attribute => resource_class.human_attribute_name(:event))
+        %select{:name => 'new_visits', :id => 'pageview-events'}
+          = page_view_new_visit_select_options
+      .field
+        = label_tag 'pageview-month', t(:filter_by, :attribute => resource_class.human_attribute_name(:month))
+        %select{:name => 'month', :id => 'pageview-month'}
+          = page_view_date_select_options(:type => :in_month)
+      .field
+        = label_tag 'pageview-contact', t(:filter_by, :attribute => resource_class.human_attribute_name(:contact))
+        %input.contact-autocomplete{:type => :text, :style => @contact.blank? && '' || 'display:none', :placeholder => 'Enter Contact...', :id => 'pageview-contact'}
+        .contact-select{:style => @contact.blank? && 'display:none' || ''}
+          %span.content= @contact.try(:name_with_email)
+          %input{:type => :hidden, :name => "contact", :value => @contact.try(:id)}
+          %a{:class => :remove, :title => "Remove", :alt => "Remove"} Remove

data/app/views/e9_crm/resources/index.html.haml

@@ -1,6 +1,7 @@
 = title (@index_title || e9_t(:index_title))
 
 = render 'header'
+= render 'shared/admin/toolbar'
 
 - if sortable_controller?
   = form_tag polymorphic_path([:update_order, resource_class]) do

data/app/views/e9_crm/visits/_header.html.haml

@@ -1,3 +1,3 @@
-.toolbar
-  .toolbar-right
+- content_for :toolbar_right do
+  = toolbar_actions do
     = link_to 'View All Activity', page_views_url(:campaign => parent.id)

data/config/locales/e9.en.yml

@@ -27,7 +27,7 @@ en:
         form_legend_search: Search Filters
         form_legend_contact: Contact Information
         form_legend_standard: Personal Information
-        send_email_template: Send Email
+        send_email_template: Send
         send_email_newsletter: Send Newsletter
         contact_newsletter_confirmation: "The system will send the newsletter to all of the selected contacts (%{count}) if they are subscribed to receieve email.  Are you sure you want to proceed?"
         no_contacts_notification: "Either you have selected no contacts, or all of those selected are opted out of bulk email.  Please correct this and try again."

data/config/locales/en.yml

@@ -172,6 +172,9 @@ en:
         created_at: Date
         owner: Responsible
         won_deal_count: Won count 
+        offer: Offer
+        from: From Date
+        until: Before Date
       offer:
         mailing_list_ids: Subscriptions
         template: Teaser Text
@@ -189,3 +192,5 @@ en:
         conversion_alert_email: Send Alert Email To
         success_page_text: Success Page Text
         custom_form_html: Custom Form Html
+      page_view:
+        month: Month Occurred

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.33'
+  VERSION = '0.1.34'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: e9_crm
 version: !ruby/object:Gem::Version
-  version: 0.1.33
+  version: 0.1.34
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000Z
+date: 2011-10-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &15422100 !ruby/object:Gem::Requirement
+  requirement: &17862500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15422100
+  version_requirements: *17862500
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &15420860 !ruby/object:Gem::Requirement
+  requirement: &17861820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '0.13'
   type: :runtime
   prerelease: false
-  version_requirements: *15420860
+  version_requirements: *17861820
 description: ! "*NOTE his plugin requires the private e9_base CMS gem and WILL NOT
   WORK without it.*\n\nCRM Plugin for the e9 CMS\n=========================\n\nTo
   use, add as a gem and install by running:\n\n    rails g e9_crm:install\n\nThen