Commit 2e7ca8c866179e78866cba1659dee45185911f5a
1 parent
366c0065
Exists in
master
and in
4 other branches
Show only tm events related to this project
Showing
3 changed files
with
13 additions
and
11 deletions
Show diff stats
app/assets/stylesheets/sections/projects.scss
| 1 | -.projects { | 1 | +.projects { |
| 2 | @extend .row; | 2 | @extend .row; |
| 3 | .activities { | 3 | .activities { |
| 4 | } | 4 | } |
| 5 | 5 | ||
| 6 | - .side { | 6 | + .side { |
| 7 | @extend .span4; | 7 | @extend .span4; |
| 8 | @extend .right; | 8 | @extend .right; |
| 9 | 9 | ||
| 10 | - .projects_box { | ||
| 11 | - h5 { | 10 | + .projects_box { |
| 11 | + h5 { | ||
| 12 | color:$style_color; | 12 | color:$style_color; |
| 13 | font-size:16px; | 13 | font-size:16px; |
| 14 | text-shadow: 0 1px 1px #fff; | 14 | text-shadow: 0 1px 1px #fff; |
| 15 | + padding: 2px 10px; | ||
| 15 | } | 16 | } |
| 16 | @extend .leftbar; | 17 | @extend .leftbar; |
| 17 | @extend .ui-box; | 18 | @extend .ui-box; |
| @@ -19,19 +20,19 @@ | @@ -19,19 +20,19 @@ | ||
| 19 | } | 20 | } |
| 20 | } | 21 | } |
| 21 | 22 | ||
| 22 | -.new_project, | ||
| 23 | -.edit_project { | ||
| 24 | - .project_name_holder { | 23 | +.new_project, |
| 24 | +.edit_project { | ||
| 25 | + .project_name_holder { | ||
| 25 | input, | 26 | input, |
| 26 | - label { | 27 | + label { |
| 27 | font-size:16px; | 28 | font-size:16px; |
| 28 | line-height:20px; | 29 | line-height:20px; |
| 29 | padding:8px; | 30 | padding:8px; |
| 30 | } | 31 | } |
| 31 | - label { | 32 | + label { |
| 32 | color:#888; | 33 | color:#888; |
| 33 | } | 34 | } |
| 34 | - .btn { | 35 | + .btn { |
| 35 | padding:6px; | 36 | padding:6px; |
| 36 | margin-left:10px; | 37 | margin-left:10px; |
| 37 | } | 38 | } |
app/controllers/team_members_controller.rb
| @@ -9,6 +9,7 @@ class TeamMembersController < ApplicationController | @@ -9,6 +9,7 @@ class TeamMembersController < ApplicationController | ||
| 9 | 9 | ||
| 10 | def show | 10 | def show |
| 11 | @team_member = project.users_projects.find(params[:id]) | 11 | @team_member = project.users_projects.find(params[:id]) |
| 12 | + @events = @team_member.user.recent_events.where(:project_id => @project.id).limit(7) | ||
| 12 | end | 13 | end |
| 13 | 14 | ||
| 14 | def new | 15 | def new |
app/views/team_members/show.html.haml
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | = form_for(@team_member, as: :team_member, url: project_team_member_path(@project, @team_member)) do |f| | 51 | = form_for(@team_member, as: :team_member, url: project_team_member_path(@project, @team_member)) do |f| |
| 52 | = f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, class: "project-access-select", disabled: !allow_admin | 52 | = f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, class: "project-access-select", disabled: !allow_admin |
| 53 | %hr | 53 | %hr |
| 54 | - = render user.recent_events.limit(5) | 54 | + = render @events |
| 55 | :javascript | 55 | :javascript |
| 56 | $(function(){ | 56 | $(function(){ |
| 57 | $('.repo-access-select, .project-access-select').live("change", function() { | 57 | $('.repo-access-select, .project-access-select').live("change", function() { |