Add missing breadcrumbs for new and edit memberships.

6 files changed, 47 insertions, 1 deletions

diff --git a/app/controllers/memberships_controller.rb b/app/controllers/memberships_controller.rb
index fc27adc..3431adc 100644
--- a/app/controllers/memberships_controller.rb
+++ b/app/controllers/memberships_controller.rb
@@ -32,6 +32,7 @@ class MembershipsController < ApplicationController
   
   def new
     @membership = @group.memberships.new
+    @root = Breadcrumb::NewMembership.new(@group)
   end
   
   def create
@@ -39,6 +40,7 @@ class MembershipsController < ApplicationController
       :group  => @group, 
       :user   => User.find_by_login!(params[:user][:login]),
       :role   => Role.find(params[:membership][:role_id]))
+    @root = Breadcrumb::NewMembership.new(@group)
     if @membership.save
       flash[:success] = I18n.t("memberships_controller.membership_created")
       redirect_to group_memberships_path(@group)
diff --git a/app/views/groups/edit.html.erb b/app/views/groups/edit.html.erb
index e23c960..e440127 100644
--- a/app/views/groups/edit.html.erb
+++ b/app/views/groups/edit.html.erb
@@ -17,6 +17,8 @@
 #++
 %>
 
+<%= breadcrumbs_from(Breadcrumb::GroupEdit.new(@group)) -%>
+
 <h1><%= t("views.groups.update_team") -%></h1>
 
 <%= error_messages_for :group -%>
diff --git a/app/views/memberships/new.html.erb b/app/views/memberships/new.html.erb
index b901428..7e0caac 100644
--- a/app/views/memberships/new.html.erb
+++ b/app/views/memberships/new.html.erb
@@ -24,6 +24,8 @@ $(document).ready(function() {
   });
 </script>
 
+<%= breadcrumbs_from(@root) -%>
+
 <h1>
   <%= t("views.memberships.new_title", 
         :group_memberships => link_to(h(@group.name), [@group, :memberships])) -%>
diff --git a/config/locales/en.rb b/config/locales/en.rb
index 0a46e90..2169e0d 100644
--- a/config/locales/en.rb
+++ b/config/locales/en.rb
@@ -519,6 +519,7 @@
         :role => "Role",
         :header_title => "Members in {{group_name}}",
         :new_title => "Add new member to {{group_memberships}}",
+        :new_breadcrumb => "Add new member",
       },
       :groups => {
         :create_team => "Create a new team",
@@ -536,7 +537,8 @@
         :edit_memberships => "Edit memberships",
         :edit_team  => 'Edit team',
         :description => 'Team description',
-        :avatar => 'Team image/logo:'
+        :avatar => 'Team image/logo:',
+        :edit_breadcrumb => "Edit Details",
       },
       :collaborators => {
         :add_new => "Add collaborators",
diff --git a/lib/breadcrumb.rb b/lib/breadcrumb.rb
index d386ff5..d949fd7 100644
--- a/lib/breadcrumb.rb
+++ b/lib/breadcrumb.rb
@@ -130,6 +130,42 @@ module Breadcrumb
     end
   end
 
+  class NewMembership
+    def initialize(group)
+      @group = group
+    end
+
+    def breadcrumb_parent
+      @group
+    end
+
+    def title
+      I18n.t("views.memberships.new_breadcrumb")
+    end
+
+    def breadcrumb_css_class
+      "add_membership"
+    end
+  end
+
+  class GroupEdit
+    def initialize(group)
+      @group = group
+    end
+
+    def breadcrumb_parent
+      @group
+    end
+
+    def title
+      I18n.t("views.groups.edit_breadcrumb")
+    end
+
+    def breadcrumb_css_class
+      "edit_group"
+    end
+  end
+
   class Committerships
     def initialize(repository)
       @repository = repository
diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css
index b92ee45..f42ab8f 100644
--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -551,6 +551,7 @@ li.project_research > a { background-image: url("../images/silk/report_magnify.p
 li.user > a { background-image: url("../images/silk/user.png") !important; }
 
 li.group > a { background-image: url("../images/silk/group.png") !important; }
+li.edit_group > a { background-image: url("../images/silk/group_edit.png") !important; }
 
 li.repository > a { background-image: url("../images/silk/database.png") !important; }
 li.repository.mainline > a { background-image: url("../images/silk/database_star.png") !important; }
@@ -627,6 +628,7 @@ table.tree tr td.submodule a { background-image: url("../images/silk/folder_go.p
 li.wiki a {background-image: url('../images/silk/book_open.png');}
 li.memberships a, li.committerships a {background-image: url('../images/silk/group_gear.png');}
 li.membership a, li.committership a {background-image: url('../images/silk/group_edit.png');}
+li.add_membership a, li.add_commitership a { background-image: url("../images/silk/group_add.png");}
 
 li.merge_requests a.selected { color: #09460F;}