diff options
| author | Michel Etienne | 2014-09-30 11:21:30 +0200 |
|---|---|---|
| committer | Michel Etienne | 2014-09-30 11:21:30 +0200 |
| commit | 779c396102f0843f95b78e7d63be6a4eefb7362a (patch) | |
| tree | ef56632d2fa58e3e8c5dec17080a4308cb5291e2 | |
| parent | 22d897aef77631855bf9fae6cde07de2a9ae1c13 (diff) | |
| download | chouette-core-779c396102f0843f95b78e7d63be6a4eefb7362a.tar.bz2 | |
acces link creation without geometry, Mantis 29071
| -rw-r--r-- | app/maps/access_link_map.rb | 2 | ||||
| -rw-r--r-- | app/views/stop_areas/access_links.html.erb | 65 |
2 files changed, 40 insertions, 27 deletions
diff --git a/app/maps/access_link_map.rb b/app/maps/access_link_map.rb index 35873a9b1..544a1e792 100644 --- a/app/maps/access_link_map.rb +++ b/app/maps/access_link_map.rb @@ -23,7 +23,7 @@ class AccessLinkMap < ApplicationMap end def bounds - @bounds ||= GeoRuby::SimpleFeatures::Point.bounds([access_link.stop_area.geometry,access_link.access_point.geometry]) + @bounds ||= GeoRuby::SimpleFeatures::Point.bounds([access_link.stop_area.geometry,access_link.access_point.geometry].compact) end end diff --git a/app/views/stop_areas/access_links.html.erb b/app/views/stop_areas/access_links.html.erb index d4727d7db..3ff1812b3 100644 --- a/app/views/stop_areas/access_links.html.erb +++ b/app/views/stop_areas/access_links.html.erb @@ -1,33 +1,46 @@ <%= title_tag t('stop_areas.access_links.title', :stop_area => @stop_area.name ) %> <div class="stop_area_show"> - <h3 class="stop_area_generics"> - <a class="generics"><%= t('.generic_access_links') %> - <%= image_tag("icons/plus.png" , :class => "switcher", :style => "display: none;") %> - <%= image_tag("icons/minus.png" , :class => "switcher" ) %> - </a> - - </h3> - <div class="generics content"> - <div class="access_link_pairs"> - <table> - <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@generic_access_links) %> - </table> - </div> + +<div class="panel-group" id="accordion"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a data-toggle="collapse" data-parent="#accordion" href="#generic_access_links"> + <%= t('.generic_access_links') %> + </a> + </h4> + </div> + <div id="generic_access_links" class="panel-collapse collapse in"> + <div class="panel-body"> + <div class="access_link_pairs"> + <table> + <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@generic_access_links) %> + </table> + </div> + </div> + </div> </div> - <h3 class="stop_area_generics"> - <a class="details"><%= t('.detail_access_links') %> - <%= image_tag("icons/plus.png" , :class => "switcher") %> - <%= image_tag("icons/minus.png" , :class => "switcher", :style => "display: none;" ) %> - </a> - - </h3> - <div class="details content" style="display: none;"> - <div class="access_link_pairs"> - <table> - <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@detail_access_links) %> - </table> - </div> +</div> + +<div class="panel-group" id="accordion"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a data-toggle="collapse" data-parent="#accordion" href="#detail_access_links"> + <%= t('.detail_access_links') %> + </a> + </h4> + </div> + <div id="detail_access_links" class="panel-collapse collapse"> + <div class="panel-body"> + <div class="access_link_pairs"> + <table> + <%= render :partial => "access_link_pairs/access_link_pair", :collection => access_links_pairs(@detail_access_links) %> + </table> + </div> + </div> + </div> </div> </div> |