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
data/app/views/alchemy_crm/admin/newsletters/_form.html.erb CHANGED
@@ -1,54 +1,54 @@
1
1
  <%= form_for [:admin, @newsletter], :class => "with_padding", :remote => true 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" %>
10
- </td>
11
- </tr>
12
- <tr>
13
- <td class="label">
14
- <%= f.label :layout %>
15
- </td>
16
- <td class="select">
17
- <%= f.select :layout, @page_layouts, { :prompt => t('Please choose') }, { :class => 'alchemy_selectbox' } %>
18
- </td>
19
- </tr>
20
- <tr>
21
- <td class="label">
22
- <%= f.label :public %>
23
- </td>
24
- <td class="checkbox">
25
- <%= f.check_box :public %>
26
- </td>
27
- </tr>
28
- <tr>
29
- <td class="label">
30
- <%= f.label :contact_groups %>
31
- </td>
32
- <%- if @contact_groups.any? -%>
33
- <td class="input">
34
- <%= render :partial => "tag_with_radiobutton", :collection => @contact_groups, :locals => {:newsletter_contact_groups => @newsletter.contact_groups} %>
35
- <%- else -%>
36
- <td class="value">
37
- <small><%= alchemy_crm_t(:you_have_no_contact_groups_yet) %></small>
38
- <%- end -%>
39
- </td>
40
- </tr>
41
- <% if @newsletter.verified_subscribers.any? -%>
42
- <tr>
43
- <td colspan="2" class="headline" style="padding: 0">
44
- <p><%= alchemy_crm_t(:subscribers_count) %>: <%= @newsletter.verified_subscribers.count %></p>
45
- </td>
46
- </tr>
47
- <% end -%>
48
- <tr>
49
- <td colspan="2" class="submit">
50
- <%= f.button t(:save), :class => "button" %>
51
- </td>
52
- </tr>
53
- </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" %>
10
+ </td>
11
+ </tr>
12
+ <tr>
13
+ <td class="label">
14
+ <%= f.label :layout %>
15
+ </td>
16
+ <td class="select">
17
+ <%= f.select :layout, @page_layouts, { :prompt => t('Please choose') }, { :class => 'alchemy_selectbox' } %>
18
+ </td>
19
+ </tr>
20
+ <tr>
21
+ <td class="label">
22
+ <%= f.label :public %>
23
+ </td>
24
+ <td class="checkbox">
25
+ <%= f.check_box :public %>
26
+ </td>
27
+ </tr>
28
+ <tr>
29
+ <td class="label">
30
+ <%= f.label :contact_groups %>
31
+ </td>
32
+ <%- if @contact_groups.any? -%>
33
+ <td class="input">
34
+ <%= render :partial => "tag_with_radiobutton", :collection => @contact_groups, :locals => {:newsletter_contact_groups => @newsletter.contact_groups} %>
35
+ <%- else -%>
36
+ <td class="value">
37
+ <small><%= alchemy_crm_t(:you_have_no_contact_groups_yet) %></small>
38
+ <%- end -%>
39
+ </td>
40
+ </tr>
41
+ <% if @newsletter.verified_subscribers.any? -%>
42
+ <tr>
43
+ <td colspan="2" class="headline" style="padding: 0">
44
+ <p><%= alchemy_crm_t(:subscribers_count) %>: <%= @newsletter.verified_subscribers.count %></p>
45
+ </td>
46
+ </tr>
47
+ <% end -%>
48
+ <tr>
49
+ <td colspan="2" class="submit">
50
+ <%= f.button t(:save), :class => "button" %>
51
+ </td>
52
+ </tr>
53
+ </table>
54
54
  <% end %>
data/app/views/alchemy_crm/admin/newsletters/_tag_with_radiobutton.html.erb CHANGED
@@ -1,7 +1,7 @@
1
1
  <span class="tag_with_radio_button">
