newsletter 3.0.2 → 3.2.0

data/app/views/newsletter/elements/edit.html.erb

@@ -1,12 +1,9 @@
-<% title "Edit Element" %>
+<%= title "Edit Element '#{@element.name}'" %>
 
 <%= render :partial => 'form' %>
 
 <%= content_for :page_navigation do %>
   <div>
-  <% if::Newsletter.use_show_for_resources %>
-    <%= link_to "Show", @element, :class => 'button' %><div class="linkbuttonEnding"></div>
-  <% end %>
-    <%= link_to "View All", design_elements_path(@design), :class => 'button' %><div class="linkbuttonEnding"></div>
+    <%= link_to "View All", design_elements_path(@design), :class => 'button' %>
   </div>
 <% end %>

data/app/views/newsletter/elements/index.html.erb

@@ -1,4 +1,4 @@
-<% title "Elements" %>
+<%= title "Elements" %>
 
 <table class="list" cellpadding="1" cellspacing="0">
   <tr class="title">
@@ -11,14 +11,14 @@
   <% end %>
   </tr>
   <% for element in @elements %>
-    <tr class="<%= cycle('odd','even') %>">
+    <tr class="<%= cycle('odd','even') %>" id="element_<%= element.id %>">
       <td><%=h element.name %></td>
       <td><%=h element.description %></td>
     <% if::Newsletter.use_show_for_resources %>
-      <td><%= link_to "View", element, :class => 'button' %><div class="linkbuttonEnding"></div></td>
+      <td><%= link_to "View", element, :class => 'button' %></td>
     <% end %>
-      <td><%= link_to "Edit", edit_element_path(element), :class => 'button' %><div class="linkbuttonEnding"></div></td>
-      <td><%= link_to "Delete", element, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %><div class="linkbuttonEnding"></div></td>
+      <td><%= link_to "Edit", edit_element_path(element), :class => 'button' %></td>
+      <td><%= link_to "Delete", element, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %></td>
     </tr>
   <% end %>
 </table>
@@ -26,7 +26,7 @@
 
 <%= content_for :page_navigation do %>
 <div>
-  <%= link_to "Back to Design", edit_design_path(@design), :class => 'button' %><div class="linkbuttonEnding"></div>
-  <%= link_to "New Newsletter Element", new_design_element_path(@design), :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= link_to "Back to Design", edit_design_path(@design), :class => 'button' %>
+  <%= link_to "New Newsletter Element", new_design_element_path(@design), :class => 'button' %>
 </div>
 <% end %>

data/app/views/newsletter/elements/new.html.erb

@@ -1,9 +1,9 @@
-<% title "New Element" %>
+<%= title "New Element" %>
 
 <%= render :partial => 'form' %>
 
 <%= content_for :page_navigation do %>
 <div>
-  <%= link_to "Back to List", design_elements_path(@design), :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= link_to "Back to List", design_elements_path(@design), :class => 'button' %>
 </div>
 <% end %>

data/app/views/newsletter/elements/show.html.erb

@@ -1,4 +1,4 @@
-<% title "Element" %>
+<%= title "Element" %>
 
 <p>
   <strong>Name:</strong>
@@ -15,8 +15,8 @@
 
 <%= content_for :page_navigation do %>
 <div>
-  <%= link_to "Edit", edit_element_path(@element), :class => 'button' %><div class="linkbuttonEnding"></div> 
-  <%= link_to "Delete", @element, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %><div class="linkbuttonEnding"></div> 
-  <%= link_to "View All", design_elements_path(@design), :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= link_to "Edit", edit_element_path(@element), :class => 'button' %> 
+  <%= link_to "Delete", @element, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %> 
+  <%= link_to "View All", design_elements_path(@design), :class => 'button' %>
 </div>
-<% end %>
+<% end %>

data/app/views/newsletter/fields/_inline_asset.html.erb

