newsletter ui: sidebar common + tracking partial

svenfuchs · Jan 7, 2009 · d753644 · d753644
1 parent b758b97
commit d753644
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 36 deletions.
diff --git a/engines/adva_newsletter/app/views/admin/issues/_sidebar_actions.html.erb b/engines/adva_newsletter/app/views/admin/issues/_sidebar_actions.html.erb
@@ -3,40 +3,7 @@
   <% if @issue.present? && !@issue.new_record?  %>
     <li><%= link_to t('adva.issue.link.edit'), edit_admin_issue_path(@site, @newsletter, @issue) %></li>
   <% end %>
-  <li><%= link_to t('adva.issue.link.new'), new_admin_issue_path %></li>
+  <%= render :partial => 'admin/shared/sidebar_common' %>
 </ul>
 
-<h3><%= t(:'adva.titles.tracking') %></h3>
-<% if @site.google_analytics_tracking_code -%>
-<% fields_for :issue do |f| -%>
-<p>
-  <%= f.check_box :track, :onclick => "$('tracking_options').toggle();" %>
-  <%= f.label :track, t(:'adva.tracking.enable_tracking'), :style => "display:inline;" %>
-</p>
-<div id="tracking_options" style="display:none;">
-  <span class="hint"><%= t(:'adva.tracking.hints.glossary', :link => link_to(t(:'adva.tracking.hints.glossary_name'), "http://www.google.com/support/googleanalytics/bin/topic.py?topic=11096&hl=#{I18n.locale}")) %>
-  <p>
-    <%= f.label :tracking_campaign, t(:'adva.tracking.tracking_campaign') %>
-    <%= f.text_field :tracking_campaign %>
-  </p>
-  <p>
-    <%= f.label :tracking_source, t(:'adva.tracking.tracking_source') %>
-    <%= f.text_field :tracking_source %>
-  </p>
-</div>
-<% end -%>
-<% else -%>
-<span class="hint"><%= t(:'adva.tracking.hints.no_tracking_code', :settings => link_to(t(:'adva.resources.settings'), edit_admin_site_path(@site))) %></span>
-<% end -%>
-<script type="text/javascript">
-toggleTrackingOptions = function(event) {
-  checkbox = event.element();
-
-  // pre-fill values if checkbox is checked
-  if(checkbox.checked) {
-    if(!$F('issue_tracking_campaign'))  $('issue_tracking_campaign').value = decodeURI('<%= @newsletter.title %>');
-    if(!$F('issue_tracking_source'))    $('issue_tracking_source').value = decodeURI($F('issue_title'));
-  }
-}
-$('issue_track').observe('click', toggleTrackingOptions);
-</script>
+<%= render :partial => 'admin/shared/tracking' %>
diff --git a/engines/adva_newsletter/app/views/admin/newsletter_subscriptions/_sidebar_actions.html.erb b/engines/adva_newsletter/app/views/admin/newsletter_subscriptions/_sidebar_actions.html.erb
@@ -1,4 +1,6 @@
 <h3><%= t('adva.titles.actions') %></h3>
 <ul>
+  <li><%= link_to t('adva.issue.link.new'), new_admin_issue_path %></li>
   <li><%= link_to t('adva.subscription.link.new'), new_admin_subscription_path %></li>
 </ul>
+<%= render :partial => 'admin/shared/tracking' %>
diff --git a/engines/adva_newsletter/app/views/admin/newsletter_subscriptions/new.html.erb b/engines/adva_newsletter/app/views/admin/newsletter_subscriptions/new.html.erb
@@ -2,9 +2,10 @@
   <%= render :partial => 'admin/layouts/sidebar_manage' %>
   <h3><%= t('adva.titles.actions') %></h3>
   <ul>
-    <li><%= link_to t('adva.subscription.link.new'), new_admin_subscription_path(@site, @newsletter) %></li>
+    <%= render :partial => 'admin/shared/sidebar_common' %>
     <li><%= link_to t('adva.users.links.new'), new_admin_site_user_path %></li>
   </ul>
+  <%= render :partial => 'admin/shared/tracking' %>
 <% end %>
 
 <%= render :partial => 'admin/newsletters/header' %>

diff --git a/engines/adva_newsletter/app/views/admin/shared/_sidebar_common.html.erb b/engines/adva_newsletter/app/views/admin/shared/_sidebar_common.html.erb
@@ -0,0 +1,2 @@
+<li><%= link_to t('adva.issue.link.new'), new_admin_issue_path(@site, @newsletter) %></li>
+<li><%= link_to t('adva.subscription.link.new'), new_admin_subscription_path(@site, @newsletter) %></li>
diff --git a/engines/adva_newsletter/app/views/admin/shared/_tracking.html.erb b/engines/adva_newsletter/app/views/admin/shared/_tracking.html.erb
@@ -0,0 +1,34 @@
+<h3><%= t(:'adva.titles.tracking') %></h3>
+<% if @site.google_analytics_tracking_code -%>
+<% fields_for :issue do |f| -%>
+<p>
+  <%= f.check_box :track, :onclick => "$('tracking_options').toggle();" %>
+  <%= f.label :track, t(:'adva.tracking.enable_tracking'), :style => "display:inline;" %>
+</p>
+<div id="tracking_options" style="display:none;">
+  <span class="hint"><%= t(:'adva.tracking.hints.glossary', :link => link_to(t(:'adva.tracking.hints.glossary_name'), "http://www.google.com/support/googleanalytics/bin/topic.py?topic=11096&hl=#{I18n.locale}")) %>
+  <p>
+    <%= f.label :tracking_campaign, t(:'adva.tracking.tracking_campaign') %>
+    <%= f.text_field :tracking_campaign %>
+  </p>
+  <p>
+    <%= f.label :tracking_source, t(:'adva.tracking.tracking_source') %>
+    <%= f.text_field :tracking_source %>
+  </p>
+</div>
+<% end -%>
+<% else -%>
+<span class="hint"><%= t(:'adva.tracking.hints.no_tracking_code', :settings => link_to(t(:'adva.resources.settings'), edit_admin_site_path(@site))) %></span>
+<% end -%>
+<script type="text/javascript">
+toggleTrackingOptions = function(event) {
+  checkbox = event.element();
+
+  // pre-fill values if checkbox is checked
+  if(checkbox.checked) {
+    if(!$F('issue_tracking_campaign'))  $('issue_tracking_campaign').value = decodeURI('<%= @newsletter.title %>');
+    if(!$F('issue_tracking_source'))    $('issue_tracking_source').value = decodeURI($F('issue_title'));
+  }
+}
+$('issue_track').observe('click', toggleTrackingOptions);
+</script>