alchemy_crm 2.0.1 → 2.0.2

data/app/models/alchemy_crm/reaction.rb

@@ -1,9 +1,9 @@
 module AlchemyCrm
-	class Reaction < ActiveRecord::Base
+  class Reaction < ActiveRecord::Base
 
-		belongs_to :recipient
-		belongs_to :page
-		belongs_to :element
+    belongs_to :recipient
+    belongs_to :page
+    belongs_to :element
 
-	end
+  end
 end

data/app/models/alchemy_crm/recipient.rb

@@ -1,48 +1,48 @@
 module AlchemyCrm
-	class Recipient < ActiveRecord::Base
-
-		belongs_to :delivery
-		belongs_to :contact
-		has_many :reactions
-
-		validates_presence_of :email
-		validates_format_of :email, :with => Authlogic::Regex.email, :if => proc { email.present? }
-
-		before_create :set_sha1
-
-		def mail_to
-			contact.nil? ? email : "#{contact.name_with_title} <#{email}>"
-		end
-
-		def reads!
-			update_attributes(:read => true, :read_at => Time.now)
-		end
-
-		def reacts!(options={})
-			update_attributes(
-				:reacted => true,
-				:reacted_at => Time.now
-			)
-			reactions.create(
-				:element_id => options[:element_id],
-				:page_id => options[:page_id],
-				:url => options[:url]
-			)
-		end
-
-		def self.new_from_contact(contact)
-			raise "No contact given!" if contact.nil?
-			recipient = new(:contact => contact, :email => contact.email, :sha1 => Digest::SHA1.hexdigest(Time.now.to_i.to_s))
-			recipient.readonly!
-			recipient
-		end
-
-	private
-
-		def set_sha1
-			self.salt = [Array.new(6){rand(256).chr}.join].pack("m")[0..7]
-			self.sha1 = Digest::SHA1.hexdigest(Time.now.to_i.to_s + salt)
-		end
-
-	end
+  class Recipient < ActiveRecord::Base
+
+    belongs_to :delivery
+    belongs_to :contact
+    has_many :reactions
+
+    validates_presence_of :email
+    validates_format_of :email, :with => Authlogic::Regex.email, :if => proc { email.present? }
+
+    before_create :set_sha1
+
+    def mail_to
+      contact.nil? ? email : "#{contact.name_with_title} <#{email}>"
+    end
+
+    def reads!
+      update_attributes(:read => true, :read_at => Time.now)
+    end
+
+    def reacts!(options={})
+      update_attributes(
+        :reacted => true,
+        :reacted_at => Time.now
+      )
+      reactions.create(
+        :element_id => options[:element_id],
+        :page_id => options[:page_id],
+        :url => options[:url]
+      )
+    end
+
+    def self.new_from_contact(contact)
+      raise "No contact given!" if contact.nil?
+      recipient = new(:contact => contact, :email => contact.email, :sha1 => Digest::SHA1.hexdigest(Time.now.to_i.to_s))
+      recipient.readonly!
+      recipient
+    end
+
+  private
+
+    def set_sha1
+      self.salt = [Array.new(6){rand(256).chr}.join].pack("m")[0..7]
+      self.sha1 = Digest::SHA1.hexdigest(Time.now.to_i.to_s + salt)
+    end
+
+  end
 end

data/app/models/alchemy_crm/subscription.rb

@@ -1,8 +1,8 @@
 module AlchemyCrm
-	class Subscription < ActiveRecord::Base
+  class Subscription < ActiveRecord::Base
 
-		belongs_to :contact
-		belongs_to :newsletter
+    belongs_to :contact
+    belongs_to :newsletter
 
-	end
+  end
 end

data/app/views/alchemy/admin/elements/fill.js.erb

