alchemy_crm 2.0.1 → 2.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (123) hide show
  1. data/Gemfile +10 -11
  2. data/alchemy_crm.gemspec +21 -21
  3. data/app/assets/javascripts/alchemy_crm/alchemy_crm.base.js +54 -54
  4. data/app/assets/stylesheets/alchemy_crm/base.css.scss +199 -199
  5. data/app/controllers/alchemy_crm/admin/base_controller.rb +5 -5
  6. data/app/controllers/alchemy_crm/admin/contact_groups_controller.rb +15 -15
  7. data/app/controllers/alchemy_crm/admin/contacts_controller.rb +95 -95
  8. data/app/controllers/alchemy_crm/admin/deliveries_controller.rb +66 -66
  9. data/app/controllers/alchemy_crm/admin/elements_controller_extension.rb +23 -23
  10. data/app/controllers/alchemy_crm/admin/mailings_controller.rb +44 -44
  11. data/app/controllers/alchemy_crm/admin/newsletters_controller.rb +16 -16
  12. data/app/controllers/alchemy_crm/admin/tags_controller.rb +60 -59
  13. data/app/controllers/alchemy_crm/base_controller.rb +3 -3
  14. data/app/controllers/alchemy_crm/contacts_controller.rb +88 -88
  15. data/app/controllers/alchemy_crm/mailings_controller.rb +16 -16
  16. data/app/controllers/alchemy_crm/recipients_controller.rb +30 -30
  17. data/app/controllers/alchemy_crm/subscriptions_controller.rb +54 -54
  18. data/app/helpers/alchemy/pages_helper_extension.rb +14 -14
  19. data/app/helpers/alchemy_crm/admin/base_helper.rb +8 -8
  20. data/app/helpers/alchemy_crm/mailings_helper.rb +175 -175
  21. data/app/mailers/alchemy_crm/bounce_receiver.rb +9 -9
  22. data/app/mailers/alchemy_crm/contacts_mailer.rb +21 -21
  23. data/app/mailers/alchemy_crm/mailings_mailer.rb +46 -46
  24. data/app/mailers/alchemy_crm/subscriptions_mailer.rb +12 -12
  25. data/app/models/alchemy/essence_element_teaser.rb +14 -14
  26. data/app/models/alchemy_crm/contact.rb +260 -260
  27. data/app/models/alchemy_crm/contact_group.rb +15 -15
  28. data/app/models/alchemy_crm/contact_group_filter.rb +17 -17
  29. data/app/models/alchemy_crm/delivery.rb +54 -54
  30. data/app/models/alchemy_crm/element_extension.rb +23 -23
  31. data/app/models/alchemy_crm/mailing.rb +90 -90
  32. data/app/models/alchemy_crm/newsletter.rb +33 -33
  33. data/app/models/alchemy_crm/reaction.rb +5 -5
  34. data/app/models/alchemy_crm/recipient.rb +46 -46
  35. data/app/models/alchemy_crm/subscription.rb +4 -4
  36. data/app/views/alchemy/admin/elements/fill.js.erb +11 -11
  37. data/app/views/alchemy/elements/_newsletter_article_view.html.erb +14 -14
  38. data/app/views/alchemy/elements/_newsletter_greeting_view.html.erb +9 -9
  39. data/app/views/alchemy/elements/_newsletter_signout_form_view.html.erb +18 -18
  40. data/app/views/alchemy/elements/_newsletter_signup_form_view.html.erb +62 -62
  41. data/app/views/alchemy/essences/_essence_element_teaser_editor.html.erb +29 -29
  42. data/app/views/alchemy/newsletter_layouts/_standard.html.erb +37 -37
  43. data/app/views/alchemy_crm/admin/contact_groups/_contact_group.html.erb +30 -30
  44. data/app/views/alchemy_crm/admin/contact_groups/_filter.html.erb +28 -28
  45. data/app/views/alchemy_crm/admin/contact_groups/_form.html.erb +45 -45
  46. data/app/views/alchemy_crm/admin/contact_groups/_tag.html.erb +4 -4
  47. data/app/views/alchemy_crm/admin/contact_groups/add_filter.js.erb +7 -7
  48. data/app/views/alchemy_crm/admin/contact_groups/index.html.erb +28 -28
  49. data/app/views/alchemy_crm/admin/contacts/_contact.html.erb +42 -42
  50. data/app/views/alchemy_crm/admin/contacts/_form.html.erb +76 -76
  51. data/app/views/alchemy_crm/admin/contacts/import.html.erb +27 -27
  52. data/app/views/alchemy_crm/admin/contacts/index.html.erb +39 -39
  53. data/app/views/alchemy_crm/admin/contacts/vcf_import_result.html.erb +24 -24
  54. data/app/views/alchemy_crm/admin/deliveries/_delivery.html.erb +30 -30
  55. data/app/views/alchemy_crm/admin/deliveries/_form.html.erb +61 -61
  56. data/app/views/alchemy_crm/admin/deliveries/_recipient.html.erb +36 -36
  57. data/app/views/alchemy_crm/admin/deliveries/index.html.erb +21 -21
  58. data/app/views/alchemy_crm/admin/deliveries/show.html.erb +61 -61
  59. data/app/views/alchemy_crm/admin/elements/teasables.html.erb +53 -53
  60. data/app/views/alchemy_crm/admin/mailings/_form.html.erb +41 -41
  61. data/app/views/alchemy_crm/admin/mailings/_mailing.html.erb +73 -73
  62. data/app/views/alchemy_crm/admin/mailings/edit_content.html.erb +170 -170
  63. data/app/views/alchemy_crm/admin/mailings/import_result.html.erb +18 -18
  64. data/app/views/alchemy_crm/admin/mailings/index.html.erb +25 -25
  65. data/app/views/alchemy_crm/admin/newsletters/_form.html.erb +52 -52
  66. data/app/views/alchemy_crm/admin/newsletters/_tag_with_radiobutton.html.erb +5 -5
  67. data/app/views/alchemy_crm/admin/newsletters/index.html.erb +29 -29
  68. data/app/views/alchemy_crm/admin/newsletters/new.html.erb +4 -4
  69. data/app/views/alchemy_crm/admin/tags/_radio_tag.html.erb +4 -4
  70. data/app/views/alchemy_crm/admin/tags/_tag.html.erb +30 -30
  71. data/app/views/alchemy_crm/admin/tags/edit.html.erb +32 -32
  72. data/app/views/alchemy_crm/admin/tags/index.html.erb +23 -23
  73. data/app/views/alchemy_crm/admin/tags/new.html.erb +14 -14
  74. data/app/views/alchemy_crm/contacts_mailer/signout_mail.html.erb +6 -6
  75. data/app/views/alchemy_crm/contacts_mailer/signout_mail.text.erb +2 -2
  76. data/app/views/alchemy_crm/contacts_mailer/signup_mail.html.erb +9 -9
  77. data/app/views/alchemy_crm/contacts_mailer/signup_mail.text.erb +2 -2
  78. data/app/views/alchemy_crm/mailings_mailer/verification_mail.html.erb +9 -9
  79. data/app/views/alchemy_crm/subscriptions/index.html.erb +4 -4
  80. data/app/views/alchemy_crm/subscriptions_mailer/overview_mail.html.erb +25 -25
  81. data/app/views/alchemy_crm/subscriptions_mailer/overview_mail.text.erb +2 -2
  82. data/app/views/csv_magic/import_errors.html.erb +23 -23
  83. data/app/views/csv_magic/mapper.html.erb +46 -46
  84. data/app/views/layouts/alchemy_crm/mailings.html.erb +177 -177
  85. data/config/initializers/assets.rb +2 -2
  86. data/config/locales/alchemy_crm.de.yml +1 -1
  87. data/config/locales/alchemy_crm.en.yml +1 -0
  88. data/config/locales/localized_country_select.de.rb +260 -260
  89. data/config/locales/localized_country_select.en.rb +274 -274
  90. data/config/routes.rb +67 -67
  91. data/db/migrate/20111104125306_remove_sent_mailing_pdf_id_from_sent_mailings.rb +1 -1
  92. data/db/migrate/20111124145923_namespace_alchemy_crm_models.rb +13 -13
  93. data/db/migrate/20120307160721_rename_alchemy_crm_recipients_sent_mailing_id.rb +3 -3
  94. data/db/migrate/20120320103412_add_indexes_to_alchemy_crm_sha1_columns.rb +3 -3
  95. data/db/migrate/20120327174301_add_more_indexes_to_alchemy_crm_tables.rb +10 -10
  96. data/lib/alchemy_crm.rb +15 -15
  97. data/lib/alchemy_crm/bounced_delivery.rb +38 -38
  98. data/lib/alchemy_crm/config.rb +25 -25
  99. data/lib/alchemy_crm/engine.rb +31 -31
  100. data/lib/alchemy_crm/i18n_helpers.rb +28 -28
  101. data/lib/alchemy_crm/newsletter_layout.rb +28 -28
  102. data/lib/alchemy_crm/seeder.rb +26 -26
  103. data/lib/alchemy_crm/version.rb +1 -1
  104. data/lib/generators/alchemy_crm/scaffold/files/newsletters.html.erb +19 -19
  105. data/lib/generators/alchemy_crm/scaffold/scaffold_generator.rb +2 -2
  106. data/lib/tasks/alchemy_crm.rake +22 -22
  107. data/lib/tasks/routes.rake +25 -25
  108. data/spec/config_spec.rb +24 -24
  109. data/spec/controllers/alchemy_crm/contacts_controller_spec.rb +147 -147
  110. data/spec/controllers/alchemy_crm/mailings_controller_spec.rb +62 -62
  111. data/spec/controllers/alchemy_crm/recipients_controller_spec.rb +109 -109
  112. data/spec/helpers/alchemy_crm/mailings_helper_spec.rb +165 -165
  113. data/spec/mailers/alchemy_crm/contacts_mailer_spec.rb +84 -84
  114. data/spec/mailers/alchemy_crm/mailings_mailer_spec.rb +29 -29
  115. data/spec/models/alchemy_crm/contact_group_spec.rb +25 -25
  116. data/spec/models/alchemy_crm/contact_spec.rb +71 -71
  117. data/spec/models/alchemy_crm/delivery_spec.rb +43 -39
  118. data/spec/models/alchemy_crm/mailing_spec.rb +46 -42
  119. data/spec/models/alchemy_crm/newsletter_spec.rb +29 -29
  120. data/spec/spec_helper.rb +36 -36
  121. metadata +6 -8
  122. data/rails/init.rb +0 -1
  123. data/recipes/alchemy-mailings-capistrano-tasks.rb +0 -12
