alchemy_crm 2.0.1 → 2.0.2

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

@@ -1,28 +1,28 @@
 <%- if @deliveries.blank? -%>
 <div class="info with_margin">
-	<%= render_icon('info') %>
-	<%= alchemy_crm_t(:this_mailing_has_not_been_delivered_yet) %>
+  <%= render_icon('info') %>
+  <%= alchemy_crm_t(:this_mailing_has_not_been_delivered_yet) %>
 </div>
 <%- else -%>
 <div class="with_padding">
-	<div class="info">
-		<%= render_icon('info') %>
-		<h1><%= alchemy_crm_t(:this_list_shows_all_deliveries) %></h1>
-		<ol>
-			<li><%= alchemy_crm_t(:you_can_open_statistics_for_delivered_mailings) %></li>
-			<li><%= alchemy_crm_t(:not_yet_delivered_mailings_can_be_canceled) %></li>
-		</ol>
-	</div>
-	<div id="deliveries">
-		<table class="list">
-			<tr>
-				<th><%= alchemy_crm_t(:delivery_scheduled_at) %></th>
-				<th class="right"><%= translate_model_attribute(:delivery, :recipients_count) %></th>
-				<th class="center"><%= translate_model_attribute(:delivery, :delivered?) %></th>
-				<th class="center"><%= alchemy_crm_t(:statistics) %></th>
-			</tr>
-			<%= render @deliveries %>
-		</table>
-	</div>
+  <div class="info">
+    <%= render_icon('info') %>
+    <h1><%= alchemy_crm_t(:this_list_shows_all_deliveries) %></h1>
+    <ol>
+      <li><%= alchemy_crm_t(:you_can_open_statistics_for_delivered_mailings) %></li>
+      <li><%= alchemy_crm_t(:not_yet_delivered_mailings_can_be_canceled) %></li>
+    </ol>
+  </div>
+  <div id="deliveries">
+    <table class="list">
+      <tr>
+        <th><%= alchemy_crm_t(:delivery_scheduled_at) %></th>
+        <th class="right"><%= translate_model_attribute(:delivery, :recipients_count) %></th>
+        <th class="center"><%= translate_model_attribute(:delivery, :delivered?) %></th>
+        <th class="center"><%= alchemy_crm_t(:statistics) %></th>
+      </tr>
+      <%= render @deliveries %>
+    </table>
+  </div>
 </div>
 <%- end -%>

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

@@ -1,66 +1,66 @@
 <div id="delivery" class="with_padding" style="padding: 8px">
-    <div class="recipient_group">
-        <h2><%= alchemy_crm_t(:total_recipients_count) %>: <span style="float: right"><%= @recipients.length %></span></h2>
+  <div class="recipient_group">
+    <h2><%= alchemy_crm_t(:total_recipients_count) %>: <span style="float: right"><%= @recipients.length %></span></h2>
+  </div>
+  
+  <div class="recipient_group">
+    <h2><%= alchemy_crm_t(:count_of_recipients_that_received_the_email) %>: <span style="float: right"><%= @read.length %></span></h2>
+    <p><%= link_to_function(alchemy_crm_t(:details), "$('#read').toggle()", :class => 'button small no-spinner') %></p>
+    <div class="recipients" id="read" style="display: none">
+      <%- if @read.blank? -%>
+      <p style="font-style: italic"><%= alchemy_crm_t(:none) %></p>
+      <%- else -%>
+      <table class="recipients_table">
+        <tr>
+          <th><%= translate_model_attribute(:contact, :name) %></th>
+          <th><%= translate_model_attribute(:contact, :email).gsub(/\*$/, '') %></th>
+        </tr>
+        <tr>
+          <%= render :partial => 'recipient', :collection => @read, :locals => {:reactions => false, :bounced => false} %>
+        </tr>
+      </table>
+      <%- end -%>
     </div>
