deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Replace projects_box with ui-box. Fixed team spinach test

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-14 13:12:11 +02:00
parent e84df44ea0
commit 88d42c2e1c
8 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/sections/projects.scss
View file

@ -6,11 +6,8 @@
.side { .side {
@extend .pull-right; @extend .pull-right;
.projects_box, .ui-box { .ui-box {
margin: 3px; margin: 3px;
}
.projects_box {
> .title { > .title {
padding: 2px 15px; padding: 2px 15px;
} }

11
app/views/dashboard/_groups.html.haml
View file

@ -12,10 +12,13 @@
- groups.each do |group| - groups.each do |group|
%li %li
= link_to group_path(id: group.path), class: dom_class(group) do = link_to group_path(id: group.path), class: dom_class(group) do
%strong.well-title= truncate(group.name, length: 35) %strong.well-title
%span.pull-right.light = truncate(group.name, length: 35)
- if group.owner == current_user %span.arrow
%i.icon-wrench →
%span.last_activity
%strong Owner:
%span= group.owner_name
- if groups.blank? - if groups.blank?
%li %li
%h3.nothing_here_message You have no groups yet. %h3.nothing_here_message You have no groups yet.

2
app/views/dashboard/_projects.html.haml
View file

@ -1,4 +1,4 @@
.projects_box .ui-box
%h5.title %h5.title
Projects Projects
%small %small

2
app/views/groups/_projects.html.haml
View file

@ -1,4 +1,4 @@
.projects_box .ui-box
%h5.title %h5.title
Projects Projects
%small %small

2
app/views/teams/_projects.html.haml
View file

@ -1,4 +1,4 @@
.projects_box .ui-box
%h5.title %h5.title
Projects Projects
%small %small

2
app/views/teams/edit.html.haml
View file

@ -11,7 +11,7 @@
.span9 .span9
.tab-content .tab-content
.tab-pane.active#tab-projects .tab-pane.active#tab-projects
.ui-box .ui-box.projects-table
%h5.title Projects %h5.title Projects
%ul.well-list %ul.well-list
- @projects.each do |project| - @projects.each do |project|

8
features/steps/userteams/userteams.rb
View file

@ -206,12 +206,8 @@ class Userteams < Spinach::FeatureSteps
visit team_path(team) visit team_path(team)
end end
When 'I click on link "Projects"' do When 'I click on link "Assign Project"' do
click_link "Projects" click_link "Assign Project"
end
And 'I click link "Assign project to Team"' do
click_link "Assign project to Team"
end end
Then 'I should see form with my own project in avaliable projects list' do Then 'I should see form with my own project in avaliable projects list' do

3
features/teams/team.feature
View file

@ -59,8 +59,7 @@ Feature: UserTeams
Given I have team with projects and members Given I have team with projects and members
And I have my own project without teams And I have my own project without teams
And I visit my team page And I visit my team page
When I click on link "Projects" When I click on link "Assign Project"
And I click link "Assign project to Team"
Then I should see form with my own project in avaliable projects list Then I should see form with my own project in avaliable projects list
When I submit form with selected project and max access When I submit form with selected project and max access
Then I should see my own project in team projects list Then I should see my own project in team projects list