Commit 9959669f1cb533e14e5df8d240c7560a2f258f84
1 parent
3d4e3245
Exists in
master
and in
4 other branches
Desctiptions removed from dashboard
Showing
6 changed files
with
13 additions
and
81 deletions
Show diff stats
app/assets/stylesheets/application.scss
| @@ -20,8 +20,6 @@ | @@ -20,8 +20,6 @@ | ||
| 20 | @import "sections/nav.scss"; | 20 | @import "sections/nav.scss"; |
| 21 | @import "sections/commits.scss"; | 21 | @import "sections/commits.scss"; |
| 22 | @import "sections/issues.scss"; | 22 | @import "sections/issues.scss"; |
| 23 | -@import "sections/groups.scss"; | ||
| 24 | -@import "sections/teams.scss"; | ||
| 25 | @import "sections/projects.scss"; | 23 | @import "sections/projects.scss"; |
| 26 | @import "sections/snippets.scss"; | 24 | @import "sections/snippets.scss"; |
| 27 | @import "sections/votes.scss"; | 25 | @import "sections/votes.scss"; |
app/assets/stylesheets/sections/groups.scss
| @@ -1,31 +0,0 @@ | @@ -1,31 +0,0 @@ | ||
| 1 | -.projects { | ||
| 2 | - @extend .row; | ||
| 3 | - .activities { | ||
| 4 | - } | ||
| 5 | - | ||
| 6 | - .side { | ||
| 7 | - @extend .right; | ||
| 8 | - | ||
| 9 | - .groups_box { | ||
| 10 | - > .title { | ||
| 11 | - padding: 2px 15px; | ||
| 12 | - } | ||
| 13 | - .well-list { | ||
| 14 | - li { padding: 15px; } | ||
| 15 | - .edit { | ||
| 16 | - float: right; | ||
| 17 | - margin: 0; | ||
| 18 | - } | ||
| 19 | - .description { | ||
| 20 | - padding-top: 5px; | ||
| 21 | - display: block; | ||
| 22 | - span, strong { | ||
| 23 | - font-size: 12px; | ||
| 24 | - color: #666; | ||
| 25 | - } | ||
| 26 | - } | ||
| 27 | - } | ||
| 28 | - @extend .ui-box; | ||
| 29 | - } | ||
| 30 | - } | ||
| 31 | -} |
app/assets/stylesheets/sections/teams.scss
| @@ -1,31 +0,0 @@ | @@ -1,31 +0,0 @@ | ||
| 1 | -.projects { | ||
| 2 | - @extend .row; | ||
| 3 | - .activities { | ||
| 4 | - } | ||
| 5 | - | ||
| 6 | - .side { | ||
| 7 | - @extend .right; | ||
| 8 | - | ||
| 9 | - .teams_box { | ||
| 10 | - > .title { | ||
| 11 | - padding: 2px 15px; | ||
| 12 | - } | ||
| 13 | - .well-list { | ||
| 14 | - li { padding: 15px; } | ||
| 15 | - .edit { | ||
| 16 | - float: right; | ||
| 17 | - margin: 0; | ||
| 18 | - } | ||
| 19 | - .description { | ||
| 20 | - padding-top: 5px; | ||
| 21 | - display: block; | ||
| 22 | - span, strong { | ||
| 23 | - font-size: 12px; | ||
| 24 | - color: #666; | ||
| 25 | - } | ||
| 26 | - } | ||
| 27 | - } | ||
| 28 | - @extend .ui-box; | ||
| 29 | - } | ||
| 30 | - } | ||
| 31 | -} |
app/views/dashboard/_groups.html.haml
| 1 | -.groups_box | 1 | +.ui-box |
| 2 | %h5.title | 2 | %h5.title |
| 3 | Groups | 3 | Groups |
| 4 | %small | 4 | %small |
| @@ -13,8 +13,6 @@ | @@ -13,8 +13,6 @@ | ||
| 13 | %li | 13 | %li |
| 14 | = link_to group_path(id: group.path), class: dom_class(group) do | 14 | = link_to group_path(id: group.path), class: dom_class(group) do |
| 15 | %strong.well-title= truncate(group.name, length: 35) | 15 | %strong.well-title= truncate(group.name, length: 35) |
| 16 | - %span.edit.light | ||
| 17 | - - if group.owner == current_user | ||
| 18 | - %i.icon-wrench | ||
| 19 | - %span.description | ||
| 20 | - %strong= group.description | 16 | + %span.pull-right.light |
| 17 | + - if group.owner == current_user | ||
| 18 | + %i.icon-wrench |
app/views/dashboard/_teams.html.haml
| 1 | -.ui-box.teams_box | 1 | +.ui-box.teams-box |
| 2 | %h5.title | 2 | %h5.title |
| 3 | Teams | 3 | Teams |
| 4 | %small | 4 | %small |
| @@ -12,11 +12,9 @@ | @@ -12,11 +12,9 @@ | ||
| 12 | %li | 12 | %li |
| 13 | = link_to team_path(id: team.path), class: dom_class(team) do | 13 | = link_to team_path(id: team.path), class: dom_class(team) do |
| 14 | %strong.well-title= truncate(team.name, length: 35) | 14 | %strong.well-title= truncate(team.name, length: 35) |
| 15 | - %span.edit.light | ||
| 16 | - - if team.owner == current_user | ||
| 17 | - %i.icon-wrench | ||
| 18 | - - tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id) | ||
| 19 | - - if tm | ||
| 20 | - = tm.access_human | ||
| 21 | - %span.description | ||
| 22 | - %strong= team.description | 15 | + %span.pull-right.light |
| 16 | + - if team.owner == current_user | ||
| 17 | + %i.icon-wrench | ||
| 18 | + - tm = current_user.user_team_user_relationships.find_by_user_team_id(team.id) | ||
| 19 | + - if tm | ||
| 20 | + = tm.access_human |
features/steps/userteams/userteams.rb
| @@ -8,7 +8,7 @@ class Userteams < Spinach::FeatureSteps | @@ -8,7 +8,7 @@ class Userteams < Spinach::FeatureSteps | ||
| 8 | end | 8 | end |
| 9 | 9 | ||
| 10 | Then 'I should see dashboard page without teams info block' do | 10 | Then 'I should see dashboard page without teams info block' do |
| 11 | - page.has_no_css?(".teams_box").must_equal true | 11 | + page.has_no_css?(".teams-box").must_equal true |
| 12 | end | 12 | end |
| 13 | 13 | ||
| 14 | When 'I have teams with my membership' do | 14 | When 'I have teams with my membership' do |
| @@ -17,7 +17,7 @@ class Userteams < Spinach::FeatureSteps | @@ -17,7 +17,7 @@ class Userteams < Spinach::FeatureSteps | ||
| 17 | end | 17 | end |
| 18 | 18 | ||
| 19 | Then 'I should see dashboard page with teams information block' do | 19 | Then 'I should see dashboard page with teams information block' do |
| 20 | - page.should have_css(".teams_box") | 20 | + page.should have_css(".teams-box") |
| 21 | end | 21 | end |
| 22 | 22 | ||
| 23 | When 'exist user teams' do | 23 | When 'exist user teams' do |