diff options
| author | Marc Florisson | 2014-09-19 12:28:23 +0200 |
|---|---|---|
| committer | Marc Florisson | 2014-09-19 12:28:23 +0200 |
| commit | ff4e748da69889a4441a051c0577b38bbaea3b47 (patch) | |
| tree | 45f226442c269ef6d9db5506a6ac3ab1f0c88915 | |
| parent | 45ac008c5964a78d3666b76c967b765a3ca3d23d (diff) | |
| parent | f7609b02356d4aa773562f49db6b9a540cd28800 (diff) | |
| download | chouette-core-ff4e748da69889a4441a051c0577b38bbaea3b47.tar.bz2 | |
fix merge
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/main/vehicle_journeys.css.scss | 18 | ||||
| -rw-r--r-- | config/locales/vehicle_journeys.yml | 4 |
3 files changed, 23 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 5f2596da1..033631a1c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/afimb/ninoxe.git - revision: 139f461be9a23566d242495df14331ec06308ce1 + revision: 70a316b3b7d8a3faf8d79fbd1732c4b9812cdb59 branch: sismo specs: ninoxe (1.1.0) diff --git a/app/assets/stylesheets/main/vehicle_journeys.css.scss b/app/assets/stylesheets/main/vehicle_journeys.css.scss index c026923fb..f6e21ad68 100644 --- a/app/assets/stylesheets/main/vehicle_journeys.css.scss +++ b/app/assets/stylesheets/main/vehicle_journeys.css.scss @@ -38,6 +38,24 @@ #workspace.vehicle_journeys.index { + #search{ + .panel-heading .btn{ + margin-left: 20px; + } + + ul.token-input-list{ + display: inline-block; + vertical-align: middle; + margin-left: 20px; + width: 250px; + } + + .advanced_search_link{ + vertical-align: -webkit-baseline-middle; + } + + } + table{ margin: 20px 0 0 0; diff --git a/config/locales/vehicle_journeys.yml b/config/locales/vehicle_journeys.yml index 2c7f93fe6..810c80ddb 100644 --- a/config/locales/vehicle_journeys.yml +++ b/config/locales/vehicle_journeys.yml @@ -45,6 +45,8 @@ en: vehicle_journeys: "Departure's times" selection: "Filter on" selection_all: "All" + select_journey_patterns: "Select journey pattern" + select_time_tables: "Enter a timetable" time_range: "Departure time threshold" advanced_search: "Advanced Search" sidebar: @@ -143,6 +145,8 @@ fr: vehicle_journeys: "Horaires de départ aux arrêts" selection: "Filtrer sur" selection_all: "Tous" + select_journey_patterns: "Sélectionner une mission" + select_time_tables: "Saisir un calendrier" time_range: "Seuil horaire au départ" advanced_search: "Recherche avancée" time_filter: |