alchemy_crm 2.0.1 → 2.0.2

data/app/views/alchemy_crm/admin/contacts/import.html.erb

@@ -1,33 +1,33 @@
 <%= form_tag import_admin_contacts_path, :remote => request.xhr?, :multipart => true, :class => 'contact_import' do %>
 
-	<div class="info">
-		<%= render_icon('info') %>
-		<h1><%= alchemy_crm_t(:headline, :scope => 'import_format_notice') %></h1>
-		<ul>
-			<li><%= alchemy_crm_t(:vcf_format, :scope => 'import_format_notice') %></li>
-			<li><%= alchemy_crm_t(:csv_format, :scope => 'import_format_notice') %></li>
-		</ul>
-	</div>
+  <div class="info">
+    <%= render_icon('info') %>
+    <h1><%= alchemy_crm_t(:headline, :scope => 'import_format_notice') %></h1>
+    <ul>
+      <li><%= alchemy_crm_t(:vcf_format, :scope => 'import_format_notice') %></li>
+      <li><%= alchemy_crm_t(:csv_format, :scope => 'import_format_notice') %></li>
+    </ul>
+  </div>
 
-	<div id="errors" style="display: none"></div>
+  <div id="errors" style="display: none"></div>
 
-	<table>
-		<tr>
-			<td class="label"><%= label_tag :file, alchemy_crm_t(:file) %></td>
-			<td><%= file_field_tag :file %></td>
-		</tr>
-		<tr>
-			<td></td>
-			<td>
-				<%= check_box_tag :verified %>
-				<%= label_tag :verified, alchemy_crm_t(:import_contacts_verified) %>
-			</td>
-		</tr>
-		<tr>
-			<td class="submit" colspan="2">
-				<%= button_tag alchemy_crm_t(:import), :name => nil, :class => 'button' %>
-			</td>
-		</tr>
-	</table>
+  <table>
+    <tr>
+      <td class="label"><%= label_tag :file, alchemy_crm_t(:file) %></td>
+      <td><%= file_field_tag :file %></td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>
+        <%= check_box_tag :verified %>
+        <%= label_tag :verified, alchemy_crm_t(:import_contacts_verified) %>
+      </td>
+    </tr>
+    <tr>
+      <td class="submit" colspan="2">
+        <%= button_tag alchemy_crm_t(:import), :name => nil, :class => 'button' %>
+      </td>
+    </tr>
+  </table>
 
 <% end %>

data/app/views/alchemy_crm/admin/contacts/index.html.erb

@@ -1,51 +1,51 @@
 <% content_for(:javascript_includes) do -%>
-	<%= javascript_include_tag "alchemy_crm/scripts.js" %>
+  <%= javascript_include_tag "alchemy_crm/scripts.js" %>
 <% end -%>
 
 <% content_for(:stylesheets) do -%>
-	<%= stylesheet_link_tag('alchemy_crm/styles') %>
+  <%= stylesheet_link_tag('alchemy_crm/styles') %>
 <% end -%>
 
 <% toolbar(
-	:buttons => [
-		{
-			:icon => "contact_add",
-			:label => alchemy_crm_t(:add_contact),
-			:url => alchemy_crm.new_admin_contact_path,
-			:title => alchemy_crm_t(:add_contact),
-			:overlay_options => {
-				:title => alchemy_crm_t(:add_contact),
-				:size => '415x560'
-			},
-			:if_permitted_to => [:new, :alchemy_crm_admin_contacts]
-		},
-		{
-			:icon => :contact_import,
-			:label => alchemy_crm_t(:import_contacts),
-			:url => alchemy_crm.import_admin_contacts_path,
-			:title => alchemy_crm_t(:import_contacts),
-			:overlay_options => {
-				:title => alchemy_crm_t(:import_contacts),
-				:size => '400x300'
-			},
-			:if_permitted_to => [:import, :alchemy_crm_admin_contacts]
-		}
-	]
+  :buttons => [
+    {
+      :icon => "contact_add",
+      :label => alchemy_crm_t(:add_contact),
+      :url => alchemy_crm.new_admin_contact_path,
+      :title => alchemy_crm_t(:add_contact),
+      :overlay_options => {
+        :title => alchemy_crm_t(:add_contact),
+        :size => '415x560'
+      },
+      :if_permitted_to => [:new, :alchemy_crm_admin_contacts]
+    },
+    {
+      :icon => :contact_import,
+      :label => alchemy_crm_t(:import_contacts),
+      :url => alchemy_crm.import_admin_contacts_path,
+      :title => alchemy_crm_t(:import_contacts),
+      :overlay_options => {
+        :title => alchemy_crm_t(:import_contacts),
+        :size => '400x300'
+      },
+      :if_permitted_to => [:import, :alchemy_crm_admin_contacts]
+    }
+  ]
 ) %>
 
 <table class="list">
