diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/layout.css.scss | 9 | ||||
| -rw-r--r-- | app/maps/connection_link_map.rb | 5 | ||||
| -rw-r--r-- | app/views/connection_links/select_areas.html.erb | 3 | ||||
| -rw-r--r-- | app/views/help/documentation.textile | 6 | ||||
| -rw-r--r-- | app/views/help/toc.textile | 1 | ||||
| -rw-r--r-- | app/views/imports/new.html.erb | 2 | ||||
| -rw-r--r-- | app/views/journey_patterns/_form.html.erb | 4 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 2 | ||||
| -rw-r--r-- | app/views/stop_areas/add_children.html.erb | 3 | ||||
| -rw-r--r-- | app/views/stop_areas/select_parent.html.erb | 3 | ||||
| -rw-r--r-- | app/views/stop_areas/show.html.erb | 2 |
11 files changed, 30 insertions, 10 deletions
diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index b9a715465..e93ec699c 100644 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -7,6 +7,15 @@ $text_color: #222; @import "user_interface/layout"; +#header .infos div.title h1 { + border: 1px solid white; + font-size: 30px; + margin: 20px 0 0 100px; + padding: 3px 15px 3px 15px; + font-weight: bold; +} + + #sidebar ul { padding: 0 8px; diff --git a/app/maps/connection_link_map.rb b/app/maps/connection_link_map.rb index a6fb8517c..897da8a5d 100644 --- a/app/maps/connection_link_map.rb +++ b/app/maps/connection_link_map.rb @@ -17,8 +17,11 @@ class ConnectionLinkMap < ApplicationMap page << map.add_layer(google_hybrid) page << map.add_layer(google_satellite) + page.assign "stop_areas_layer", kml_layer(polymorphic_path([referential, connection_link, :stop_areas], :format => :kml), :styleMap => StyleMap::StopAreasStyleMap.new.style_map) + page << map.add_layer(:stop_areas_layer) + page << map.add_control( hover_control_display_name(:stop_areas_layer) ) #page << map.add_layer(kml_layer(connection_link, :styleMap => StyleMap::ConnectionLinkStyleMap.new( :style => connection_link_style).style_map)) - page << map.add_layer(kml_layer(polymorphic_path([referential, connection_link, :stop_areas], :format => :kml), :styleMap => StyleMap::StopAreasStyleMap.new.style_map)) + #page << map.add_layer(kml_layer(polymorphic_path([referential, connection_link, :stop_areas], :format => :kml), :styleMap => StyleMap::StopAreasStyleMap.new.style_map)) page << map.zoom_to_extent(bounds) if bounds end end diff --git a/app/views/connection_links/select_areas.html.erb b/app/views/connection_links/select_areas.html.erb index 0c46395d7..2df3831b4 100644 --- a/app/views/connection_links/select_areas.html.erb +++ b/app/views/connection_links/select_areas.html.erb @@ -9,7 +9,8 @@ <%= form.buttons do %> <%= form.commit_button %> - ou <%= link_to "revenir", [@referential, @connection_link] %> + <%= t('or') %> + <%= link_to t('cancel'), [@referential, @connection_link] %> <% end %> </div> <% end %> diff --git a/app/views/help/documentation.textile b/app/views/help/documentation.textile new file mode 100644 index 000000000..2b3d1ff93 --- /dev/null +++ b/app/views/help/documentation.textile @@ -0,0 +1,6 @@ +--- +layout: default +title: Documentation +--- + +La documentation de Chouette est disponible sur le site "Chouette.mobi":http://www.chouette.mobi/spip.php?rubrique15
\ No newline at end of file diff --git a/app/views/help/toc.textile b/app/views/help/toc.textile index 8a0d204f5..1ce35cac2 100644 --- a/app/views/help/toc.textile +++ b/app/views/help/toc.textile @@ -7,6 +7,7 @@ h3. Sommaire # "Généralités":introduction ## "Normalisation":normalisation +## "Documentation":documentation # "Espaces de données":dataspaces # "Réseaux":networks # "Transporteurs":companies diff --git a/app/views/imports/new.html.erb b/app/views/imports/new.html.erb index 6d4fd50e3..1b797b0d6 100644 --- a/app/views/imports/new.html.erb +++ b/app/views/imports/new.html.erb @@ -21,7 +21,7 @@ <%= form.buttons do %> <%= form.commit_button true %> <li><%= t('or') %></li> - <li><%= link_to t('back'), :back %></li> + <li><%= link_to t('cancel'), :back %></li> <% end %> <% end %> <% end %> diff --git a/app/views/journey_patterns/_form.html.erb b/app/views/journey_patterns/_form.html.erb index ef2bcc9d2..b6c37ab1b 100644 --- a/app/views/journey_patterns/_form.html.erb +++ b/app/views/journey_patterns/_form.html.erb @@ -4,8 +4,8 @@ <%= form.input :published_name %> <%= form.input :registration_number %> <%= form.input :comment %> - <%= form.input :stop_point_ids, :as => :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]} %> - <% if @route.new_record? %> + <%= form.input :stop_point_ids, :as => :check_boxes, :collection => @route.stop_points.map { |s| [s.stop_area.name, s.id.to_s]}, :input_html => (@journey_pattern.new_record? ? { :checked => 'checked' }:{}) %> + <% if @journey_pattern.new_record? %> <%= form.input :objectid %> <% else %> <li> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 110594cb5..4eb3b1b70 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -22,7 +22,7 @@ <% if selected_referential? %> <h1><%= @referential.name %></h1> <% elsif help_page? %> - <h1>Documentation</h1> + <h1>Guide d'utilisation</h1> <% end %> </div> <div class="interaction"> diff --git a/app/views/stop_areas/add_children.html.erb b/app/views/stop_areas/add_children.html.erb index a8b29146a..ff3323dab 100644 --- a/app/views/stop_areas/add_children.html.erb +++ b/app/views/stop_areas/add_children.html.erb @@ -8,7 +8,8 @@ <%= form.buttons do %> <%= form.commit_button %> - ou <%= link_to "revenir", [@referential, @stop_area] %> + <%= t('or') %> + <%= link_to t('cancel'), [@referential, @stop_area] %> <% end %> </div> <% end %> diff --git a/app/views/stop_areas/select_parent.html.erb b/app/views/stop_areas/select_parent.html.erb index bf361b869..26baf984a 100644 --- a/app/views/stop_areas/select_parent.html.erb +++ b/app/views/stop_areas/select_parent.html.erb @@ -8,7 +8,8 @@ <%= form.buttons do %> <%= form.commit_button %> - ou <%= link_to "revenir", [@referential, @stop_area] %> + <%= t('or') %> + <%= link_to t('cancel'), [@referential, @stop_area] %> <% end %> </div> <% end %> diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb index 41d7576b5..28867de45 100644 --- a/app/views/stop_areas/show.html.erb +++ b/app/views/stop_areas/show.html.erb @@ -93,7 +93,6 @@ <%= link_to([@referential, @stop_area.parent]) do %> <%= image_tag "map/" + @stop_area.parent.stop_area_type + ".png" %><span><%= @stop_area.parent.name %></span> <% end %> - <%= link_to image_tag("user_interface/ui/remove.png"), referential_stop_area_path(@referential, @stop_area.parent), :method => :delete, :confirm => t('stop_areas.actions.destroy_confirm'), :class => "remove" %> </div> <div class="link"><%= image_tag "icons/link.png"%></div> <% else %> @@ -114,7 +113,6 @@ <%= link_to([@referential, child]) do %> <%= image_tag "map/" + child.stop_area_type + ".png" %><span><%= child.name %></span> <% end %> - <%= link_to image_tag("user_interface/ui/remove.png"), referential_stop_area_path(@referential, child), :method => :delete, :confirm => t('stop_areas.actions.destroy_confirm'), :class => "remove" %> </div> <% end %> </div> |