@@ -1,32 +1,32 @@
1
1
  <tr class="<%= cycle('even', 'odd') %> filterable">
2
- <td class="icon">
3
- <%= render_icon 'group' -%>
4
- </td>
5
- <td class="name">
6
- <%= contact_group.name -%>
7
- </td>
8
- <td class="count">
9
- <%= contact_group.contacts.count %>
10
- </td>
11
- <td class="tools">
12
- <%= link_to_overlay_window(
13
- "",
14
- edit_admin_contact_group_path(contact_group),
15
- {
16
- :size => '500x255',
17
- :title => alchemy_crm_t(:edit_contact_group)
18
- },
19
- {
20
- :title => alchemy_crm_t(:edit_contact_group),
21
- :class => 'icon group_edit'
22
- }
23
- ) -%>
24
- <%= link_to_confirmation_window(
25
- '',
26
- alchemy_crm_t(:do_you_really_want_to_delete_this_contact_group?),
27
- admin_contact_group_path(contact_group),
28
- :title => alchemy_crm_t(:delete_contact_group),
29
- :class => "icon group_delete"
30
- ) -%>
31
- </td>
2
+ <td class="icon">
3
+ <%= render_icon 'group' -%>
4
+ </td>
5
+ <td class="name">
6
+ <%= contact_group.name -%>
7
+ </td>
8
+ <td class="count">
9
+ <%= contact_group.contacts.count %>
10
+ </td>
11
+ <td class="tools">
12
+ <%= link_to_overlay_window(
13
+ "",
14
+ edit_admin_contact_group_path(contact_group),
15
+ {
16
+ :size => '500x255',
17
+ :title => alchemy_crm_t(:edit_contact_group)
18
+ },
19
+ {
20
+ :title => alchemy_crm_t(:edit_contact_group),
21
+ :class => 'icon group_edit'
22
+ }
23
+ ) -%>
24
+ <%= link_to_confirmation_window(
25
+ '',
26
+ alchemy_crm_t(:do_you_really_want_to_delete_this_contact_group?),
27
+ admin_contact_group_path(contact_group),
28
+ :title => alchemy_crm_t(:delete_contact_group),
29
+ :class => "icon group_delete"
30
+ ) -%>
31
+ </td>
32
32
  </tr>