-    
-    <div class="recipient_group">
-        <h2><%= alchemy_crm_t(:count_of_recipients_that_received_the_email) %>: <span style="float: right"><%= @read.length %></span></h2>
-        <p><%= link_to_function(alchemy_crm_t(:details), "$('#read').toggle()", :class => 'button small no-spinner') %></p>
-        <div class="recipients" id="read" style="display: none">
-            <%- if @read.blank? -%>
-            <p style="font-style: italic"><%= alchemy_crm_t(:none) %></p>
-            <%- else -%>
-            <table class="recipients_table">
-                <tr>
-                    <th><%= translate_model_attribute(:contact, :name) %></th>
-                    <th><%= translate_model_attribute(:contact, :email).gsub(/\*$/, '') %></th>
-                </tr>
-                <tr>
-                    <%= render :partial => 'recipient', :collection => @read, :locals => {:reactions => false, :bounced => false} %>
-                </tr>
-            </table>
-            <%- end -%>
-        </div>
+  </div>
+  
+  <div class="recipient_group">
+    <h2><%= alchemy_crm_t(:count_of_recipients_that_clicked_a_link) %>: <span style="float: right"><%= @reacted.length %></span></h2>
+    <p><%= link_to_function(alchemy_crm_t(:details), "$('#reacted').toggle()", :class => 'button small no-spinner') %></p>
+    <div class="recipients" id="reacted" style="display: none">
+      <%- if @reacted.blank? -%>
+      <p style="font-style: italic"><%= alchemy_crm_t(:none) %></p>
+      <%- else -%>
+      <table class="recipients_table">
+        <tr>
+          <th><%= translate_model_attribute(:contact, :name) %></th>
+          <th><%= translate_model_attribute(:contact, :email).gsub(/\*$/, '') %></th>
+          <th><%= alchemy_crm_t(:clicked_links) %></th>
+        </tr>
+        <tr>
+          <%= render :partial => 'recipient', :collection => @reacted, :locals => {:reactions => true, :bounced => false} %>
+        </tr>
+      </table>
+      <%- end -%>
     </div>
-    
-    <div class="recipient_group">
-        <h2><%= alchemy_crm_t(:count_of_recipients_that_clicked_a_link) %>: <span style="float: right"><%= @reacted.length %></span></h2>
-        <p><%= link_to_function(alchemy_crm_t(:details), "$('#reacted').toggle()", :class => 'button small no-spinner') %></p>
-        <div class="recipients" id="reacted" style="display: none">
-            <%- if @reacted.blank? -%>
-            <p style="font-style: italic"><%= alchemy_crm_t(:none) %></p>
-            <%- else -%>
-            <table class="recipients_table">
-                <tr>
-                    <th><%= translate_model_attribute(:contact, :name) %></th>
-                    <th><%= translate_model_attribute(:contact, :email).gsub(/\*$/, '') %></th>
-                    <th><%= alchemy_crm_t(:clicked_links) %></th>
-                </tr>
-                <tr>
-                    <%= render :partial => 'recipient', :collection => @reacted, :locals => {:reactions => true, :bounced => false} %>
-                </tr>
-            </table>
-            <%- end -%>
-        </div>
-    </div>
-    
-    <div class="recipient_group">
-        <h2><%= alchemy_crm_t(:count_of_bounced_emails) %>: <span style="float: right"><%= @bounced.length %></span></h2>
-        <p><%= link_to_function(alchemy_crm_t(:details), "$('#bounced').toggle()", :class => 'button small no-spinner') %></p>
-        <div class="recipients" id="bounced" style="display: none">
-            <%- if @bounced.blank? -%>
-            <p style="font-style: italic"><%= alchemy_crm_t(:none) %></p>
-            <%- else -%>
-            <table class="recipients_table">
-                <tr>
-                    <th><%= translate_model_attribute(:contact, :name) %></th>
-                    <th><%= translate_model_attribute(:contact, :email).gsub(/\*$/, '') %></th>
-                </tr>
-                <tr>
-                    <%= render :partial => 'recipient', :collection => @bounced, :locals => {:reactions => false, :bounced => true} %>
-                </tr>
-            </table>
-            <%- end -%>
-        </div>
+  </div>
+  
+  <div class="recipient_group">
+    <h2><%= alchemy_crm_t(:count_of_bounced_emails) %>: <span style="float: right"><%= @bounced.length %></span></h2>
+    <p><%= link_to_function(alchemy_crm_t(:details), "$('#bounced').toggle()", :class => 'button small no-spinner') %></p>
+    <div class="recipients" id="bounced" style="display: none">
+      <%- if @bounced.blank? -%>
+      <p style="font-style: italic"><%= alchemy_crm_t(:none) %></p>
+      <%- else -%>
+      <table class="recipients_table">
+        <tr>
+          <th><%= translate_model_attribute(:contact, :name) %></th>
+          <th><%= translate_model_attribute(:contact, :email).gsub(/\*$/, '') %></th>
+        </tr>
+        <tr>
+          <%= render :partial => 'recipient', :collection => @bounced, :locals => {:reactions => false, :bounced => true} %>
+        </tr>
+      </table>
+      <%- end -%>
     </div>