@@ -1,36 +1,16 @@
-  <tr valign="top">
-     <td colspan="2">
-<div class="newsletter_parts_group">
+<div class="newsletter_parts_group" id="piece_field_values_attributes_<%= field.id %>">
 	<h2>Asset for <%= field.label %></h2>
-    <table cellpadding="2" cellspacing="0" border="0">
-	<tr>
-      <td colspan="2">Either enter a url to your asset or upload a file.</td>
-    </tr>
-
-    <tr>
-   <td colspan="2">
+      Either enter a url to your asset or upload a file.<br />
       <% unless field.description.blank? %>
-        <%= field.description %>
+        <%= field.description %><br />
       <% end %>
-          <%= image_tag field_value.url unless field_value.url.blank? %>
-   </td>
-    </tr>
-
-  <tr>
-    <td><%= label_tag 'piece[field_values_attributes]['+field.id.to_s+'][url]', "Url:" %></td>
-    <td><%= text_field_tag 'piece[field_values_attributes]['+field.id.to_s+'][url]', field_value.url %></td>
-  </tr>
-
-  <tr>
-      <td>
-    <label for="asset">Upload An Asset:</label></td>
-     <td><%= file_field_tag 'piece[field_values_attributes]['+field.id.to_s+'][uploaded_data]' %>
-   
-      <%= hidden_field_tag 'piece[field_values_attributes]['+field.id.to_s+'][asset_id]', field_value.asset_id %>
-    </td>
-  </tr>
-
-  </table>
+      <% if field_value.url.present? && field_value.is_image? %>
+          <%= image_tag field_value.url, id: "piece_field_values_image_#{field.id}" %><br />
+     <% end %>
+    <%= label_tag 'piece[field_values_attributes]['+field.id.to_s+'][url]', "Url:" %>
+    <%= text_field_tag 'piece[field_values_attributes]['+field.id.to_s+'][url]', field_value.url, :style=>'width: 590px;' %><br />
+    <label for="asset">Upload An Asset:</label>
+    <%= file_field_tag 'piece[field_values_attributes]['+field.id.to_s+'][uploaded_data]' %>
+    <%= hidden_field_tag 'piece[field_values_attributes]['+field.id.to_s+'][asset_id]', field_value.asset_id %>
+    <%= link_to "Delete Asset", "#", onclick: "if(confirm('Are you sure?')) {jQuery('#piece_field_values_image_#{field.id}').hide(); jQuery('#piece_field_values_attributes_#{field.id}_url').val('')}; return false;", class: "button" %>
 </div>
-    </td>
-  </tr>

data/app/views/newsletter/fields/_text.html.erb

@@ -1,4 +1,2 @@
-  <tr valign="top">
-     <td width='150'><%= label_tag 'piece[field_values_attributes]['+field.id.to_s+'][text]', "#{field.label}:" %></td>
-     <td><%= text_field_tag 'piece[field_values_attributes]['+field.id.to_s+'][text]', field.value_for_piece(piece) %></td>
-  </tr>
+<%= label_tag 'piece[field_values_attributes]['+field.id.to_s+'][text]', "#{field.label}:" %>
+<%= text_field_tag 'piece[field_values_attributes]['+field.id.to_s+'][text]', field.value_for_piece(piece,false), :style=>'width: 620px;' %><br />

data/app/views/newsletter/fields/_text_area.html.erb

@@ -1,7 +1,2 @@
-<tr valign="top">
-   <td width='150'><%= label_tag 'piece[field_values_attributes]['+field.id.to_s+'][text_area]', "#{field.label}:" %></td>
-   <td><%= text_area_tag 'piece[field_values_attributes]['+field.id.to_s+'][text_area]', field.value_for_piece(piece), {:cols => 80, :rows => 30} %></td>
-</tr>
-<div class="entry">
- 
-</div>
+<%= label_tag 'piece[field_values_attributes]['+field.id.to_s+'][text_area]', "#{field.label}:" %>
+<%= text_area_tag 'piece[field_values_attributes]['+field.id.to_s+'][text_area]', field.value_for_piece(piece), {:cols => 74, :rows => 30} %><br />

