Business intelligence made simple
Switched to tag [skip ci]
Andrew Kane4f2158c03df9
diff --git a/app/views/blazer/_variables.html.erb b/app/views/blazer/_variables.html.erbindex 89f27cdd..c8233cbd 100644--- a/app/views/blazer/_variables.html.erb+++ b/app/views/blazer/_variables.html.erb@@ -9,7 +9,7 @@return moment.tz(time.format(format), timeZone)}<% end %>- <%= content_tag :form, id: "bind", method: "get", action: action, class: "form-inline", style: "margin-bottom: 15px;" do %>+ <%= tag.form id: "bind", method: "get", action: action, class: "form-inline", style: "margin-bottom: 15px;" do %><% date_vars = ["start_time", "end_time"] %><% if (date_vars - @bind_vars).empty? %><% @bind_vars = @bind_vars - date_vars %>@@ -31,7 +31,7 @@<%= hidden_field_tag var, var_params[var] %><div class="selectize-control single" style="width: 200px;">- <%= content_tag :div, id: "#{var}-select", class: "selectize-input", style: "display: inline-block;" do %>+ <%= tag.div id: "#{var}-select", class: "selectize-input", style: "display: inline-block;" do %><span>Select a date</span><% end %></div>diff --git a/app/views/blazer/checks/index.html.erb b/app/views/blazer/checks/index.html.erbindex 8e2a442f..4bb338b9 100644--- a/app/views/blazer/checks/index.html.erb+++ b/app/views/blazer/checks/index.html.erb@@ -39,7 +39,7 @@<td><%= link_to check.query.name, check.query %> <span class="text-muted"><%= check.try(:check_type).to_s.gsub("_", " ") %></span></td><td><% if check.state %>- <%= content_tag :small, check.state.upcase, class: "check-state #{check.state.parameterize.gsub("-", "_")}" %>+ <%= tag.small check.state.upcase, class: "check-state #{check.state.parameterize.gsub("-", "_")}" %><% end %></td><td><%= check.schedule if check.respond_to?(:schedule) %></td>diff --git a/app/views/blazer/queries/_chart.html.erb b/app/views/blazer/queries/_chart.html.erbindex 49aed410..d0ea5ddd 100644--- a/app/views/blazer/queries/_chart.html.erb+++ b/app/views/blazer/queries/_chart.html.erb@@ -1,5 +1,5 @@<% chart_id = SecureRandom.hex %>-<%= content_tag :div, nil, id: chart_id, style: "height: 300px;" %>+<%= tag.div id: chart_id, style: "height: 300px;" %><%= javascript_tag nonce: true do %>(function() {<%= blazer_js_var "chart", {type: type, id: chart_id, data: data, options: options} %>diff --git a/app/views/blazer/queries/run.html.erb b/app/views/blazer/queries/run.html.erbindex 7b1099cb..c75d6989 100644--- a/app/views/blazer/queries/run.html.erb+++ b/app/views/blazer/queries/run.html.erb@@ -73,7 +73,7 @@<% end %><% if @markers.any? %><% map_id = SecureRandom.hex %>- <%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %>+ <%= tag.div id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %><%= javascript_tag nonce: true do %><%= blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token %><%= blazer_js_var "markers", @markers %>@@ -82,7 +82,7 @@<% end %><% elsif @geojson.any? %><% map_id = SecureRandom.hex %>- <%= content_tag :div, nil, id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %>+ <%= tag.div id: map_id, style: "height: #{@only_chart ? 300 : 500}px;" %><%= javascript_tag nonce: true do %><%= blazer_js_var "mapboxAccessToken", Blazer.mapbox_access_token %><%= blazer_js_var "geojson", @geojson %>