@@ -1,30 +1,30 @@
1
1
  <div class="filter">
2
- <%= select_tag(
3
- "contact_group[filters_attributes][#{count}][column]",
4
- options_for_select(AlchemyCrm::Contact::COLUMN_NAMES, filter.column),
5
- :id => "filter_column_#{count}",
6
- :class => 'alchemy_selectbox medium'
7
- ) %>
8
- <%= select_tag(
9
- "contact_group[filters_attributes][#{count}][operator]",
10
- options_for_select(AlchemyCrm::ContactGroupFilter::OPERATORS, filter.operator),
11
- :id => "filter_operator_#{count}",
12
- :class => 'alchemy_selectbox short'
13
- ) %>
14
- <%= text_field_tag(
15
- "contact_group[filters_attributes][#{count}][value]",
16
- filter.value,
17
- :class => 'thin_border',
18
- :id => "filter_value_#{count}"
19
- ) %>
20
- <%- unless filter.new_record? -%>
21
- <input type="hidden" value="<%= filter.id %>" name="contact_group[filters_attributes][<%= count %>][id]" />
22
- <%- end -%>
23
- <span class="remove_filter">
24
- <%= link_to_function(
25
- render_icon('close small'),
26
- "AlchemyCrm.removeContactGroupFilter(this, '#{filter.id}', '#{count}')",
27
- :title => alchemy_crm_t(:remove_filter)
28
- ) %>
29
- </span>
2
+ <%= select_tag(
3
+ "contact_group[filters_attributes][#{count}][column]",
4
+ options_for_select(AlchemyCrm::Contact::COLUMN_NAMES, filter.column),
5
+ :id => "filter_column_#{count}",
6
+ :class => 'alchemy_selectbox medium'
7
+ ) %>
8
+ <%= select_tag(
9
+ "contact_group[filters_attributes][#{count}][operator]",
10
+ options_for_select(AlchemyCrm::ContactGroupFilter::OPERATORS, filter.operator),
11
+ :id => "filter_operator_#{count}",
12
+ :class => 'alchemy_selectbox short'
13
+ ) %>
14
+ <%= text_field_tag(
15
+ "contact_group[filters_attributes][#{count}][value]",
16
+ filter.value,
17
+ :class => 'thin_border',
18
+ :id => "filter_value_#{count}"
19
+ ) %>
20
+ <%- unless filter.new_record? -%>
21
+ <input type="hidden" value="<%= filter.id %>" name="contact_group[filters_attributes][<%= count %>][id]" />
22
+ <%- end -%>
23
+ <span class="remove_filter">
24
+ <%= link_to_function(
25
+ render_icon('close small'),
26
+ "AlchemyCrm.removeContactGroupFilter(this, '#{filter.id}', '#{count}')",
27
+ :title => alchemy_crm_t(:remove_filter)
28
+ ) %>
29
+ </span>
30
30
  </div>
