spree_dash 0.70.0.rc2 → 0.70.0

Sign up to get free protection for your applications and to get access to all the features.
data/LICENSE CHANGED
@@ -1,4 +1,4 @@
1
- Copyright (c) 2007-2010, Rails Dog LLC and other contributors
1
+ Copyright (c) 2007-2011, Rails Dog LLC and other contributors
2
2
  All rights reserved.
3
3
 
4
4
  Redistribution and use in source and binary forms, with or without modification,
@@ -84,7 +84,7 @@ jQuery(document).ready(function(){
84
84
  },
85
85
  series:[{lineWidth:3, color: '#0095DA', fillAndStroke: true, fill: true, fillColor: '#E6F7FF'}],
86
86
  highlighter: {
87
- formatString: "Date: %s <br/>Value: %s ",
87
+ formatString: "Date: %s <br />Value: %s ",
88
88
  sizeAdjust: 7.5
89
89
  }
90
90
  };
@@ -1,4 +1,4 @@
1
- <h1><%= t("overview") %></h1>
1
+ <h1><%= t(:overview) %></h1>
2
2
 
3
3
  <div data-hook="admin_dashboard">
4
4
  <% if @show_dashboard %>
@@ -6,8 +6,8 @@
6
6
  <div class="dashboard_left">
7
7
  <div data-hook="admin_dashboard_left">
8
8
  <div class="dashboard_small_wrapper">
9
- <h2><%= t('best_selling_products') %></h2>
10
- <div id="best_selling_products" style="width:50%;height:170px;float:left"></div>
9
+ <h2><%= t(:best_selling_products) %></h2>
10
+ <div id="best_selling_products" style="width:50%; height:170px; float:left;"></div>
11
11
  <div id="pie_legend">
12
12
  <% @best_selling_variants.each_with_index do |v,i| %>
13
13
  <span style="background-color:<%= @pie_colors[i] %>">&nbsp;</span>
@@ -16,8 +16,8 @@
16
16
  <% end %>
17
17
  </div>
18
18
 
19
- <h2><%= t('top_grossing_products') %></h2>
20
- <div id="top_grossing_products" style="width:50%;height:170px;float:left"></div>
19
+ <h2><%= t(:top_grossing_products) %></h2>
20
+ <div id="top_grossing_products" style="width:50%; height:170px; float:left;"></div>
21
21
  <div id="pie_legend">
22
22
  <% @top_grossing_variants.each_with_index do |v,i| %>
23
23
  <span style="background-color:<%= @pie_colors[i] %>">&nbsp;</span>
@@ -26,8 +26,8 @@
26
26
  <% end %>
27
27
  </div>
28
28
 
29
- <h2><%= t('best_selling_taxons') %></h2>
30
- <div id="best_selling_taxons" style="width:50%;height:170px;float:left"></div>
29
+ <h2><%= t(:best_selling_taxons) %></h2>
30
+ <div id="best_selling_taxons" style="width:50%; height:170px; float:left;"></div>
31
31
  <div id="pie_legend">
32
32
  <% @best_selling_taxons.each_with_index do |t,i| %>
33
33
  <span style="background-color:<%= @pie_colors[i] %>">&nbsp;</span>
@@ -148,7 +148,7 @@
148
148
 
149
149
  <% content_for :head do %>
150
150
  <% if @show_dashboard %>
151
- <script type="text/javascript">
151
+ <%= javascript_tag do -%>
152
152
  var orders_by_day_points = [[<%== @orders_by_day.map { |day| "[\"#{day[0]}\",#{day[1]}]" }.join(",") %>]];
153
153
  var best_selling_variants_points = [<%== @best_selling_variants.map { |v| "[\"#{h(v[0])}\",#{v[1]}]" }.join(",") %>];
154
154
  var top_grossing_variants_points = [<%== @top_grossing_variants.map { |v| "[\"#{h(v[0])}\",#{v[1]}]" }.join(",") %>];
@@ -158,7 +158,7 @@
158
158
  var by_day = "<%= t(:by_day) %>";
159
159
 
160
160
  var pie_colors = [<%== @pie_colors.map{|c| "'#{c}'"}.join(",") %>];
161
- </script>
161
+ <% end -%>
162
162
  <!--[if IE]><%= javascript_include_tag 'jqPlot/excanvas.min.js' %><![endif]-->
163
163
  <% end %>
164
164
  <% end %>
metadata CHANGED
@@ -1,15 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_dash
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15425137
5
- prerelease: 7
4
+ hash: 263
5
+ prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 70
9
9
  - 0
10
- - rc
11
- - 2
12
- version: 0.70.0.rc2
10
+ version: 0.70.0
13
11
  platform: ruby
14
12
  authors:
15
13
  - Brian Quinn
@@ -17,7 +15,7 @@ autorequire:
17
15
  bindir: bin
18
16
  cert_chain: []
19
17
 
20
- date: 2011-09-30 00:00:00 Z
18
+ date: 2011-10-07 00:00:00 Z
21
19
  dependencies:
22
20
  - !ruby/object:Gem::Dependency
23
21
  type: :runtime
@@ -27,14 +25,12 @@ dependencies:
27
25
  requirements:
28
26
  - - "="
29
27
  - !ruby/object:Gem::Version
30
- hash: 15425137
28
+ hash: 263
31
29
  segments:
32
30
  - 0
33
31
  - 70
34
32
  - 0
35
- - rc
36
- - 2
37
- version: 0.70.0.rc2
33
+ version: 0.70.0
38
34
  version_requirements: *id001
39
35
  name: spree_core
40
36
  description: Required dependency for Spree
@@ -89,14 +85,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
89
85
  required_rubygems_version: !ruby/object:Gem::Requirement
90
86
  none: false
91
87
  requirements:
92
- - - ">"
88
+ - - ">="
93
89
  - !ruby/object:Gem::Version
94
- hash: 25
90
+ hash: 3
95
91
  segments:
96
- - 1
97
- - 3
98
- - 1
99
- version: 1.3.1
92
+ - 0
93
+ version: "0"
100
94
  requirements:
101
95
  - none
102
96
  rubyforge_project: spree_dash