aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/application.js1
-rw-r--r--app/assets/javascripts/tools.js.coffee6
-rw-r--r--app/assets/javascripts/vehicle_journey.js.coffee12
-rw-r--r--app/assets/javascripts/vehicle_journey_frequencies.js.coffee (renamed from app/assets/javascripts/vehicle_journeys_frequencies.js.coffee)0
-rw-r--r--app/assets/stylesheets/main/layout.css.scss4
-rw-r--r--app/assets/stylesheets/main/vehicle_journey_frequencies.scss (renamed from app/assets/stylesheets/main/vehicle_journeys_frequencies.scss)52
-rw-r--r--app/assets/stylesheets/main/vehicle_journeys.css.scss57
7 files changed, 95 insertions, 37 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 212ccdff8..0862295a4 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -22,6 +22,7 @@
//= require footable/footable.filter
//= require footable/footable.paginate
//= require footable/footable.sort
+//= require tools
//= require_directory ./plugins
//= require_directory .
//= require_directory ./stop_areas
diff --git a/app/assets/javascripts/tools.js.coffee b/app/assets/javascripts/tools.js.coffee
new file mode 100644
index 000000000..b30eb6f15
--- /dev/null
+++ b/app/assets/javascripts/tools.js.coffee
@@ -0,0 +1,6 @@
+(($) ->
+ $ ->
+ $('.ce-hide').removeClass 'ce-hide'
+ return
+ return
+) jQuery
diff --git a/app/assets/javascripts/vehicle_journey.js.coffee b/app/assets/javascripts/vehicle_journey.js.coffee
index 54b359b7a..caf505960 100644
--- a/app/assets/javascripts/vehicle_journey.js.coffee
+++ b/app/assets/javascripts/vehicle_journey.js.coffee
@@ -1,6 +1,6 @@
jQuery ->
swap_hour_minute = ( from, to) ->
- rows = $('.vehicle_journeys tbody.journey_pattern_dependent_list tr.time')
+ rows = $('tbody.journey_pattern_dependent_list tr.time')
for row in rows
do (row) ->
$(row).find( to).find('.hour')[0].value = $(row).find( from).find('.hour')[0].value
@@ -8,15 +8,15 @@ jQuery ->
copy_departures_to_arrivals = (event) ->
event.preventDefault()
- swap_hour_minute( '.departure_time', '.arrival_time')
+ swap_hour_minute('.departure_time', '.arrival_time')
- $(document).on("click", '.vehicle_journeys a.to_arrivals', copy_departures_to_arrivals)
+ $(document).on('click', '[data-ce-action="to_arrivals"]', copy_departures_to_arrivals)
copy_arrivals_to_departures = (event) ->
event.preventDefault()
- swap_hour_minute( '.arrival_time', '.departure_time')
+ swap_hour_minute('.arrival_time', '.departure_time')
- $(document).on("click", '.vehicle_journeys a.to_departures', copy_arrivals_to_departures)
+ $(document).on('click', '[data-ce-action="to_departures"]', copy_arrivals_to_departures)
switch_vehicle_journey_at_stops = (event) ->
event.preventDefault()
@@ -72,4 +72,4 @@ jQuery ->
slide_to( '.departure_time', duration)
slide_to( '.arrival_time', duration)
- $(document).on("click", '.vehicle_journeys a.slide', slide) \ No newline at end of file
+ $(document).on("click", '.vehicle_journeys a.slide', slide)
diff --git a/app/assets/javascripts/vehicle_journeys_frequencies.js.coffee b/app/assets/javascripts/vehicle_journey_frequencies.js.coffee
index 24f83d18b..24f83d18b 100644
--- a/app/assets/javascripts/vehicle_journeys_frequencies.js.coffee
+++ b/app/assets/javascripts/vehicle_journey_frequencies.js.coffee
diff --git a/app/assets/stylesheets/main/layout.css.scss b/app/assets/stylesheets/main/layout.css.scss
index 0a9ade3a8..556ed5116 100644
--- a/app/assets/stylesheets/main/layout.css.scss
+++ b/app/assets/stylesheets/main/layout.css.scss
@@ -17,6 +17,10 @@ ol.breadcrumb{
margin-top: 10px;
}
+.ce-hide {
+ visibility: hidden;
+}
+
#middle{
min-height: 500px;
-webkit-box-shadow: 0 0 5px 2px rgba(0, 0, 0, .2);
diff --git a/app/assets/stylesheets/main/vehicle_journeys_frequencies.scss b/app/assets/stylesheets/main/vehicle_journey_frequencies.scss
index 682f02e12..5ca5f64e7 100644
--- a/app/assets/stylesheets/main/vehicle_journeys_frequencies.scss
+++ b/app/assets/stylesheets/main/vehicle_journey_frequencies.scss
@@ -1,10 +1,22 @@
#workspace {
.ce-TimeBandFormTable {
- border-left: 1px solid #616161;
+ display: none;
+ }
+ .ce-TimeBandFormTable {
+ .btn {
+ white-space: normal;
+ width: 130px;
+ }
+ }
+ .ce-TimeBandFormTable th {
+ text-align: center;
+ padding-bottom: 10px;
+ }
+ .ce-TimeBandFormTable td {
+ padding: 6px 20px 6px 20px;
}
.ce-TimeBandFormTable td {
- padding: 0 20px 4px 20px;
- vertical-align: top;
+ vertical-align: middle;
}
.ce-TimeBandFormTable td:last-child {
text-align: right;
@@ -22,9 +34,12 @@
width: 2px;
margin-left: -1px;
background-color: #61970b;
- }
- .ce-TimeBandFormTable tr:last-child td .ce-TimeBandFormTable-line {
- display: none;
+ }
+ .ce-TimeBandFormTable tr:first-child td .ce-TimeBandFormTable-line:after {
+ top: 50%;
+ }
+ .ce-TimeBandFormTable tr:last-child td .ce-TimeBandFormTable-line:after {
+ bottom: 50%;
}
.ce-TimeBandFormTable-circle {
position: relative;
@@ -39,18 +54,28 @@
background-color: #fff;
border: 2px solid #61970b;
}
- .ce-TimeBandFormTable-subList {
-
- }
.ce-FrequencyFormFields {
+ display: table;
+ width: 100%;
padding-left: 25%;
> li {
- display: inline-block;
+ display: table-cell;
+ width: 21%;
vertical-align: top;
+ padding:0 ;
+ margin: 0;
+ &:nth-last-child(2), &:last-child {
+ width: 8%;
+ }
+ label {
+ font-size: 13px;
+ padding-left: 0;
+ }
legend {
position: relative;
width: auto;
float: none;
+ border: 0;
label {
position: relative;
}
@@ -66,4 +91,11 @@
}
}
}
+ form.vehicle_journey_frequency {
+ .actions-add-fields {
+ clear: both;
+ padding-left: 25%;
+ margin-top: 10px;
+ }
+ }
}
diff --git a/app/assets/stylesheets/main/vehicle_journeys.css.scss b/app/assets/stylesheets/main/vehicle_journeys.css.scss
index 119883fb4..6f67bc4b4 100644
--- a/app/assets/stylesheets/main/vehicle_journeys.css.scss
+++ b/app/assets/stylesheets/main/vehicle_journeys.css.scss
@@ -1,21 +1,30 @@
-// Place all the styles related to the routes controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
-
-#workspace.vehicle_journeys.edit, #workspace.vehicle_journeys.update, #workspace.vehicle_journeys.create, #workspace.vehicle_journeys.new {
+#workspace.vehicle_journeys.edit,
+#workspace.vehicle_journeys.update,
+#workspace.vehicle_journeys.create,
+#workspace.vehicle_journeys.new,
+#workspace.vehicle_journey_frequencies.edit,
+#workspace.vehicle_journey_frequencies.update,
+#workspace.vehicle_journey_frequencies.create,
+#workspace.vehicle_journey_frequencies.new {
#route_color{
width: 100px;
color: white;
font-weight: bold;
}
+ .btn {
+ padding: 6px 12px;
+ }
+
.time_table_list { padding-left: 25%; }
- #vehicle_journey_footnote_ids_input {
+ #vehicle_journey_footnote_ids_input,
+ #vehicle_journey_frequency_footnote_ids_input {
min-height: 3em;
}
- .vehicle_journey_at_stops {
+ .vehicle_journey_at_stops,
+ .vehicle_journey_frequency_at_stops {
margin-left: 25%;
thead, tbody, tfoot{
@@ -56,7 +65,8 @@
}
}
-#workspace.vehicle_journeys.index
+#workspace.vehicle_journeys.index,
+#workspace.vehicle_journey_frequencies.index
{
#search{
@@ -95,39 +105,44 @@
}
-#workspace.vehicle_journeys.show, #workspace.vehicle_journeys.edit, #workspace.vehicle_journeys.update, #workspace.vehicle_journeys.create, #workspace.vehicle_journeys.new {
-
- .to_departures {
- cursor: pointer;
- }
-
- .to_arrivals {
- cursor: pointer;
- }
+#workspace.vehicle_journeys.show,
+#workspace.vehicle_journeys.edit,
+#workspace.vehicle_journeys.update,
+#workspace.vehicle_journeys.create,
+#workspace.vehicle_journeys.new,
+#workspace.vehicle_journey_journey.show,
+#workspace.vehicle_journey_journey.edit,
+#workspace.vehicle_journey_journey.update,
+#workspace.vehicle_journey_journey.create,
+#workspace.vehicle_journey_journey.new {
.slide {
cursor: pointer;
}
}
-#workspace.vehicle_journeys.show
+#workspace.vehicle_journeys.show,
+#workspace.vehicle_journey_frequencies.show
{
.summary p label {
font-weight: bold;
}
}
-#workspace.vehicle_journeys.timeless
+#workspace.vehicle_journeys.timeless,
+#workspace.vehicle_journey_frequencies.timeless
{
.summary p label {
font-weight: bold;
}
- .vehicle_journeys {
+ .vehicle_journeys,
+ .vehicle_journey_frequencies {
margin-top: 20px;
}
- .vehicle_journey {
+ .vehicle_journey,
+ .vehicle_journey_frequency {
span.included_day_type {
font-weight: bolder;
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 05:33:22 +0000