Download as
Browse Code »

Commit 88d42c2e1c5ef3d312efbba658d852e638bf8f31

Authored by Dmitriy Zaporozhets
1 parent e84df44e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Replace projects_box with ui-box. Fixed team spinach test

Showing 8 changed files with 15 additions and 20 deletions   Show diff stats
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @88d42c2
... ... @@ -6,11 +6,8 @@
6 6 .side {
7 7 @extend .pull-right;
8 8  
9   - .projects_box, .ui-box {
  9 + .ui-box {
10 10 margin: 3px;
11   - }
12   -
13   - .projects_box {
14 11 > .title {
15 12 padding: 2px 15px;
16 13 }
... ...
app/views/dashboard/_groups.html.haml
  Diff comments   View file @88d42c2
... ... @@ -12,10 +12,13 @@
12 12 - groups.each do |group|
13 13 %li
14 14 = link_to group_path(id: group.path), class: dom_class(group) do
15   - %strong.well-title= truncate(group.name, length: 35)
16   - %span.pull-right.light
17   - - if group.owner == current_user
18   - %i.icon-wrench
  15 + %strong.well-title
  16 + = truncate(group.name, length: 35)
  17 + %span.arrow
  18 + →
  19 + %span.last_activity
  20 + %strong Owner:
  21 + %span= group.owner_name
19 22 - if groups.blank?
20 23 %li
21 24 %h3.nothing_here_message You have no groups yet.
... ...
app/views/dashboard/_projects.html.haml
  Diff comments   View file @88d42c2
1   -.projects_box
  1 +.ui-box
2 2 %h5.title
3 3 Projects
4 4 %small
... ...
app/views/groups/_projects.html.haml
  Diff comments   View file @88d42c2
1   -.projects_box
  1 +.ui-box
2 2 %h5.title
3 3 Projects
4 4 %small
... ...
app/views/teams/_projects.html.haml
  Diff comments   View file @88d42c2
1   -.projects_box
  1 +.ui-box
2 2 %h5.title
3 3 Projects
4 4 %small
... ...
app/views/teams/edit.html.haml
  Diff comments   View file @88d42c2
... ... @@ -11,7 +11,7 @@
11 11 .span9
12 12 .tab-content
13 13 .tab-pane.active#tab-projects
14   - .ui-box
  14 + .ui-box.projects-table
15 15 %h5.title Projects
16 16 %ul.well-list
17 17 - @projects.each do |project|
... ...
features/steps/userteams/userteams.rb
  Diff comments   View file @88d42c2
... ... @@ -206,12 +206,8 @@ class Userteams < Spinach::FeatureSteps
206 206 visit team_path(team)
207 207 end
208 208  
209   - When 'I click on link "Projects"' do
210   - click_link "Projects"
211   - end
212   -
213   - And 'I click link "Assign project to Team"' do
214   - click_link "Assign project to Team"
  209 + When 'I click on link "Assign Project"' do
  210 + click_link "Assign Project"
215 211 end
216 212  
217 213 Then 'I should see form with my own project in avaliable projects list' do
... ...
features/teams/team.feature
  Diff comments   View file @88d42c2
... ... @@ -59,8 +59,7 @@ Feature: UserTeams
59 59 Given I have team with projects and members
60 60 And I have my own project without teams
61 61 And I visit my team page
62   - When I click on link "Projects"
63   - And I click link "Assign project to Team"
  62 + When I click on link "Assign Project"
64 63 Then I should see form with my own project in avaliable projects list
65 64 When I submit form with selected project and max access
66 65 Then I should see my own project in team projects list
... ...