diff options
| -rw-r--r-- | app/assets/stylesheets/partials/ie_report.css.scss | 48 | ||||
| -rw-r--r-- | app/views/shared/_ie_report_line.html.erb | 6 | ||||
| -rw-r--r-- | config/locales/ie_report.en.yml | 1 | ||||
| -rw-r--r-- | config/locales/ie_report.fr.yml | 5 |
4 files changed, 8 insertions, 52 deletions
diff --git a/app/assets/stylesheets/partials/ie_report.css.scss b/app/assets/stylesheets/partials/ie_report.css.scss index 312dac9ad..55286d690 100644 --- a/app/assets/stylesheets/partials/ie_report.css.scss +++ b/app/assets/stylesheets/partials/ie_report.css.scss @@ -1,12 +1,6 @@ .status { margin-left: 10px; } - -.status_aborted,.status_canceled { color: #a94442;} -.status_started { color: #31708f;} -.status_scheduled { color: #31708f;} -.status_terminated { color: #3c763d;} - .resume { &:after{ content: " "; @@ -15,15 +9,10 @@ clear: both; visibility: hidden; } - - #files_statistics { height: 225px; } - #objects_statistics { height: 225px; } - .caption { text-align :center; font-weight: bold; } - dl.inline dd { display: inline; margin: 0; @@ -40,44 +29,7 @@ .report { margin-top: 20px; - .form-group { margin-right: 20px; } - - .files { - img { - margin-right: 5px; - } - - .file_name{ - font-weight: bold; - margin-right: 30px; - } - } - - .files_error{ - color: #e22b1b; - display: none; - } - - div.files_ignored{ - color: #898e7f; - display: none; - } - - div.files_ok{ - color: #8fc861; - display: none; - } - - div.lines{ - display: none; - th, td{ - text-align: center; - } - - .fa-check{ color: $brand-success; } - .fa-times{ color: $brand-danger; } - } } diff --git a/app/views/shared/_ie_report_line.html.erb b/app/views/shared/_ie_report_line.html.erb index b9fc5dd45..8dac052c8 100644 --- a/app/views/shared/_ie_report_line.html.erb +++ b/app/views/shared/_ie_report_line.html.erb @@ -25,11 +25,12 @@ </div> </form> </p> - <table id="table-line" class="table table-hover table-striped data-table" data-filter="#filter-line" data-page-size="20"> + <table id="table-line" class="table table-hover table-striped data-table toggle-circle toggle-medium" data-filter="#filter-line" data-page-size="20"> <thead> <tr> <th><%= t(".table.line.state") %></th> - <th data-toggle="true"><%= t(".table.line.lines") %></th> + <th><%= t(".table.line.lines") %></th> + <th data-toggle="true" data-sort-ignore="true"><%= t(".table.line.details") %></th> <th data-hide="all"><%= t(".table.line.routes") %></th> <th data-hide="all"><%= t(".table.line.connection_links") %></th> <th data-hide="all"><%= t(".table.line.time_tables") %></th> @@ -44,6 +45,7 @@ <tr> <td data-value="<%=line_item.status%>"><%= line_item.status ? font_awesome_classic_tag("fa-check") : font_awesome_classic_tag("fa-times") %></td> <td><%= line_item.name %></td> + <td></td> <td><%= line_item.routes %></td> <td><%= line_item.connection_links %></td> <td><%= line_item.time_tables %></td> diff --git a/config/locales/ie_report.en.yml b/config/locales/ie_report.en.yml index e0035f150..d77559a8d 100644 --- a/config/locales/ie_report.en.yml +++ b/config/locales/ie_report.en.yml @@ -15,6 +15,7 @@ en: state: "State" routes: "Routes" lines: "Lines" + details: "Details" connection_links: "Connection links" time_tables: "Timetables" stop_areas: "Stop Areas" diff --git a/config/locales/ie_report.fr.yml b/config/locales/ie_report.fr.yml index 0b6ddda4d..f55c0c9a6 100644 --- a/config/locales/ie_report.fr.yml +++ b/config/locales/ie_report.fr.yml @@ -12,9 +12,10 @@ fr: unsaved_lines: 'Lignes non-sauvegardés' table: line: - state: "Etat" + state: "État" routes: "Séquences d'arrêts" lines: "Lignes" + details: "Détails" connection_links: "Correspondances" time_tables: "Calendriers" stop_areas: "Arrèts" @@ -27,7 +28,7 @@ fr: ie_report_file: title_default: "Résultat d'%{job} du fichier %{extension}" table: - state: 'Etat' + state: 'État' name: 'Nom du fichier' error: "Erreur" ignored: "Ignoré" |