Tweak how aliases breadcrumbs are generated

5 files changed, 10 insertions, 8 deletions

diff --git a/app/controllers/emails_controller.rb b/app/controllers/emails_controller.rb
index 8f6b6ce..d02b2ad 100644
--- a/app/controllers/emails_controller.rb
+++ b/app/controllers/emails_controller.rb
@@ -6,10 +6,12 @@ class EmailsController < ApplicationController
   
   def index
     @emails = @user.email_aliases
+    @root = Breadcrumb::Aliases.new(current_user)
   end
   
   def new
     @email = @user.email_aliases.new
+    @root = Breadcrumb::NewAlias.new(current_user)
   end
   
   def create
diff --git a/app/helpers/breadcrumbs_helper.rb b/app/helpers/breadcrumbs_helper.rb
index 607b5f2..848addd 100644
--- a/app/helpers/breadcrumbs_helper.rb
+++ b/app/helpers/breadcrumbs_helper.rb
@@ -59,7 +59,7 @@ module BreadcrumbsHelper
       messages_path
     when Breadcrumb::SentMessages 
       sent_messages_path
-    when Breadcrumb::UserAliases
+    when Breadcrumb::Aliases
       user_emails_path
     when Message
       an_object.new_record? ? new_message_path : message_path(an_object)
diff --git a/app/views/emails/index.html.erb b/app/views/emails/index.html.erb
index 39431b8..f031972 100644
--- a/app/views/emails/index.html.erb
+++ b/app/views/emails/index.html.erb
@@ -1,6 +1,6 @@
 <% @page_title = t("views.aliases.aliases_title") -%>
 <% content_for :submenu do -%>
-  <%= render :partial => "site/breadcrumbs", :locals => {:root => Breadcrumb::UserAliases.new(current_user) } -%>
+  <%= render :partial => "site/breadcrumbs", :locals => {:root => @root } -%>
 <% end -%>
 
 <h1><%= t("views.aliases.aliases_title") -%></h1>
diff --git a/app/views/emails/new.html.erb b/app/views/emails/new.html.erb
index b6c6cd2..41a252f 100644
--- a/app/views/emails/new.html.erb
+++ b/app/views/emails/new.html.erb
@@ -1,6 +1,6 @@
-<% @page_title = t("views.emails.new_alias") -%>
+<% @page_title = t("views.aliases.new_alias") -%>
 <% content_for :submenu do -%>
-  <%= render :partial => "site/breadcrumbs", :locals => {:root => Breadcrumb::UserNewAlias.new(current_user)} -%>
+  <%= render :partial => "site/breadcrumbs", :locals => {:root => @root} -%>
 <% end -%>
 
 <h1><%= t("views.aliases.new_alias") -%></h1>
diff --git a/lib/breadcrumb.rb b/lib/breadcrumb.rb
index 30ac74f..18bdd0b 100644
--- a/lib/breadcrumb.rb
+++ b/lib/breadcrumb.rb
@@ -198,7 +198,7 @@ module Breadcrumb
     end
   end
 
-  class UserAliases
+  class Aliases
     def initialize(user)
       @user = user
     end
@@ -216,13 +216,13 @@ module Breadcrumb
     end
   end
 
-  class UserNewAlias
-    def initialize(user)
+  class NewAlias
+  def initialize(user)
       @user = user
     end
 
     def breadcrumb_parent
-      Breadcrumb::UserAliases.new(@user)
+      Aliases.new(@user)
     end
 
     def title