diff options
| author | Bruno Perles | 2015-10-29 11:12:48 +0100 |
|---|---|---|
| committer | Bruno Perles | 2015-10-29 11:12:48 +0100 |
| commit | e44df2e9e0770d6f7e83c23d0b79dcb2c83c4467 (patch) | |
| tree | a0ac693b0088704e774f340138a6b2ddfc5270e8 | |
| parent | bbdbdaee9ef0c126d6117be11708a7cd192b20d6 (diff) | |
| download | chouette-core-e44df2e9e0770d6f7e83c23d0b79dcb2c83c4467.tar.bz2 | |
Add validates to journey_frequency
3 files changed, 7 insertions, 16 deletions
diff --git a/app/assets/stylesheets/main/vehicle_journey_frequencies.scss b/app/assets/stylesheets/main/vehicle_journey_frequencies.scss index 4d580f35d..a60fa5218 100644 --- a/app/assets/stylesheets/main/vehicle_journey_frequencies.scss +++ b/app/assets/stylesheets/main/vehicle_journey_frequencies.scss @@ -51,12 +51,18 @@ display: table; width: 100%; padding-left: 25%; + .inline-errors { + margin: 0; + } > li { display: table-cell; width: 21%; vertical-align: top; padding:0 ; margin: 0; + &:first-child select { + width: 160px; + } &:nth-last-child(2), &:last-child { width: 8%; } diff --git a/app/presenters/timeband_presenter.rb b/app/presenters/timeband_presenter.rb deleted file mode 100644 index 62a29faf5..000000000 --- a/app/presenters/timeband_presenter.rb +++ /dev/null @@ -1,15 +0,0 @@ -class TimebandPresenter - - def initialize(timeband) - @timeband = timeband - end - - def title - if @timeband.name.blank? - "#{I18n.l(@timeband.start_time, format: :hour)}-#{I18n.l(@timeband.end_time, format: :hour)}" - else - @timeband.name - end - end - -end diff --git a/app/views/vehicle_journey_frequencies/_show_journey_frequencies.html.erb b/app/views/vehicle_journey_frequencies/_show_journey_frequencies.html.erb index df12a4f50..5d3551503 100644 --- a/app/views/vehicle_journey_frequencies/_show_journey_frequencies.html.erb +++ b/app/views/vehicle_journey_frequencies/_show_journey_frequencies.html.erb @@ -14,7 +14,7 @@ <% @vehicle_journey_frequency.journey_frequencies.each do |journey_frequency| %> <tr class="<%= cycle :odd, :even %>"> <td> - <%= link_to TimebandPresenter.new(journey_frequency.timeband).title, + <%= link_to journey_frequency.timeband.fullname, referential_timeband_path(@referential, journey_frequency.timeband) %> </td> <td><%= l(journey_frequency.first_departure_time, format: :hour) %></td> |