2
- <%= check_box_tag "newsletter[contact_group_ids][]", tag_with_radiobutton.id, newsletter_contact_groups.include?(tag_with_radiobutton), :id => tag_with_radiobutton.name.downcase + "_contact_group" %>
3
- <label for="<%= tag_with_radiobutton.name.downcase + "_contact_group" %>" class="tag">
4
- <%= tag_with_radiobutton.name %>
5
- <small>(<%= tag_with_radiobutton.contacts.count %>)</small>
6
- </label>
2
+ <%= check_box_tag "newsletter[contact_group_ids][]", tag_with_radiobutton.id, newsletter_contact_groups.include?(tag_with_radiobutton), :id => tag_with_radiobutton.name.downcase + "_contact_group" %>
3
+ <label for="<%= tag_with_radiobutton.name.downcase + "_contact_group" %>" class="tag">
4
+ <%= tag_with_radiobutton.name %>
5
+ <small>(<%= tag_with_radiobutton.contacts.count %>)</small>
6
+ </label>
7
7
  </span>
data/app/views/alchemy_crm/admin/newsletters/index.html.erb CHANGED
@@ -1,42 +1,42 @@
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
 
5
5
  <%- content_for :toolbar do -%>
6
6
  <div id="toolbar_buttons">
7
- <div class="button_with_label">
8
- <%= link_to_overlay_window(
9
- content_tag('span', '', :class => 'icon format_add'),
10
- new_admin_newsletter_path(),
11
- {
12
- :title => alchemy_crm_t(:add_newsletter),
13
- :size => '340x220'
14
- },
15
- {
16
- :title => alchemy_crm_t(:add_newsletter),
17
- :class => 'icon_button'
18
- }
19
- ) -%><br />
20
- <label><%= alchemy_crm_t(:add_newsletter) %></label>
21
- </div>
7
+ <div class="button_with_label">
8
+ <%= link_to_overlay_window(
9
+ content_tag('span', '', :class => 'icon format_add'),
10
+ new_admin_newsletter_path(),
11
+ {
12
+ :title => alchemy_crm_t(:add_newsletter),
13
+ :size => '340x220'
14
+ },
15
+ {
16
+ :title => alchemy_crm_t(:add_newsletter),
17
+ :class => 'icon_button'
18
+ }
19
+ ) -%><br />
20
+ <label><%= alchemy_crm_t(:add_newsletter) %></label>
21
+ </div>
22
22
  </div>
23
23
  <%= render :partial => 'alchemy/admin/partials/search_form' %>
24
24
  <%- end -%>
25
25
 
26
26
  <table class="list">
27
- <%- unless @newsletters.blank? -%>
28
- <tr class="legend">
29
- <th class="icon"></th>
30
- <th class="name"><%= translate_model_attribute(:newsletter, :name) %></th>
31
- <th style="width: 120px"><%= translate_model_attribute(:newsletter, :layout) %></th>
32
- <th style="width: 80px" class="center"><%= translate_model_attribute(:newsletter, :public) %></th>
33
- <th class="size" style="width: 120px"><%= translate_model_attribute(:newsletter, :contacts_count) %></th>
34
- <th class="size" style="width: 120px"><%= translate_model_attribute(:newsletter, :subscribers_count) %></th>
35
- <th class="size" style="width: 120px"><%= translate_model_attribute(:newsletter, :contact_group_contacts_count) %></th>
36
- <th class="tools" style="width: 44px"></th>
37
- </tr>
38
- <%- end -%>
39
- <%= render @newsletters %>
27
+ <%- unless @newsletters.blank? -%>
28
+ <tr class="legend">
29
+ <th class="icon"></th>
30
+ <th class="name"><%= translate_model_attribute(:newsletter, :name) %></th>
31
+ <th style="width: 120px"><%= translate_model_attribute(:newsletter, :layout) %></th>
32
+ <th style="width: 80px" class="center"><%= translate_model_attribute(:newsletter, :public) %></th>
33
+ <th class="size" style="width: 120px"><%= translate_model_attribute(:newsletter, :contacts_count) %></th>
34
+ <th class="size" style="width: 120px"><%= translate_model_attribute(:newsletter, :subscribers_count) %></th>
35
+ <th class="size" style="width: 120px"><%= translate_model_attribute(:newsletter, :contact_group_contacts_count) %></th>
36
+ <th class="tools" style="width: 44px"></th>
37
+ </tr>
38
+ <%- end -%>
39
+ <%= render @newsletters %>
40
40
  </table>
41
41
 
