RubyGems - newsletter - Versions diffs - 3.0.2 → 3.2.0 - Mend

newsletter 3.0.2 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (259) hide show

data/app/views/layouts/newsletter/application.html.erb CHANGED Viewed

@@ -3,110 +3,25 @@
 <head>
   <!-- iReach template -->
   <title><%= h(yield(:title) || "iReach Newsletter Manager") %></title>
-  <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>
+  <%= stylesheet_link_tag    "newsletter/application", :media => "all" %>
+  <link href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/le-frog/jquery-ui.css" media="screen" rel="stylesheet" type="text/css" />
+  <%= javascript_include_tag "newsletter/application" %>
   <%= csrf_meta_tags %>
-  <link href="/stylesheets/nav.css" media="screen" rel="stylesheet" type="text/css" />
-  <link href="/stylesheets/admin.css" media="screen" rel="stylesheet" type="text/css" />
-<% begin %>
-<% if admin_nav_menu.present? %>
-  <script>
-     function showMenu(id, id2) {
-       <% for menuitem in admin_nav_menu %>
-         <% if menuitem.admin_menu && menuitem.admin_menu.length > 0 && menuitem.is_visible %>
-              elem = document.getElementById("menu_<%= menuitem.id %>")
-              if (elem) elem.style.display = "none";
-           <% for submenuitem in menuitem.admin_menu.order("menu_order ASC") %>
-              <% if submenuitem.admin_menu && submenuitem.admin_menu.length > 0 && submenuitem.is_visible %>
-                elem = document.getElementById("menu_<%= submenuitem.id %>")
-                if (elem) elem.style.display = "none";
-              <% end %>
-           <% end %>
-         <% end %>
-       <% end %>
-       document.getElementById("menu_"+id).style.display = "inline";
-       if (id2) document.getElementById("menu_"+id2).style.display = "inline";
-     }
-  </script>
-<% end %>
-<% rescue => e %>
-<!-- Error building JS Menu <%= e.message %> <%= e.backtrace.join("\n") %> -->
-<% end %>
-  <%= content_for :head %>
+  <%= yield :head %>
 </head>