@@ -1,13 +1,13 @@
 (function($) {
-	<% @target_contents.each do |tc| %>
-		$("#<%= tc.form_field_id %>").val('<%= escape_javascript(content.ingredient) %>');
-		<% if content.essence_type == "EssenceRichtext" %>
-			tinymce.get('<%= tc.form_field_id %>').load();
-		<% end %>
-	<% end %>
-	$('#<%= @content.form_field_id(:url) %>').val('<%= @params %>');
-	Alchemy.setElementDirty('#element_<%= @element.id %>')
-	Alchemy.PreviewWindow.refresh();
-	Alchemy.closeCurrentWindow();
-	Alchemy.growl('<%=t("Inhalte wurden übernommen", :scope => "alchemy_crm") %>');
+  <% @target_contents.each do |tc| %>
+    $("#<%= tc.form_field_id %>").val('<%= escape_javascript(content.ingredient) %>');
+    <% if content.essence_type == "EssenceRichtext" %>
+      tinymce.get('<%= tc.form_field_id %>').load();
+    <% end %>
+  <% end %>
+  $('#<%= @content.form_field_id(:url) %>').val('<%= @params %>');
+  Alchemy.setElementDirty('#element_<%= @element.id %>')
+  Alchemy.PreviewWindow.refresh();
+  Alchemy.closeCurrentWindow();
+  Alchemy.growl('<%=t("Inhalte wurden übernommen", :scope => "alchemy_crm") %>');
 })(jQuery);

data/app/views/alchemy/elements/_newsletter_article_view.html.erb

@@ -1,16 +1,16 @@
 <table class="newsletter_article" cellpadding="0" cellspacing="0" border="0" width="100%"<%= element_preview_code(element) -%>>
-	<tr>
-		<% if element.has_ingredient?(:image) -%>
-		<td width="240" valign="top" style="padding-right: 10px">
-			<%= render_essence_view_by_name(element, 'image', {:image_size => '240x160', :crop => true}, {:style => "outline:none; text-decoration:none; -ms-interpolation-mode: bicubic; display: block"}) %>
-		</td>
-		<% end -%>
-		<td valign="top">
-			<h2><%= render_essence_view_by_name(element, 'headline') %></h2>
-			<%= render_essence_view_by_name(element, 'text') %>
-			<% if element.has_ingredient?('link') -%>
-				<%= tracked_link_tag ::I18n.t(:more), element.ingredient('link') %>
-			<% end -%>
-		</td>
-	</tr>
+  <tr>
+    <% if element.has_ingredient?(:image) -%>
+    <td width="240" valign="top" style="padding-right: 10px">
+      <%= render_essence_view_by_name(element, 'image', {:image_size => '240x160', :crop => true}, {:style => "outline:none; text-decoration:none; -ms-interpolation-mode: bicubic; display: block"}) %>
+    </td>
+    <% end -%>
+    <td valign="top">
+      <h2><%= render_essence_view_by_name(element, 'headline') %></h2>
+      <%= render_essence_view_by_name(element, 'text') %>
+      <% if element.has_ingredient?('link') -%>
+        <%= tracked_link_tag ::I18n.t(:more), element.ingredient('link') %>
+      <% end -%>
+    </td>
+  </tr>
 </table>

data/app/views/alchemy/elements/_newsletter_greeting_view.html.erb

@@ -1,11 +1,11 @@
 <div class="newsletter_greeting" <%= element_preview_code(element) -%>>
-	<h2>
-		<% if @contact.salutation == "ms" -%>
-		<%= render_essence_view_by_name(element, 'female_greeting') %>
-		<% else -%>
-		<%= render_essence_view_by_name(element, 'male_greeting') %>
-		<% end -%>
-		<%= @contact.fullname %>,
-	</h2>
-	<%= render_essence_view_by_name(element, 'text') %>
+  <h2>
+    <% if @contact.salutation == "ms" -%>
+    <%= render_essence_view_by_name(element, 'female_greeting') %>
+    <% else -%>
+    <%= render_essence_view_by_name(element, 'male_greeting') %>
+    <% end -%>
+    <%= @contact.fullname %>,
+  </h2>
+  <%= render_essence_view_by_name(element, 'text') %>
 </div>

data/app/views/alchemy/elements/_newsletter_signout_form_view.html.erb

@@ -9,24 +9,24 @@
 <% else -%>
 
 <%= form_tag alchemy_crm.signout_contacts_path do %>