@@ -1,47 +1,47 @@
1
1
  <%= form_for [:admin, @contact_group], :remote => true, :class => 'contact_group_form' do |f| %>
2
- <div id="errors" style="display:none"></div>
3
- <table>
4
- <tr>
5
- <td class="label">
6
- <%= f.label :name %>
7
- </td>
8
- <td class="input">
9
- <%= f.text_field :name, :class => "thin_border", :style => 'margin-right: 24px' %>
10
- </td>
11
- </tr>
12
- <tr>
13
- <td class="label">
14
- <label><%= alchemy_crm_t(:contacts_tagged_with) %></label>
15
- </td>
16
- <td class="input">
17
- <%= render :partial => "tag", :collection => @tags, :locals => {:tags => @contact_group.contact_tags, :name => "contact_group" } %>
18
- </td>
19
- </tr>
20
- <% unless @contact_group.new_record? -%>
21
- <tr>
22
- <td colspan="2" style="padding: 0">
23
- <div id="filter_container">
24
- <h2><%= alchemy_crm_t(:filter) %></h2>
25
- <%- @contact_group.filters.each_with_index do |filter, i| -%>
26
- <%= render :partial => "filter", :object => filter, :locals => {:count => i} %>
27
- <%- end -%>
28
- </div>
29
- <p>
30
- <%= link_to(
31
- render_icon('create') + alchemy_crm_t(:add_filter),
32
- add_filter_admin_contact_groups_path(:contact_group_id => @contact_group.id),
33
- :method => 'get',
34
- :class => 'small button with_icon',
35
- :remote => true
36
- ) %>
37
- </p>
38
- </td>
39
- </tr>
40
- <% end -%>
41
- <tr>
42
- <td class="submit" colspan="2">
43
- <%= f.button t(:save), :class => "button" %>
44
- </td>
45
- </tr>
46
- </table>
2
+ <div id="errors" style="display:none"></div>
3
+ <table>
4
+ <tr>
5
+ <td class="label">
6
+ <%= f.label :name %>
7
+ </td>
8
+ <td class="input">
9
+ <%= f.text_field :name, :class => "thin_border", :style => 'margin-right: 24px' %>
10
+ </td>
11
+ </tr>
12
+ <tr>
13
+ <td class="label">
14
+ <label><%= alchemy_crm_t(:contacts_tagged_with) %></label>
15
+ </td>
16
+ <td class="input">
17
+ <%= render :partial => "tag", :collection => @tags, :locals => {:tags => @contact_group.contact_tags, :name => "contact_group" } %>
18
+ </td>
19
+ </tr>
20
+ <% unless @contact_group.new_record? -%>
21
+ <tr>
22
+ <td colspan="2" style="padding: 0">
23
+ <div id="filter_container">
24
+ <h2><%= alchemy_crm_t(:filter) %></h2>
25
+ <%- @contact_group.filters.each_with_index do |filter, i| -%>
26
+ <%= render :partial => "filter", :object => filter, :locals => {:count => i} %>
27
+ <%- end -%>
28
+ </div>
29
+ <p>
30
+ <%= link_to(
31
+ render_icon('create') + alchemy_crm_t(:add_filter),
32
+ add_filter_admin_contact_groups_path(:contact_group_id => @contact_group.id),
33
+ :method => 'get',
34
+ :class => 'small button with_icon',
35
+ :remote => true
36
+ ) %>
37
+ </p>
38
+ </td>
39
+ </tr>
40
+ <% end -%>
41
+ <tr>
42
+ <td class="submit" colspan="2">
43
+ <%= f.button t(:save), :class => "button" %>
44
+ </td>
45
+ </tr>
46
+ </table>
47
47
  <% end %>
