e9_crm 0.1.23 → 0.1.24
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitignore +1 -0
- data/app/views/e9_crm/contact_merges/_field.html.haml +11 -10
- data/app/views/e9_crm/contact_merges/_form.html.haml +11 -12
- data/app/views/e9_crm/contacts/_sidebar_actions.html.haml +1 -3
- data/app/views/e9_crm/contacts/_sidebar_search_form.html.haml +5 -6
- data/app/views/e9_crm/contacts/_table.html.haml +8 -0
- data/app/views/e9_crm/contacts/index.html.haml +20 -6
- data/config/locales/en.yml +2 -0
- data/lib/e9_crm/version.rb +1 -1
- metadata +1 -2
- data/app/views/e9_crm/contacts/_contact.html.haml +0 -18
data/.gitignore
CHANGED
@@ -1,13 +1,14 @@
|
|
1
1
|
- val = f.object.send(column)
|
2
2
|
- a_checked = val == contact_a(column) || val.blank?
|
3
3
|
- b_checked = !a_checked
|
4
|
-
|
5
|
-
= f.label column
|
6
|
-
.
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
4
|
+
%fieldset
|
5
|
+
%legend= f.label column
|
6
|
+
.fields
|
7
|
+
.field.radio
|
8
|
+
%label{:for => "contact_a_#{column}"}
|
9
|
+
= contact_a(column).presence || e9_t(:no_value)
|
10
|
+
= f.radio_button column, contact_a(column), :checked => a_checked, :id => "contact_a_#{column}"
|
11
|
+
.field.radio
|
12
|
+
%label{:for => "contact_b_#{column}"}
|
13
|
+
= contact_b(column).presence || e9_t(:no_value)
|
14
|
+
= f.radio_button column, contact_b(column), :checked => b_checked, :id => "contact_b_#{column}"
|
@@ -2,18 +2,17 @@
|
|
2
2
|
= hidden_field_tag :contact_a_id, @contact_a.id
|
3
3
|
= hidden_field_tag :contact_b_id, @contact_b.id
|
4
4
|
|
5
|
-
.
|
6
|
-
= f.label :avatar
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
= radio_button_tag 'contact_avatar', 'b'
|
5
|
+
%fieldset.radios
|
6
|
+
%legend= f.label :avatar
|
7
|
+
.fields
|
8
|
+
.field.radio
|
9
|
+
%label{:for => "contact_avatar_a"}
|
10
|
+
<img src="#{@contact_a.avatar_url}" alt="Photo for #{@contact_a.name}" />
|
11
|
+
= radio_button_tag 'contact_avatar', 'a', :checked => true
|
12
|
+
.field.radio
|
13
|
+
%label{:for => "contact_avatar_b"}
|
14
|
+
<img src="#{@contact_b.avatar_url}" alt="Photo for #{@contact_b.name}" />
|
15
|
+
= radio_button_tag 'contact_avatar', 'b'
|
17
16
|
|
18
17
|
= render 'field', :column => :first_name, :f => f
|
19
18
|
= render 'field', :column => :last_name, :f => f
|
@@ -1,20 +1,19 @@
|
|
1
1
|
%fieldset
|
2
2
|
%legend= e9_t(:search_options_legend)
|
3
|
-
|
4
|
-
= submit_tag t(:clear_all_filters), :name => nil, :id => 'contact_search_clear'
|
3
|
+
= submit_tag t(:clear_all_filters), :name => nil, :id => 'contact_search_clear'
|
5
4
|
|
6
|
-
= form_tag(resource_class, :method => :get, :id => 'contact_search_form') do
|
5
|
+
= form_tag(resource_class, :method => :get, :class => 'field', :id => 'contact_search_form') do
|
7
6
|
= label_tag 'contact_search_field', t(:search)
|
8
|
-
= text_field_tag 'search', params[:search], :id => 'contact_search_field'
|
7
|
+
= text_field_tag 'search', params[:search], :id => 'contact_search_field', :placeholder => t(:contact_search_placeholder)
|
9
8
|
|
10
|
-
= form_tag(resource_class, :method => :get, :class => 'scope-selects') do
|
9
|
+
= form_tag(resource_class, :method => :get, :class => 'scope-selects field', :id => 'company_search_form') do
|
11
10
|
= label_tag 'contact_company_select', Company.model_name.human
|
12
11
|
%select{:name => 'company', :id => 'contact_company_select'}
|
13
12
|
= company_select_options
|
14
13
|
|
15
14
|
.field#contact_tag_list
|
16
15
|
%label{:for => 'contact_tag_autocomplete'} Tags
|
17
|
-
%input#contact_tag_autocomplete.list{:type => 'text', 'data-iname' => 'contact', 'data-field' => '[tagged]', :placeholder =>
|
16
|
+
%input#contact_tag_autocomplete.list{:type => 'text', 'data-iname' => 'contact', 'data-field' => '[tagged]', :placeholder => t(:tag_search_placeholder)}
|
18
17
|
%ul#contact_tag_select.select
|
19
18
|
- Array.wrap(params[:tagged]).each do |tag|
|
20
19
|
%li.ui-state-default
|
@@ -1,6 +1,14 @@
|
|
1
1
|
- field_map = local_assigns[:field_map] || records_table_field_map
|
2
2
|
|
3
3
|
%table.records
|
4
|
+
%thead
|
5
|
+
%tr
|
6
|
+
- field_map[:fields].keys.each do |key|
|
7
|
+
- if key.is_a?(Symbol)
|
8
|
+
%th= resource_class.human_attribute_name(key)
|
9
|
+
- else
|
10
|
+
%th= orderable_column_link(key)
|
11
|
+
%th= e9_t(:actions)
|
4
12
|
%tbody
|
5
13
|
- if collection.empty?
|
6
14
|
%tr
|
@@ -1,8 +1,22 @@
|
|
1
1
|
= title (@index_title || e9_t(:index_title))
|
2
2
|
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
3
|
+
.toolbar
|
4
|
+
.toolbar-left
|
5
|
+
#sidebar-email-form
|
6
|
+
= render 'sidebar_email_form'
|
7
|
+
|
8
|
+
.toolbar-middle
|
9
|
+
#sidebar-search-form
|
10
|
+
= render 'sidebar_search_form'
|
11
|
+
|
12
|
+
.toolbar-right
|
13
|
+
#sidebar-actions
|
14
|
+
%fieldset
|
15
|
+
%legend= "Manage"#e9_t(:search_options_legend)
|
16
|
+
.manage-contacts
|
17
|
+
= link_to_new_resource(Contact)
|
18
|
+
.manage-company
|
19
|
+
= link_to_collection(Company)
|
20
|
+
|
21
|
+
#records_table
|
22
|
+
= render 'table', :resources => collection
|
data/config/locales/en.yml
CHANGED
@@ -1,4 +1,6 @@
|
|
1
1
|
en:
|
2
|
+
contact_search_placeholder: Type keyword, then hit enter...
|
3
|
+
tag_search_placeholder: Enter a tag...
|
2
4
|
email_taken_title: Oops!
|
3
5
|
duplicate_email_title: Oops!
|
4
6
|
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
CHANGED
metadata
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
name: e9_crm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
4
|
prerelease:
|
5
|
-
version: 0.1.
|
5
|
+
version: 0.1.24
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
8
8
|
- Travis Cox
|
@@ -235,7 +235,6 @@ files:
|
|
235
235
|
- app/views/e9_crm/contact_merges/_field.html.haml
|
236
236
|
- app/views/e9_crm/contact_merges/_form.html.haml
|
237
237
|
- app/views/e9_crm/contact_merges/new.html.haml
|
238
|
-
- app/views/e9_crm/contacts/_contact.html.haml
|
239
238
|
- app/views/e9_crm/contacts/_details.html.haml
|
240
239
|
- app/views/e9_crm/contacts/_form_inner.html.haml
|
241
240
|
- app/views/e9_crm/contacts/_header.html.haml
|
@@ -1,18 +0,0 @@
|
|
1
|
-
-#.contact-deals
|
2
|
-
-#%h2
|
3
|
-
-#= Deal.model_name.human.pluralize
|
4
|
-
-#= link_to_new_resource(Deal, :deal => {:contact_id => resource.id })
|
5
|
-
-#- resource.deals.each do |deal|
|
6
|
-
-#.contact-deal
|
7
|
-
-#.contact-deal-status
|
8
|
-
-#= deal.status
|
9
|
-
-#.contact-deal-type
|
10
|
-
-#= deal.type.titleize
|
11
|
-
-#.contact-deal-value
|
12
|
-
-#= deal.value
|
13
|
-
-#.contact-leads
|
14
|
-
-#%h2
|
15
|
-
-#= Lead.model_name.human.pluralize
|
16
|
-
-#- resource.leads.each do |lead|
|
17
|
-
-#.contact-lead
|
18
|
-
-#.contact-lead-type
|