diff options
| -rw-r--r-- | app/assets/stylesheets/main/time_tables.css.scss | 54 | ||||
| -rw-r--r-- | app/views/referentials/_referential.erb | 46 | ||||
| -rw-r--r-- | app/views/referentials/show.js.erb | 40 | ||||
| -rw-r--r-- | app/views/time_tables/_show_time_table.html.erb | 64 |
4 files changed, 106 insertions, 98 deletions
diff --git a/app/assets/stylesheets/main/time_tables.css.scss b/app/assets/stylesheets/main/time_tables.css.scss index e0535fcc8..a2bd5a968 100644 --- a/app/assets/stylesheets/main/time_tables.css.scss +++ b/app/assets/stylesheets/main/time_tables.css.scss @@ -13,22 +13,23 @@ span.included_day_type { font-weight: bolder; - color: black; + margin-right: 3px; } span.excluded_day_type { + margin-right: 3px; } .validity_out { - color: #FC4903 !important; + color: $brand-danger; } .validity_out_soon { - color: orange !important; + color: $brand-warning; } .validity_regular { - color: #86B41D !important; + color: $brand-success; } } } @@ -45,42 +46,51 @@ .typeahead.dropdown-menu { z-index: 100001; } - + .validity_out { - color: #FC4903 !important; + color: $brand-danger; } .validity_out_soon { - color: orange !important; + color: $brand-warning; } .validity_regular { - color: #86B41D !important; + color: $brand-success; + } + + span.included_day_type { + font-weight: bolder; + margin-right: 3px; } - .day_type { - border-style:solid; - border-width:1px; - } - .period { + span.excluded_day_type { + margin-right: 3px; + } + + .period { padding-left:50px; padding-right:450px; - } - .date { + } + + .date { padding-left:50px; - } - .odd { + } + + .odd { padding-left:50px; padding-right:450px; - } - .even { + } + + .even { padding-left:50px; padding-right:450px; - } - .actions { - float: right; } + .actions { + float: right; + } + .summary p label { font-weight: bold; } diff --git a/app/views/referentials/_referential.erb b/app/views/referentials/_referential.erb index 3bc6fd0dc..f0df7eccb 100644 --- a/app/views/referentials/_referential.erb +++ b/app/views/referentials/_referential.erb @@ -1,14 +1,36 @@ -<%= div_for(referential) do %> - <%= link_to referential.name, referential %> - <div class="info"> - <%= referential.human_attribute_name('lines') %>: <span class="lines_count"></span> - - <%= referential.human_attribute_name('networks') %>: <span class="networks_count"></span> - - <%= referential.human_attribute_name('vehicle_journeys') %>: <span class="vehicle_journeys_count"></span> - - <%= referential.human_attribute_name('time_tables') %>: <span class="time_tables_count"></span> - <div class="actions"> - <%= link_to t("actions.edit"), edit_referential_path(referential), :class => "edit" %> | - <%= link_to t("actions.destroy"), referential_path(referential), :method => :delete, :data => {:confirm => t('referentials.actions.destroy_confirm')}, :class => "remove" %> - </div> +<div id="index_item" class="panel panel-default referential"> + <div class="panel-heading"> + <div class="panel-title clearfix"> + <span class="pull-right"> + <%= link_to edit_referential_path(referential), :class => "btn btn-default btn-sm" do %> + <span class="fa fa-pencil"></span> + <% end %> + <%= link_to referential_path(referential), :method => :delete, :data => {:confirm => t('companies.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %> + <span class="fa fa-trash-o"></span> + <% end %> + </span> + <h5> + <%= link_to([@referential, referential], :class => "preview", :title => "#{Referential.model_name.human.capitalize} #{referential.name}") do %> + <span class="name"> + <%= truncate(referential.name, :length => 20) %> + </span> + <% end %> + </h5> + </div> </div> + <div id="referential_<%= referential.id %>" class="panel-body"> + <p> + <%= referential.human_attribute_name('lines') %>: <span class="lines_count"></span> + </p> + <p> + <%= referential.human_attribute_name('networks') %>: <span class="networks_count"></span> + </p> + <p> + <%= referential.human_attribute_name('vehicle_journeys') %>: <span class="vehicle_journeys_count"></span> + </p> + <p> + <%= referential.human_attribute_name('time_tables') %>: <span class="time_tables_count"></span> + </p> + </div> +</div> <%= javascript_include_tag referential_path(referential,:format => :js) %> -<% end %> diff --git a/app/views/referentials/show.js.erb b/app/views/referentials/show.js.erb index d44962b14..05b623b93 100644 --- a/app/views/referentials/show.js.erb +++ b/app/views/referentials/show.js.erb @@ -1,25 +1,25 @@ -$(document).ready(function() { +$(function (){ + var ref, update_infos, update_referential_details, _i, _len, _ref, _results; - jQuery(function() { -var ref, update_infos, update_referential_details, _i, _len, _ref, _results; -update_infos = function(json) { -var info, update_info; -info = $('#referential_' + json.referential_id + ' .info'); -update_info = function(key, value) { -if (key.match(/_count$/)) { -return $(info.find('.' + key)[0]).text(value); -} -}; -return $.each(json, update_info); -}; -update_referential_details = function() { -return $.getJSON("<%= referential_path(@referential, :format => :json) %>", update_infos); -}; + update_infos = function(json) { + var info, update_info; + info = $('#referential_' + json.referential_id); + console.log(info) + update_info = function(key, value) { + if (key.match(/_count$/)) { + return $(info.find('.' + key)[0]).text(value); + } + }; + return $.each(json, update_info); + }; + + update_referential_details = function() { + return $.getJSON("<%= referential_path(@referential, :format => :json) %>", update_infos); + }; -_results = []; -_results.push(update_referential_details()); + _results = []; + _results.push(update_referential_details()); -return _results; -}); + return _results; }); diff --git a/app/views/time_tables/_show_time_table.html.erb b/app/views/time_tables/_show_time_table.html.erb index 35fefce75..d2366f64e 100644 --- a/app/views/time_tables/_show_time_table.html.erb +++ b/app/views/time_tables/_show_time_table.html.erb @@ -1,5 +1,18 @@ <div class="time_table_show" id="time_table_show"> - + <p> + <span class="state-code <%= time_table_state_code(@time_table) %>"><i class="fa fa-certificate"></i></span> + <label> + <% if @time_table.bounding_dates.empty? %> + <%= t(".resume_empty") %> + <% else %> + <%= t(".resume", :start_date => l(@time_table.bounding_dates.min), :end_date => l(@time_table.bounding_dates.max)) %> + <% end %> + </label> + </p> + <p> + <label><%= @time_table.human_attribute_name("tag_list") %>: </label> + <%= @time_table.tag_list %> + </p> <ul id="tabs" class="nav nav-tabs" data-tabs="tabs"> <li class="active"><a href="#time_tables" data-toggle="tab"><%= @time_table.human_attribute_name("calendars") %></a></li> <li><a href="#time_tables_datas" data-toggle="tab"><%= @time_table.human_attribute_name("calendar_details") %></a></li> @@ -33,58 +46,21 @@ </div> </div> <div class="tab-pane" id="time_tables_datas"> - <div class="summary"> - <p> - <span class="state-code <%= time_table_state_code(@time_table) %>"><i class="fa fa-certificate"></i></span> - <label> - <% if @time_table.bounding_dates.empty? %> - <%= t(".resume_empty") %> - <% else %> - <%= t(".resume", :start_date => l(@time_table.bounding_dates.min), - :end_date => l(@time_table.bounding_dates.max)) %> - <% end %> - </label> - </p> + <div class="summary"> <p> <label><%= @time_table.human_attribute_name("version") %>: </label> <%= @time_table.version %> </p> <p> - <label><%= @time_table.human_attribute_name("tag_list") %>: </label> - <%= @time_table.tag_list %> - </p> - <p> <label><%= @time_table.human_attribute_name("day_types") %>: </label> <% if @time_table.int_day_types & 508 == 0 %> <label><%= @time_table.human_attribute_name("none") %></label> <% else %> - <% if @time_table.monday %> - <span class='day_type'> <%= @time_table.human_attribute_name("monday") %> </span> - <% end %> - - <% if @time_table.tuesday %> - <span class='day_type'> <%= @time_table.human_attribute_name("tuesday") %> </span> - <% end %> - - <% if @time_table.wednesday %> - <span class='day_type'> <%= @time_table.human_attribute_name("wednesday") %> </span> - <% end %> - - <% if @time_table.thursday %> - <span class='day_type'> <%= @time_table.human_attribute_name("thursday") %> </span> - <% end %> - - <% if @time_table.friday %> - <span class='day_type'> <%= @time_table.human_attribute_name("friday") %> </span> - <% end %> - - <% if @time_table.saturday %> - <span class='day_type'> <%= @time_table.human_attribute_name("saturday") %> </span> - <% end %> - - <% if @time_table.sunday %> - <span class='day_type'> <%= @time_table.human_attribute_name("sunday") %> </span> - <% end %> + <% %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) %> + </span> + <% end %> <% end %> </p> |