42
42
  <%= render 'alchemy/admin/partials/pagination_links', :items => @newsletters, :scope => alchemy_crm %>
data/app/views/alchemy_crm/admin/newsletters/new.html.erb CHANGED
@@ -1,9 +1,9 @@
1
1
  <%- if @page_layouts.blank? -%>
2
2
  <div class="with_padding">
3
- <div class="info">
4
- <%= render_icon('info') %>
5
- <%= alchemy_crm_t(:newsletter_layout_not_found_notice) %>
6
- </div>
3
+ <div class="info">
4
+ <%= render_icon('info') %>
5
+ <%= alchemy_crm_t(:newsletter_layout_not_found_notice) %>
6
+ </div>
7
7
  </div>
8
8
  <%- else -%>
9
9
  <%= render :partial => "form" %>
data/app/views/alchemy_crm/admin/tags/_radio_tag.html.erb CHANGED
@@ -1,6 +1,6 @@
1
1
  <span class="tag_with_radio_button" name="<%= radio_tag.name %>">
2
- <%= radio_button_tag name + "[merge_to]", radio_tag.id, false, :id => radio_tag.name + "_tag_list", :onclick => "$('tag_replace_button').value = 'ersetzen mit ' + this.parentNode.readAttribute('name')"%>
3
- <label for="<%= radio_tag.name + "_tag_list" %>">
4
- <%= radio_tag.name %>&nbsp;<%= contact_count_from_tag(radio_tag) %>
5
- </label>
2
+ <%= radio_button_tag name + "[merge_to]", radio_tag.id, false, :id => radio_tag.name + "_tag_list", :onclick => "$('tag_replace_button').value = 'ersetzen mit ' + this.parentNode.readAttribute('name')"%>
3
+ <label for="<%= radio_tag.name + "_tag_list" %>">
4
+ <%= radio_tag.name %>&nbsp;<%= contact_count_from_tag(radio_tag) %>
5
+ </label>
6
6
  </span>
data/app/views/alchemy_crm/admin/tags/_tag.html.erb CHANGED
@@ -1,32 +1,32 @@
1
1
  <tr class="<%= cycle('even', 'odd') %> filterable" name="<%= tag.name -%>">
2
- <td class="icon">
3
- <%= content_tag 'span', '', :class => 'icon tag' -%>
4
- </td>
5
- <td class="name">
6
- <%= tag.name -%>
7
- </td>
8
- <td class="size" style="width: 120px">
9
- <%= contact_count_from_tag(tag) -%>
10
- </td>
11
- <td class="tools">
12
- <%= link_to_overlay_window(
13
- "",
14
- edit_admin_tag_path(tag),
15
- {
16
- :title => alchemy_crm_t(:edit_tag),
17
- :size => '350x325'
18
- },
19
- {
20
- :title => alchemy_crm_t(:edit_tag),
21
- :class => 'icon tag_edit'
22
- }
23
- ) -%>
24
- <%= link_to_confirmation_window(
25
- '',
26
- alchemy_crm_t(:do_you_really_want_to_delete_this_tag?),
27
- admin_tag_path(tag),
28
- :title => alchemy_crm_t(:delete_tag),
29
- :class => "icon tag_delete"
30
- ) -%>
31
- </td>
2
+ <td class="icon">
3
+ <%= content_tag 'span', '', :class => 'icon tag' -%>
4
+ </td>
5
+ <td class="name">
6
+ <%= tag.name -%>
7
+ </td>
8
+ <td class="size" style="width: 120px">
9
+ <%= contact_count_from_tag(tag) -%>
10
+ </td>
11
+ <td class="tools">
12
+ <%= link_to_overlay_window(
13
+ "",
14
+ edit_admin_tag_path(tag),
15
+ {
16
+ :title => alchemy_crm_t(:edit_tag),
17
+ :size => '350x325'
18
+ },
19
+ {
20
+ :title => alchemy_crm_t(:edit_tag),
21
+ :class => 'icon tag_edit'
22
+ }
23
+ ) -%>
24
+ <%= link_to_confirmation_window(
25
+ '',
26
+ alchemy_crm_t(:do_you_really_want_to_delete_this_tag?),
27
+ admin_tag_path(tag),
28
+ :title => alchemy_crm_t(:delete_tag),
29
+ :class => "icon tag_delete"
30
+ ) -%>
31
+ </td>
32
32
  </tr>
