diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/main/time_tables.css.scss | 23 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/vehicle_journeys.css.scss | 38 | ||||
| -rw-r--r-- | app/assets/stylesheets/modules/index_item.css.scss | 21 | ||||
| -rw-r--r-- | app/views/time_tables/_cell_info.html.erb | 14 | ||||
| -rw-r--r-- | app/views/time_tables/_cell_title.html.erb | 10 | ||||
| -rw-r--r-- | app/views/time_tables/_time_table.html.erb | 14 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/show.html.erb | 2 |
7 files changed, 35 insertions, 87 deletions
diff --git a/app/assets/stylesheets/main/time_tables.css.scss b/app/assets/stylesheets/main/time_tables.css.scss index 091904f2d..12bedcda3 100644 --- a/app/assets/stylesheets/main/time_tables.css.scss +++ b/app/assets/stylesheets/main/time_tables.css.scss @@ -4,29 +4,6 @@ #workspace.time_tables.index { - #index_item{ - - span.included_day_type { - font-weight: bolder; - margin-right: 3px; - } - - span.excluded_day_type { - margin-right: 3px; - } - - .validity_out { - color: $brand-danger; - } - - .validity_out_soon { - color: $brand-warning; - } - - .validity_regular { - color: $brand-success; - } - } } diff --git a/app/assets/stylesheets/main/vehicle_journeys.css.scss b/app/assets/stylesheets/main/vehicle_journeys.css.scss index ba0de3730..1025eb88c 100644 --- a/app/assets/stylesheets/main/vehicle_journeys.css.scss +++ b/app/assets/stylesheets/main/vehicle_journeys.css.scss @@ -97,44 +97,6 @@ .summary p label { font-weight: bold; } - - .time_tables { - margin-top: 20px; - } - - .time_table { - span.included_day_type { - font-weight: bolder; - color: black; - } - span.excluded_day_type { - } - - .state-code { - width: 25px; - height: 64px; - float: left; - margin-right: 10px; - - .validity_out { - background-color: #FC4903; - width: 25px; - height: 25px; - } - - .validity_out_soon { - background-color: orange; - width: 25px; - height: 25px; - } - - .validity_regular { - background-color: #86B41D; - width: 25px; - height: 25px; - } - } - } } #workspace.vehicle_journeys.timeless diff --git a/app/assets/stylesheets/modules/index_item.css.scss b/app/assets/stylesheets/modules/index_item.css.scss index 6fc1c6013..2404c879a 100644 --- a/app/assets/stylesheets/modules/index_item.css.scss +++ b/app/assets/stylesheets/modules/index_item.css.scss @@ -3,6 +3,18 @@ .panel-heading{ @extend .clearfix; + + .validity_out { + color: $brand-danger; + } + + .validity_out_soon { + color: $brand-warning; + } + + .validity_regular { + color: $brand-success; + } button { margin-left:3px; @@ -38,6 +50,15 @@ i{ margin-right: 5px; } + + span.included_day_type { + font-weight: bolder; + margin-right: 3px; + } + + span.excluded_day_type { + margin-right: 3px; + } } diff --git a/app/views/time_tables/_cell_info.html.erb b/app/views/time_tables/_cell_info.html.erb deleted file mode 100644 index 6ca63ba77..000000000 --- a/app/views/time_tables/_cell_info.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - <%= time_tables_shortest_info(time_table) %> - <% unless time_table.periods.empty? %> - <div> - <% %w(monday tuesday wednesday thursday friday saturday sunday).each do |day_type| %> - <span class="<%= time_table.send( day_type) ? "included_day_type" : "excluded_day_type" %>"> - <%= time_table.human_attribute_name(day_type).first(2) %> - </span> - <% end %> - </div> - <% end %> - <% unless time_table.tags.empty? %> - <div><%= tag_list_shortened(time_table) %></div> - <% end %> - diff --git a/app/views/time_tables/_cell_title.html.erb b/app/views/time_tables/_cell_title.html.erb deleted file mode 100644 index 22ada09eb..000000000 --- a/app/views/time_tables/_cell_title.html.erb +++ /dev/null @@ -1,10 +0,0 @@ - <%= link_to([@referential, time_table]) do %> - <div class="state-code" > - <div class="<%= time_table_state_code(time_table) %>" > - </div> - </div> - <% end %> - <div class="name"> - <%= link_to truncate(time_table.comment, :length => 30), [@referential, time_table], :title => "#{Chouette::TimeTable.model_name.human.capitalize} #{time_table.comment}"%> - </div> - diff --git a/app/views/time_tables/_time_table.html.erb b/app/views/time_tables/_time_table.html.erb index e9d02fa38..5d7042e47 100644 --- a/app/views/time_tables/_time_table.html.erb +++ b/app/views/time_tables/_time_table.html.erb @@ -20,6 +20,18 @@ </div> </div> <div class="panel-body"> - <%= render "cell_info", time_table: time_table %> + <%= time_tables_shortest_info(time_table) %> + <% unless time_table.periods.empty? %> + <div> + <% %w(monday tuesday wednesday thursday friday saturday sunday).each do |day_type| %> + <span class="<%= time_table.send( day_type) ? "included_day_type" : "excluded_day_type" %>"> + <%= time_table.human_attribute_name(day_type).first(2) %> + </span> + <% end %> + </div> + <% end %> + <% unless time_table.tags.empty? %> + <div><%= tag_list_shortened(time_table) %></div> + <% end %> </div> </div> diff --git a/app/views/vehicle_journeys/show.html.erb b/app/views/vehicle_journeys/show.html.erb index f964fc4ea..e90a74aa8 100644 --- a/app/views/vehicle_journeys/show.html.erb +++ b/app/views/vehicle_journeys/show.html.erb @@ -94,7 +94,7 @@ <h3><%= t('.time_tables') %></h3> <div class="time_tables paginated_content"> - <%= paginated_content @vehicle_journey.time_tables, "time_table" %> + <%= paginated_content @vehicle_journey.time_tables, "time_tables/time_table" %> </div> |