1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00

restablished erb files

This commit is contained in:
Sylvain 2018-10-25 17:08:13 +02:00
parent 5da4bf6317
commit e7031c90d5
25 changed files with 5 additions and 24 deletions

View File

@ -333,10 +333,10 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco
// Open the modal window allowing the user to log in. // Open the modal window allowing the user to log in.
// # // #
var openLoginModal = function (toState, toParams, callback) { var openLoginModal = function (toState, toParams, callback) {
// <% active_provider = AuthProvider.active %> <% active_provider = AuthProvider.active %>
// <% if active_provider.providable_type != DatabaseProvider.name %> <% if active_provider.providable_type != DatabaseProvider.name %>
$window.location.href = '<%=user_omniauth_authorize_path(AuthProvider.active.strategy_name.to_sym)%>' $window.location.href = '<%=user_omniauth_authorize_path(AuthProvider.active.strategy_name.to_sym)%>'
// <% else %> <% else %>
return $uibModal.open({ return $uibModal.open({
templateUrl: '<%= asset_path "shared/deviseModal.html" %>', templateUrl: '<%= asset_path "shared/deviseModal.html" %>',
size: 'sm', size: 'sm',
@ -414,7 +414,7 @@ Application.Controllers.controller('ApplicationController', ['$rootScope', '$sco
} }
// otherwise the user just closed the modal // otherwise the user just closed the modal
// <% end %> <% end %>
// # // #
// Detect if the current page (tab/window) is active of put as background. // Detect if the current page (tab/window) is active of put as background.

View File

@ -43,7 +43,7 @@ Application.Controllers.controller('EventsController', ['$scope', '$state', 'Eve
age_range_id: null age_range_id: null
} }
// $scope.monthNames = [<%= t('date.month_names')[1..-1].map { |m| "\"#{m}\"" }.join(', ') %>] $scope.monthNames = [<%= t('date.month_names')[1..-1].map { |m| "\"#{m}\"" }.join(', ') %>]
// # // #
// Adds a resultset of events to the bottom of the page, grouped by month // Adds a resultset of events to the bottom of the page, grouped by month

View File

@ -1,19 +0,0 @@
===== /home/sylvain/workspace/fab-manager/app/assets/javascripts/controllers/application.coffee
NormalizeStage failed to parse: unexpected <
303 | ##
304 | openLoginModal = (toState, toParams, callback) ->
> 305 | <% active_provider = AuthProvider.active %>
| ^
306 | <% if active_provider.providable_type != DatabaseProvider.name %>
307 | $window.location.href = '<%=user_omniauth_authorize_path(AuthProvider.active.strategy_name.to_sym)%>'
===== /home/sylvain/workspace/fab-manager/app/assets/javascripts/controllers/events.coffee
NormalizeStage failed to parse: unexpected <
32 | age_range_id: null
33 |
> 34 | $scope.monthNames = [<%= t('date.month_names')[1..-1].map { |m| "\"#{m}\"" }.join(', ') %>]
| ^
35 |
36 | ##