-	<%- unless @contacts.blank? -%>
-	<tr>
-		<th class="icon"></th>
-		<th class="name" style="width: 180px"><%= translate_model_attribute(:contact, :lastname).gsub(/\*$/, '') %></th>
-		<th class="name" style="width: 180px"><%= translate_model_attribute(:contact, :firstname).gsub(/\*$/, '') %></th>
-		<th class="name"><%= translate_model_attribute(:contact, :organisation) %></th>
-		<th class="name"><%= translate_model_attribute(:contact, :email).gsub(/\*$/, '') %></th>
-		<th class="name"><%= translate_model_attribute(:contact, :tags) %></th>
-		<th class="center"><%= translate_model_attribute(:contact, :verified) %></th>
-		<th class="tools" style="width: 60px"></th>
-	</tr>
-	<%- end -%>
-	<%= render @contacts %>
+  <%- unless @contacts.blank? -%>
+  <tr>
+    <th class="icon"></th>
+    <th class="name" style="width: 180px"><%= translate_model_attribute(:contact, :lastname).gsub(/\*$/, '') %></th>
+    <th class="name" style="width: 180px"><%= translate_model_attribute(:contact, :firstname).gsub(/\*$/, '') %></th>
+    <th class="name"><%= translate_model_attribute(:contact, :organisation) %></th>
+    <th class="name"><%= translate_model_attribute(:contact, :email).gsub(/\*$/, '') %></th>
+    <th class="name"><%= translate_model_attribute(:contact, :tags) %></th>
+    <th class="center"><%= translate_model_attribute(:contact, :verified) %></th>
+    <th class="tools" style="width: 60px"></th>
+  </tr>
+  <%- end -%>
+  <%= render @contacts %>
 </table>
 <%= render 'alchemy/admin/partials/pagination_links', :items => @contacts, :scope => alchemy_crm %>

data/app/views/alchemy_crm/admin/contacts/vcf_import_result.html.erb

@@ -1,49 +1,49 @@
 <%- content_for(:javascript_includes) do -%>
-	<%= javascript_include_tag "alchemy_crm/scripts.js" %>
+  <%= javascript_include_tag "alchemy_crm/scripts.js" %>
 <%- end -%>
 
 <%- content_for(:stylesheets) do -%>
-	<%= stylesheet_link_tag('alchemy_crm/styles') %>
+  <%= stylesheet_link_tag('alchemy_crm/styles') %>
 <%- end -%>
 
 <h1><%= alchemy_crm_t('Import result') %></h1>
 
 <% if @valid_contacts.any? -%>
 <div class="flash notice" style="margin: 8px 0">
-	<%= render_icon('true') %>
-	<%= alchemy_crm_t('%{count} contacts imported successfully') % {:count => @valid_contacts.length} %>
+  <%= render_icon('true') %>
+  <%= alchemy_crm_t('%{count} contacts imported successfully') % {:count => @valid_contacts.length} %>
 </div>
 <% end -%>
 
 <% if @errors -%>
 <div class="flash error" style="margin: 8px 0">
-	<%= render_icon('error') %><%= @errors %>
+  <%= render_icon('error') %><%= @errors %>
 </div>
 <% end -%>
 
 <% if @contacts -%>
 <table>
