app/views/admin/overview/index.html.erb in spree_dash-0.70.0.rc2 vs app/views/admin/overview/index.html.erb in spree_dash-0.70.0
- old
+ new
@@ -1,35 +1,35 @@
-<h1><%= t("overview") %></h1>
+<h1><%= t(:overview) %></h1>
<div data-hook="admin_dashboard">
<% if @show_dashboard %>
<div class="dashboard">
<div class="dashboard_left">
<div data-hook="admin_dashboard_left">
<div class="dashboard_small_wrapper">
- <h2><%= t('best_selling_products') %></h2>
- <div id="best_selling_products" style="width:50%;height:170px;float:left"></div>
+ <h2><%= t(:best_selling_products) %></h2>
+ <div id="best_selling_products" style="width:50%; height:170px; float:left;"></div>
<div id="pie_legend">
<% @best_selling_variants.each_with_index do |v,i| %>
<span style="background-color:<%= @pie_colors[i] %>"> </span>
<label><%= truncate v[0], :length => 27 %></label>
<div><%= number_with_delimiter v[1] %> <%= t(:units) %></div>
<% end %>
</div>
- <h2><%= t('top_grossing_products') %></h2>
- <div id="top_grossing_products" style="width:50%;height:170px;float:left"></div>
+ <h2><%= t(:top_grossing_products) %></h2>
+ <div id="top_grossing_products" style="width:50%; height:170px; float:left;"></div>
<div id="pie_legend">
<% @top_grossing_variants.each_with_index do |v,i| %>
<span style="background-color:<%= @pie_colors[i] %>"> </span>
<label><%= truncate v[0], :length => 27 %></label>
<div><%= number_to_currency v[1], :precision => 0 %></div>
<% end %>
</div>
- <h2><%= t('best_selling_taxons') %></h2>
- <div id="best_selling_taxons" style="width:50%;height:170px;float:left"></div>
+ <h2><%= t(:best_selling_taxons) %></h2>
+ <div id="best_selling_taxons" style="width:50%; height:170px; float:left;"></div>
<div id="pie_legend">
<% @best_selling_taxons.each_with_index do |t,i| %>
<span style="background-color:<%= @pie_colors[i] %>"> </span>
<label><%= truncate t[0], :length => 27 %></label>
<div><%= number_with_delimiter t[1] %> <%= t(:units) %></div>
@@ -146,19 +146,19 @@
<% end %>
</div>
<% content_for :head do %>
<% if @show_dashboard %>
- <script type="text/javascript">
+ <%= javascript_tag do -%>
var orders_by_day_points = [[<%== @orders_by_day.map { |day| "[\"#{day[0]}\",#{day[1]}]" }.join(",") %>]];
var best_selling_variants_points = [<%== @best_selling_variants.map { |v| "[\"#{h(v[0])}\",#{v[1]}]" }.join(",") %>];
var top_grossing_variants_points = [<%== @top_grossing_variants.map { |v| "[\"#{h(v[0])}\",#{v[1]}]" }.join(",") %>];
var best_selling_taxons_points = [<%== @best_selling_taxons.map { |t| "[\"#{h(t[0])}\",#{t[1]}]" }.join(",") %>];
var orders = "<%= t(:orders) %>";
var by_day = "<%= t(:by_day) %>";
var pie_colors = [<%== @pie_colors.map{|c| "'#{c}'"}.join(",") %>];
- </script>
+ <% end -%>
<!--[if IE]><%= javascript_include_tag 'jqPlot/excanvas.min.js' %><![endif]-->
<% end %>
<% end %>