diff options
| author | Luc Donnet | 2014-10-10 10:53:40 +0200 |
|---|---|---|
| committer | Luc Donnet | 2014-10-10 10:53:40 +0200 |
| commit | 9795df2fd81653142b3617a42048bd775dd297db (patch) | |
| tree | c3ee6844407b314575cb937ab2ba6587f86fcb43 | |
| parent | ceda2215d35e1ac2923af62f3f00f2feb214764e (diff) | |
| download | chouette-core-9795df2fd81653142b3617a42048bd775dd297db.tar.bz2 | |
Fix css for multiple selection line Refs #0029199
| -rw-r--r-- | app/assets/javascripts/multiple_selection.js.coffee | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/lines.css.scss | 5 | ||||
| -rw-r--r-- | app/views/lines/_line.erb | 10 |
3 files changed, 13 insertions, 8 deletions
diff --git a/app/assets/javascripts/multiple_selection.js.coffee b/app/assets/javascripts/multiple_selection.js.coffee index 86b260fb7..fc81fd5d0 100644 --- a/app/assets/javascripts/multiple_selection.js.coffee +++ b/app/assets/javascripts/multiple_selection.js.coffee @@ -3,7 +3,8 @@ jQuery -> event.preventDefault() $('#multiple_selection_menu div.enabled').show() $('#multiple_selection_menu div.disabled').hide() - $('input[type=checkbox].multiple_selection').fadeIn() + $('input[type=checkbox].multiple_selection').show() + $('.line_number').hide() $('#multiple_selection_menu a.enable').click(enable_multiple_selection) @@ -11,7 +12,8 @@ jQuery -> event.preventDefault() $('#multiple_selection_menu div.enabled').hide() $('#multiple_selection_menu div.disabled').show() - $('input[type=checkbox].multiple_selection').fadeOut() + $('input[type=checkbox].multiple_selection').hide() + $('.line_number').show() $('#multiple_selection_menu a.disable').click(disable_multiple_selection) diff --git a/app/assets/stylesheets/main/lines.css.scss b/app/assets/stylesheets/main/lines.css.scss index 653ca899c..0f2cc3593 100644 --- a/app/assets/stylesheets/main/lines.css.scss +++ b/app/assets/stylesheets/main/lines.css.scss @@ -3,7 +3,10 @@ // You can use Sass (SCSS) here: http://sass-lang.com/ #workspace.lines.index -{ +{ + input[type="checkbox"].multiple_selection{ + vertical-align: middle; + } } #workspace.lines.edit, #workspace.lines.new, #workspace.lines.create, #workspace.lines.update diff --git a/app/views/lines/_line.erb b/app/views/lines/_line.erb index 9c4b816bd..f5606d907 100644 --- a/app/views/lines/_line.erb +++ b/app/views/lines/_line.erb @@ -10,12 +10,12 @@ <% end %> </span> <h5> - <%= link_to([@referential, line], :class => "preview", :title => "#{Chouette::Line.model_name.human.capitalize} #{line.name}") do %> + <%= check_box_tag "ids[]", line.id, false, :class => "multiple_selection", :style => "display: none;" %> <% if line.number and line.number.length <= 3 %> - <span class="label label-default"><%= line.number %></span> - <% end %> - <span class="name"> - <%= check_box_tag "ids[]", line.id, false, :class => "multiple_selection", :style => "display: none;" %> + <span class="label label-default line_number"><%= line.number %></span> + <% end %> + <%= link_to([@referential, line], :class => "preview", :title => "#{Chouette::Line.model_name.human.capitalize} #{line.name}") do %> + <span class="name"> <%= truncate(line.name, :length => 20) %> </span> <% end %> |