-	<tr>
-		<th><%= translate_model_attribute(:contact, :name) %></th>
-		<th><%= translate_model_attribute(:contact, :email).gsub(/\*$/, '') %></th>
-		<th><%= alchemy_crm_t(:import_status) %></th>
-	</tr>
-	<% @contacts.each do |contact| -%>
-	<tr class="<%= cycle("even", "odd") %><%= contact.invalid? ? ' disabled' : nil -%>">
-		<td><%= contact.fullname %></td>
-		<td><%= contact.email %></td>
-		<td>
-			<% if contact.valid? -%>
-			<%= render_icon(:true) %>
-			<% else -%>
-			<%= contact.errors.full_messages.join('<br>') %>
-			<% end -%>
-		</td>
-	</tr>
-	<% end -%>
+  <tr>
+    <th><%= translate_model_attribute(:contact, :name) %></th>
+    <th><%= translate_model_attribute(:contact, :email).gsub(/\*$/, '') %></th>
+    <th><%= alchemy_crm_t(:import_status) %></th>
+  </tr>
+  <% @contacts.each do |contact| -%>
+  <tr class="<%= cycle("even", "odd") %><%= contact.invalid? ? ' disabled' : nil -%>">
+    <td><%= contact.fullname %></td>
+    <td><%= contact.email %></td>
+    <td>
+      <% if contact.valid? -%>
+      <%= render_icon(:true) %>
+      <% else -%>
+      <%= contact.errors.full_messages.join('<br>') %>
+      <% end -%>
+    </td>
+  </tr>
+  <% end -%>
 </table>
 <% end -%>
 
 <p style="margin: 8px 0">
-	<%= link_to t(:continue), admin_contacts_path, :class => 'button' %>
+  <%= link_to t(:continue), admin_contacts_path, :class => 'button' %>
 </p>

data/app/views/alchemy_crm/admin/deliveries/_delivery.html.erb

@@ -1,32 +1,32 @@
 <tr class="delivery <%= cycle('even', 'odd') %>">
-	<td>
-		<%= l(delivery.deliver_at, :format => :deliveries) %>
-		<%- unless delivery.delivered? -%>
-		<%= link_to_confirmation_window(
-			render_icon('destroy'),
-			alchemy_crm_t(:do_you_want_to_cancel_the_delivery?),
-			admin_delivery_path(delivery),
-			:title => alchemy_crm_t(:cancel_delivery)
-		) -%>
-		<%- end -%>
-	</td>
-	<td class="right">
-		<%= delivery.recipients.count %>
-	</td>
-	<td class="center">
-		<%= render_icon(delivery.delivered?) %>
-	</td>
-	<td class="center">
-		<%- if delivery.delivered? -%>
-		<%= link_to_overlay_window(
-			render_icon('statistics'),
-			admin_delivery_path(delivery),
-			{
-				:title => alchemy_crm_t(:show_statistics) % {:name => delivery.mailing.name, :date => l(delivery.delivered_at)},
-				:size => '540x400',
-				:modal => false
-			}
-		) %>
-		<%- end -%>
-	</td>
+  <td>
+    <%= l(delivery.deliver_at, :format => :deliveries) %>
+    <%- unless delivery.delivered? -%>
+    <%= link_to_confirmation_window(
+      render_icon('destroy'),
+      alchemy_crm_t(:do_you_want_to_cancel_the_delivery?),
+      admin_delivery_path(delivery),
+      :title => alchemy_crm_t(:cancel_delivery)
+    ) -%>
+    <%- end -%>
+  </td>
+  <td class="right">
+    <%= delivery.recipients.count %>
+  </td>
+  <td class="center">
+    <%= render_icon(delivery.delivered?) %>
+  </td>
+  <td class="center">
+    <%- if delivery.delivered? -%>
+    <%= link_to_overlay_window(
+      render_icon('statistics'),
+      admin_delivery_path(delivery),
+      {
+        :title => alchemy_crm_t(:show_statistics) % {:name => delivery.mailing.name, :date => l(delivery.delivered_at)},
+        :size => '540x400',
+        :modal => false
+      }
+    ) %>
+    <%- end -%>
+  </td>
 </tr>

