Commit 436e96467dba5ccbaa5ffef21f760f6441fe8a0f
1 parent
b07c02eb
Exists in
master
and in
4 other branches
Nicer icons for enabled/disabled stuff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
5 changed files
with
7 additions
and
15 deletions
Show diff stats
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/helpers/icons_helper.rb
| 1 | module IconsHelper | 1 | module IconsHelper |
| 2 | def boolean_to_icon(value) | 2 | def boolean_to_icon(value) |
| 3 | if value.to_s == "true" | 3 | if value.to_s == "true" |
| 4 | - content_tag :i, nil, class: 'icon-circle cgreen' | 4 | + content_tag :i, nil, class: 'icon-ok cgreen' |
| 5 | else | 5 | else |
| 6 | - content_tag :i, nil, class: 'icon-circle cgray' | 6 | + content_tag :i, nil, class: 'icon-off clgray' |
| 7 | end | 7 | end |
| 8 | end | 8 | end |
| 9 | 9 |
app/models/hipchat_service.rb
app/views/projects/services/_form.html.haml
app/views/projects/services/index.html.haml
| @@ -6,12 +6,8 @@ | @@ -6,12 +6,8 @@ | ||
| 6 | - @services.each do |service| | 6 | - @services.each do |service| |
| 7 | %li | 7 | %li |
| 8 | %h4 | 8 | %h4 |
| 9 | - - if service.activated? | ||
| 10 | - %span.cgreen | ||
| 11 | - %i.icon-circle | ||
| 12 | - - else | ||
| 13 | - %span.cgray | ||
| 14 | - %i.icon-circle-blank | ||
| 15 | = link_to edit_project_service_path(@project, service.to_param) do | 9 | = link_to edit_project_service_path(@project, service.to_param) do |
| 16 | = service.title | 10 | = service.title |
| 11 | + .pull-right | ||
| 12 | + = boolean_to_icon service.activated? | ||
| 17 | %p= service.description | 13 | %p= service.description |