@@ -1,6 +1,6 @@
1
1
  <span style="float:left"><%= check_box_tag name + "[contact_tag_list][]", tag.name, tags.include?(tag), :id => tag.name + "_contact_tag_list" %>
2
- <label for="<%= tag.name + "_contact_tag_list" %>" class="tag">
3
- <%= tag.name %>
4
- <%= contact_count_from_tag(tag) %>
5
- </label>
2
+ <label for="<%= tag.name + "_contact_tag_list" %>" class="tag">
3
+ <%= tag.name %>
4
+ <%= contact_count_from_tag(tag) %>
5
+ </label>
6
6
  </span>
@@ -1,9 +1,9 @@
1
1
  (function($) {
2
- $('#filter_container').append('<%= escape_javascript(render(
3
- :partial => "filter",
4
- :object => @filter,
5
- :locals => {:count => @count}
6
- )) %>');
7
- Alchemy.enableButton('#alchemyOverlay a.button.small');
8
- Alchemy.SelectBox('#filter_container select');
2
+ $('#filter_container').append('<%= escape_javascript(render(
3
+ :partial => "filter",
4
+ :object => @filter,
5
+ :locals => {:count => @count}
6
+ )) %>');
7
+ Alchemy.enableButton('#alchemyOverlay a.button.small');
8
+ Alchemy.SelectBox('#filter_container select');
9
9
  })(jQuery);
@@ -1,41 +1,41 @@
1
1
  <%- content_for(:stylesheets) do -%>
2
- <%= stylesheet_link_tag('alchemy_crm/styles') %>
2
+ <%= stylesheet_link_tag('alchemy_crm/styles') %>
3
3
  <%- end -%>
4
4
  <%- content_for(:javascript_includes) do -%>
5
- <%= javascript_include_tag('alchemy_crm/scripts') %>
5
+ <%= javascript_include_tag('alchemy_crm/scripts') %>
6
6
  <%- end -%>
7
7
 
8
8
  <%- content_for :toolbar do -%>
9
- <div id="toolbar_buttons">
10
- <div class="button_with_label">
11
- <%= link_to_overlay_window(
12
- content_tag('span', '', :class => 'icon group_add'),
13
- new_admin_contact_group_path(),
14
- {
15
- :title => alchemy_crm_t(:add_contact_group),
16
- :size => '500x255'
17
- },
18
- {
19
- :class => 'icon_button',
20
- :title => alchemy_crm_t(:add_contact_group)
21
- }
22
- ) -%><br />
23
- <label><%= alchemy_crm_t(:add_contact_group) %></label>
24
- </div>
25
- </div>
9
+ <div id="toolbar_buttons">
10
+ <div class="button_with_label">
11
+ <%= link_to_overlay_window(
12
+ content_tag('span', '', :class => 'icon group_add'),
13
+ new_admin_contact_group_path(),
14
+ {
15
+ :title => alchemy_crm_t(:add_contact_group),
16
+ :size => '500x255'
17
+ },
18
+ {
19
+ :class => 'icon_button',
20
+ :title => alchemy_crm_t(:add_contact_group)
21
+ }
22
+ ) -%><br />
23
+ <label><%= alchemy_crm_t(:add_contact_group) %></label>
24
+ </div>
25
+ </div>
26
26
  <%= render :partial => 'alchemy/admin/partials/search_form' %>