data/app/views/alchemy_crm/admin/deliveries/_form.html.erb

@@ -1,65 +1,65 @@
 <%= form_for [:admin, @delivery] do |f| %>
-	<div id="errors" style="display:none"></div>
-	<table style="width: 100%">
-		<tr>
-			<td class="label"><%= f.label :name, 'Name:' %></td>
-			<td><%= @mailing.name %></td>
-		</tr>
-		<tr>
-			<td class="label"><%= f.label :subject, 'Betreff:' %></td>
-			<td><%= @mailing.subject %></td>
-		</tr>
-		<tr>
-			<td class="label"><%= f.label :recipients, 'Empfänger:' %></td>
-			<td><%= @delivery.new_record? ? @mailing.contacts_not_having_email_yet.count : @delivery.recipients.count %> (<%= link_to_function "Empfänger anzeigen", "jQuery('#all_contacts').toggle(); AlchemyCrm.toggleLabel(this, 'Empfänger ausblenden', 'Empfänger anzeigen')" ,:class => "" %>)</td>
-		</tr>
-		<tr>
-			<td></td>
-			<td>
-				<ul id="all_contacts" style="display: none">
-					<% emails = @delivery.new_record? ? @mailing.emails : @delivery.recipients.collect(&:email) -%>
-					<%- emails.each do |email| -%>
-					<li class="<%= cycle("even", "odd") -%>"><%= email %></li>
-					<%- end -%>
-				</ul>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<%= f.label :deliver_at, "versenden am" %>
-			</td>
-			<td class="delivery_time">
-				<%= text_field_tag nil, @delivery.deliver_at.strftime('%d.%m.%Y'), :class => 'datepicker thin_border', :id => nil, :style => 'width: 90px' %>
-				<label>um</label>
-				<%= f.time_select :deliver_at, { :minute_step => 15, :time_separator => '<label>:&nbsp;</label>'.html_safe }, { :class => 'alchemy_selectbox time_select' } %>
-				<label>Uhr</label>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2" class="submit">
-				<%= f.hidden_field :mailing_id %>
-				<%= f.button("speichern", :class => "button") %>
-			</td>
-		</tr>
-	</table>
+  <div id="errors" style="display:none"></div>
+  <table style="width: 100%">
+    <tr>
+      <td class="label"><%= f.label :name, 'Name:' %></td>
+      <td><%= @mailing.name %></td>
+    </tr>
+    <tr>
+      <td class="label"><%= f.label :subject, 'Betreff:' %></td>
+      <td><%= @mailing.subject %></td>
+    </tr>
+    <tr>
+      <td class="label"><%= f.label :recipients, 'Empfänger:' %></td>
+      <td><%= @delivery.new_record? ? @mailing.contacts_not_having_email_yet.count : @delivery.recipients.count %> (<%= link_to_function "Empfänger anzeigen", "jQuery('#all_contacts').toggle(); AlchemyCrm.toggleLabel(this, 'Empfänger ausblenden', 'Empfänger anzeigen')" ,:class => "" %>)</td>
+    </tr>
+    <tr>
+      <td></td>
+      <td>
+        <ul id="all_contacts" style="display: none">
+          <% emails = @delivery.new_record? ? @mailing.emails : @delivery.recipients.collect(&:email) -%>
+          <%- emails.each do |email| -%>
+          <li class="<%= cycle("even", "odd") -%>"><%= email %></li>
+          <%- end -%>
+        </ul>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <%= f.label :deliver_at, "versenden am" %>
+      </td>
+      <td class="delivery_time">
+        <%= text_field_tag nil, @delivery.deliver_at.strftime('%d.%m.%Y'), :class => 'datepicker thin_border', :id => nil, :style => 'width: 90px' %>
+        <label>um</label>
+        <%= f.time_select :deliver_at, { :minute_step => 15, :time_separator => '<label>:&nbsp;</label>'.html_safe }, { :class => 'alchemy_selectbox time_select' } %>
+        <label>Uhr</label>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2" class="submit">
+        <%= f.hidden_field :mailing_id %>
+        <%= f.button("speichern", :class => "button") %>
+      </td>
+    </tr>
+  </table>
 <% end %>
 <script type="text/javascript" charset="utf-8">