-<body>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-  <tr>
-    <td><img src="/images/1topLeft.gif" width="269" height="85" /></td>
-    <td width="100%" align="left" background="/images/topMid.gif"><img src="/images/1topMidR.gif" width="435" height="85" /></td>
-    <td align="right"><img src="/images/1topRight.gif" width="62" height="85" /></td>
-  </tr>
-</table>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-  <tr>
-    <td valign="top" bgcolor="#FFFFFF">
-  <table border="0" cellspacing="0" cellpadding="0" class="menu">
-  <tr>
-    <td valign="top"><img src="/images/menuMainLeft.gif" width="7" height="257" /></td>
-    <td valign="top" class="table-bk">
-    <!-- Start Admin Menu <%= @admin_nav_menu.inspect %> -->
-<% begin %>
-    <% if admin_nav_menu.present? %>
-      <% for menuitem in admin_nav_menu %>
-        <% if menuitem.admin_menu && menuitem.admin_menu.length > 0 && menuitem.is_visible && menuitem.authorized(session[:admin][:user_id]) %>
-          <span class="category" onClick="javascript:showMenu(<%= menuitem.id %>, 0)" style="cursor:pointer"><%= menuitem.description %></span><br/>
-          <div id="menu_<%= menuitem.id %>" style="display:<%= (params[:menu_id].to_i == menuitem.id) ? 'inline' : 'none' %>">
-          <% for submenuitem in menuitem.admin_menu %>
-            <% if submenuitem.is_visible and submenuitem.authorized(session[:admin][:user_id]) %>
-              <% if submenuitem.admin_menu && submenuitem.admin_menu.length > 0 && submenuitem.is_visible && submenuitem.authorized(session[:admin][:user_id]) %>
-                  &nbsp;&nbsp;&nbsp;<span class="menuSM" onClick="javascript:showMenu(<%= menuitem.id %>, <%= submenuitem.id %>)" style="cursor:pointer"><%= submenuitem.description %></span><br/>
-                  <div id="menu_<%= submenuitem.id %>" style="display:<%= (params[:submenu_id].to_i == submenuitem.id) ? 'inline' : 'none' %>">
-                  <% for subsubmenuitem in submenuitem.admin_menu %>
-                    <% if subsubmenuitem.is_visible and subsubmenuitem.authorized(session[:admin][:user_id]) %>
-                       &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span class="menuSM"><%= link_to menuitem.description, "/#{submenuitem.path}?menu_id=#{submenuitem.id}" %></span><br/>
-                    <% end %>
-                  <% end %>
-                  </div>
-               <% elsif submenuitem.is_visible and submenuitem.authorized(session[:admin][:user_id]) %>
-                  &nbsp;&nbsp;&nbsp;<span class="menuSM"><%= link_to submenuitem.description, "/#{submenuitem.path}?menu_id=#{menuitem.id}" %></span><br/>
-               <% end %>
-            <% end %>
-          <% end %>
-          </div>
-     <hr class="line" />
-        <% elsif menuitem.is_visible and menuitem.authorized(session[:admin][:user_id]) %>
-          <%= link_to menuitem.description, "/#{menuitem.path}" %><br/>
-         <hr class="line" />
-        <% end %>
-      <% end %>
-    <% end %>
-<% rescue => e %>
-<!-- Error building Menu <%= e.message %> <%= e.backtrace.join("\n") %> -->
-<% end %>
-</td>
-</tr>
-<tr>
-<td><img src="/images/menuBotLeft.gif" width="7" height="8" /></td>
-<td><img src="/images/menuBot.gif" width="176" height="8" /></td></tr>
-</table>
-    </td>
-    <td width="100%" valign="top" bgcolor="#FFFFFF" class="main">
+<div id="top"><%= image_tag "newsletter/iReach_logo.gif", width: "269", height:"85", style: "float: left;" %><%= image_tag "newsletter/TopCenter.gif", width: "435", height: "85", style: "float: left;" %><%= image_tag "newsletter/TopRight.gif", width: "62", height: "85", style: "float: right;" %>&nbsp;</div>
+<div style="background-color: #fff;">
+  <div id="menu">
+    <ul>
+      <li><span onClick="$('#setup_submenu').toggle();return false">Setup</span>
+        <ul id='setup_submenu' <%= ' style="display:none"'.html_safe unless request.path =~ %r#/newsletter/designs|setup# %>>
+          <%= content_tag(:li, link_to('Newsletter Designs', news.designs_path)) if can?(:manage, Newsletter::Design) %>
+        </ul>
+      </li>
+      <%= content_tag(:li, link_to('Newsletters', news.newsletters_path)) if can?(:manage, Newsletter::Newsletter) %>
+    </ul>
+  </div>
+<div id="page_content">
       <% flash.each do |name, msg| -%>
         <%= content_tag :div, msg, :id => "flash_#{name}" %>
       <% end -%>
@@ -114,22 +29,11 @@
       <% if show_title? -%>
         <h1><%=h yield(:title) %></h1>
       <% end -%>
       <%= yield %>
       <%= yield :page_navigation %>
-</td>
-<td background="/images/1midRight.gif"><img src="/images/1midRight.gif" width="62" height="19"/></td>
-  </tr>
-</table>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-<tr>
-<td width="100%" background="/images/1botMid.gif"><img src="/images/1botMid.gif" width="13" height="39" /></td>
-<td align="right"><img src="/images/1botRight.gif" width="62" height="39" /></td>
-</tr>
-</table>
+</div>
+</div>
+<%= image_tag "newsletter/BottomRight.gif", width: "62", height: "85", style: "float: right;" %>
 </body>
 </html>

data/app/views/layouts/newsletter/layout.html.erb ADDED Viewed

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+  <title>IReach Newsletter Archive</title>
+</head>
+<body>
+  <div id="top"><%= image_tag "mail_manager/iReach_logo.gif", width: "269", height:"85" %></div>
+  <div id="page_content">
+    <% flash.each do |name, msg| -%>
+      <%= content_tag :div, msg, :id => "flash_#{name}" %>
+    <% end -%>
+    <%= yield %>
+  </div>
+</body>
+</html>