+  </div>
 </div>

data/app/views/alchemy_crm/admin/elements/teasables.html.erb

@@ -1,57 +1,57 @@
 <div id="overlay_toolbar" style="margin: 0">
-	Nur Elemente der Seite:
-	<%= select_tag(
-		"pages",
-		options_for_select([["Alle", ""]]) + options_from_collection_for_select(@pages, :id, :name),
-		:onchange => "AlchemyCrm.teasablesFilter(this.value)",
-		:class => 'alchemy_selectbox'
-	) %>
-	anzeigen.
+  Nur Elemente der Seite:
+  <%= select_tag(
+    "pages",
+    options_for_select([["Alle", ""]]) + options_from_collection_for_select(@pages, :id, :name),
+    :onchange => "AlchemyCrm.teasablesFilter(this.value)",
+    :class => 'alchemy_selectbox'
+  ) %>
+  anzeigen.
 </div>
 <div class="with_padding" style="padding: 8px">
-	<div id="teasable_elements">
-		<%- if @elements.blank? -%>
-		<p>Es wurden keine Elemente gefunden.</p>
-		<%- else -%>
-		<%- @elements.group_by{ |e| e.page }.each do |page, elements| -%>
-		<%- if page -%>
-		<div id="teasable_page_<%= page.id %>" class="teasable_page">
-			<h2><%= page.name %></h2>
-			<%- elements.each do |element| -%>
-			<div class="teasable_element">
-				<%= element.preview_text(200) %>
-			</div>
-			<div class="teasable_tools">
-				<%= link_to(
-					"kompletten Inhalt in das Mailing übernehmen",
-					url_for({
-						:controller => "/admin/elements",
-						:action => "fill",
-						:id => @element.id,
-						:source_element_id => element.id
-					}),
-					:method => 'put',
-					:class => 'button',
-					:remote => true
-				) %>
-				<%= link_to(
-					"Nur einen Link setzen",
-					url_for({
-						:controller => "/admin/elements",
-						:action => "link",
-						:id => @element.id,
-						:source_element_id => element.id,
-						:link_only => true
-					}),
-					:method => 'put',
-					:class => "link_only button",
-					:remote => true
-				) %>
-			</div>
-			<%- end -%>
-		</div>
-		<%- end -%>
-		<%- end -%>
-		<%- end -%>
-	</div>
+  <div id="teasable_elements">
+    <%- if @elements.blank? -%>
+    <p>Es wurden keine Elemente gefunden.</p>
+    <%- else -%>
+    <%- @elements.group_by{ |e| e.page }.each do |page, elements| -%>
+    <%- if page -%>
+    <div id="teasable_page_<%= page.id %>" class="teasable_page">
+      <h2><%= page.name %></h2>
+      <%- elements.each do |element| -%>
+      <div class="teasable_element">
+        <%= element.preview_text(200) %>
+      </div>
+      <div class="teasable_tools">
+        <%= link_to(
+          "kompletten Inhalt in das Mailing übernehmen",
+          url_for({
+            :controller => "/admin/elements",
+            :action => "fill",
+            :id => @element.id,
+            :source_element_id => element.id
+          }),
+          :method => 'put',
+          :class => 'button',
+          :remote => true
+        ) %>
+        <%= link_to(
+          "Nur einen Link setzen",
+          url_for({
+            :controller => "/admin/elements",
+            :action => "link",
+            :id => @element.id,
+            :source_element_id => element.id,
+            :link_only => true
+          }),
+          :method => 'put',
+          :class => "link_only button",
+          :remote => true
+        ) %>
+      </div>
+      <%- end -%>
+    </div>
+    <%- end -%>
+    <%- end -%>
+    <%- end -%>
+  </div>
 </div>

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

