newsletter 0.1.2 → 3.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmM2ZGRjMWQwODBjZjViNDFlMjMxZWUzZTIzNzY3NzFhOGNlMmM2Mw==
+    NmM2ZjA1ZGZiODAxODZhNGUzMDZmMGIzZDQ3NTRhYjI0YzEzZDJkNg==
   data.tar.gz: !binary |-
-    ZDQ1MzM5YWM1OTQ0Y2I5ZDNhMmM1YmY3OTU4YjU1Y2NiMWE5Mjc4Mw==
+    MzJmMjgzYzYwYmZkOGUxYzRhNGM3OTAyYmMzMzAyNDI4MGUzYzFkYg==
 SHA512:
   metadata.gz: !binary |-
-    M2IwYWY3NWJjNzg2MjI1ZjE1MmFkZDIxZjJjNTdhODhkZDVkMmQ5YTY4M2Ew
-    YWNmZWEyMDQyOTI4NjFlMmExODY5MmI0YmM4MjczNzkwMjkwOGY0YzRjMTJm
-    M2Y1NDNkNWEwMmM3ZDBlZTQyZDc1MjVkNjJiNDNkMDJhZmY2Nzk=
+    ZTZkZDNkZTJkYzczNmQ4ZDViMmQzNTExMjZlMTNkZjZlMWNmZDg1YWRlOTk2
+    NzA5NmJkY2MwYzNlNTBkN2EyZjI3YTVkNmFhZGEyZDRkMTc0NmUyMDMxZjE2
+    MTgzM2NlMzgxMDUxYzlhOTZiMDBiNzRjMDFjNzRlZGUwNjcxYTE=
   data.tar.gz: !binary |-
-    MjU5MWY2Yjc3MGQxMmVmOTUyZmZjMjExOWQ2MDM1Zjc5MjFiNDA4Yjk5OTMz
-    ZTlhYTc2YTk1ZWVkZjEzYTMzN2NjYzE2Mjc5YzUwNDlmZDAyOGYwM2ZlZDM1
-    MWRlOTBjYmQ0M2Y3OGI3MGI4MDI5MWUyZTQ4OTY3YjBlZjVkNjc=
+    NjYwZTg1MTVlNzgzMzFhYTYwYTIyMGQ4NDJkNTQ4OTFkNDVlY2E0OGZkOTI4
+    YzMzZTRlZGNhMGNjZWJmMmU3MjY3ZDU4MTY2NGYzNzRlMTgwZWM1MWMzODNm
+    ZjQ1Yjg4OGU5NzA1MzQ3N2QzNzA1Y2NlNTQ5ZGY3YWFiMDk5ZDg=

data/.gitignore

@@ -18,3 +18,5 @@ tmp
 *.sqlite3
 log
 *.log
+spec/test_app/designs
+spec/test_app/config/database.yml

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p547
+ruby-1.9.3-p551

data/Gemfile

@@ -14,13 +14,15 @@ gem "jquery-rails"
 # your gem to rubygems.org.
 
 # Testing Gems
+gem 'mysql2'
 gem "rspec-rails", "~>2.14"
+gem "cucumber-rails", require: false
 gem "factory_girl_rails", "~>4.3"
+gem 'poltergeist'
 gem "faker"
 gem "sqlite3"
-gem 'foreman'
 gem 'database_cleaner'
-gem 'guard-rspec'
-gem 'guard-livereload'
-gem 'zeus'
 gem 'pry-rails'
+gem 'spring'
+gem 'spring-commands-rspec'
+gem 'spring-commands-cucumber'

data/app/controllers/newsletter/application_controller.rb

@@ -1,9 +1,12 @@
 require 'dynamic_form'
 require 'nested_form'
-class Newsletter::ApplicationController < ActionController::Base
+class Newsletter::ApplicationController < ApplicationController 
   layout 'newsletter/application'
   helper_method :title, :use_show_for_resources?, :site_url, :show_title?
-  
+  load_and_authorize_resource if respond_to? :load_and_authorize_resource
+
+  before_filter :authenticate_user! if respond_to? :authenticate_user!
+
   def title(value=nil)
     @title = value if value.present?
     @title
@@ -24,4 +27,4 @@ class Newsletter::ApplicationController < ActionController::Base
   rescue
     "#{default_url_options[:protocol]||'http'}://#{default_url_options[:domain]}"
   end
-end
+end

data/app/controllers/newsletter/designs_controller.rb

