aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Etienne2012-11-13 10:23:06 +0100
committerMichel Etienne2012-11-13 10:23:06 +0100
commit0c9781ac6c9927c4631826c2319c0c14436587d6 (patch)
tree4f9065381bfc1de250c5f1808cb5becd0d7017fb
parente4728a4cc84f91bc2aa6bb82c38c1b87ff629ba2 (diff)
downloadchouette-core-0c9781ac6c9927c4631826c2319c0c14436587d6.tar.bz2
add created bloc for each show view
-rw-r--r--app/assets/stylesheets/access_points.css.scss1
-rw-r--r--app/views/access_links/show.html.erb9
-rw-r--r--app/views/access_points/show.html.erb9
-rw-r--r--app/views/companies/show.html.erb9
-rw-r--r--app/views/connection_links/show.html.erb9
-rw-r--r--app/views/group_of_lines/show.html.erb11
-rw-r--r--app/views/journey_patterns/show.html.erb9
-rw-r--r--app/views/lines/show.html.erb9
-rw-r--r--app/views/networks/show.html.erb9
-rw-r--r--app/views/routes/show.html.erb9
-rw-r--r--app/views/stop_areas/_genealogical.html.erb66
-rw-r--r--app/views/stop_areas/show.html.erb76
-rw-r--r--app/views/vehicle_journeys/show.html.erb9
-rw-r--r--config/locales/en.yml1
-rw-r--r--config/locales/fr.yml2
-rw-r--r--config/locales/stop_areas.yml10
16 files changed, 86 insertions, 162 deletions
diff --git a/app/assets/stylesheets/access_points.css.scss b/app/assets/stylesheets/access_points.css.scss
index 7a27050fa..22dc3ac3d 100644
--- a/app/assets/stylesheets/access_points.css.scss
+++ b/app/assets/stylesheets/access_points.css.scss
@@ -46,7 +46,6 @@
}
.summary{
- height: 400px;
p label {
font-weight: bold;
diff --git a/app/views/access_links/show.html.erb b/app/views/access_links/show.html.erb
index 27e2e9bbf..aa049899a 100644
--- a/app/views/access_links/show.html.erb
+++ b/app/views/access_links/show.html.erb
@@ -70,14 +70,6 @@
<label><%= @access_link.human_attribute_name("objectid") %>: </label>
<%= @access_link.objectid %>
</p>
- <p>
- <label><%= @access_link.human_attribute_name("creation_time") %>: </label>
- <%= l(@access_link.creation_time) %>
- </p>
- <p>
- <label><%= @access_link.human_attribute_name("creator_id") %>: </label>
- <%= @access_link.creator_id %>
- </p>
</div>
</div>
@@ -87,4 +79,5 @@
<li><%= link_to t('access_links.actions.destroy'), referential_access_point_access_link_path(@referential, @access_link.access_point, @access_link), :method => :delete, :data => {:confirm => t('access_links.actions.destroy_confirm')}, :class => "remove" %></li>
<br>
</ul>
+ <%= creation_tag(@access_link) %>
<% end %>
diff --git a/app/views/access_points/show.html.erb b/app/views/access_points/show.html.erb
index 97bd961d6..7b25d6b96 100644
--- a/app/views/access_points/show.html.erb
+++ b/app/views/access_points/show.html.erb
@@ -89,14 +89,6 @@
<label><%= @access_point.human_attribute_name("objectid") %>: </label>
<%= @access_point.objectid %>
</p>
- <p>
- <label><%= @access_point.human_attribute_name("creation_time") %>: </label>
- <%= l(@access_point.creation_time) %>
- </p>
- <p>
- <label><%= @access_point.human_attribute_name("creator_id") %>: </label>
- <%= @access_point.creator_id %>
- </p>
</div>
</div>
@@ -149,4 +141,5 @@
<li><%= link_to t('access_points.actions.destroy'), referential_stop_area_access_point_path(@referential, @stop_area, @access_point), :method => :delete, :data => {:confirm => t('access_points.actions.destroy_confirm')}, :class => "remove" %></li>
</ul>
<br>
+ <%= creation_tag(@access_point) %>
<% end %>
diff --git a/app/views/companies/show.html.erb b/app/views/companies/show.html.erb
index fe819d360..844832ee1 100644
--- a/app/views/companies/show.html.erb
+++ b/app/views/companies/show.html.erb
@@ -43,14 +43,6 @@
<label><%= Chouette::Company.human_attribute_name("objectid") %>: </label>
<%= @company.objectid %>
</p>
- <p>
- <label><%= @company.human_attribute_name("creation_time") %>: </label>
- <%= l(@company.creation_time) %>
- </p>
- <p>
- <label><%= @company.human_attribute_name("creator_id") %>: </label>
- <%= @company.creator_id %>
- </p>
</div>
</div>
@@ -60,4 +52,5 @@
<li><%= link_to t('companies.actions.destroy'), referential_company_path(@referential, @company), :method => :delete, :data => {:confirm => t('companies.actions.destroy_confirm')}, :class => "remove" %></li>
<br>
</ul>
+ <%= creation_tag(@company) %>
<% end %>
diff --git a/app/views/connection_links/show.html.erb b/app/views/connection_links/show.html.erb
index 58c90cc41..a41112621 100644
--- a/app/views/connection_links/show.html.erb
+++ b/app/views/connection_links/show.html.erb
@@ -79,14 +79,6 @@
<label><%= @connection_link.human_attribute_name("objectid") %>: </label>
<%= @connection_link.objectid %>
</p>
- <p>
- <label><%= @connection_link.human_attribute_name("creation_time") %>: </label>
- <%= l(@connection_link.creation_time) %>
- </p>
- <p>
- <label><%= @connection_link.human_attribute_name("creator_id") %>: </label>
- <%= @connection_link.creator_id %>
- </p>
</div>
</div>
@@ -97,4 +89,5 @@
<li><%= link_to t('connection_links.actions.select_areas'), select_areas_referential_connection_link_path(@referential, @connection_link), :class => "select_areas" %></li>
<br>
</ul>
+ <%= creation_tag(@connection_link) %>
<% end %>
diff --git a/app/views/group_of_lines/show.html.erb b/app/views/group_of_lines/show.html.erb
index 60c4b7def..5e77bfe78 100644
--- a/app/views/group_of_lines/show.html.erb
+++ b/app/views/group_of_lines/show.html.erb
@@ -15,14 +15,6 @@
<label><%= @group_of_line.human_attribute_name("objectid") %>: </label>
<%= @group_of_line.objectid %>
</p>
- <p>
- <label><%= @group_of_line.human_attribute_name("creation_time") %>: </label>
- <%= l @group_of_line.creation_time %>
- </p>
- <p>
- <label><%= @group_of_line.human_attribute_name("creator_id") %>: </label>
- <%= @group_of_line.creator_id %>
- </p>
</div>
<p class="after_map" />
@@ -35,8 +27,6 @@
<div class="lines_detail" style="display: none;">
<%= render :partial => "lines_detail" %>
</div>
-
-
</div>
<% content_for :sidebar do %>
@@ -45,4 +35,5 @@
<li><%= link_to t('group_of_lines.actions.destroy'), referential_group_of_line_path(@referential, @group_of_line), :method => :delete, :data => {:confirm => t('group_of_lines.actions.destroy_confirm')} , :class => "remove" %></li>
<br>
</ul>
+ <%= creation_tag(@group_of_line) %>
<% end %>
diff --git a/app/views/journey_patterns/show.html.erb b/app/views/journey_patterns/show.html.erb
index b9378abd5..eb8f40cc1 100644
--- a/app/views/journey_patterns/show.html.erb
+++ b/app/views/journey_patterns/show.html.erb
@@ -32,14 +32,6 @@
<label><%= @journey_pattern.human_attribute_name("objectid") %>: </label>
<%= @journey_pattern.objectid %>
</p>
- <p>
- <label><%= @journey_pattern.human_attribute_name("creation_time") %>: </label>
- <%= l @journey_pattern.creation_time %>
- </p>
- <p>
- <label><%= @journey_pattern.human_attribute_name("creator_id") %>: </label>
- <%= @journey_pattern.creator_id %>
- </p>
</div>
</div>
@@ -56,5 +48,6 @@
<li><%= link_to t('journey_patterns.actions.destroy'), referential_line_route_journey_pattern_path(@referential, @line, @route, @journey_pattern), :method => :delete, :data => {:confirm => t('journey_patterns.actions.destroy_confirm')}, :class => "remove" %></li>
<li><%= link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => @journey_pattern.id}), :class => "link" %></li>
</ul>
+ <%= creation_tag(@journey_pattern) %>
<% end %>
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb
index 737d922a0..668eaebdc 100644
--- a/app/views/lines/show.html.erb
+++ b/app/views/lines/show.html.erb
@@ -48,14 +48,6 @@
<label><%= @line.human_attribute_name("objectid") %>: </label>
<%= @line.objectid %>
</p>
- <p>
- <label><%= @line.human_attribute_name("creation_time") %>: </label>
- <%= l(@line.creation_time) %>
- </p>
- <p>
- <label><%= @line.human_attribute_name("creator_id") %>: </label>
- <%= @line.creator_id %>
- </p>
</div>
</div>
@@ -81,4 +73,5 @@
<li><%= link_to t('routes.actions.new'), new_referential_line_route_path(@referential, @line), :class => "add" %></li>
<br>
</ul>
+ <%= creation_tag(@line) %>
<% end %>
diff --git a/app/views/networks/show.html.erb b/app/views/networks/show.html.erb
index 8ed9c422f..273a04aed 100644
--- a/app/views/networks/show.html.erb
+++ b/app/views/networks/show.html.erb
@@ -37,14 +37,6 @@
<label><%= Chouette::Network.human_attribute_name("objectid") %>: </label>
<%= @network.objectid %>
</p>
- <p>
- <label><%= @network.human_attribute_name("creation_time") %>: </label>
- <%= l @network.creation_time %>
- </p>
- <p>
- <label><%= @network.human_attribute_name("creator_id") %>: </label>
- <%= @network.creator_id %>
- </p>
</div>
</div>
@@ -54,4 +46,5 @@
<li><%= link_to t('networks.actions.destroy'), referential_network_path(@referential, @network), :method => :delete, :data => {:confirm => t('networks.actions.destroy_confirm')}, :class => "remove" %></li>
<br>
</ul>
+ <%= creation_tag(@network) %>
<% end %>
diff --git a/app/views/routes/show.html.erb b/app/views/routes/show.html.erb
index 414d0474a..654e3975a 100644
--- a/app/views/routes/show.html.erb
+++ b/app/views/routes/show.html.erb
@@ -52,14 +52,6 @@
<label><%= @route.human_attribute_name("objectid") %>: </label>
<%= @route.objectid %>
</p>
- <p>
- <label><%= @route.human_attribute_name("creation_time") %>: </label>
- <%= l @route.creation_time %>
- </p>
- <p>
- <label><%= @route.human_attribute_name("creator_id") %>: </label>
- <%= @route.creator_id %>
- </p>
</div>
</div>
@@ -104,5 +96,6 @@
</li>
<% end %>
</ul>
+ <%= creation_tag(@route) %>
<% end %>
diff --git a/app/views/stop_areas/_genealogical.html.erb b/app/views/stop_areas/_genealogical.html.erb
new file mode 100644
index 000000000..3b935ce92
--- /dev/null
+++ b/app/views/stop_areas/_genealogical.html.erb
@@ -0,0 +1,66 @@
+ <h3><%= genealogical_title %></h3>
+
+ <% if @stop_area.parent.present? %>
+ <div class="parent">
+ <%= link_to([@referential, @stop_area.parent]) do %>
+ <%= image_tag "map/" + @stop_area.parent.stop_area_type + ".png" %><span><%= @stop_area.parent.name %></span>
+ <% end %>
+ </div>
+ <div class="link"><%= image_tag "icons/link.png"%></div>
+ <% elsif @stop_area.routing_lines.present? %>
+ <div class="lines">
+ <% @stop_area.routing_lines.each do |line| %>
+ <div class="line">
+ <%= link_to([@referential, line]) do %>
+ <span><%= line.name %></span>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ <div class="link"><%= image_tag "icons/link.png"%></div>
+ <% else %>
+ <div class="no_parent">&nbsp;</div>
+ <% end %>
+
+ <div class="target">
+ <%= image_tag "map/" + @stop_area.stop_area_type + ".png"%><span><%= @stop_area.name %></span>
+ </div>
+
+ <% if @stop_area.children.present? %>
+ <div class="link"><%= image_tag "icons/link.png"%></div>
+ <div class="children">
+ <% @stop_area.children.each do |child| %>
+ <div class="child">
+ <%= link_to([@referential, child]) do %>
+ <%= image_tag "map/" + child.stop_area_type + ".png" %><span><%= child.name %></span>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ <% elsif @stop_area.routing_stops.present? %>
+ <div class="link"><%= image_tag "icons/link.png"%></div>
+ <div class="children">
+ <% @stop_area.routing_stops.each do |stop| %>
+ <div class="child">
+ <%= link_to([@referential, stop]) do %>
+ <%= image_tag "map/" + stop.stop_area_type + ".png" %><span><%= stop.name %></span>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ <% elsif @stop_area.routes.present? %>
+ <div class="link"><%= image_tag "icons/link.png"%></div>
+ <div class="children">
+ <% @stop_area.routes.each do |route| %>
+ <div class="child">
+ <%= link_to([@referential, route.line ]) do %>
+ <span><%= route.line.number %></span>
+ <% end %>
+ &nbsp;
+ <%= link_to([@referential, route.line , route]) do %>
+ <span><%= route.name %></span>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ <% end %>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index 44755d020..310761a03 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -74,85 +74,12 @@
<label><%= @stop_area.human_attribute_name("objectid") %>: </label>
<%= @stop_area.objectid %>
</p>
- <p>
- <label><%= @stop_area.human_attribute_name("creation_time") %>: </label>
- <%= l(@stop_area.creation_time) %>
- </p>
- <p>
- <label><%= @stop_area.human_attribute_name("creator_id") %>: </label>
- <%= @stop_area.creator_id %>
- </p>
</div>
<p class="after_map" />
<div class="genealogical">
- <h3><%= genealogical_title %></h3>
-
- <% if @stop_area.parent.present? %>
- <div class="parent">
- <%= link_to([@referential, @stop_area.parent]) do %>
- <%= image_tag "map/" + @stop_area.parent.stop_area_type + ".png" %><span><%= @stop_area.parent.name %></span>
- <% end %>
- </div>
- <div class="link"><%= image_tag "icons/link.png"%></div>
- <% elsif @stop_area.routing_lines.present? %>
- <div class="lines">
- <% @stop_area.routing_lines.each do |line| %>
- <div class="line">
- <%= link_to([@referential, line]) do %>
- <span><%= line.name %></span>
- <% end %>
- </div>
- <% end %>
- </div>
- <div class="link"><%= image_tag "icons/link.png"%></div>
- <% else %>
- <div class="no_parent">&nbsp;</div>
- <% end %>
-
- <div class="target">
- <%= image_tag "map/" + @stop_area.stop_area_type + ".png"%><span><%= @stop_area.name %></span>
- </div>
-
- <% if @stop_area.children.present? %>
- <div class="link"><%= image_tag "icons/link.png"%></div>
- <div class="children">
- <% @stop_area.children.each do |child| %>
- <div class="child">
- <%= link_to([@referential, child]) do %>
- <%= image_tag "map/" + child.stop_area_type + ".png" %><span><%= child.name %></span>
- <% end %>
- </div>
- <% end %>
- </div>
- <% elsif @stop_area.routing_stops.present? %>
- <div class="link"><%= image_tag "icons/link.png"%></div>
- <div class="children">
- <% @stop_area.routing_stops.each do |stop| %>
- <div class="child">
- <%= link_to([@referential, stop]) do %>
- <%= image_tag "map/" + stop.stop_area_type + ".png" %><span><%= stop.name %></span>
- <% end %>
- </div>
- <% end %>
- </div>
- <% elsif @stop_area.routes.present? %>
- <div class="link"><%= image_tag "icons/link.png"%></div>
- <div class="children">
- <% @stop_area.routes.each do |route| %>
- <div class="child">
- <%= link_to([@referential, route.line ]) do %>
- <span><%= route.line.number %></span>
- <% end %>
- &nbsp;
- <%= link_to([@referential, route.line , route]) do %>
- <span><%= route.name %></span>
- <% end %>
- </div>
- <% end %>
- </div>
- <% end %>
+ <%= render "stop_areas/genealogical" %>
</div>
</div>
@@ -208,4 +135,5 @@
<% end %>
</table>
<br>
+ <%= creation_tag(@stop_area) %>
<% end %>
diff --git a/app/views/vehicle_journeys/show.html.erb b/app/views/vehicle_journeys/show.html.erb
index 3ed6452ae..b6203c2bc 100644
--- a/app/views/vehicle_journeys/show.html.erb
+++ b/app/views/vehicle_journeys/show.html.erb
@@ -42,14 +42,6 @@
<label><%= @vehicle_journey.human_attribute_name("objectid") %>: </label>
<%= @vehicle_journey.objectid %>
</p>
- <p>
- <label><%= @vehicle_journey.human_attribute_name("creation_time") %>: </label>
- <%= l @vehicle_journey.creation_time %>
- </p>
- <p>
- <label><%= @vehicle_journey.human_attribute_name("creator_id") %>: </label>
- <%= @vehicle_journey.creator_id %>
- </p>
</div>
</div>
<h3>
@@ -107,5 +99,6 @@
<% end %>
<% end %>
</div>
+ <%= creation_tag(@vehicle_journey) %>
<% end %>
<% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 62de85bbc..fd461119f 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -7,4 +7,5 @@ en:
"false": "no"
time:
formats:
+ short: "%d %b %y %H:%M"
hour: "%H:%M"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 9e74d5804..7175b138d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -15,7 +15,7 @@ fr:
time:
formats:
default: "%d %B %Y %H:%M:%S"
- short: "%d %b %H:%M"
+ short: "%d %b %y %H:%M"
long: "%A %d %B %Y à %Hh%M"
hour: "%Hh%M"
minute: "%M min"
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index 390251e59..0d0ae207b 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -24,12 +24,13 @@ en:
title: Stop %{stop_area}
geographic_data: Geographic data
no_geographic_data: None
- genealogical: Links between stop area
- genealogical_routing: "Routing constraint's links"
itl_managment: "Routing constraint's links managment"
stop_managment: "Parent-Child links managment"
access_managment: "Access Points and Links managment"
access_points: Access Points
+ genealogical:
+ genealogical: Links between stop area
+ genealogical_routing: "Routing constraint's links"
index:
title: Stop areas
name_or_country_code: Name or Country code
@@ -113,12 +114,13 @@ fr:
title: Arrêt %{stop_area}
geographic_data: Données géographiques
no_geographic_data: Aucune
- genealogical: Lien entre arrêts
- genealogical_routing: "Liens de l'ITL"
itl_managment: "Gestion des liens de l'ITL"
stop_managment: "Gestion des relations père-fils"
access_managment: "Gestion des accès et liens associés"
access_points: "Points d'accès"
+ genealogical:
+ genealogical: Lien entre arrêts
+ genealogical_routing: "Liens de l'ITL"
access_links:
title: "Liens Accès-Arrêts des accès de %{stop_area}"
generic_access_links: "Liens globaux"