@@ -1,43 +1,43 @@
 <%= form_for [:admin, @mailing], :class => " with_padding", :remote => true do |f| %>
-	<div id="errors" style="display: none"></div>
-	<table>
-		<tr>
-			<td class="label">
-				<%= f.label :newsletter %>
-			</td>
-			<td class="select">
-				<%= f.collection_select :newsletter_id, @newsletters, :id, :humanized_name, { :prompt => t('Please choose') }, { :class => "alchemy_selectbox long" } %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<%= f.label :name %>
-			</td>
-			<td class="input">
-				<%= f.text_field :name, :class => "thin_border long" %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<%= f.label :subject %>
-			</td>
-			<td class="input">
-				<%= f.text_field :subject, :class => "thin_border long" %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label">
-				<%= f.label :additional_email_addresses %>
-			</td>
-			<td class="input">
-				<%= f.text_area :additional_email_addresses, :class => "thin_border long", :style => "height: 4em;" %>
-				<p style="text-align: right"><sup><%= alchemy_crm_t(:seperate_emails_with_comma) %></sup></p>
-			</td>
-		</tr>
-		<tr>
-			<td class="submit" colspan="2">
-				<%= f.button t(:save), :class => "button" %>
-			</td>
-		</tr>
-	</table>
+  <div id="errors" style="display: none"></div>
+  <table>
+    <tr>
+      <td class="label">
+        <%= f.label :newsletter %>
+      </td>
+      <td class="select">
+        <%= f.collection_select :newsletter_id, @newsletters, :id, :humanized_name, { :prompt => t('Please choose') }, { :class => "alchemy_selectbox long" } %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <%= f.label :name %>
+      </td>
+      <td class="input">
+        <%= f.text_field :name, :class => "thin_border long" %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <%= f.label :subject %>
+      </td>
+      <td class="input">
+        <%= f.text_field :subject, :class => "thin_border long" %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <%= f.label :additional_email_addresses %>
+      </td>
+      <td class="input">
+        <%= f.text_area :additional_email_addresses, :class => "thin_border long", :style => "height: 4em;" %>
+        <p style="text-align: right"><sup><%= alchemy_crm_t(:seperate_emails_with_comma) %></sup></p>
+      </td>
+    </tr>
+    <tr>
+      <td class="submit" colspan="2">
+        <%= f.button t(:save), :class => "button" %>
+      </td>
+    </tr>
+  </table>
 <% end %>

data/app/views/alchemy_crm/admin/mailings/_mailing.html.erb

@@ -1,75 +1,75 @@
 <tr class="<%= cycle('even', 'odd') %>">