data/app/views/newsletter/areas/_area.html.erb CHANGED Viewed

@@ -14,7 +14,7 @@
 		 				  :style => "position: relative;"} do %>
 			<!--Element Template - <%= piece.element.view_path %> -->
 			<%= content_tag :div, link_to("Delete", piece, :confirm => 'Are you sure?',
-									:method => :delete, :class=> "delete_link") +
+									:method => :delete, :class=> "delete_link", :target => '_top') +
 									" | " +
 			 					  link_to("Edit", edit_piece_path(piece), :target => '_top', :class=> "edit_link"),
 								  :id=>"modify_piece_#{piece.id}",:style => "display:none", :class => "piece_tool" %>

data/app/views/newsletter/designs/_area_fields.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
 <%= div_for f.object do %>
 	<%= f.text_field :name %>
-	<%= f.link_to_remove "Remove", {class: 'button'} %><div class='linkbuttonEnding'></div>
+	<%= f.link_to_remove "Remove", {class: 'button'} %>
 <% end %>

data/app/views/newsletter/designs/_form.html.erb CHANGED Viewed

@@ -1,41 +1,23 @@
 <%= nested_form_for @design do |f| %>
   <%= f.error_messages %>
-  <table cellspacing='1' cellpadding='0' border='0'>
-    <tr>
-       <td width='150'><%= f.label :name %></td>
-       <td><%= f.text_field :name %></td>
-    </tr>
-    <tr>
-       <td width='150'><%= f.label :description %></td>
-       <td><%= f.text_field :description %></td>
-    </tr>
+       <%= f.label :name %>
+       <%= f.text_field :name %><br />
+       <%= f.label :description %>
+       <%= f.text_field :description %><br />
     <% unless @design.name.blank? %>
