newsletter 3.0.2 → 3.2.0

data/app/assets/stylesheets/newsletter/timepicker.css

@@ -0,0 +1,54 @@
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { float: left; clear:left; padding: 0 0 0 5px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 45%; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; padding: 0 5px 0 0; }
+.ui-timepicker-rtl dl dt{ float: right; clear: right; }
+.ui-timepicker-rtl dl dd { margin: 0 45% 10px 10px; }
+ .ui-tooltip, .arrow:after {
+background: #285c00;
+border: 2px solid #45930b;
+}
+.ui-tooltip {
+padding: 10px 20px;
+color: white;
+border-radius: 20px;
+font: bold 14px "Helvetica Neue", Sans-Serif;
+box-shadow: 0 0 7px black;
+}
+.arrow {
+width: 70px;
+height: 16px;
+overflow: hidden;
+position: absolute;
+left: 50%;
+margin-left: -35px;
+bottom: -16px;
+}
+.arrow.top {
+top: -16px;
+bottom: auto;
+}
+.arrow.left {
+left: 20%;
+}
+.arrow:after {
+content: "";
+position: absolute;
+left: 20px;
+top: -20px;
+width: 25px;
+height: 25px;
+box-shadow: 6px 5px 9px -9px black;
+-webkit-transform: rotate(45deg);
+-ms-transform: rotate(45deg);
+transform: rotate(45deg);
+}
+.arrow.top:after {
+bottom: -20px;
+top: auto;
+}

data/app/controllers/newsletter/application_controller.rb

@@ -1,30 +1,9 @@
 require 'dynamic_form'
 require 'nested_form'
-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
+require 'cancan'
+class Newsletter::ApplicationController < ::ApplicationController 
+  layout Newsletter.layout
+  load_and_authorize_resource
 
-  before_filter :authenticate_user! if respond_to? :authenticate_user!
-
-  def title(value=nil)
-    @title = value if value.present?
-    @title
-  end
-
-  def show_title?
-    true
-  end
-
-  def use_show_for_resources?
-    ::Newsletter.use_show_for_resources
-  rescue 
-    false
-  end
-
-  def site_url
-    ::Newsletter.site_url
-  rescue
-    "#{default_url_options[:protocol]||'http'}://#{default_url_options[:domain]}"
-  end
+  helper :'newsletter/layout'
 end

data/app/controllers/newsletter/areas_controller.rb

@@ -12,44 +12,6 @@ module Newsletter
       head :ok
     end
   
-    def index
-      @areas = Area.find(:all)
-    end
-
-    def show
-    end
-
-    def new
-      @newsletter_area = Area.new
-    end
-
-    def edit
-    end
-
-    def create
-      @newsletter_area = Area.new(params[:area])
-      if @newsletter_area.save
-        flash[:notice] = 'Area was successfully created.'
-          redirect_to(@newsletter_area)
-      else
-          render :action => "new"
-      end
-    end
-
-    def update
-      if @newsletter_area.update_attributes(params[:area])
-        flash[:notice] = 'Area was successfully updated.'
-        redirect_to(@newsletter_area) 
-      else
-        render :action => "edit"
-      end
-    end
-
-    def destroy
-      @newsletter_area.destroy
-      redirect_to(areas_url)
-    end
-  
     protected
   
     def find_design

data/app/controllers/newsletter/designs_controller.rb

@@ -3,8 +3,11 @@ module Newsletter
   class DesignsController < ::Newsletter::ApplicationController
     before_filter :find_design, :except => [:new, :create, :index]
 
+    include DeleteableActions
+
     def index
-      @designs = Design.find(:all)
+      @designs = Design.order(:name).paginate(page: (params[:page] || 1), 
+        per_page: (params[:per_page] || 30))
     end
 
     def show
@@ -38,7 +41,7 @@ module Newsletter
     end
 
     def destroy
-      @design.destroy
+      @design.delete
       redirect_to(designs_url)
     end
     

data/app/controllers/newsletter/elements_controller.rb

@@ -55,21 +55,21 @@ module Newsletter
   
     protected
     def find_element
-      @element = Element.find_by_id(params[:id])
+      @element ||= Element.find_by_id(params[:id])
     end
   
     def find_design
