index.html.erb in spree_dash-0.30.0

- old
+ new

@@ -95,11 +95,11 @@
                 <th class="text-right"><%= t('total') %></th>
               </tr>
             </thead>
             <% @last_five_orders.each do |order| %>
               <tr>
-                <td><%= order[0] %></td>
+                <td><%= truncate order[0], :length => 18 %></td>
                 <td class="text-right"><%= order[1] %></td>
                 <td class="text-right"><%= number_to_currency order[2] %></td>
               </tr>
             <% end %>
           </table>
@@ -139,11 +139,11 @@
       </div>
     <% end %>
     <p style="clear:both;">&nbsp;</p>
   <% else %>
     <%= hook :admin_dashboard_welcome do %>
-      <%= t('overview_welcome') %>
+      <%= raw t('overview_welcome') %>
     <% end %>
   <% end %>
 <% end %>
 
 <% content_for :head do %>
@@ -158,15 +158,15 @@
         var orders = "<%= t(:orders) %>";
         var by_day = "<%= t(:by_day) %>";
 
         var pie_colors = [<%= raw @pie_colors.map{|c| "'#{c}'"}.join(",") %>];
        </script>
-    <% end %>
 
-    <%= javascript_include_tag 'jqPlot/jquery.jqplot.min.js', 'jqPlot/plugins/jqplot.dateAxisRenderer.min.js', 'jqPlot/plugins/jqplot.highlighter.min.js',
+      <%= javascript_include_tag 'jqPlot/jquery.jqplot.min.js', 'jqPlot/plugins/jqplot.dateAxisRenderer.min.js', 'jqPlot/plugins/jqplot.highlighter.min.js',
         'jqPlot/plugins/jqplot.canvasAxisTickRenderer.min.js', 'jqPlot/plugins/jqplot.canvasTextRenderer.min.js', 'jqPlot/plugins/jqplot.canvasAxisLabelRenderer.min.js',
         'jqPlot/plugins/jqplot.pieRenderer.min.js', 'dashboard.js' %>
     <!--[if IE]><%= javascript_include_tag 'jqPlot/excanvas.min.js' %><![endif]-->
+    <% end %>
   <% end %>
 
   <%= hook :admin_dashboard_stylesheet do %>
      <%= stylesheet_link_tag 'admin/dashboard.css' %>
   <% end %>