data/app/views/alchemy_crm/admin/tags/edit.html.erb CHANGED
@@ -1,40 +1,40 @@
1
1
  <h2 class="with_padding"><%= alchemy_crm_t(:you_can_rename_this_tag) %></h2>
2
2
  <%= form_for @tag, :as => :tag, :url => {:controller => :tags, :action => "update", :id => @tag.id}, :html => {:method => :put}, :remote => true do |f| %>
3
- <table border="0" cellspacing="4" cellpadding="4" style="width: 100%">
4
- <tr>
5
- <td class="label medium">
6
- <%= f.label :name, "Name" %>
7
- </td>
8
- <td class="input">
9
- <%= f.text_field :name, :class => "thin_border long" %>
10
- </td>
11
- </tr>
12
- <tr>
13
- <td colspan="2" class="submit">
14
- <%= f.button alchemy_crm_t(:rename), :class => "button" %>
15
- </td>
16
- </tr>
17
- </table>
3
+ <table border="0" cellspacing="4" cellpadding="4" style="width: 100%">
4
+ <tr>
5
+ <td class="label medium">
6
+ <%= f.label :name, "Name" %>
7
+ </td>
8
+ <td class="input">
9
+ <%= f.text_field :name, :class => "thin_border long" %>
10
+ </td>
11
+ </tr>
12
+ <tr>
13
+ <td colspan="2" class="submit">
14
+ <%= f.button alchemy_crm_t(:rename), :class => "button" %>
15
+ </td>
16
+ </tr>
17
+ </table>
18
18
  <% end %>
19
19
  <% if @tags.any? -%>
20
20
  <h2 class="with_padding"><%= alchemy_crm_t(:or_replace_it_with_an_existing_tag) %>:</h2>
21
21
  <%= form_for @tag, :as => :tag, :url => {:controller => :tags, :action => "update", :id => @tag.id, :replace => true}, :html => {:method => :put, :style => "clear: both"}, :remote => true do |f| %>
22
- <table border="0" cellspacing="4" cellpadding="4" style="width: 100%">
23
- <tr>
24
- <td class="label medium">
25
- <label>Tags</label>
26
- </td>
27
- <td class="input">
28
- <div class="tag_list">
29
- <%= render :partial => "radio_tag", :collection => @tags, :locals => {:name => "tag"} %>
30
- </div>
31
- </td>
32
- </tr>
33
- <tr>
34
- <td colspan="2" style="text-align: right">
35
- <%= f.button alchemy_crm_t(:replace), :class => "button", :id => "tag_replace_button" %>
36
- </td>
37
- </tr>
38
- </table>
22
+ <table border="0" cellspacing="4" cellpadding="4" style="width: 100%">
23
+ <tr>
24
+ <td class="label medium">
25
+ <label>Tags</label>
26
+ </td>
27
+ <td class="input">
28
+ <div class="tag_list">
29
+ <%= render :partial => "radio_tag", :collection => @tags, :locals => {:name => "tag"} %>
30
+ </div>
31
+ </td>
32
+ </tr>
33
+ <tr>
34
+ <td colspan="2" style="text-align: right">
35
+ <%= f.button alchemy_crm_t(:replace), :class => "button", :id => "tag_replace_button" %>
36
+ </td>
37
+ </tr>
38
+ </table>
39
39
  <% end %>
40
40
  <% end -%>
data/app/views/alchemy_crm/admin/tags/index.html.erb CHANGED
@@ -1,35 +1,35 @@
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
 
5
5
  <%- content_for :toolbar do -%>