-      return @design = @element.design if @element
-      @design = Design.find_by_id(params[:design_id])
+      return @design ||= @element.design if @element && @element.design.present?
+      @design ||= Design.find_by_id(params[:design_id])
     end
   
     def find_fields
-      return @fields = @element.fields if @element
-      [Field.new]
+      return @fields ||= @element.fields if @element && @element.fields.present?
+      @fields ||= [Field.new]
     end
   
     def find_field_types
-      @field_types = Field.valid_types
+      @field_types ||= Field.valid_types
     end
   end
-end
+end

data/app/controllers/newsletter/fields_controller.rb

@@ -1,49 +1,4 @@
 module Newsletter
   class FieldsController < ::Newsletter::ApplicationController  
-    before_filter :find_field, :except => [:index, :new, :create]
-
-    def index
-      @fields = NewsletterField.find(:all)
-    end
-
-    def show
-    end
-
-    def new
-      @field = NewsletterField.new
-    end
-
-    def edit
-    end
-
-    def create
-      @field = Field.new(params[:field])
-      if @field.save
-        flash[:notice] = 'NewsletterField was successfully created.'
-        redirect_to(@field)  
-      else
-        render :action => "new"
-      end
-    end
-
-    def update
-      if @field.update_attributes(params[:field])
-        flash[:notice] = 'Field was successfully updated.'
-        redirect_to(@field)
-      else
-        render :action => "edit"
-      end
-    end
-
-    def destroy
-      @field.destroy
-      redirect_to(fields_url)
-    end
-    
-    protected
-    
-    def find_field
-      @field = Field.find(params[:id])
-    end
   end
-end
+end

data/app/controllers/newsletter/newsletters_controller.rb

@@ -1,11 +1,7 @@
 module Newsletter
   class NewslettersController < ::Newsletter::ApplicationController
-    skip_before_filter :authorize, :only => ["archive","show"]
-    before_filter :find_newsletter, :only => [:editor,:publish,:unpublish,:edit,:update,:destroy,:show]
-    #FIXME: why do we need to place this custom code here instead of reopening the class?
-    skip_before_filter :authenticate, :only => [:archive,:show]
-  
-  
+    helper_method :newsletter
+
     def sort
       Newsletter.all.each do | newsletter |
         newsletter.sequence = params["newsletters"].index(newsletter.id.to_s)+1
@@ -43,26 +39,16 @@ module Newsletter
   
     def show
       return redirect_to(main_app.newsletter_archive_path) unless @newsletter.present?
-      newsletter_html = render_to_string :inline => File.readlines(@newsletter.design.view_path).join, 
-        :locals => @newsletter.locals
-      if params[:mode].eql?('email')
-        #mailer handles substitutions
-        render :text => newsletter_html
-      else
-        #no substitutions
-        render :text => newsletter_html
-      end
+      render layout: false
     end
 
     def editor
       params[:editor] = '1'
-      newsletter_html = render_to_string :inline => File.readlines(@newsletter.design.view_path).join, 
-        :locals => @newsletter.locals
-      render :text => newsletter_html
+      render :show, layout: false
     end
 
     def new
-      @newsletter = Newsletter.new
+      @newsleter = Newsletter.new
       @designs = Design.active
     end
 
@@ -95,10 +81,6 @@ module Newsletter
       @newsletter.destroy
       redirect_to(newsletters_url)
     end
-  
-    protected 
-    def find_newsletter
-      @newsletter = Newsletter.find_by_id(params[:id])
-    end
+
   end
 end

data/app/controllers/newsletter/pieces_controller.rb

@@ -1,17 +1,9 @@
 module Newsletter
   class PiecesController < ::Newsletter::ApplicationController
-    before_filter :find_piece, :except => [:new,:create,:index]
     before_filter :find_newsletter
     before_filter :find_element
     before_filter :find_area
 