-    <tr>
-    	<td width='150'><label>Design Filename</label></td>
-    	<td><%= @design.view_path.gsub(/^#{::Newsletter.designs_path}/,'') %></td>
-  	</tr>
+    	<label>Design Filename</label>
+    	     <div style="padding-top: 9px;"><%= @design.view_path.gsub(/^#{::Newsletter.designs_path}/,'') %></div><br />
   	<% end %>
-    <tr valign='top'>
-       <td width='150'><%= f.label :html_text %></td>
-       <td><%= f.text_area :html_text %></td>
-    </tr>
-    <tr valign='top'>
-      <td colspan='2'>
+       <%= f.label :html_text %>
+            <%= f.text_area :html_text %><br />
       <div class='newsletter_parts_group'>
          <h2 style='padding-bottom: 0; margin-bottom: 0; font-size: 10pt; '>Areas</h2>
+         The HTML code field above should contain &lt;%= render [your_area_name] %&gt; for each area you create.<br/>
          <div id="areas">
             <%= f.fields_for :areas %>
          </div>
-      	<%= f.link_to_add('Add Area', :areas, {class: 'button'}) %><div class='linkbuttonEnding'></div>
+      	<%= f.link_to_add('Add Area', :areas, {class: 'button'}) %>
       </div>
-      </td>
-    </tr>
-    <tr>
-      <td align="right" colspan="2"><%= f.submit "Submit", :class => 'button' %><div class="buttonEnding"></div></td>
-    </tr>
-  </table>
+      <div class="submit_button"><%= f.submit "Submit", :class => 'button' %></div>
 <% end %>
-<% content_for :head do %>
-  <%= javascript_include_tag '/javascripts/nested_form.js' %>
-<% end %>

data/app/views/newsletter/designs/_newsletter_area.html.erb CHANGED Viewed

@@ -2,14 +2,14 @@
   <% fields_for 'design[area_attributes][]', area do |naf| %>
 		<%= naf.text_field :name, :index => nil %>
 		<% if area.new_record? %>
-			<%= link_to_function "Remove", "$(this).up('.area').remove()", :class => 'button' %><div class='linkbuttonEnding' style='margin-top: 7px;'></div><br/>
+			<%= link_to_function "Remove", "$(this).up('.area').remove()", :class => 'button' %><br/>
 		<% else %>
 			<%= link_to_function "Remove", "$(this).next('.should_destroy').value = 1; $(this).hide();"+
 			    "$('area_restore_#{area.id}').show()", :class => 'button',
 			    :id =>  "area_remove_#{area.id}" %>
 			<%= link_to_function "Restore", "$(this).next('.should_destroy').value = 0; $(this).hide();"+
 			    "$('area_remove_#{area.id}').show()", :class => 'button',
-			    :id =>  "area_restore_#{area.id}", :style => 'display:none' %><div class='linkbuttonEnding' style='margin-top: 5px;'></div><br/>
+			    :id =>  "area_restore_#{area.id}", :style => 'display:none' %><br/>
 			<%= naf.hidden_field :id, :index => nil %>
 			<%= naf.hidden_field :should_destroy, :index => nil, :class => 'should_destroy' %>
 		<% end %>

data/app/views/newsletter/designs/edit.html.erb CHANGED Viewed

@@ -1,14 +1,11 @@
-<% title "Edit Design" %>
+<%= title "Edit Design" %>
 <%= render :partial => 'form' %>
 <%= content_for :page_navigation do %>
   <div>
-  <% if::Newsletter.use_show_for_resources %>
-    <%= link_to "Show", @design, :class => 'button' %><div class="linkbuttonEnding"></div>
-  <% end %>
-    <%= link_to "View All", designs_path, :class => 'button' %><div class="linkbuttonEnding"></div>
+    <%= link_to "View All", designs_path, :class => 'button' %>
     <%= link_to 'Manage Elements', design_elements_path(@design),
-  		 :class => 'button' %><div class="linkbuttonEnding"></div>
+  		 :class => 'button' %>
   </div>
 <% end %>

data/app/views/newsletter/designs/index.html.erb CHANGED Viewed

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

data/app/views/newsletter/designs/new.html.erb CHANGED Viewed

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

data/app/views/newsletter/designs/show.html.erb CHANGED Viewed

@@ -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/elements/_field_fields.html.erb CHANGED Viewed

@@ -1,27 +1,14 @@
 <%= div_for f.object do %>
-  <table border="0" cellpadding="1" cellspacing="0">
 	<%= f.error_messages %>
-	<tr vlalign="top">
-		<td width="150"><%= f.label :name %></td>
-		<td><%= f.text_field :name%></td>
-	</tr>
-	<tr vlalign="top">
-		<td width="150"><%= f.label :label %><br /></td>
-		<td><%= f.text_field :label %></td>
-	</tr>
-	<tr vlalign="top">
-		<td width="150"><%= f.label :description %><br /></td>
-		<td><%= f.text_field :description %></td>
-	</tr>
-	<tr vlalign="top">
-		<td width="150"><%= f.label :type %></td>
-		<td><%= f.select :type, options_for_select(@field_types.collect{|type| [type.gsub(/Newsletter::Field::/,'').humanize,type]}, f.object.class.name) %></td>
-	</tr>
-	<tr vlalign="top">
-	  <td align="right" colspan="2">
-	  <%= f.link_to_remove "Remove", {class: 'button'} %><div class='linkbuttonEnding'>
-	<br/><br/><hr/>
-	  </td>
-	</tr>
-	</table>
-<% end %>
+		<%= f.label :name %>
+		<%= f.text_field :name%><br />
+		<%= f.label :label %>
+		<%= f.text_field :label %><br />
+		<%= f.label :description %>
+		<%= f.text_field :description %><br />
+		<%= f.label :type %>
+		<%= f.select :type, options_for_select(@field_types.collect{|type| [type.gsub(/Newsletter::Field::/,'').humanize,type]}, f.object.class.name) %>
+		<%= f.hidden_field :sequence, {class: 'sequence'} %>
+	  <%= f.link_to_remove "Remove", {class: 'button', style: 'margin-left: 130px;'} %>
+    <hr>
+<% end %>

data/app/views/newsletter/elements/_form.html.erb CHANGED Viewed

@@ -1,51 +1,55 @@
 <%= nested_form_for @element do |f| %>
   <%= f.error_messages %>
-  <table cellspacing='1' cellpadding='0' border='0'>
-    <tr valign="top">
-       <td width='150'><%= f.label :name %></td>
-       <td><%= f.text_field :name %></td>
-    </tr>
-    <tr valign="top">
-       <td width='150'><%= f.label :description %></td>
-       <td><%= f.text_field :description %></td>
-    </tr>
+       <%= f.label :name %>
+       <%= f.text_field :name %><br />
+       <%= f.label :description %>
+       <%= f.text_field :description %><br />
     <% unless @element.name.blank? %>
-    <tr valign="top">
-    	<td width='150'><label>Design Filename</label></td>
-    	<td><%= @element.file_path.gsub(/^#{::Newsletter.designs_path}/,'') %></td>
-  	</tr>
+    	<label>Design Filename</label>
+    	     <div style="padding-top: 7px";><%= @element.file_path.gsub(/^#{::Newsletter.designs_path}/,'') %></div><br />
   	<% end %>
-    <tr valign="top">
-       <td width='150'><%= f.label :html_text %></td>
-       <td><%= f.text_area :html_text %></td>
-    </tr>
-    <tr valign="top">
-      <td colspan="2">
+       <%= f.label :html_text %>
+       <%= f.text_area :html_text %><br />
         <div class='newsletter_parts_group' style='margin-top: 10px; padding: 0 5px 5px 15px; border: thin dashed black; background-color: #eee'>
-           <h2 style='padding-bottom: 0; margin-bottom: 0; font-size: 10pt; '>Fields</h2>
+           <h2 style='font-size: 10pt; '>Fields</h2>
+           The HTML code field above should contain (at the least):
+            <ul>
+              <li>&lt;%= [field_name] %&gt; for each Text field.</li>
+              <li>&lt;%= filter([field_name]) %&gt; for each Textarea.</li>
+              <li>&lt;%= image_tag([field_name]) %&gt; for each Inlineasset that will contain an image.</li>
+              <li>&lt;%= link_to([field_name]) %&gt; for each Inlineasset that will contain a link.</li>
+            </ul>
         		<div id="newsletter_fields">
         			<%= f.fields_for :fields %>
+        		  <%= f.link_to_add('Add Field', :fields, {class: 'button add_field'}) %>
         		</div>
-        		<%= f.link_to_add('Add Field', :fields, {class: 'button'}) %><div class="linkbuttonEnding"></div>
+<%= content_for :head do %>
+<script>
+jQuery(document).ready(function() {
+  jQuery("#newsletter_fields").sortable({
+    axis: 'y',
+    stop: function (event, ui) {
+      var sequence = 1;
+      jQuery('#newsletter_fields .fields input.sequence').each(function(){
+          jQuery(this).val(sequence);
+          sequence += 1;
+      });
+    }
+  });
+  jQuery('.add_field').click(function() {
+    jQuery( "#newsletter_fields" ).sortable( "refresh" );
+  });
+});
+</script>
+<% end %>
       	</div>
       	<div class='newsletter_parts_group' style='margin-top: 10px; padding: 0 5px 5px 15px; border: thin dashed black; background-color: #eee'>
            <h2 style='padding-bottom: 0; margin-bottom: 0; font-size: 10pt; '>Areas</h2>
         	<% @design.areas.each do |area| %>
-        	 <%= check_box_tag 'element[area_ids][]', area.id, @element.areas.include?(area) %><%= area.name %><br/>
+        	 <%= check_box_tag "element[area_ids][#{area.id}]", area.id, @element.areas.include?(area), name: "element[area_ids][]" %><%= label_tag "element[area_ids][#{area.id}]", area.name %><br/>
         	<% end %>
       	</div>
       	<%= hidden_field_tag :design_id, @design.id %>
-    	</td>
-    </tr>
-    <tr>
-      <td align="right" colspan="2"><%= f.submit "Submit", :class => 'button' %><div class="buttonEnding"></div></td>
-    </tr>
-  </table>
-<% end %>
+      <div class="submit_button"><%= f.submit "Submit", :class => 'button' %></div>
-<% content_for :head do %>
-  <%= javascript_include_tag '/javascripts/nested_form.js' %>
 <% end %>