@@ -48,4 +48,4 @@ module Newsletter
       @design = Design.find(params[:id])
     end
   end
-end
+end

data/app/controllers/newsletter/pieces_controller.rb

@@ -1,6 +1,5 @@
 module Newsletter
   class PiecesController < ::Newsletter::ApplicationController
-    layout 'admin'
     before_filter :find_piece, :except => [:new,:create,:index]
     before_filter :find_newsletter
     before_filter :find_element
@@ -51,21 +50,23 @@ module Newsletter
     protected 
   
     def find_piece 
-      @piece = Piece.find_by_id(params[:id])
+      return @piece if @piece.newsletter.present?
+      return nil unless params[:id].present?
+      @piece ||= Piece.find_by_id(params[:id])
     end
   
     def find_newsletter
-      return @newsletter = @piece.newsletter unless @piece.nil?
+      return @newsletter = find_piece.newsletter unless find_piece.nil?
       @newsletter = ::Newsletter::Newsletter.find(params[:newsletter_id] || params[:piece][:newsletter_id])
     end
   
     def find_element
-      return @element = @piece.element unless @piece.nil?
+      return @element = find_piece.element unless find_piece.nil?
       @element = Element.find(params[:element_id] || params[:piece][:element_id])
     end
   
     def find_area
-      return @area = @piece.area unless @piece.nil?
+      return @area = find_piece.area unless find_piece.nil?
       @area = Area.find(params[:area_id] || params[:piece][:area_id])
     end
   end

data/app/models/newsletter.rb

@@ -1,11 +1,2 @@
 module Newsletter
 end
-
-require 'newsletter/area'
-require 'newsletter/asset'
-require 'newsletter/element'
-require 'newsletter/field'
-require 'newsletter/field_value'
-require 'newsletter/newsletter'
-require 'newsletter/piece'
-require 'newsletter/design'

data/app/models/newsletter/design.rb

@@ -7,7 +7,7 @@ Newsletter::Designs define a main layout, with areas to group Elements/Pieces.
 
 =end
 
-module Newsletter
+module ::Newsletter
   class Design < ActiveRecord::Base
     self.table_name =  "#{::Newsletter.table_prefix}designs"
     has_many :areas, :order => :name, :class_name => 'Newsletter::Area'
@@ -49,6 +49,7 @@ module Newsletter
     def self.import(filename,design_name=nil)
       raise "You must give a filename to import!" unless filename
       data = YAML.load_file(filename)