-	(function($) {
-		
-		$('input.datepicker').datepicker({
-			dateFormat: 'dd.mm.yy',
-			dayNames: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
-			dayNamesMin: ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'],
-			monthNames: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
-			monthNamesShort: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
-			onClose: function(dateText, inst) {
-				var dateparts = dateText.split('.');
-				console.info('partsText: ', dateparts);
-				$('#delivery_deliver_at_1i').val(dateparts[2]);
-				$('#delivery_deliver_at_2i').val(dateparts[1]);
-				$('#delivery_deliver_at_3i').val(dateparts[0]);
-			}
-		});
-		
-	})(jQuery);
+  (function($) {
+    
+    $('input.datepicker').datepicker({
+      dateFormat: 'dd.mm.yy',
+      dayNames: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
+      dayNamesMin: ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'],
+      monthNames: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
+      monthNamesShort: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
+      onClose: function(dateText, inst) {
+        var dateparts = dateText.split('.');
+        console.info('partsText: ', dateparts);
+        $('#delivery_deliver_at_1i').val(dateparts[2]);
+        $('#delivery_deliver_at_2i').val(dateparts[1]);
+        $('#delivery_deliver_at_3i').val(dateparts[0]);
+      }
+    });
+    
+  })(jQuery);
 </script>

data/app/views/alchemy_crm/admin/deliveries/_recipient.html.erb

@@ -1,40 +1,40 @@
 <tr class="recipient">
-    <td>
-        <%= if recipient.contact.blank?
-                "<i>#{alchemy_crm_t(:without)}</i>".html_safe
-            else
-                link_to(recipient.contact.fullname.blank? ? "<i>#{alchemy_crm_t(:without)}</i>".html_safe : recipient.contact.fullname, admin_contacts_path(:query => recipient.contact.email), :title => alchemy_crm_t(:show_contact))
-            end
-        %>
-    </td>
-    <td>
-        <%= recipient.email %>
-    </td>
-    <%- if reactions -%>
-    <td>
-        <%- recipient.reactions.each do |reaction| -%>
-            <%= reaction.url %><br />
-        <%- end -%>
-    </td>
+  <td>
+    <%= if recipient.contact.blank?
+        "<i>#{alchemy_crm_t(:without)}</i>".html_safe
+      else
+        link_to(recipient.contact.fullname.blank? ? "<i>#{alchemy_crm_t(:without)}</i>".html_safe : recipient.contact.fullname, admin_contacts_path(:query => recipient.contact.email), :title => alchemy_crm_t(:show_contact))
+      end
+    %>
+  </td>
+  <td>
+    <%= recipient.email %>
+  </td>
+  <%- if reactions -%>
+  <td>
+    <%- recipient.reactions.each do |reaction| -%>
+      <%= reaction.url %><br />
     <%- end -%>
-    <%- if bounced -%>
-    <td>
-        <%- if recipient.contact -%>
-        <%= link_to_overlay_window(
-			alchemy_crm_t(:edit_contact),
-			edit_admin_contact_path(recipient.contact),
-			{
-				:title => alchemy_crm_t(:edit_contact),
-				:size => '415x560'
-			},
-			{
-				:title => alchemy_crm_t(:edit_contact),
-				:class => 'button with_icon edit'
-			}
-		) -%>
-		<%- else -%>
-		&nbsp;
-		<%- end -%>
-    </td>
+  </td>
+  <%- end -%>
+  <%- if bounced -%>
+  <td>
+    <%- if recipient.contact -%>
+    <%= link_to_overlay_window(
+      alchemy_crm_t(:edit_contact),
+      edit_admin_contact_path(recipient.contact),
+      {
+        :title => alchemy_crm_t(:edit_contact),
+        :size => '415x560'
+      },
+      {
+        :title => alchemy_crm_t(:edit_contact),
+        :class => 'button with_icon edit'
+      }
+    ) -%>
+    <%- else -%>
+    &nbsp;
     <%- end -%>
+  </td>
+  <%- end -%>
 </tr>