aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Donnet2014-09-26 16:03:06 +0200
committerLuc Donnet2014-09-26 16:03:06 +0200
commit47917e5fd239f0c4589688ddf7768d21573c349a (patch)
treedebd4b47f14f581a4de0ea4cae4aea876e0d9ad0
parent819886b714d89a07d6c8d55ebf74d21f281b83e0 (diff)
downloadchouette-core-47917e5fd239f0c4589688ddf7768d21573c349a.tar.bz2
Fix css for index list vehicle journeys
-rw-r--r--app/assets/stylesheets/main/vehicle_journeys.css.scss14
-rw-r--r--app/views/vehicle_journeys/index.html.erb15
2 files changed, 11 insertions, 18 deletions
diff --git a/app/assets/stylesheets/main/vehicle_journeys.css.scss b/app/assets/stylesheets/main/vehicle_journeys.css.scss
index 4e3a1c897..580874df4 100644
--- a/app/assets/stylesheets/main/vehicle_journeys.css.scss
+++ b/app/assets/stylesheets/main/vehicle_journeys.css.scss
@@ -39,20 +39,18 @@
#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;
+ margin-left: 15px;
}
- .advanced_search_link{
- vertical-align: -webkit-baseline-middle;
- }
+ .advanced_search{ margin-left: 40px; }
+
+ .time_tables_id_eq{ margin-left: 20px; }
+
+ .vehicle_journey_at_stops_departure_time_gt{ margin-left: 20px; }
}
diff --git a/app/views/vehicle_journeys/index.html.erb b/app/views/vehicle_journeys/index.html.erb
index 69fd302fa..990f028e9 100644
--- a/app/views/vehicle_journeys/index.html.erb
+++ b/app/views/vehicle_journeys/index.html.erb
@@ -3,19 +3,14 @@
<%= search_form_for @q, :url => referential_line_route_vehicle_journeys_path(@referential,@line,@route), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f| %>
<div class="panel panel-default">
<div class="panel-heading">
- <div class="input-group col-md-9">
- <%= f.label :journey_pattern_id_eq, "Missions" %>
- <%= f.text_field :journey_pattern_id_eq %>
-
- <div class="input-group-btn">
- <button class="btn btn-default" type="submit"><i class="fa fa-search"></i></button>
- </div>
- </div><!-- /input-group -->
- <a data-toggle="collapse" data-parent="#search" href="#advanced_search">
+ <%= f.label :journey_pattern_id_eq, "Missions" %>
+ <%= f.text_field(:journey_pattern_id_eq, :class => "form-control") %>
+ <button class="btn btn-default" type="submit"><i class="fa fa-search"></i></button>
+ <a data-toggle="collapse" data-parent="#search" href="#advanced_search" class="advanced_search">
<i class="fa fa-plus"></i> <%= "#{t('.advanced_search')}" %>
</a>
</div>
-
+
<div id="advanced_search" class="panel-collapse collapse">
<div class="panel-body">
<div>