27
27
  <%- end -%>
28
28
 
29
29
  <table class="list" id="group_list">
30
- <%- unless @contact_groups.blank? -%>
31
- <tr>
32
- <th class="icon"></th>
33
- <th class="name"><%= translate_model_attribute(:contact_group, :name) %></th>
34
- <th class="count" style="width: 120px"><%= translate_model_attribute(:contact_group, :contacts_count) %></th>
35
- <th class="tools" style="width: 40px"></th>
36
- </tr>
37
- <%- end -%>
38
- <%= render @contact_groups %>
30
+ <%- unless @contact_groups.blank? -%>
31
+ <tr>
32
+ <th class="icon"></th>
33
+ <th class="name"><%= translate_model_attribute(:contact_group, :name) %></th>
34
+ <th class="count" style="width: 120px"><%= translate_model_attribute(:contact_group, :contacts_count) %></th>
35
+ <th class="tools" style="width: 40px"></th>
36
+ </tr>
37
+ <%- end -%>
38
+ <%= render @contact_groups %>
39
39
  </table>
40
40
 
41
41
  <%= render 'alchemy/admin/partials/pagination_links', :items => @contact_groups, :scope => alchemy_crm %>
@@ -1,44 +1,44 @@
1
1
  <tr class="<%= cycle('even', 'odd') %><%= contact.disabled? ? ' disabled' : nil %>">
2
- <td class="icon">
3
- <%= content_tag('span', '', :class => 'icon contact') %>
4
- </td>
5
- <td class="name" style="width: 180px">
6
- <%= contact.lastname %>
7
- </td>
8
- <td class="name" style="width: 180px">
9
- <%= contact.firstname %>
10
- </td>
11
- <td class="name"><%= contact.organisation %></td>
12
- <td class="email"><%= contact.email %></td>
13
- <td class="tags"><%= contact.tag_list %></td>
14
- <td class="center"><%= render_icon contact.verified? && !contact.disabled %></td>
15
- <td class="tools">
16
- <%= link_to_overlay_window(
17
- '',
18
- edit_admin_contact_path(contact),
19
- {
20
- :title => alchemy_crm_t(:edit_contact),
21
- :size => '415x560'
22
- },
23
- {
24
- :title => alchemy_crm_t(:edit_contact),
25
- :class => 'icon contact_edit'
26
- }
27
- ) -%>
28
- <%= link_to(
29
- '',
30
- export_admin_contact_path(contact),
31
- {
32
- :title => alchemy_crm_t(:export_contact),
33
- :class => 'icon contact_export'
34
- }
35
- ) -%>
36
- <%= link_to_confirmation_window(
37
- "",
38
- alchemy_crm_t(:do_you_really_want_to_delete_this_contact?),
39
- admin_contact_path(contact),
40
- :title => alchemy_crm_t(:delete_contact),
41
- :class => 'icon contact_delete'
42
- ) %>
43
- </td>
2
+ <td class="icon">
3
+ <%= content_tag('span', '', :class => 'icon contact') %>
4
+ </td>
5
+ <td class="name" style="width: 180px">
6
+ <%= contact.lastname %>
7
+ </td>
8
+ <td class="name" style="width: 180px">
9
+ <%= contact.firstname %>
10
+ </td>
11
+ <td class="name"><%= contact.organisation %></td>
12
+ <td class="email"><%= contact.email %></td>
13
+ <td class="tags"><%= contact.tag_list %></td>
14
+ <td class="center"><%= render_icon contact.verified? && !contact.disabled %></td>
15
+ <td class="tools">
16
+ <%= link_to_overlay_window(
17
+ '',
18
+ edit_admin_contact_path(contact),
19
+ {
20
+ :title => alchemy_crm_t(:edit_contact),
21
+ :size => '415x560'
22
+ },
23
+ {
24
+ :title => alchemy_crm_t(:edit_contact),
25
+ :class => 'icon contact_edit'
26
+ }
27
+ ) -%>
28
+ <%= link_to(
29
+ '',
30
+ export_admin_contact_path(contact),
31
+ {
32
+ :title => alchemy_crm_t(:export_contact),
33
+ :class => 'icon contact_export'
34
+ }
35
+ ) -%>
36
+ <%= link_to_confirmation_window(
37
+ "",
38
+ alchemy_crm_t(:do_you_really_want_to_delete_this_contact?),
39
+ admin_contact_path(contact),
40
+ :title => alchemy_crm_t(:delete_contact),
41
+ :class => 'icon contact_delete'
42
+ ) %>
43
+ </td>
44
44
  </tr>