6
- <div id="toolbar_buttons">
7
- <div class="button_with_label">
8
- <%= link_to_overlay_window(
9
- content_tag('span', '', :class => 'icon tag_add'),
10
- new_admin_tag_path,
11
- {
12
- :title => alchemy_crm_t('New Tag'),
13
- :size => '310x210'
14
- },
15
- :title => alchemy_crm_t('New Tag'),
16
- :class => 'icon_button'
17
- ) %><br />
18
- <label><%= alchemy_crm_t('New Tag') %></label>
19
- </div>
20
- </div>
6
+ <div id="toolbar_buttons">
7
+ <div class="button_with_label">
8
+ <%= link_to_overlay_window(
9
+ content_tag('span', '', :class => 'icon tag_add'),
10
+ new_admin_tag_path,
11
+ {
12
+ :title => alchemy_crm_t('New Tag'),
13
+ :size => '310x210'
14
+ },
15
+ :title => alchemy_crm_t('New Tag'),
16
+ :class => 'icon_button'
17
+ ) %><br />
18
+ <label><%= alchemy_crm_t('New Tag') %></label>
19
+ </div>
20
+ </div>
21
21
  <%= render :partial => 'alchemy/admin/partials/search_form' %>
22
22
  <%- end -%>
23
23
 
24
24
  <%- if @tags.any? -%>
25
25
  <table class="list" id="tag_list">
26
- <tr class="legend">
27
- <th class="icon"></th>
28
- <th class="name"><%= ActsAsTaggableOn::Tag.human_attribute_name(:name) %></th>
29
- <th class="size" style="width: 120px"><%= ActsAsTaggableOn::Tag.human_attribute_name(:contacts_count) %></th>
30
- <th class="tools"></th>
31
- </tr>
32
- <%= render :partial => 'tag', :collection => @tags %>
26
+ <tr class="legend">
27
+ <th class="icon"></th>
28
+ <th class="name"><%= ActsAsTaggableOn::Tag.human_attribute_name(:name) %></th>
29
+ <th class="size" style="width: 120px"><%= ActsAsTaggableOn::Tag.human_attribute_name(:contacts_count) %></th>
30
+ <th class="tools"></th>
31
+ </tr>
32
+ <%= render :partial => 'tag', :collection => @tags %>
33
33
  </table>
34
34
  <%= render 'alchemy/admin/partials/pagination_links', :items => @tags, :scope => alchemy_crm %>
35
35
  <%- end -%>
data/app/views/alchemy_crm/admin/tags/new.html.erb CHANGED
@@ -1,16 +1,16 @@
1
1
  <%= form_for [:admin, @tag], :as => :tag, :url => admin_tags_path, :html => {:id => 'new_tag'}, :remote => true do |form| %>
2
- <div class="info">
3
- <%= render_icon('info') %>
4
- <%= alchemy_crm_t(:tags_get_created_while_tagging_contacts) %>
5
- </div>
6
- <div id="errors" style="display: none"></div>
7
- <table>
8
- <tr>
9
- <td class="label"><%= form.label :name %></td>
10
- <td class="input"><%= form.text_field :name, :class => 'input_field' %></td>
11
- </tr>
12
- <tr>
13
- <td colspan="2" class="submit"><%= form.button t('save'), :name => nil, :class => 'button' %></td>
14
- </tr>
15
- </table>
2
+ <div class="info">
3
+ <%= render_icon('info') %>
4
+ <%= alchemy_crm_t(:tags_get_created_while_tagging_contacts) %>
5
+ </div>
6
+ <div id="errors" style="display: none"></div>
7
+ <table>
8
+ <tr>
9
+ <td class="label"><%= form.label :name %></td>
10
+ <td class="input"><%= form.text_field :name, :class => 'input_field' %></td>
11
+ </tr>
12
+ <tr>
13
+ <td colspan="2" class="submit"><%= form.button t('save'), :name => nil, :class => 'button' %></td>
14
+ </tr>
15
+ </table>
16
16
  <% end %>
data/app/views/alchemy_crm/contacts_mailer/signout_mail.html.erb CHANGED
@@ -1,8 +1,8 @@
1
1
  <html>
2
- <body>
3
- <%= raw @element.ingredient("text") % {
4
- :link => alchemy_crm.disable_contact_url(:token => @contact.email_sha1),
5
- :name => @contact.fullname
6
- } rescue "" %>
7
- </body>
2
+ <body>
3
+ <%= raw @element.ingredient("text") % {
4
+ :link => alchemy_crm.disable_contact_url(:token => @contact.email_sha1),
5
+ :name => @contact.fullname
6
+ } rescue "" %>
7
+ </body>
8
8
  </html>