From ce6f868ba5f7443f453df25c8b6d6e62719183cd Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 20 Oct 2015 13:55:23 +0200 Subject: [PATCH] Replaced active with is-active class. --- .../app/controllers/report.js.coffee | 34 +++++++++---------- .../app/views/report/download_header.jst.eco | 2 +- .../app/views/report/time_picker.jst.eco | 8 ++--- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/app/controllers/report.js.coffee b/app/assets/javascripts/app/controllers/report.js.coffee index f6564eec9..3d63b9357 100644 --- a/app/assets/javascripts/app/controllers/report.js.coffee +++ b/app/assets/javascripts/app/controllers/report.js.coffee @@ -212,15 +212,15 @@ class Download extends App.Controller active = false @el.find('.js-dataDownloadBackendSelector').each( (index, element) -> - if $(element).parent().hasClass('active') + if $(element).parent().hasClass('is-active') active = true ) if !active - @el.find('.js-dataDownloadBackendSelector').first().parent().addClass('active') + @el.find('.js-dataDownloadBackendSelector').first().parent().addClass('is-active') # rerender view after backend is selected @el.find('.js-dataDownloadBackendSelector').each( (index, element) => - if $(element).parent().hasClass('active') + if $(element).parent().hasClass('is-active') @profileSelectedId = $(element).data('profile-id') @backendSelected = $(element).data('backend') ) @@ -230,8 +230,8 @@ class Download extends App.Controller tableUpdate: (e) => if e e.preventDefault() - @el.find('.js-dataDownloadBackendSelector').parent().removeClass('active') - $(e.target).parent().addClass('active') + @el.find('.js-dataDownloadBackendSelector').parent().removeClass('is-active') + $(e.target).parent().addClass('is-active') @profileSelectedId = $(e.target).data('profile-id') @backendSelected = $(e.target).data('backend') @@ -297,8 +297,8 @@ class TimeRangePicker extends App.Controller @html App.view('report/time_range_picker')() # select time slot - @el.find('.js-timeRange').removeClass('active') - @el.find('.js-timeRange[data-type="' + @ui.params.timeRange + '"]').addClass('active') + @el.find('.js-timeRange').removeClass('is-active') + @el.find('.js-timeRange[data-type="' + @ui.params.timeRange + '"]').addClass('is-active') select: (e) => console.log('TS click') @@ -336,35 +336,35 @@ class TimePicker extends App.Controller ) # select time slot - @el.find('.time-slot').removeClass('active') - @el.find('.time-slot[data-type="' + @ui.params.timeRange + '"]').addClass('active') + @el.find('.time-slot').removeClass('is-active') + @el.find('.time-slot[data-type="' + @ui.params.timeRange + '"]').addClass('is-active') selectTimeDay: (e) => e.preventDefault() @ui.params.day = $(e.target).data('type') - $(e.target).parent().parent().find('li').removeClass('active') - $(e.target).parent().addClass('active') + $(e.target).parent().parent().find('li').removeClass('is-active') + $(e.target).parent().addClass('is-active') App.Event.trigger( 'ui:report:rerender' ) selectTimeMonth: (e) => e.preventDefault() @ui.params.month = $(e.target).data('type') - $(e.target).parent().parent().find('li').removeClass('active') - $(e.target).parent().addClass('active') + $(e.target).parent().parent().find('li').removeClass('is-active') + $(e.target).parent().addClass('is-active') App.Event.trigger( 'ui:report:rerender' ) selectTimeWeek: (e) => e.preventDefault() @ui.params.week = $(e.target).data('type') - $(e.target).parent().parent().find('li').removeClass('active') - $(e.target).parent().addClass('active') + $(e.target).parent().parent().find('li').removeClass('is-active') + $(e.target).parent().addClass('is-active') App.Event.trigger( 'ui:report:rerender' ) selectTimeYear: (e) => e.preventDefault() @ui.params.year = $(e.target).data('type') - $(e.target).parent().parent().find('li').removeClass('active') - $(e.target).parent().addClass('active') + $(e.target).parent().parent().find('li').removeClass('is-active') + $(e.target).parent().addClass('is-active') App.Event.trigger( 'ui:report:rerender' ) _timeSlotPicker: -> diff --git a/app/assets/javascripts/app/views/report/download_header.jst.eco b/app/assets/javascripts/app/views/report/download_header.jst.eco index 2c06034c9..d772fe768 100644 --- a/app/assets/javascripts/app/views/report/download_header.jst.eco +++ b/app/assets/javascripts/app/views/report/download_header.jst.eco @@ -4,7 +4,7 @@ <% for profile in @profiles: %> <% for backend in @metric.backend: %> <% if backend.dataDownload: %> -
  • <%= @T(backend.display) %>
  • +
  • <%= @T(backend.display) %>
  • <% end %> <% end %> <% end %> diff --git a/app/assets/javascripts/app/views/report/time_picker.jst.eco b/app/assets/javascripts/app/views/report/time_picker.jst.eco index 707fc5220..7e015223a 100644 --- a/app/assets/javascripts/app/views/report/time_picker.jst.eco +++ b/app/assets/javascripts/app/views/report/time_picker.jst.eco @@ -2,7 +2,7 @@ <% if @params.timeRange is 'day': %>
    <% for item in @timeRangeDay: %> - + <% end %>

    @@ -11,7 +11,7 @@ <% if @params.timeRange is 'day' || @params.timeRange is 'month': %>
    <% for item in @timeRangeMonth: %> - + <% end %>

    @@ -20,7 +20,7 @@ <% if @params.timeRange is 'week': %>
    <% for item in @timeRangeWeek: %> - + <% end %>

    @@ -29,7 +29,7 @@ <% if @params.timeRange isnt 'realtime': %>
    <% for item in @timeRangeYear: %> - + <% end %>
    <% end %>