spree_dash 1.2.4 → 1.3.0.rc1

data/app/controllers/spree/admin/analytics_controller.rb

@@ -1,8 +1,8 @@
 module Spree
   class Admin::AnalyticsController < Admin::BaseController
-    before_filter :redirect_if_registered
 
     def sign_up
+      redirect_if_registered and return
       @store = {
         :first_name => '',
         :last_name => '',
@@ -15,6 +15,7 @@ module Spree
     end
 
     def register
+      redirect_if_registered and return
       @store = params[:store]
       @store[:url] = format_url(@store[:url])
 
@@ -34,17 +35,34 @@ module Spree
         Spree::Dash::Config.app_token = @store[:app_token]
         Spree::Dash::Config.site_id = @store[:site_id]
         Spree::Dash::Config.token = @store[:site_token]
-        redirect_to admin_path, :notice => t(:successfully_signed_up_for_analytics)
+        flash[:notice] = t(:successfully_signed_up_for_analytics)
+        redirect_to admin_path
       rescue Spree::Dash::JirafeException => e
         flash[:error] = e.message
         render :sign_up
       end
     end
 
+    def edit
+
+    end
+
+    def update
+      Spree::Dash::Config.app_id = params[:app_id]
+      Spree::Dash::Config.app_token = params[:app_token]
+      Spree::Dash::Config.site_id = params[:site_id]
+      Spree::Dash::Config.token = params[:token]
+      flash[:success] = t(:jirafe_settings_updated, :scope => "spree.dash")
+      redirect_to admin_analytics_path
+    end
+
     private
 
     def redirect_if_registered
-      redirect_to admin_path, :notice => t(:already_signed_up_for_analytics) if Spree::Dash::Config.configured?
+      if Spree::Dash::Config.configured?
+        flash[:success] = t(:already_signed_up_for_analytics)
+        redirect_to admin_path and return true
+      end
     end
 
     def format_url(url)

data/app/helpers/spree/admin/overview_helper.rb

@@ -4,7 +4,7 @@ module Spree
 
       def jirafe_locale_links
         Spree::Admin::OverviewController::JIRAFE_LOCALES.collect do |langage, locale|
-          link_to t(langage), admin_path(:locale => locale)
+          link_to image_tag("flags/#{locale.split('_')[1].downcase}.png", :alt => langage.to_s.titleize), admin_path(:locale => locale), :class => 'with-tip', :title => langage.to_s.titleize, :data => {:'tip-color' => 'green'}
         end
       end
 

data/app/helpers/spree/analytics_helper.rb

@@ -42,7 +42,7 @@ module Spree
     end
 
     def completed_analytics_tags
-      return {} unless flash[:commerce_tracking] and @order and @order.complete?
+      return {} unless @order and @order.complete?
       { :confirm => { :orderid => @order.number,
                       :total => @order.total,
                       :shipping => @order.ship_total,

data/app/overrides/analytics_header.rb

@@ -1,5 +1,5 @@
-Deface::Override.new(:virtual_path => Spree::Config[:layout],
-                     :name => "add_analytics_header",
-                     :insert_bottom => "head",
-                     :partial => "spree/analytics/header",
-                     :original => '6f23c8af6e863d0499835c00b3f2763cb98e1d75')
+Deface::Override.new(:virtual_path => "spree/admin/shared/_configuration_menu",
+                     :name => "add_dashboard_sidebar_link",
+                     :insert_bottom => ".sidebar",
+                     :text => "<%= configurations_sidebar_menu_item t(:jirafe), admin_analytics_path %>",
+                     :original => 'a74f177275dc303c9cd5994b2e24e027434c3cbb')

data/app/views/spree/admin/analytics/edit.html.erb

@@ -0,0 +1,26 @@
+<h2><%= t(:header, :scope => "spree.dash.jirafe") %></h2>
+
+<p><%= t(:explanation, :scope => "spree.dash.jirafe") %></p>
+
+<%= form_tag admin_analytics_path, :method => :put do %>
+  <div class="field">
+    <%= label_tag 'app_id', t(:app_id, :scope => "spree.dash.jirafe") %><br>
+    <%= text_field_tag 'app_id', Spree::Dash::Config.app_id %> 
+  </div>
+  <div class="field">
+    <%= label_tag 'app_token', t(:app_token, :scope => "spree.dash.jirafe") %><br>
+    <%= text_field_tag 'app_token', Spree::Dash::Config.app_token, :size => 40 %> 
+  </div>
+  <div class="field">
+    <%= label_tag 'site_id', t(:site_id, :scope => "spree.dash.jirafe") %><br>
+    <%= text_field_tag 'site_id', Spree::Dash::Config.site_id %> 
+  </div>
+  <div class="field">
+    <%= label_tag 'token', t(:token, :scope => "spree.dash.jirafe") %><br>
+    <%= text_field_tag 'token', Spree::Dash::Config.token, :size => 40 %> 
+  </div>
+  <div class="form-buttons" data-hook="buttons">
+    <%= submit_tag "Update" %>
+  </div>
+<% end %>
+

data/app/views/spree/admin/analytics/sign_up.html.erb

@@ -1,45 +1,61 @@
+<% content_for :page_title do %>
+  <%= t(:analytics_sign_up) %>
+<% end %>
+
+<% content_for :page_title_classes do %>
+  align-center
+<% end %>
+
 <%= form_tag admin_analytics_register_path do %>
-  <fieldset id="analytics_signup" data-hook>
-    <legend><%= t(:analytics_sign_up) %></legend>
-    <p>
-      <%= check_box_tag 'store[terms_of_service]', @store[:terms_of_service], @store.has_key?(:terms_of_service), :size => 50 %>
-      <%= label_tag 'store[terms_of_service]', t(:agree_to_terms_of_service) %> (<a href="http://jirafe.com/about/terms" target="_new"><%= t(:review) %></a>)
-    </p>
-    <p>
-      <%= check_box_tag 'store[privacy_policy]', @store[:privacy_policy], @store.has_key?(:privacy_policy), :size => 50 %>
-      <%= label_tag 'store[privacy_policy]', t(:agree_to_privacy_policy) %> (<a href="http://jirafe.com/about/privacy" target="_new"><%= t(:review) %></a>)
-    </p>
-    <p>
-      <%= label_tag :first_name %><br>
+  <div id="analytics_signup" data-hook class="align-center label-block">
+    <div class="field">
+      <%= label_tag :first_name %>
       <%= text_field_tag 'store[first_name]', @store[:first_name], :size => 50 %>
-    </p>
-    <p>
-      <%= label_tag :last_name %><br>
+    </div>
+    
+    <div class="field">
+      <%= label_tag :last_name %>
       <%= text_field_tag 'store[last_name]', @store[:last_name], :size => 50 %>
-    </p>
-    <p>
-      <%= label_tag :email %><br>
+    </div>
+
+    <div class="field">
+      <%= label_tag :email %>
       <%= email_field_tag 'store[email]', @store[:email], :size => 50 %>
-    </p>
-    <p>
-      <%= label_tag :store_name %><br>
+    </div>
+    
+    <div class="field">
+      <%= label_tag :store_name %>
       <%= text_field_tag 'store[name]', @store[:name], :size => 50 %>
-    </p>
-    <p>
-      <%= label_tag :store_url %><br>
+    </div>
+    
+    <div class="field">
+      <%= label_tag :store_url %>
       <%= url_field_tag 'store[url]', @store[:url], :size => 50 %>
-    </p>
-    <p>
-      <%= label_tag :currency %><br>
-      <%= select_tag 'store[currency]', options_for_select(Spree::AnalyticsHelper::CURRENCIES, @store[:currency]) %>
-    </p>
-    <p>
-      <%= label_tag :time_zone %><br>
-      <%= select_tag 'store[time_zone]', time_zone_options_for_select(@store[:time_zone]) %>
-    </p>
-  </fieldset>
-  <p class="form-buttons" data-hook="buttons">
-    <%= button t(:activate) %>
-    <%= t(:or) %> <%= link_to t(:cancel), admin_path %>
-  </p>
+    </div>
+
+    <div class="field">
+      <%= label_tag :currency %>
+      <%= select_tag 'store[currency]', options_for_select(Spree::AnalyticsHelper::CURRENCIES, @store[:currency]), :class => 'select2' %>
+    </div>
+
+    <div class="field">
+      <%= label_tag :time_zone %>
+      <%= select_tag 'store[time_zone]', time_zone_options_for_select(@store[:time_zone]), :class => 'select2' %>
+    </div>
+
+    <div class="field">
+      <%= check_box_tag 'store[terms_of_service]', @store[:terms_of_service], @store.has_key?(:terms_of_service), :size => 50 %>
+      <%= label_tag 'store[terms_of_service]', t(:agree_to_terms_of_service) %> (<a href="http://jirafe.com/about/terms" target="_new"><%= t(:review) %></a>)
+    </div>
+    
+    <div class="field">
+      <%= check_box_tag 'store[privacy_policy]', @store[:privacy_policy], @store.has_key?(:privacy_policy), :size => 50 %>
+      <%= label_tag 'store[privacy_policy]', t(:agree_to_privacy_policy) %> (<a href="http://jirafe.com/about/privacy" target="_new"><%= t(:review) %></a>)
+    </div>
+  </div>
+  <div class="form-buttons" data-hook="buttons">
+    <%= button t(:activate), 'icon-ok' %>
+    <%= t(:or) %>
+    <%= link_to_with_icon 'icon-remove', t(:cancel), admin_path, :class => 'button' %>
+  </div>
 <% end %>

data/app/views/spree/admin/overview/index.html.erb

@@ -4,7 +4,13 @@
 <% end %>
 
 <% if Spree::Dash::Config.configured? %>
-  <h1><%= t(:overview) %></h1>
+  
+  <% content_for :page_actions do %>
+    <li id="jirafe_locales">
+      <i class="icon-globe"></i> <%= t(:choose_dashboard_locale) %>: <%= raw jirafe_locale_links.join(' ') %>
+    </li>
+  <% end %>
+
   <div id="jirafe"></div>
   <%= javascript_tag :defer => 'defer' do %>
     jirafe.jQuery('#jirafe').jirafe({
@@ -19,17 +25,27 @@
         }
     }, 10000);
   <% end %>
-  <div id="jirafe_locales">
-    <%= raw jirafe_locale_links.join(' | ') %>
-  </div>
 <% else %>
-  <div class="analytics_splash">
-    <%= image_tag 'analytics_dashboard_preview.png', :alt => 'Spree Analytics' %>
-  </div>
-  <br/>
-  <div class="preview-buttons">
-    <%= link_to content_tag(:span, t(:activate)), admin_analytics_sign_up_path, :class => 'button green' %>
-    <%= t(:or) %> &nbsp;
-    <%= link_to content_tag(:span, t(:learn_more)), "http://spreecommerce.com/blog/2012/01/31/introducing-spree-analytics/", :class => 'button', :target => '_blank' %>
+  <div class="no-border-top analytics-description">
+    <div class="description-text">
+      <hgroup>
+        <h1><%= t(:analytics_desc_header_1)%></h1>
+        <h6><%= t(:analytics_desc_header_2)%></h6>
+      </hgroup>
+
+      <ul>
+        <li><%= t(:analytics_desc_list_1)%></li>
+        <li><%= t(:analytics_desc_list_2)%></li>
+        <li><%= t(:analytics_desc_list_3)%></li>
+        <li><%= t(:analytics_desc_list_4)%></li>
+      </ul>
+    </div>
+    <div class="preview-buttons filter-actions actions">
+      <%= link_to_with_icon 'icon-ok', t(:activate), admin_analytics_sign_up_path, :class => 'button' %>
+      <span class="or">&nbsp; <%= t(:or) %> &nbsp;</span>
+      <%= link_to_with_icon 'icon-info-sign', t(:learn_more), "http://spreecommerce.com/blog/2012/01/31/introducing-spree-analytics/", :class => 'button', :target => '_blank' %>
+    </div>
   </div>
+
+  <div class="analytics_splash"></div>
 <% end %>

data/config/locales/en.yml

@@ -2,4 +2,21 @@ en:
   agree_to_terms_of_service: Agree to Terms of Service
   agree_to_privacy_policy: Agree to Privacy Policy
   already_signed_up_for_analytics: You have already signed up for Spree Analytics
-  successfully_signed_up_for_analytics: Successfully signed up for Spree Analytics
+  successfully_signed_up_for_analytics: Successfully signed up for Spree Analytics
+  analytics_desc_header_1: Spree Analytics
+  analytics_desc_header_2: Live analytics integrated into your Spree dashboard
+  analytics_desc_list_1: Get live sales information as it happens
+  analytics_desc_list_2: Requires only a free Spree account to activate
+  analytics_desc_list_3: Absolutely no code to install
+  analytics_desc_list_4: It's completely free!
+
+  spree:
+    dash:
+      jirafe:
+        header: Jirafe Analytics Settings
+        app_id: App ID
+        app_token: App Token
+        site_id: Site ID
+        token: Token
+        explanation: The fields below may already be populated if you chose to register with Jirafe from the admin dashboard.
+      jirafe_settings_updated: Jirafe Settings have been updated.

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spree_dash
 version: !ruby/object:Gem::Version
-  version: 1.2.4
-  prerelease: 
+  version: 1.3.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Brian Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -51,14 +51,14 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- app/assets/images/analytics_dashboard_preview.png
+- app/assets/images/analytics_dashboard_preview.jpg
 - app/controllers/spree/admin/analytics_controller.rb
 - app/controllers/spree/admin/overview_controller.rb
 - app/helpers/spree/admin/overview_helper.rb
 - app/helpers/spree/analytics_helper.rb
 - app/models/spree/dash_configuration.rb
 - app/overrides/analytics_header.rb
-- app/overrides/configuration_menu_link.rb
+- app/views/spree/admin/analytics/edit.html.erb
 - app/views/spree/admin/analytics/sign_up.html.erb
 - app/views/spree/admin/overview/index.html.erb
 - app/views/spree/analytics/_header.html.erb
@@ -69,8 +69,7 @@ files:
 - lib/spree/dash.rb
 - lib/spree_dash.rb
 homepage: http://spreecommerce.com
-licenses:
-- BSD-3
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -84,12 +83,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -656834076944566421
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 

data/app/overrides/configuration_menu_link.rb

@@ -1,5 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/admin/shared/_configuration_menu",
-                     :name => "add_dashboard_sidebar_link",
-                     :insert_bottom => ".sidebar",
-                     :text => "<%= configurations_sidebar_menu_item t(:jirafe), admin_analytics_path %>",
-                     :original => 'a74f177275dc303c9cd5994b2e24e027434c3cbb')