@@ -2,85 +2,85 @@
2
2
  <div id="errors" style="display:none"></div>
3
3
  <% if @contact.disabled? -%>
4
4
  <div class="info">
5
- <%= render_icon(:info) %>
6
- <p>
7
- <strong><%= alchemy_crm_t(:contact_is_disabled_notice) %></strong>
8
- </p>
5
+ <%= render_icon(:info) %>
6
+ <p>
7
+ <strong><%= alchemy_crm_t(:contact_is_disabled_notice) %></strong>
8
+ </p>
9
9
  </div>
10
10
  <% end -%>
11
11
  <table id="contact">
12
- <tr>
13
- <td class="label"><%= f.label :salutation %></td>
14
- <td class="select">
15
- <%= f.select(:salutation,
16
- options_for_select([
17
- [t('Please choose'), ''],
18
- [alchemy_crm_t(:mr, :scope => 'salutations'), :mr],
19
- [alchemy_crm_t(:ms, :scope => 'salutations'), :ms]
20
- ], @contact.salutation), {}, { :class => 'alchemy_selectbox very_short' }) %>
21
- </td>
22
- <td class="label right"><%= f.label :title %></td>
23
- <td class="input"><%= f.text_field :title, :class => "thin_border medium_long" %></td>
24
- </tr>
25
- <tr>
26
- <td class="label"><%= f.label :firstname %></td>
27
- <td colspan="3" class="input"><%= f.text_field :firstname, :class => "thin_border very_long" %></td>
28
- </tr>
29
- <tr>
30
- <td class="label"><%= f.label :lastname %></td>
31
- <td colspan="3" class="input"><%= f.text_field :lastname, :class => "thin_border very_long" %></td>
32
- </tr>
33
- <tr>
34
- <td class="label"><%= f.label :organisation %></td>
35
- <td colspan="3" class="input"><%= f.text_field :organisation, :class => "thin_border very_long" %></td>
36
- </tr>
37
- <tr>
38
- <td class="label"><%= f.label :email %></td>
39
- <td colspan="3" class="input"><%= f.text_field :email, :class => "thin_border very_long" %></td>
40
- </tr>
41
- <tr>
42
- <td class="label"><%= f.label :phone %></td>
43
- <td colspan="3" class="input"><%= f.text_field :phone, :class => "thin_border very_long" %></td>
44
- </tr>
45
- <tr>
46
- <td class="label"><%= f.label :mobile %></td>
47
- <td colspan="3" class="input"><%= f.text_field :mobile, :class => "thin_border very_long" %></td>
48
- </tr>
49
- <tr>
50
- <td class="label"><%= f.label :address %></td>
51
- <td colspan="3" class="input"><%= f.text_field :address, :class => "thin_border very_long" %></td>
52
- </tr>
53
- <tr>
54
- <td class="label"><%= f.label :zip %></td>
55
- <td class="input"><%= f.text_field :zip, :class => "thin_border short" %></td>
56
- <td class="label right"><%= f.label :city %></td>
57
- <td class="input"><%= f.text_field :city, :class => "thin_border medium_long" %></td>
58
- </tr>
59
- <tr>
60
- <td class="label"><%= f.label :country %></td>
61
- <td colspan="3" class="input">
62
- <%= f.country_select :country, {}, {:include_blank => t('Please choose')}, {:class => "alchemy_selectbox very_long"} %>
63
- </td>
64
- </tr>
65
- <tr>
66
- <td class="label"><%= f.label :tag_list %></td>
67
- <td colspan="3" class="input">
68
- <%= f.autocomplete_field :tag_list, autocomplete_tag_list_admin_contacts_path, :class => "thin_border very_long", 'data-delimiter' => ',' %>
69
- <p><small>*<%= alchemy_crm_t(:seperate_tags_with_comma) %></small></p>
70
- </td>
71
- </tr>
72
- <tr>
73
- <td class="label">Status</td>
74
- <td class="checkbox" colspan="3">
75
- <%= f.check_box :verified %>
76
- <%= f.label :verified %>
77
- <%= f.check_box :disabled %>
78
- <%= f.label :disabled %>
79
- </td>
80
- </tr>
81
- <tr>
82
- <td class="submit" colspan="4"><%= f.button t(:save), :class => "button" %></td>
83
- </tr>
12
+ <tr>
13
+ <td class="label"><%= f.label :salutation %></td>
14
+ <td class="select">
15
+ <%= f.select(:salutation,
16
+ options_for_select([
17
+ [t('Please choose'), ''],
18
+ [alchemy_crm_t(:mr, :scope => 'salutations'), :mr],
19
+ [alchemy_crm_t(:ms, :scope => 'salutations'), :ms]
20
+ ], @contact.salutation), {}, { :class => 'alchemy_selectbox very_short' }) %>
21
+ </td>
22
+ <td class="label right"><%= f.label :title %></td>
23
+ <td class="input"><%= f.text_field :title, :class => "thin_border medium_long" %></td>
24
+ </tr>
25
+ <tr>
26
+ <td class="label"><%= f.label :firstname %></td>
27
+ <td colspan="3" class="input"><%= f.text_field :firstname, :class => "thin_border very_long" %></td>
28
+ </tr>
29
+ <tr>
30
+ <td class="label"><%= f.label :lastname %></td>
31
+ <td colspan="3" class="input"><%= f.text_field :lastname, :class => "thin_border very_long" %></td>
32
+ </tr>
33
+ <tr>
34
+ <td class="label"><%= f.label :organisation %></td>
35
+ <td colspan="3" class="input"><%= f.text_field :organisation, :class => "thin_border very_long" %></td>
36
+ </tr>
37
+ <tr>
38
+ <td class="label"><%= f.label :email %></td>
39
+ <td colspan="3" class="input"><%= f.text_field :email, :class => "thin_border very_long" %></td>
40
+ </tr>
41
+ <tr>
42
+ <td class="label"><%= f.label :phone %></td>
43
+ <td colspan="3" class="input"><%= f.text_field :phone, :class => "thin_border very_long" %></td>
44
+ </tr>
45
+ <tr>
46
+ <td class="label"><%= f.label :mobile %></td>
47
+ <td colspan="3" class="input"><%= f.text_field :mobile, :class => "thin_border very_long" %></td>
48
+ </tr>
49
+ <tr>
50
+ <td class="label"><%= f.label :address %></td>
51
+ <td colspan="3" class="input"><%= f.text_field :address, :class => "thin_border very_long" %></td>
52
+ </tr>
53
+ <tr>
54
+ <td class="label"><%= f.label :zip %></td>
55
+ <td class="input"><%= f.text_field :zip, :class => "thin_border short" %></td>
56
+ <td class="label right"><%= f.label :city %></td>
57
+ <td class="input"><%= f.text_field :city, :class => "thin_border medium_long" %></td>
58
+ </tr>
59
+ <tr>
60
+ <td class="label"><%= f.label :country %></td>
61
+ <td colspan="3" class="input">
62
+ <%= f.country_select :country, {}, {:include_blank => t('Please choose')}, {:class => "alchemy_selectbox very_long"} %>
63
+ </td>
64
+ </tr>
65
+ <tr>
66
+ <td class="label"><%= f.label :tag_list %></td>
67
+ <td colspan="3" class="input">
68
+ <%= f.autocomplete_field :tag_list, autocomplete_tag_list_admin_contacts_path, :class => "thin_border very_long", 'data-delimiter' => ',' %>
69
+ <p><small>*<%= alchemy_crm_t(:seperate_tags_with_comma) %></small></p>
70
+ </td>
71
+ </tr>
72
+ <tr>
73
+ <td class="label">Status</td>
74
+ <td class="checkbox" colspan="3">
75
+ <%= f.check_box :verified %>
76
+ <%= f.label :verified %>
77
+ <%= f.check_box :disabled %>
78
+ <%= f.label :disabled %>
79
+ </td>
80
+ </tr>
81
+ <tr>
82
+ <td class="submit" colspan="4"><%= f.button t(:save), :class => "button" %></td>
83
+ </tr>
84
84
  </table>
85
85
 
86
86
  <% end %>