-	<td class="icon">
-		<%= content_tag('span', '', :class => 'icon mailing') %>
-	</td>
-	<td class="name">
-		<%= link_to mailing.name, {:action => 'edit_content', :id => mailing}, :title => alchemy_crm_t(:edit_mailing_content) -%>
-	</td>
-	<td class="name">
-		<%= mailing.subject -%>
-	</td>
-	<td>
-		<%= mailing.newsletter.blank? ? '' : mailing.newsletter.name -%>
-	</td>
-	<td class="size">
-		<%= mailing.recipients.count -%>
-	</td>
-	<td class="time">
-		<%- if mailing.next_pending_delivery -%>
-		<%= mailing.next_pending_delivery.deliver_at.nil? ? '' : l(mailing.next_pending_delivery.deliver_at) -%>
-		<%- end -%>
-	</td>
-	<td class="tools">
-		<%= link_to_overlay_window(
-			render_icon('send_mailing'),
-			new_admin_delivery_path(:mailing_id => mailing.id),
-			{
-				:title => alchemy_crm_t('Send Mailing'),
-				:size => '420x210'
-			},
-			{
-				:title => alchemy_crm_t('Send Mailing')
-			}
-		) %>
-		<%= link_to_overlay_window(
-			render_icon('delivery'),
-			admin_mailing_deliveries_path(mailing.id),
-			{
-				:title => alchemy_crm_t(:sent_mailings),
-				:size => '500x550'
-			},
-			{
-				:title => alchemy_crm_t(:show_sent_mailings)
-			}
-		) -%>
-		<%= link_to_overlay_window(
-			render_icon('mailing_copy'),
-			copy_admin_mailing_path(mailing),
-			{
-				:title => alchemy_crm_t(:copy_mailing),
-				:size => '450x260'
-			},
-			{
-				:title => alchemy_crm_t(:copy_mailing)
-			}
-		) -%>
-		<%= link_to_overlay_window(
-			render_icon('mailing_edit'),
-			edit_admin_mailing_path(mailing),
-			{
-				:title => alchemy_crm_t(:edit_mailing),
-				:size => '450x270'
-			},
-			{
-				:class => 'edit_mailing_button',
-				:title => alchemy_crm_t(:edit_mailing)
-			}
-		) -%>
-		<%= link_to_confirmation_window(
-			render_icon('mailing_delete'),
-			alchemy_crm_t(:do_you_really_want_to_delete_this_mailing?),
-			admin_mailing_path(mailing),
-			:title => alchemy_crm_t(:delete_mailing)
-		) -%>
-	</td>
+  <td class="icon">
+    <%= content_tag('span', '', :class => 'icon mailing') %>
+  </td>
+  <td class="name">
+    <%= link_to mailing.name, {:action => 'edit_content', :id => mailing}, :title => alchemy_crm_t(:edit_mailing_content) -%>
+  </td>
+  <td class="name">
+    <%= mailing.subject -%>
+  </td>
+  <td>
+    <%= mailing.newsletter.blank? ? '' : mailing.newsletter.name -%>
+  </td>
+  <td class="size">
+    <%= mailing.recipients.count -%>
+  </td>
+  <td class="time">
+    <%- if mailing.next_pending_delivery -%>
+    <%= mailing.next_pending_delivery.deliver_at.nil? ? '' : l(mailing.next_pending_delivery.deliver_at, :format => :short) -%>
+    <%- end -%>
+  </td>
+  <td class="tools">
+    <%= link_to_overlay_window(
+      render_icon('send_mailing'),
+      new_admin_delivery_path(:mailing_id => mailing.id),
+      {
+        :title => alchemy_crm_t('Send Mailing'),
+        :size => '420x210'
+      },
+      {
+        :title => alchemy_crm_t('Send Mailing')
+      }
+    ) %>
+    <%= link_to_overlay_window(
+      render_icon('delivery'),
+      admin_mailing_deliveries_path(mailing.id),
+      {
+        :title => alchemy_crm_t(:sent_mailings),
+        :size => '500x550'
+      },
+      {
+        :title => alchemy_crm_t(:show_sent_mailings)
+      }
+    ) -%>
+    <%= link_to_overlay_window(
+      render_icon('mailing_copy'),
+      copy_admin_mailing_path(mailing),
+      {
+        :title => alchemy_crm_t(:copy_mailing),
+        :size => '450x260'
+      },
+      {
+        :title => alchemy_crm_t(:copy_mailing)
+      }
+    ) -%>
+    <%= link_to_overlay_window(
+      render_icon('mailing_edit'),
+      edit_admin_mailing_path(mailing),
+      {
+        :title => alchemy_crm_t(:edit_mailing),
+        :size => '450x270'
+      },
+      {
+        :class => 'edit_mailing_button',
+        :title => alchemy_crm_t(:edit_mailing)
+      }
+    ) -%>
+    <%= link_to_confirmation_window(
+      render_icon('mailing_delete'),
+      alchemy_crm_t(:do_you_really_want_to_delete_this_mailing?),
+      admin_mailing_path(mailing),
+      :title => alchemy_crm_t(:delete_mailing)
+    ) -%>
+  </td>
 </tr>