data/app/views/newsletter/newsletters/_form.html.erb

@@ -1,21 +1,11 @@
 <%= form_for(@newsletter) do |f| %>
   <%= f.error_messages %>
 
-<table cellpadding="2" cellspacing="0" border="0">
-  <tr>
-    <td><%= f.label :name %> </td>
-    <td><%= f.text_field :name %></td>
-  </tr>
   <% if @newsletter.design.nil? %>
-  <tr>
-    <td><%= f.label :design %></td>
-    <td><%= f.select :design_id, @designs.collect {|design| [ design.name, design.id ] } %></td>
-  </tr>
-<% end %>
-<tr>
-  <td colspan="2" align="right"><%= f.submit "Save", :class => "button" %><div class="buttonEnding"></div>
-</td>
-</tr>
-</table>
-
+    <%= f.label :design %>
+    <%= f.select :design_id, @designs.collect {|design| [ design.name, design.id ] } %><br />
+  <% end %>
+    <%= f.label :name %>
+    <%= f.text_field :name, :style=> 'float: left; margin-right: 10px;' %>
+    <%= f.submit "Save", :class => "button" %><div style="clear: both;"></div>
 <% end %>

data/app/views/newsletter/newsletters/_head.html.erb

@@ -1,8 +1,7 @@
 <% unless is_email? %>
 <link rel="stylesheet" href="https://code.jquery.com/ui/1.10.3/themes/le-frog/jquery-ui.css">
