e9_crm 0.1.23 → 0.1.24

data/.gitignore

@@ -2,3 +2,4 @@
 *.swp
 pkg/*
 Gemfile.lock
+*.tmproj

data/app/views/e9_crm/contact_merges/_field.html.haml

@@ -1,13 +1,14 @@
 - val = f.object.send(column)
 - a_checked = val == contact_a(column) || val.blank?
 - b_checked = !a_checked
-.field
-  = f.label column
-  .contact-a-value
-    %label{:for => "contact_a_#{column}"}
-      = contact_a(column).presence || e9_t(:no_value)
-    = f.radio_button column, contact_a(column), :checked => a_checked, :id => "contact_a_#{column}"
-  .contact-b-value
-    %label{:for => "contact_b_#{column}"}
-      = contact_b(column).presence || e9_t(:no_value)
-    = f.radio_button column, contact_b(column), :checked => b_checked, :id => "contact_b_#{column}"
+%fieldset
+  %legend= f.label column
+  .fields
+    .field.radio
+      %label{:for => "contact_a_#{column}"}
+        = contact_a(column).presence || e9_t(:no_value)
+      = f.radio_button column, contact_a(column), :checked => a_checked, :id => "contact_a_#{column}"
+    .field.radio
+      %label{:for => "contact_b_#{column}"}
+        = contact_b(column).presence || e9_t(:no_value)
+      = f.radio_button column, contact_b(column), :checked => b_checked, :id => "contact_b_#{column}"

data/app/views/e9_crm/contact_merges/_form.html.haml

@@ -2,18 +2,17 @@
   = hidden_field_tag :contact_a_id, @contact_a.id
   = hidden_field_tag :contact_b_id, @contact_b.id
 
-  .field
-    = f.label :avatar
-
-    .contact-a-value
-      %label{:for => "contact_avatar_a"}
-        <img src="#{@contact_a.avatar_url}" alt="Photo for #{@contact_a.name}" />
-      = radio_button_tag 'contact_avatar', 'a', :checked => true
-
-    .contact-b-value
-      %label{:for => "contact_avatar_b"}
-        <img src="#{@contact_b.avatar_url}" alt="Photo for #{@contact_b.name}" />
-      = radio_button_tag 'contact_avatar', 'b'
+  %fieldset.radios
+    %legend= f.label :avatar
+    .fields
+      .field.radio
+        %label{:for => "contact_avatar_a"}
+          <img src="#{@contact_a.avatar_url}" alt="Photo for #{@contact_a.name}" />
+        = radio_button_tag 'contact_avatar', 'a', :checked => true
+      .field.radio
+        %label{:for => "contact_avatar_b"}
+          <img src="#{@contact_b.avatar_url}" alt="Photo for #{@contact_b.name}" />
+        = radio_button_tag 'contact_avatar', 'b'
 
   = render 'field', :column => :first_name, :f => f
   = render 'field', :column => :last_name, :f => f

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

@@ -1,3 +1 @@
-.actions
-  = link_to_new_resource(Contact)
-  = link_to_collection(Company)
+

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

@@ -1,20 +1,19 @@
 %fieldset
   %legend= e9_t(:search_options_legend)
-  .actions
-    = submit_tag t(:clear_all_filters), :name => nil, :id => 'contact_search_clear'
+  = submit_tag t(:clear_all_filters), :name => nil, :id => 'contact_search_clear'
 
-  = form_tag(resource_class, :method => :get, :id => 'contact_search_form') do
+  = 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'
+    = text_field_tag 'search', params[:search], :id => 'contact_search_field', :placeholder => t(:contact_search_placeholder)
 
-  = form_tag(resource_class, :method => :get, :class => 'scope-selects') do
+  = form_tag(resource_class, :method => :get, :class => 'scope-selects field', :id => 'company_search_form') do
     = label_tag 'contact_company_select', Company.model_name.human
     %select{:name => 'company', :id => 'contact_company_select'}
       = company_select_options
 
   .field#contact_tag_list
     %label{:for => 'contact_tag_autocomplete'} Tags
-    %input#contact_tag_autocomplete.list{:type => 'text', 'data-iname' => 'contact', 'data-field' => '[tagged]', :placeholder => 'Enter a tag...'}
+    %input#contact_tag_autocomplete.list{:type => 'text', 'data-iname' => 'contact', 'data-field' => '[tagged]', :placeholder => t(:tag_search_placeholder)}
     %ul#contact_tag_select.select
       - Array.wrap(params[:tagged]).each do |tag|
         %li.ui-state-default

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

@@ -1,6 +1,14 @@
 - field_map = local_assigns[:field_map] || records_table_field_map
 
 %table.records
+  %thead
+    %tr
+      - field_map[:fields].keys.each do |key|
+        - if key.is_a?(Symbol)
+          %th= resource_class.human_attribute_name(key)
+        - else
+          %th= orderable_column_link(key)
+      %th= e9_t(:actions)
   %tbody
     - if collection.empty?
       %tr

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

@@ -1,8 +1,22 @@
 = title (@index_title || e9_t(:index_title))
 
-#index-body
-  #records_table
-    = render 'table', :resources => collection
-
-#index-sidebar
-  = render 'index_sidebar'
+.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"#e9_t(:search_options_legend)
+        .manage-contacts
+          = link_to_new_resource(Contact)
+        .manage-company
+          = link_to_collection(Company)
+        
+#records_table
+  = render 'table', :resources => collection

data/config/locales/en.yml

@@ -1,4 +1,6 @@
 en:
+  contact_search_placeholder: Type keyword, then hit enter...
+  tag_search_placeholder: Enter a tag...
   email_taken_title: Oops!
   duplicate_email_title: Oops!
   edit_conflict: "<p>This email is already attached to another contact and cannot be used.</p><p>Do you want to merge these contacts now?</p><p>Be careful!  If you have made extensive edits you may want to save first and come back to merge.</p>"

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.23'
+  VERSION = '0.1.24'
 end

metadata

@@ -2,7 +2,7 @@
 name: e9_crm
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors: 
 - Travis Cox
@@ -235,7 +235,6 @@ files:
 - app/views/e9_crm/contact_merges/_field.html.haml
 - app/views/e9_crm/contact_merges/_form.html.haml
 - app/views/e9_crm/contact_merges/new.html.haml
-- app/views/e9_crm/contacts/_contact.html.haml
 - app/views/e9_crm/contacts/_details.html.haml
 - app/views/e9_crm/contacts/_form_inner.html.haml
 - app/views/e9_crm/contacts/_header.html.haml

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

@@ -1,18 +0,0 @@
--#.contact-deals
-  -#%h2
-    -#= Deal.model_name.human.pluralize
-    -#= link_to_new_resource(Deal, :deal => {:contact_id => resource.id })
-  -#- resource.deals.each do |deal|
-    -#.contact-deal
-      -#.contact-deal-status
-        -#= deal.status
-      -#.contact-deal-type
-        -#= deal.type.titleize
-      -#.contact-deal-value
-        -#= deal.value
--#.contact-leads
-  -#%h2
-    -#= Lead.model_name.human.pluralize
-  -#- resource.leads.each do |lead|
-      -#.contact-lead
-        -#.contact-lead-type