-	<% if flash[:notice].present? -%>
-	<p class="flash notice"><%= flash[:notice] %></p>
-	<% end -%>
-	<table>
-		<tr>
-			<td class="label">
-				<%= label_tag 'email', ::I18n.t(:email, :scope => "activerecord.attributes.alchemy_crm/contact") %>
-			</td>
-			<td class="input">
-				<%= email_field_tag 'email', params[:email], :required => true, :class => 'text_field' %>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="2" class="submit">
-				<%= button_tag ::I18n.t('signout_form.button_label', :scope => :alchemy_crm), :name => nil %>
-			</td>
-		</tr>
-	</table>
+  <% if flash[:notice].present? -%>
+  <p class="flash notice"><%= flash[:notice] %></p>
+  <% end -%>
+  <table>
+    <tr>
+      <td class="label">
+        <%= label_tag 'email', ::I18n.t(:email, :scope => "activerecord.attributes.alchemy_crm/contact") %>
+      </td>
+      <td class="input">
+        <%= email_field_tag 'email', params[:email], :required => true, :class => 'text_field' %>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2" class="submit">
+        <%= button_tag ::I18n.t('signout_form.button_label', :scope => :alchemy_crm), :name => nil %>
+      </td>
+    </tr>
+  </table>
 <% end %>
 
 <% end -%>

data/app/views/alchemy/elements/_newsletter_signup_form_view.html.erb

@@ -11,68 +11,68 @@
 <% else -%>
 
 <%= form_for [alchemy_crm, @contact ||= AlchemyCrm::Contact.new], :url => alchemy_crm.signup_contacts_path do |form| %>