-<script src="/javascripts/jquery.js" type="text/javascript"></script>
-<script src="/javascripts/jquery_ujs.js" type="text/javascript"></script>
-<script src="/javascripts/jquery-ui-1.10.3.custom.js" type="text/javascript"></script>
+<%= javascript_include_tag 'newsletter/application' %>
+<%= yield :head_content %>
 
 <style>
 .edit_link {

data/app/views/newsletter/newsletters/_newsletter.html.erb

@@ -1,6 +1,11 @@
-<% content_for :head_content do %>
-  <link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
-  <script src="http://code.jquery.com/jquery-1.9.1.js"></script>
-  <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
-<% end %>
-<%= render :inline => File.readlines(@newsletter.design.view_path).join, :locals => @newsletter.locals %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title><%= @newsletter.name %></title>
+  <%= render 'newsletter/newsletters/head' %>
+</head>
+<body>
+  <%= render :inline => File.readlines(@newsletter.design.view_path).join, :locals => @newsletter.locals %>
+</body>
+</html>

data/app/views/newsletter/newsletters/archive.html.erb

@@ -1,4 +1,4 @@
-<% title "Newsletter Archive" %>
+<%= title "Newsletter Archive" %>
 
 <ul style="margin-bottom: 100px;">
 <% @newsletters.published.each do |newsletter| %>

data/app/views/newsletter/newsletters/edit.html.erb

@@ -1,21 +1,16 @@
-<% title "Edit Newsletter" %>
-
+<%= title "Edit Newsletter" %>
+<label>Design</label>
+<div style="font-size: 11pt; padding-top: 5px;"><%= @newsletter.design.name %> </div><br />
 <%= render :partial => 'form' %>
-
-<h3>Design - <%= @newsletter.design.name %> </h3>
 <% if @newsletter.design %>
- <table cellpadding="2" cellspacing="0" border="0">
  <% @newsletter.areas.each do |area| %>
-   <%= form_tag new_newsletter_piece_path(@newsletter), :method => :get do %>
+   <%= form_tag new_newsletter_piece_path(@newsletter), :method => :get, :id => "add_element_for_area_#{area.id}" do %>
       <%= hidden_field_tag 'area_id', area.id %>
-      <tr>
-      <td><%= label_tag 'element_id', "Area: #{area.name.humanize}" %></td>
-      <td><%= select_tag 'element_id',  options_from_collection_for_select(area.elements, 'id', 'name') %></td>
-      <td><%= submit_tag 'Add Element', :class => 'button' %><div class="buttonEnding"></div></td>
-      </tr>
+      <%= label_tag "area_#{area.id}_element_id", "Area: #{area.name.humanize}" %>
+      <%= select_tag 'element_id',  options_from_collection_for_select(area.elements, 'id', 'name'), :style=>'margin-right: 10px;', :id => "area_#{area.id}_element_id" %>
+      <%= submit_tag 'Add Element', :class => 'button', :id => "add_element_#{area.id}" %><br />
    <% end %>
 <% end %>
-   </table>
 
 <p><b>Newsletter Window Size: </b>
 <% [[640,480],[800,600],[1024,768],[1280,1024],[1600,1200]].each do |width,height| %>
@@ -29,9 +24,6 @@
 
 <%= content_for :page_navigation do %>
   <div>
-  <% if::Newsletter.use_show_for_resources %>
-    <%= link_to "Show", @newsletter, :class => 'button' %><div class="linkbuttonEnding"></div>
-  <% end %>
-    <%= link_to "Back", newsletters_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+    <%= link_to "Back", newsletters_path, :class => 'button' %>
   </div>
 <% end %>

data/app/views/newsletter/newsletters/index.html.erb

@@ -1,6 +1,6 @@
-<% title "Newsletters" %>
+<%= title "Newsletters" %>
 <div>
-  <%= link_to "New Newsletter", new_newsletter_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= link_to "New Newsletter", new_newsletter_path, :class => 'button' %>
 <div><br /><br /><%= will_paginate @newsletters %></div>
 <table class="list" cellpadding="1" cellspacing="0">
   <tr class="title">
@@ -11,11 +11,11 @@
     <tr class="<%= cycle('odd','even') %>">
       <td><%=h newsletter.name %></td>
 	    <% if newsletter.published? %>
-	    <td><%= link_to 'Un&ndash;Publish'.html_safe, unpublish_newsletter_path(newsletter), :class=>"button" %><div class="linkbuttonEnding"></div></td>
-	    <% else %><td><%= link_to 'Publish', publish_newsletter_path(newsletter), :class=>"button" %><div class="linkbuttonEnding"></div></td>
+	    <td><%= link_to 'Un&ndash;Publish'.html_safe, unpublish_newsletter_path(newsletter), :class=>"button" %></td>
+	    <% else %><td><%= link_to 'Publish', publish_newsletter_path(newsletter), :class=>"button" %></td>
 	    <% end %>
-      <td><%= link_to "Edit", edit_newsletter_path(newsletter), :class => 'button' %><div class="linkbuttonEnding"></div></td>
-      <td><%= link_to "Delete", newsletter, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %><div class="linkbuttonEnding"></div></td>
+      <td><%= link_to "Edit", edit_newsletter_path(newsletter), :class => 'button' %></td>
+      <td><%= link_to "Delete", newsletter, :confirm => 'Are you sure?', :method => :delete, :class => 'button' %></td>
     </tr>
   <% end %>
 </table>
@@ -23,7 +23,7 @@
 
 <%= content_for :page_navigation do %>
 <div>
-  <%= link_to "New Newsletter", new_newsletter_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= link_to "New Newsletter", new_newsletter_path, :class => 'button' %>
 </div>
 <div><br /><br /><%= will_paginate @newsletters %></div>
 <% end %>

data/app/views/newsletter/newsletters/new.html.erb

@@ -1,9 +1,9 @@
-<% title "New Newsletter" %>
+<%= title "New Newsletter" %>
 
 <%= render :partial => 'form' %>
 
 <%= content_for :page_navigation do %>
 <div>
-  <%= link_to "Back to List", newsletters_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+  <%= link_to "Back to List", newsletters_path, :class => 'button' %>
 </div>
 <% end %>

data/app/views/newsletter/newsletters/show.html.erb

@@ -1,6 +1,11 @@
-<% content_for :head_content do %>
-  <link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
-  <script src="http://code.jquery.com/jquery-1.9.1.js"></script>
-  <script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
-<% end %>
-<%= render :inline => File.readlines(@newsletter.design.view_path).join, :locals => @newsletter.locals %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title><%= @newsletter.name %></title>
+  <%= render 'newsletter/newsletters/head' %>
+</head>
+<body>
+  <%= render :inline => File.readlines(@newsletter.design.view_path).join, :locals => @newsletter.locals %>
+</body>
+</html>

data/app/views/newsletter/pieces/_form.html.erb

@@ -1,5 +1,3 @@
-
-<table cellspacing='1' cellpadding='0' border='0'> 
 <%= form_for(@piece,  :html => { :multipart => true }) do |f| %>
   <%= f.error_messages %>
 	<% @piece.element.fields.each do |field| %>
@@ -7,13 +5,8 @@
 		<%= render :partial => field.form_partial_path, :locals => { :piece => @piece, :field => field, :field_value => field.value_for_piece(@piece) } %>
       
 	<% end %>
-  <tr>
-    <td colspan="2" align="right">
 	<%= f.hidden_field :element_id %>
 	<%= f.hidden_field :area_id %>
 	<%= f.hidden_field :newsletter_id %>
-    <%= f.submit "Submit", :class => 'button' %><div class="buttonEnding"></div>
-    </td>
-  </tr>
+    <%= f.submit "Submit", :class => 'button' %>
 <% end %>
-</table>

data/app/views/newsletter/pieces/edit.html.erb

@@ -1,11 +1,9 @@
-<% title "Editing #{ @piece.element.name }" %>
+<%= title "Editing #{ @piece.element.name } in Area: #{ @piece.area.name.humanize }" %>
 <p><%= @piece.element.description %></p>
 <%= render :partial => 'form' %>
 
 
 <%= content_for :page_navigation do %>
-  <div>
-    <%= link_to 'Back', edit_newsletter_path(@newsletter), :class => 'button' %><div class="linkbuttonEnding"></div>
-  </div>
+    <%= link_to 'Back', edit_newsletter_path(@newsletter), :class => 'button' %>
 <% end %>
 

data/app/views/newsletter/pieces/new.html.erb

@@ -1,10 +1,8 @@
-<% title "New Piece" %>
-
+<%= title "New #{ @piece.element.name } in Area: #{ @piece.area.name.humanize }" %>
+<p><%= @piece.element.description %></p>
 <%= render :partial => 'form' %>
 
 <%= content_for :page_navigation do %>
-  <div>
-    <%= link_to 'Back', edit_newsletter_path(@newsletter), :class => 'button' %><div class="linkbuttonEnding"></div>
-  </div>
+    <%= link_to 'Back', edit_newsletter_path(@newsletter), :class => 'button' %>
 <% end %>
 

data/config/locales/newsletters.en.yml

@@ -0,0 +1,27 @@
+en:
+  activerecord:
+    models:
+      newsletter/design:
+        one: "Design"
+        other: "Designs"
+      newsletter/element:
+        one: "Element"
+        other: "Elements"
+
+    attributes:
+      newsletter/design:
+        name: "Name"
+        description: "Description"
+        html_text: "HTML code"
+      newsletter/element:
+        html_text: "HTML code"
+
+    errors:
+      messages:
+        record_invalid: "record is invalid"
+
+  navigation:
+
+  helpers:
+
+  messages:

data/config/routes.rb

@@ -7,9 +7,9 @@ Newsletter::Engine.routes.draw do
       get :editor
     end
     collection do
-      get :short
+      get :sort
     end
-    resources :pieces, :only => [:index,:new,:create]
+    resources :pieces, :only => [:new]
   end
   resources :pieces, :only => [:edit,:create,:update,:destroy]
   resources :designs do
@@ -21,7 +21,7 @@ Newsletter::Engine.routes.draw do
   match '/newsletters/:id/:mode' => 'newsletters#show', :method => :get, :as => :public_newsletter_mode
   match '/newsletters/:id/public' => 'newsletters#show', :method => :get, :as => :public_newsletter
   match '/newsletters/:id' => 'newsletters#show', :method => :get, :as => :newsletter
-  match '/newsletters' => 'newsletters#index', :method => :get, :as => :newsletter
+  match '/newsletters' => 'newsletters#index', :method => :get, :as => :newsletters
   root :to => 'newsletters#index'
 end
 
@@ -30,4 +30,4 @@ Rails.application.routes.draw do
   match '/newsletters/archive' => 'newsletter/newsletters#archive', :method => :get, :as => :newsletter_archive
   match '/newsletters/:id/:mode' => 'newsletter/newsletters#show', :method => :get, :as => :public_newsletter_mode
   match '/newsletters/:id/public' => 'newsletter/newsletters#show', :method => :get, :as => :public_newsletter
-end
+end

data/designs/exports/Example.yml

@@ -0,0 +1,202 @@
+---
+:name: Example Design
+:html_text: ! "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\r\n<html
+  xmlns=\"http://www.w3.org/1999/xhtml\">\r\n<head>\r\n<meta http-equiv=\"Content-Type\"
+  content=\"text/html; charset=utf-8\" />\r\n<style type=\"text/css\">\r\nh1{font-family:
+  Arial Black, Arial, Helvetica, sans-serif; color: #333333; font-size:22px; margin:0;
+  padding: 0 0 10px 0; }\r\nh2{font-family: Arial Black, Arial, Helvetica, sans-serif;
+  color: #333333; font-size:17px; margin:0; padding: 7px 0 0 0;}\r\nh3 {font-family:
+  Arial Black, Arial, Helvetica, sans-serif; color: #0068b3; font-size:9pt; margin:0;
+  padding: 0;}\r\np {font-family: Arial, Helvetica, sans-serif; color: #333333; font-size:8.5pt;
+  margin-top:4px; margin-bottom:4px;}\r\np.right{font-family: Arial, Helvetica, sans-serif;
+  color: #333333; font-size:9.5pt; margin:0 0 15px 0; padding: 0; line-height:1.2em;}\r\na{text-decoration:none;
+  color: #0068b3;}\r\na:hover {color: #7fc348;}\r\n.footer {font-size:7pt;}\r\np a
+  {font-size: 6pt; font-weight: bold;}\r\np.right a {font-size: 7pt;}\r\nhr{color:
+  #7fc348; margin:5px 0; height: 1px; padding: 0;}\r\n.bullet {color: #7fc348; font-weight:
+  bold; height: 5px;}\r\np.pullquote {color: #333333; background:url(<%= asset_path(
+  \"images/pullquote_bg.gif\") %>) repeat-x ; margin:0; padding: 15px; text-align:center;
+  font-style: italic; font-size: 7pt;}\r\np.pullquote a { color: #333333;}\r\np.pullquote
+  a:hover {color: #0068b3;}\r\n  .wrappertable {\r\n\twidth: 574px;\r\n\tmargin: 0
+  8px;\r\n  }\r\n   .leftcoltable {\r\n\twidth: 227px;\r\n  } \r\n  .rightcoltable
+  {\r\n\twidth: 347px;\r\n\tpadding-left: 15px;\r\n  }\r\n@media only screen and (max-device-width:
+  600px) {\r\n  .wrappertable {\r\n\twidth: 95%;\r\n  }\r\n   .leftcoltable {\r\n\twidth:
+  100%;\r\n  }\r\n  .rightcoltable {\r\n\twidth: 100%;\r\n  }\r\n}\r\n</style>\r\n<%=
+  render partial: 'head' %>\r\n</head>\r\n<body>\r\n<table cellspacing=\"0\" cellpadding=\"0\"
+  class=\"wrappertable\">\r\n<tr><td colspan=\"2\" align=\"center\">\r\n<h1>Newsletter
+  Header Image or Name</h1></td></tr>\r\n<tr bgcolor=\"#0068b3\" cellpadding=\"2\"
+  cellspacing=\"2\"><td style=\"font-family:arial,sans-serif;font-size:11px;color:#FFFFFF;\"cellpadding=\"2\"
+  cellspacing=\"2\">Your Tagline or Newsletter Description</td><td  align=\"right\"
+  style=\"font-family:arial,sans-serif;font-size:12px;color:#FFFFFF;\" cellpadding=\"2\"
+  cellspacing=\"2\"><%= @newsletter.name %></td></tr>\r\n</table>\r\n\r\n<table cellspacing=\"0\"
+  cellpadding=\"0\" class=\"wrappertable\">\r\n<tr valign=\"top\">\r\n<td><table cellspacing=\"0\"
+  cellpadding=\"0\" class=\"leftcoltable\" align=\"left\"><tr><td>\r\n<h2>In This
+  Issue</h2>\r\n<!-- Left Column -->\r\n<%= render left_column %>\r\n<hr />\r\n<h3><%=
+  link_to \"Newsletter Archives\", \"#{::Newsletter.site_url}/newsletters/archive\",
+  :target => '_blank' %></h3>\r\n<p>If you missed a previous release or simply want
+  to review an article of interest, all our newsletters have been archived. <%= link_to
+  \"Read More\", \"#{::Newsletter.site_url}/newsletters/archive\" %></p>\r\n</td></tr></table>\r\n<!--Right
+  Column-->\r\n<table cellspacing=\"0\" cellpadding=\"0\" class=\"rightcoltable\"
+  align=\"right\"><tr><td>\r\n<%= render right_column %>\r\n</td></tr></table></td>\r\n</tr>\r\n<%
+  if is_email? %>\r\n<tr><td><hr /><p class=\"footer\" align=\"center\"><font color=\"#aaaaaa\">To
+  remove your address from this newsletter list, please click <%= link_to \"Here\",
+  '#UNSUBSCRIBE_URL##' %>.</font></p></td></tr>\r\n<% end %>\r\n<tr><td><hr /><p class=\"footer\"
+  align=\"center\"><font color=\"#555555\"><b>My Company, Inc.</b> <span class=\"bullet\">&#8226;</span>
+  123 Test Road <span class=\"bullet\">&#8226;</span>  Austin, TX 78230 p:210.495.1171
+  <span class=\"bullet\">&#8226;</span> f:555.555.1244 <span class=\"bullet\">&#8226;</span>
+  toll free: 1.800.555.5555</font></p></td></tr>\r\n</table>\r\n</body>\r\n</html>"
+:description: This is the simple newsletter template.
+:areas:
+- :name: left_column
+  :description: This will house the elements of the 'left_column'
+- :name: right_column
+  :description: This will house the elements of the 'right_column'
+:elements:
+- :name: Left Column Article
+  :description: Has a heading, an excerpt, and a Read More link
+  :html_text: ! '<hr />
+
+    <h3>
+
+    <% unless link.url.blank? %>
+
+    <%= link_to headline, link.url %>
+
+    <% else %>
+
+    <%=h headline %>
+
+    <% end %>
+
+    </h3>
+
+
+    <p><%= filter(article_excerpt) %> <nobr><%= link_to(''Read More'', link.url) unless
+    link.url.blank? %></nobr></p>
+
+'
+  :areas:
+  - :name: left_column
+    :description: This will house the elements of the 'left_column'
+  :fields:
+  - :name: article_excerpt
+    :label: Article Excerpt
+    :sequence: 
+    :is_required: 
+    :description: Article Excerpt
+    :type: Newsletter::Field::TextArea
+  - :name: link
+    :label: Read More Link
+    :sequence: 
+    :is_required: 
+    :description: Read More Link
+    :type: Newsletter::Field::InlineAsset
+  - :name: headline
+    :label: Headline
+    :sequence: 
+    :is_required: 
+    :description: Headline
+    :type: Newsletter::Field::Text
+- :name: Left Column Image
+  :description: Image that is formatted for the left column
+  :html_text: ! '<hr />
+
+    <p><%= image_tag image.url, {:width=>"220", :alt=>image.text } %></p>
+
+'
+  :areas:
+  - :name: left_column
+    :description: This will house the elements of the 'left_column'
+  :fields:
+  - :name: image
+    :label: Image
+    :sequence: 1
+    :is_required: true
+    :description: image formatted for left column
+    :type: Newsletter::Field::InlineAsset
+- :name: Right column article
+  :description: RIght Column Article
+  :html_text: ! '<h1><%= headline %></h1>
+
+    <p class="right">
+
+    <%= image_tag(image.url, {:width=>"174", :vspace=>"5", :hspace=>"10", :align=>"left",
+    :alt => image.text} ) unless image.url.blank? %>
+
+    <%= filter(article_excerpt) %>
+
+    <nobr><%= link_to(''Read More'', link.url) unless link.url.blank? %></nobr></p>'
+  :areas:
+  - :name: right_column
+    :description: This will house the elements of the 'right_column'
+  :fields:
+  - :name: headline
+    :label: Headline
+    :sequence: 
+    :is_required: 
+    :description: Headline
+    :type: Newsletter::Field::Text
+  - :name: image
+    :label: Image
+    :sequence: 
+    :is_required: 
+    :description: Article Image
+    :type: Newsletter::Field::InlineAsset
+  - :name: link
+    :label: Read More Link
+    :sequence: 
+    :is_required: 
+    :description: Read More Link
+    :type: Newsletter::Field::InlineAsset
+  - :name: article_excerpt
+    :label: Article Excerpt
+    :sequence: 
+    :is_required: 
+    :description: Article Excerpt
+    :type: Newsletter::Field::TextArea
+- :name: Right Column Headline
+  :description: Headline for use in the right column!
+  :html_text: <h1><%= headline %></h1>
+  :areas:
+  - :name: right_column
+    :description: This will house the elements of the 'right_column'
+  :fields:
+  - :name: headline
+    :label: Headline
+    :sequence: 
+    :is_required: 
+    :description: Headline
+    :type: Newsletter::Field::Text
+- :name: Right Column Image
+  :description: Image for use in the right column
+  :html_text: ! '<%= image_tag image.url,  {:width=>"320", :alt=>image.text, :style=>"margin:0;
+    padding: 15px 0 0 0;"} %>'
+  :areas:
+  - :name: right_column
+    :description: This will house the elements of the 'right_column'
+  :fields:
+  - :name: image
+    :label: Image
+    :sequence: 
+    :is_required: 
+    :description: Right Column Image
+    :type: Newsletter::Field::InlineAsset
+- :name: Right Column Paragraph
+  :description: paragraph for use in the right column, may contain a link
+  :html_text: ! "<p class=\"right\">\n\t<%= filter(body) %> <%= link_to 'Read More',
+    link.url unless link.url.blank? %>\n</p>"
+  :areas:
+  - :name: right_column
+    :description: This will house the elements of the 'right_column'
+  :fields:
+  - :name: link
+    :label: Link
+    :sequence: 
+    :is_required: 
+    :description: Link
+    :type: Newsletter::Field::InlineAsset
+  - :name: body
+    :label: Body
+    :sequence: 
+    :is_required: 
+    :description: Body
+    :type: Newsletter::Field::TextArea