diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index 6568d42..b6b1423 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -6,11 +6,8 @@ .side { @extend .pull-right; - .projects_box, .ui-box { + .ui-box { margin: 3px; - } - - .projects_box { > .title { padding: 2px 15px; } diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml index 89158f4..3124d76 100644 --- a/app/views/dashboard/_groups.html.haml +++ b/app/views/dashboard/_groups.html.haml @@ -12,10 +12,13 @@ - groups.each do |group| %li = link_to group_path(id: group.path), class: dom_class(group) do - %strong.well-title= truncate(group.name, length: 35) - %span.pull-right.light - - if group.owner == current_user - %i.icon-wrench + %strong.well-title + = truncate(group.name, length: 35) + %span.arrow + → + %span.last_activity + %strong Owner: + %span= group.owner_name - if groups.blank? %li %h3.nothing_here_message You have no groups yet. diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml index 30fb726..105e23f 100644 --- a/app/views/dashboard/_projects.html.haml +++ b/app/views/dashboard/_projects.html.haml @@ -1,4 +1,4 @@ -.projects_box +.ui-box %h5.title Projects %small diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index 4fa4a17..bf1a624 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -1,4 +1,4 @@ -.projects_box +.ui-box %h5.title Projects %small diff --git a/app/views/teams/_projects.html.haml b/app/views/teams/_projects.html.haml index 238db92..09dff4e 100644 --- a/app/views/teams/_projects.html.haml +++ b/app/views/teams/_projects.html.haml @@ -1,4 +1,4 @@ -.projects_box +.ui-box %h5.title Projects %small diff --git a/app/views/teams/edit.html.haml b/app/views/teams/edit.html.haml index 2e13c1e..c9d573e 100644 --- a/app/views/teams/edit.html.haml +++ b/app/views/teams/edit.html.haml @@ -11,7 +11,7 @@ .span9 .tab-content .tab-pane.active#tab-projects - .ui-box + .ui-box.projects-table %h5.title Projects %ul.well-list - @projects.each do |project| diff --git a/features/steps/userteams/userteams.rb b/features/steps/userteams/userteams.rb index f049431..5835deb 100644 --- a/features/steps/userteams/userteams.rb +++ b/features/steps/userteams/userteams.rb @@ -206,12 +206,8 @@ class Userteams < Spinach::FeatureSteps visit team_path(team) end - When 'I click on link "Projects"' do - click_link "Projects" - end - - And 'I click link "Assign project to Team"' do - click_link "Assign project to Team" + When 'I click on link "Assign Project"' do + click_link "Assign Project" end Then 'I should see form with my own project in avaliable projects list' do diff --git a/features/teams/team.feature b/features/teams/team.feature index 5b7c15a..1ae1812 100644 --- a/features/teams/team.feature +++ b/features/teams/team.feature @@ -59,8 +59,7 @@ Feature: UserTeams Given I have team with projects and members And I have my own project without teams And I visit my team page - When I click on link "Projects" - And I click link "Assign project to Team" + When I click on link "Assign Project" Then I should see form with my own project in avaliable projects list When I submit form with selected project and max access Then I should see my own project in team projects list -- libgit2 0.21.2