-	<% if flash[:notice].present? -%>
-	<p class="flash notice"><%= flash[:notice] %></p>
-	<% end -%>
-	<%= form.error_messages %>
-	<table>
-		<tr>
-			<td class="label"><%= form.label :salutation %></td>
-			<td class="input" colspan="3">
-				<%= form.radio_button :salutation, :mr, :required => true %>
-				<%= form.label :salutation_mr, ::I18n.t(:mr, :scope => 'alchemy_crm.salutations', :default => 'Mr') %>
-				<%= form.radio_button :salutation, :ms, :required => true %>
-				<%= form.label :salutation_ms, ::I18n.t(:ms, :scope => 'alchemy_crm.salutations', :default => 'Ms') %>
-			</td>
-		</tr>
-		<tr>
-			<td class="label"><%= form.label :firstname %></td>
-			<td class="input" colspan="3"><%= form.text_field :firstname, :class => 'text_field', :required => true %></td>
-		</tr>
-		<tr>
-			<td class="label"><%= form.label :lastname %></td>
-			<td class="input" colspan="3"><%= form.text_field :lastname, :class => 'text_field', :required => true %></td>
-		</tr>
-		<tr>
-			<td class="label"><%= form.label :email %></td>
-			<td class="input" colspan="3"><%= form.email_field :email, :class => 'text_field', :required => true %></td>
-		</tr>
-		<tr>
-			<td class="label"><%= form.label :address %></td>
-			<td class="input" colspan="3"><%= form.text_field :address, :class => 'text_field' %></td>
-		</tr>
-		<tr>
-			<td class="label"><%= form.label :zip %></td>
-			<td class="input short"><%= form.text_field :zip, :class => 'text_field' %></td>
-			<td class="label short"><%= form.label :city %></td>
-			<td class="input medium"><%= form.text_field :city, :class => 'text_field' %></td>
-		</tr>
-		<tr>
-			<td class="label"><%= form.label :phone %></td>
-			<td class="input" colspan="3"><%= form.text_field :phone, :class => 'text_field' %></td>
-		</tr>
-		<tr>
-			<td colspan="4">
-				<%= render_essence_view_by_name element, 'choose_newsletter_text' %>
-				<% if @newsletters.length == 1 -%>
-					<%= hidden_field_tag "contact[subscriptions_attributes][0][newsletter_id]", @newsletters.first.id %>
-				<% else -%>
-					<% @newsletters.each_with_index do |newsletter, idx| -%>
-					<p>
-						<%= check_box_tag "contact[subscriptions_attributes][#{idx}][newsletter_id]", newsletter.id, @contact.subscriptions.detect { |ns| ns.newsletter_id == newsletter.id } %>
-						<%= label_tag "contact[subscriptions_attributes][#{idx}][newsletter_id]", newsletter.name %>
-					</p>
-					<% end -%>
-				<% end -%>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4" class="submit">
-				<%= form.button ::I18n.t('subscribe_form.button_label', :scope => :alchemy_crm), :name => nil %>
-			</td>
-		</tr>
-	</table>
-	<p class="mandatory_fields_notice"><%= ::I18n.t(:mandatory_fields, :scope => :alchemy_crm) %></p>
+  <% if flash[:notice].present? -%>
+  <p class="flash notice"><%= flash[:notice] %></p>
+  <% end -%>
+  <%= form.error_messages %>
+  <table>
+    <tr>
+      <td class="label"><%= form.label :salutation %></td>
+      <td class="input" colspan="3">
+        <%= form.radio_button :salutation, :mr, :required => true %>
+        <%= form.label :salutation_mr, ::I18n.t(:mr, :scope => 'alchemy_crm.salutations', :default => 'Mr') %>
+        <%= form.radio_button :salutation, :ms, :required => true %>
+        <%= form.label :salutation_ms, ::I18n.t(:ms, :scope => 'alchemy_crm.salutations', :default => 'Ms') %>
+      </td>
+    </tr>
+    <tr>
+      <td class="label"><%= form.label :firstname %></td>
+      <td class="input" colspan="3"><%= form.text_field :firstname, :class => 'text_field', :required => true %></td>
+    </tr>
+    <tr>
+      <td class="label"><%= form.label :lastname %></td>
+      <td class="input" colspan="3"><%= form.text_field :lastname, :class => 'text_field', :required => true %></td>
+    </tr>
+    <tr>
+      <td class="label"><%= form.label :email %></td>
+      <td class="input" colspan="3"><%= form.email_field :email, :class => 'text_field', :required => true %></td>
+    </tr>
+    <tr>
+      <td class="label"><%= form.label :address %></td>
+      <td class="input" colspan="3"><%= form.text_field :address, :class => 'text_field' %></td>
+    </tr>
+    <tr>
+      <td class="label"><%= form.label :zip %></td>
+      <td class="input short"><%= form.text_field :zip, :class => 'text_field' %></td>
+      <td class="label short"><%= form.label :city %></td>
+      <td class="input medium"><%= form.text_field :city, :class => 'text_field' %></td>
+    </tr>
+    <tr>
+      <td class="label"><%= form.label :phone %></td>
+      <td class="input" colspan="3"><%= form.text_field :phone, :class => 'text_field' %></td>
+    </tr>
+    <tr>
+      <td colspan="4">
+        <%= render_essence_view_by_name element, 'choose_newsletter_text' %>
+        <% if @newsletters.length == 1 -%>
+          <%= hidden_field_tag "contact[subscriptions_attributes][0][newsletter_id]", @newsletters.first.id %>
+        <% else -%>
+          <% @newsletters.each_with_index do |newsletter, idx| -%>
+          <p>
+            <%= check_box_tag "contact[subscriptions_attributes][#{idx}][newsletter_id]", newsletter.id, @contact.subscriptions.detect { |ns| ns.newsletter_id == newsletter.id } %>
+            <%= label_tag "contact[subscriptions_attributes][#{idx}][newsletter_id]", newsletter.name %>
+          </p>
+          <% end -%>
+        <% end -%>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="4" class="submit">
+        <%= form.button ::I18n.t('subscribe_form.button_label', :scope => :alchemy_crm), :name => nil %>
+      </td>
+    </tr>
+  </table>
+  <p class="mandatory_fields_notice"><%= ::I18n.t(:mandatory_fields, :scope => :alchemy_crm) %></p>
 <% end %>
 
 <% end -%>

data/app/views/alchemy/essences/_essence_element_teaser_editor.html.erb

@@ -1,31 +1,31 @@
 <div class="content_editor" id="<%= content_dom_id(content) %>">
