aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2014-09-29 10:59:20 +0200
committerLuc Donnet2014-09-29 10:59:20 +0200
commit8c95b9eb841db3a9dfee3a3538f1ec7e98921039 (patch)
treeba711db95dd8c473d7c131146d2dc36c87971aa5
parent640413ba2aa89d859a4ca3725427065d2b07e760 (diff)
downloadchouette-core-8c95b9eb841db3a9dfee3a3538f1ec7e98921039.tar.bz2
Add calendar for time table in vehicle journey popover Refs #0029047
-rw-r--r--app/assets/stylesheets/vendor/bootstrap_changes.css.scss5
-rw-r--r--app/views/vehicle_journeys/_show_popover.html.erb3
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/stylesheets/vendor/bootstrap_changes.css.scss b/app/assets/stylesheets/vendor/bootstrap_changes.css.scss
index 62565af7a..597c9897d 100644
--- a/app/assets/stylesheets/vendor/bootstrap_changes.css.scss
+++ b/app/assets/stylesheets/vendor/bootstrap_changes.css.scss
@@ -15,6 +15,11 @@
span.excluded_day_type {
}
+ span.bounding{
+ font-size: 11px;
+ margin-left: 5px;
+ }
+
.validity_out {
color: $brand-danger;
}
diff --git a/app/views/vehicle_journeys/_show_popover.html.erb b/app/views/vehicle_journeys/_show_popover.html.erb
index 895c15395..5f6fe51ea 100644
--- a/app/views/vehicle_journeys/_show_popover.html.erb
+++ b/app/views/vehicle_journeys/_show_popover.html.erb
@@ -18,7 +18,8 @@
<span class="<%= time_table.send( day_type) ? "included_day_type" : "excluded_day_type"%> time_table_info">
<%= time_table.human_attribute_name(day_type).first(2) %>
</span>
- <% end %>
+ <% end %>
+ <span class="bounding"><%= time_table_bounding( time_table) %></span>
</li>
<% end %>
</ul>