+      design = nil
       transaction do 
         data[:name] = design_name if design_name
         design = Design.create!(:name => data[:name], 
@@ -61,6 +62,7 @@ module Newsletter
           Element.import(design,element_data)
         end
       end
+      design
     end
 
     # returns path to newsletter design for use in views and is the same for actual file
@@ -157,4 +159,4 @@ module Newsletter
     #   end
     # end
   end
-end
+end

data/app/models/newsletter/element.rb

@@ -66,16 +66,9 @@ module Newsletter
         super
       end
     end
-  # {"0"=>{"name"=>"asdfas", "label"=>"asdfasd", "description"=>"fasdfasdf", 
-  #   "type"=>"Newsletter::Field::TextArea", "_destroy"=>"false", "id"=>"22"},
-  #    "1"=>{"name"=>"asdfasdf", "label"=>"asdfasdf", "description"=>"asdfasdf",
-  #     "type"=>"Newsletter::Field::InlineAsset", "_destroy"=>"false", "id"=>"23"}}
-  #   # # used to modify Newsletter::Fields in-form
-    def fields_attributes=(fields_attributes)
-      @fields_attributes = fields_attributes
-    end
 
     def save_fields
+      return true unless @fields_attributes.present?
       @fields_attributes.each_pair do |index,attributes|
         should_destroy = ['true','1'].include?attributes.delete(:_destroy)
         if attributes[:id].blank?
@@ -166,4 +159,4 @@ module Newsletter
     #   end
     # end
   end
-end
+end

data/app/models/newsletter/field.rb

@@ -109,7 +109,3 @@ module Newsletter
     end
 end
 
-require 'newsletter/field/inline_asset'
-require 'newsletter/field/text'
-require 'newsletter/field/text_area'
-

data/app/models/newsletter/piece.rb

@@ -22,7 +22,6 @@ module Newsletter
     scope :by_area, lambda {|area| {:conditions => {:area_id => area.id, :deleted_at => nil}}}
     scope :by_newsletter, lambda {|newsletter| {:conditions => {:newsletter_id => newsletter.id, :deleted_at => nil}}}
 
-    # accepts_nested_attributes_for :field_values
     attr_accessor :field_values_attributes
 
     attr_protected :id
@@ -43,6 +42,7 @@ module Newsletter
     end
 
     def newsletter
+      return nil unless newsletter_id.present?
       @newsletter ||= ::Newsletter::Newsletter.find(newsletter_id)
     end
     

data/config/spring.rb

@@ -0,0 +1 @@
+Spring.application_root = './spec/test_app'

data/lib/newsletter/settings.rb

@@ -41,10 +41,10 @@ class Newsletter::Settings
       $stderr.puts "Missing Configuration: either define ::Conf with proper values or create a config/newsletter.yml with rake newsletter:default_app_config"
     end
     c = ::Newsletter::Settings.new
-    c.use_file!("#{Rails.root}/config/newsletter.yml")
-    c.use_file!("#{Rails.root}/config/newsletter.local.yml")
+    c.use_file!(standard_file)
+    c.use_file!(local_file)
     c.use_section!(Rails.env)
     c
   end
   
-end
+end

data/lib/newsletter/version.rb

@@ -1,3 +1,3 @@
 module Newsletter
-  VERSION = "0.1.2"
+  VERSION = "3.0.0"
 end

data/newsletter.gemspec

@@ -9,19 +9,19 @@ Gem::Specification.new do |gem|
   gem.version       = Newsletter::VERSION
   gem.authors       = ["Lone Star Internet"]
   gem.email         = ["biz@lone-star.net"]
-  gem.description   = %q{Newletter templating and management system.}
-  gem.summary       = %q{ewletter templating and management system.}
+  gem.licenses      = ['MIT']
+  gem.description   = %q{Newsletter templating and management system.}
+  gem.summary       = %q{Newsletter templating and management system.}
   gem.homepage      = "http://ireach.com"
 
   gem.add_dependency "rails", "~>3.2"
-  gem.add_dependency "mini_magick"
-  gem.add_dependency "will_paginate"
-  gem.add_dependency 'carrierwave'
-  gem.add_dependency "delayed_job", "~>4"
+  gem.add_dependency "mini_magick", "~>4.1"
+  gem.add_dependency "will_paginate", "~>3.0"
+  gem.add_dependency 'carrierwave', "~>0.10" 
   gem.add_dependency "dynamic_form", "~>1.1"
-  gem.add_dependency 'nested_form'
-  gem.add_dependency 'curb'
-  gem.add_dependency 'acts_as_list'
+  gem.add_dependency 'nested_form', "~>0.3"
+  gem.add_dependency 'acts_as_list', "~>0.5"
+  gem.add_dependency 'cancancan', "~>1.9"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/newsletters/exports/example-export.yaml

@@ -1,213 +1,200 @@
---- 
-:name: eESI Newsletter
-:elements: 
+---
+:name: My 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<title>Simple Newsletter</title>\r\n<style
+  type=\"text/css\">\r\nh1{font-family: Arial Black, Arial, Helvetica, sans-serif;
+  color: #333333; font-size:22px; margin:0; padding: 20px 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</style><% unless is_email? %><%=
+  yield :head_content %><%= javascript_include_tag :application %><% end %>\r\n</head>\r\n\r\n<body>\r\n<table
+  cellspacing=\"0\" cellpadding=\"0\" style=\"margin: 0 8px; width: 574px;\">\r\n<tr><td
+  colspan=\"2\" align=\"center\">\r\n<%= image_tag \"images/newsletter_header.gif\",
+  \ {:width=>\"564\"} %></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\">A Professional Employer Organization Newsletter</td><td  align=\"right\"
+  style=\"font-family:arial,sans-serif;font-size:12px;color:#FFFFFF;\" cellpadding=\"2\"
+  cellspacing=\"2\"><%= @newsletter.name %></td></tr><h3><%= link_to \"Newsletter
+  Archives\", \"#{::Newsletter.site_url}/newsletters/archive\", :target => '_blank'
+  %></h3>\r\n</table>\r\n\r\n<table cellspacing=\"0\" cellpadding=\"0\" style=\"margin:
+  0 8px; width: 574px;\">\r\n<tr valign=\"top\">\r\n<td width=\"227\">\r\n\r\n<h2>In
+  This Issue</h2>\r\n<!-- Left Column -->\r\n<%= render left_column %>\r\n<hr />\r\n\r\n<h3><%=
+  link_to \"Newsletter Archives\", \"#{::Newsletter.site_url}/newsletters/archive\",
+  :target => '_blank' %></h3>\r\n\r\n\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\r\n\r\n</td>\r\n<!--Right
+  Column-->\r\n<td width=\"347\" style=\"padding-left: 15px; padding-top: 20px;\">\r\n<%=
+  render right_column %>\r\n</td>\r\n</tr>\r\n\r\n<% if is_email? %>\r\n<tr><td colspan=\"3\"><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\r\n<tr><td colspan=\"3\"><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\r\n\r\n\r\n\r\n\r\n\r\n</table>\r\n</body>\r\n</html>\r\n"
+: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
-  :areas: 
+  :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'
-  :description: Has a heading, an excerpt, and a Read More link
-  :fields: 
+  :fields:
   - :name: article_excerpt
+    :label: Article Excerpt
     :sequence: 
+    :is_required: 
     :description: Article Excerpt
-    :label: Article Excerpt
     :type: Newsletter::Field::TextArea
-    :is_required: 
   - :name: link
+    :label: Read More Link
     :sequence: 
+    :is_required: 
     :description: Read More Link
-    :label: Read More Link
     :type: Newsletter::Field::InlineAsset
-    :is_required: 
   - :name: headline
+    :label: Headline
     :sequence: 
+    :is_required: 
     :description: Headline
-    :label: Headline
     :type: Newsletter::Field::Text
-    :is_required: 
-  :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>
-
 - :name: Left Column Image
-  :areas: 
+  :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'
-  :description: Image that is formatted for the left column
-  :fields: 
+  :fields:
   - :name: image
+    :label: Image
     :sequence: 1
+    :is_required: true
     :description: image formatted for left column
-    :label: Image
     :type: Newsletter::Field::InlineAsset
-    :is_required: true
-  :html_text: |
-    <hr />
-    <p><%= image_tag image.url, {:width=>"220", :alt=>image.text } %></p>
-
 - :name: Right column article
-  :areas: 
+  :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'
-  :description: RIght Column Article
-  :fields: 
+  :fields:
   - :name: headline
+    :label: Headline
     :sequence: 
+    :is_required: 
     :description: Headline
-    :label: Headline
     :type: Newsletter::Field::Text
-    :is_required: 
   - :name: image
+    :label: Image
     :sequence: 
+    :is_required: 
     :description: Article Image
-    :label: Image
     :type: Newsletter::Field::InlineAsset
-    :is_required: 
   - :name: link
+    :label: Read More Link
     :sequence: 
+    :is_required: 
     :description: Read More Link
-    :label: Read More Link
     :type: Newsletter::Field::InlineAsset
-    :is_required: 
   - :name: article_excerpt
+    :label: Article Excerpt
     :sequence: 
+    :is_required: 
     :description: Article Excerpt
-    :label: Article Excerpt
     :type: Newsletter::Field::TextArea
-    :is_required: 
-  :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>
 - :name: Right Column Headline
-  :areas: 
+  :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'
-  :description: Headline for use in the right column!
-  :fields: 
+  :fields:
   - :name: headline
+    :label: Headline
     :sequence: 
+    :is_required: 
     :description: Headline
-    :label: Headline
     :type: Newsletter::Field::Text
-    :is_required: 
-  :html_text: <h1><%= headline %></h1>
 - :name: Right Column Image
-  :areas: 
+  :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'
-  :description: Image for use in the right column
-  :fields: 
+  :fields:
   - :name: image
+    :label: Image
     :sequence: 
+    :is_required: 
     :description: Right Column Image
-    :label: Image
     :type: Newsletter::Field::InlineAsset
-    :is_required: 
-  :html_text: "<%= image_tag image.url,  {:width=>\"320\", :alt=>image.text, :style=>\"margin:0; padding: 15px 0 0 0;\"} %>"
 - :name: Right Column Paragraph
-  :areas: 
+  :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'
-  :description: paragraph for use in the right column, may contain a link
-  :fields: 
+  :fields:
   - :name: link
+    :label: Link
     :sequence: 
+    :is_required: 
     :description: Link
-    :label: Link
     :type: Newsletter::Field::InlineAsset
-    :is_required: 
   - :name: body
+    :label: Body
     :sequence: 
+    :is_required: 
     :description: Body
-    :label: Body
     :type: Newsletter::Field::TextArea
-    :is_required: 
-  :html_text: |-
-    <p class="right">
-    	<%= filter(body) %> <%= link_to 'Read More', link.url unless link.url.blank? %>
-    </p>
-: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'
-:description: This is the monthly newsletter template for eEmployers
-:html_text: |
-  <!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>eEmployers Newsletter</title>
-  <style type="text/css">
-  h1{font-family: Arial Black, Arial, Helvetica, sans-serif; color: #333333; font-size:22px; margin:0; padding: 20px 0 10px 0; }
-  h2{font-family: Arial Black, Arial, Helvetica, sans-serif; color: #333333; font-size:17px; margin:0; padding: 7px 0 0 0;}
-  h3 {font-family: Arial Black, Arial, Helvetica, sans-serif; color: #0068b3; font-size:9pt; margin:0; padding: 0;}
-  p {font-family: Arial, Helvetica, sans-serif; color: #333333; font-size:8.5pt; margin-top:4px; margin-bottom:4px;}
-  p.right{font-family: Arial, Helvetica, sans-serif; color: #333333; font-size:9.5pt; margin:0 0 15px 0; padding: 0; line-height:1.2em;}
-  a{text-decoration:none; color: #0068b3;}
-  a:hover {color: #7fc348;}
-  .footer {font-size:7pt;}
-  p a {font-size: 6pt; font-weight: bold;}
-  p.right a {font-size: 7pt;}
-  hr{color: #7fc348; margin:5px 0; height: 1px; padding: 0;}
-  .bullet {color: #7fc348; font-weight: bold; height: 5px;}
-  p.pullquote {color: #333333; background:url(http://www.eesipeo.com/newsletter_images/pullquote_bg.gif) repeat-x ; margin:0; padding: 15px; text-align:center; font-style: italic; font-size: 7pt;}
-  p.pullquote a { color: #333333;}
-  p.pullquote a:hover {color: #0068b3;}
-  </style><%= yield :head_content %><%= javascript_include_tag :defaults %>
-  </head>
-  
-  <body>
-  <table cellspacing="0" cellpadding="0" style="margin: 0 8px; width: 574px;">
-  <tr><td colspan="2" align="center">
-  <%= image_tag "#{::Newsletter.site_url}/images/newsletter_header.gif",  {:width=>"564"} %></td></tr>
-  <tr bgcolor="#0068b3" cellpadding="2" cellspacing="2"><td style="font-family:arial,sans-serif;font-size:11px;color:#FFFFFF;"cellpadding="2" cellspacing="2">A Professional Employer Organization Newsletter</td><td  align="right" style="font-family:arial,sans-serif;font-size:12px;color:#FFFFFF;" cellpadding="2" cellspacing="2"><%= @newsletter.name %></td></tr>
-  </table>
-  
-  <table cellspacing="0" cellpadding="0" style="margin: 0 8px; width: 574px;">
-  <tr valign="top">
-  <td width="227">
-  
-  <h2>In This Issue</h2>
-  <!-- Left Column -->
-  <%= render left_column %>
-  <hr />
-  
-  <h3><%= link_to "PeopleTalk Archives", "http://test1.lnstar.com/newsletters/archive", :target => '_blank' %></h3>
-  
-  <p>If you missed a previous release or simply want to review an article of interest, all our PeopleTalk newsletters have been archived. <%= link_to "Read More", "http://test1.lnstar.com/newsletters/archive" %></p>
-  
-  
-  </td>
-  <!--Right Column-->
-  <td width="347" style="padding-left: 15px; padding-top: 20px;">
-  <%= render right_column %>
-  </td>
-  </tr>
-  
-  <% if is_email? %>
-  <tr><td colspan="3"><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>
-  <% end %>
-  
-  <tr><td colspan="3"><hr /><p class="footer" align="center"><font color="#555555"><b>eEmployers Solutions, Inc.</b> <span class="bullet">&#8226;</span> 12211 Huebner Road <span class="bullet">&#8226;</span>  San Antonio, TX 78230 p:210.495.1171 <span class="bullet">&#8226;</span> f:210.495.1244 <span class="bullet">&#8226;</span> toll free: 1.888.465.1171</font></p></td></tr>
-  
-  
-  
-  
-  
-  
-  </table>
-  </body>
-  </html>
-