-    def index
-      @pieces = @newsletter.pieces.active
-    end
-
-    def show
-    end
-
     def new
       @piece = Piece.new({
         :area_id => @area.id,
@@ -44,30 +36,25 @@ module Newsletter
 
     def destroy
       @piece.destroy
-      redirect_to(newsletter_path(@newsletter,:editor=>1))
+      redirect_to(edit_newsletter_path(@newsletter))
     end
   
     protected 
   
-    def find_piece 
-      return @piece if @piece.try(:newsletter_id).present?
-      return nil unless params[:id].present?
-      @piece ||= Piece.find_by_id(params[:id])
-    end
-  
     def find_newsletter
-      return @newsletter = find_piece.newsletter unless find_piece.nil?
-      @newsletter = ::Newsletter::Newsletter.find(params[:newsletter_id] || params[:piece][:newsletter_id])
+      @newsletter ||= (@piece.try(:newsletter) || 
+        ::Newsletter::Newsletter.find(params[:newsletter_id] || 
+        params[:piece][:newsletter_id]))
     end
   
     def find_element
-      return @element = find_piece.element unless find_piece.nil?
-      @element = Element.find(params[:element_id] || params[:piece][:element_id])
+      @element ||= (@piece.try(:element) || 
+        Element.find(params[:element_id] || params[:piece][:element_id]))
     end
   
     def find_area
-      return @area = find_piece.area unless find_piece.nil?
-      @area = Area.find(params[:area_id] || params[:piece][:area_id])
+      @area ||= (@piece.try(:area) || 
+        Area.find(params[:area_id] || params[:piece][:area_id]))
     end
   end
 end

data/app/helpers/newsletter/designs_helper.rb

@@ -1,11 +1,4 @@
 module Newsletter
   module DesignsHelper
-    #left 'newsletter' in function name for helper scoping
-    def add_newsletter_area_link(name)
-      link_to_function name, {:class => "button"} do |page|
-        page.insert_html :bottom, :areas, :partial => 'newsletter_area', 
-          :object => Area.new
-      end  
-    end
   end
-end
+end

data/app/helpers/newsletter/layout_helper.rb

@@ -0,0 +1,43 @@
+module Newsletter
+  module LayoutHelper
+    def title(value=nil, locals={})
+      if value.nil?
+        @page_title
+      else
+        @page_title = translate( value, locals)
+        "<h1>#{@page_title}</h1>".html_safe
+      end
+    end
+
+    def use_show_for_resources?
+      ::Newsletter.use_show_for_resources
+    rescue 
+      # :nocov: shouldn't happen
+      false
+      # :nocov:
+    end
+
+    def show_title?
+      return @show_title if defined? @show_title
+      true
+    rescue 
+      # :nocov: shouldn't happen
+      false
+      # :nocov:
+    end
+
+    def site_url
+      ::Newsletter.site_url
+    rescue
+      # :nocov: shouldn't happen
+      "#{default_url_options[:protocol]||'http'}://#{default_url_options[:domain]}"
+      # :nocov:
+    end
+
+    def translate(key, options={})
+      super(key, options.merge(raise: true))
+    rescue I18n::MissingTranslationData
+      key
+    end
+  end
+end

data/app/helpers/newsletter/newsletters_helper.rb

@@ -1,9 +1,5 @@
 module Newsletter
   module NewslettersHelper
-    def render_area
-      render @newsletter.design.areas.by_newsletter(@newsletter)
-    end
-
     def is_email?
       params[:mode].eql?('email')
     end
@@ -15,10 +11,18 @@ module Newsletter
       new_text.html_safe
     end
 
+    def design_image(image_filename, options={})
+      options_text = ''
+      options.each_pair do |key,value|
+        options_text << %Q| #{key}="#{ERB::Util.html_escape value}"|
+      end
+      %Q|<img src="#{ERB::Util.html_escape @newsletter.image_uri(image_filename)}"#{options_text}/>|.html_safe
+    end
+
     protected 
     def filter_eols_to_brs(text,orig_text)
       return '' if text.blank?
-      return '' if orig_text =~ /<br\s*\/>/i
+      return text if orig_text =~ /<br\s*\/>/i
       text.gsub(/(\r\n|\r|\n)/,'<br/>')
     end
 

data/app/models/newsletter/area.rb

@@ -43,8 +43,5 @@ module Newsletter
       area.save
     end
   
-    def should_destroy?
-      should_destroy.to_i == 1
-    end
   end
-end
+end