-	<%- if options[:show_link_text] -%>
-	<label>Link Text</label>
-	<%= text_field_tag(
-		"contents[content_#{content.id}][text]",
-		content.essence.text,
-		:id => "content_#{content.id}_text",
-		:class => "thin_border text_long"
-	) %>
-	<%- end -%>
-	<%= hidden_field_tag "contents[content_#{content.id}][url]", content.essence.url, :id => "content_#{content.id}_url" %>
-	<%= hidden_field_tag "contents[content_#{content.id}][title]", content.essence.title, :id => "content_#{content.id}_title" %>
-	<div style="overflow: hidden; margin: 4px 0; line-height: 25px">
-		<p>
-			Mit einem Element aus dem CMS verknüpfen:
-			<%= link_to_overlay_window(
-				render_icon('fill_from_element'),
-				teasable_elements_path(:content_id => content.id),
-				{
-					:title => 'Element aus dem CMS wählen',
-					:size => '450x500'
-				},
-				{
-					:class => 'icon_button',
-					:title => 'Element aus dem CMS wählen',
-					:style => 'float: right'
-				}
-			) -%>
-		</p>
-	</div>
+  <%- if options[:show_link_text] -%>
+  <label>Link Text</label>
+  <%= text_field_tag(
+    "contents[content_#{content.id}][text]",
+    content.essence.text,
+    :id => "content_#{content.id}_text",
+    :class => "thin_border text_long"
+  ) %>
+  <%- end -%>
+  <%= hidden_field_tag "contents[content_#{content.id}][url]", content.essence.url, :id => "content_#{content.id}_url" %>
+  <%= hidden_field_tag "contents[content_#{content.id}][title]", content.essence.title, :id => "content_#{content.id}_title" %>
+  <div style="overflow: hidden; margin: 4px 0; line-height: 25px">
+    <p>
+      Mit einem Element aus dem CMS verknüpfen:
+      <%= link_to_overlay_window(
+        render_icon('fill_from_element'),
+        teasable_elements_path(:content_id => content.id),
+        {
+          :title => 'Element aus dem CMS wählen',
+          :size => '450x500'
+        },
+        {
+          :class => 'icon_button',
+          :title => 'Element aus dem CMS wählen',
+          :style => 'float: right'
+        }
+      ) -%>
+    </p>
+  </div>
 </div>

data/app/views/alchemy/newsletter_layouts/_standard.html.erb

@@ -1,39 +1,39 @@
 <table cellpadding="0" cellspacing="0" border="0" align="center" width="100%">
-	<tr>
-		<td valign="top">
-			<table cellpadding="0" cellspacing="0" border="0" align="center" width="610">
-				<tr>
-					<td valign="middle">
-						<%= image_from_server_tag('logo.png', :style => 'outline:none; text-decoration:none; -ms-interpolation-mode: bicubic;') %>
-					</td>
-					<td valign="middle" align="center">
-						<h1>Newsletter in <%= current_language.name %></h1>
-						<h2><%= @mailing.name %></h2>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-	<tr>
-		<td valign="top">
-			<table cellpadding="0" cellspacing="0" border="0" align="center" width="610">
-				<tr>
-					<td valign="top">
-						<%= render_elements %>
-					</td>
-				</tr>
-			</table
-		</td>
-	</tr>
-	<tr>
-		<td valign="top">
-			<table cellpadding="0" cellspacing="0" border="0" align="center" width="610">
-				<tr>
-					<td valign="top">
-						<%= link_to_unsubscribe_page %>
-					</td>
-				</tr>
-			</table
-		</td>
-	</tr>
+  <tr>
+    <td valign="top">
+      <table cellpadding="0" cellspacing="0" border="0" align="center" width="610">
+        <tr>
+          <td valign="middle">
+            <%= image_from_server_tag('logo.png', :style => 'outline:none; text-decoration:none; -ms-interpolation-mode: bicubic;') %>
+          </td>
+          <td valign="middle" align="center">
+            <h1>Newsletter in <%= current_language.name %></h1>
+            <h2><%= @mailing.name %></h2>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr>
+    <td valign="top">
+      <table cellpadding="0" cellspacing="0" border="0" align="center" width="610">
+        <tr>
+          <td valign="top">
+            <%= render_elements %>
+          </td>
+        </tr>
+      </table
+    </td>
+  </tr>
+  <tr>
+    <td valign="top">
+      <table cellpadding="0" cellspacing="0" border="0" align="center" width="610">
+        <tr>
+          <td valign="top">
+            <%= link_to_unsubscribe_page %>
+          </td>
+        </tr>
+      </table
+    </td>
+  </tr>
 </table>