From 15383f00359587431e69ec6c609d3a264e82e66c Mon Sep 17 00:00:00 2001
From: Alberto Vena <kennyadsl@gmail.com>
Date: Wed, 28 Sep 2011 18:49:09 +0200
Subject: [PATCH 1/2] 0.70.x version adjustments

---
 app/overrides/faq_admin_tab.rb                |  4 +++
 config/routes.rb                              |  5 +++-
 .../spree_faq/install/install_generator.rb    | 30 +++++++++++++++++++
 lib/spree_faq.rb                              | 23 ++++++++++++--
 lib/spree_faq/engine.rb                       | 12 --------
 lib/spree_faq_hooks.rb                        |  6 ----
 6 files changed, 59 insertions(+), 21 deletions(-)
 create mode 100644 app/overrides/faq_admin_tab.rb
 create mode 100644 lib/generators/spree_faq/install/install_generator.rb
 delete mode 100644 lib/spree_faq/engine.rb
 delete mode 100644 lib/spree_faq_hooks.rb

diff --git a/app/overrides/faq_admin_tab.rb b/app/overrides/faq_admin_tab.rb
new file mode 100644
index 0000000..d139805
--- /dev/null
+++ b/app/overrides/faq_admin_tab.rb
@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "layouts/admin",
+                     :name => "faq_admin_tab",
+                     :insert_bottom => "[data-hook='admin_tabs']",
+                     :text => "<%= tab(:faq) %>")
diff --git a/config/routes.rb b/config/routes.rb
index 195ba7a..e6d9242 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,7 +1,10 @@
 Rails.application.routes.draw do
-  match :faq, :to => 'faqs#index', :as => 'faq'
 
+  match :faq, :to => 'faqs#index', :as => 'faq'
+  
   namespace :admin do 
     resources :question_categories
+    match :faq, :to => 'question_categories#index'
   end
+  
 end
diff --git a/lib/generators/spree_faq/install/install_generator.rb b/lib/generators/spree_faq/install/install_generator.rb
new file mode 100644
index 0000000..3381df1
--- /dev/null
+++ b/lib/generators/spree_faq/install/install_generator.rb
@@ -0,0 +1,30 @@
+module SpreeFaq
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+
+      def add_javascripts
+        append_file "app/assets/javascripts/admin/all.js", "//= require admin/jquery.scrollTo-min\n" 
+        append_file "app/assets/javascripts/store/all.js", "//= require store/spree_faq"
+      end
+
+      def add_stylesheets
+        inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_faq\n", :before => /\*\//, :verbose => true
+      end
+    end
+
+      def add_migrations
+        run 'rake railties:install:migrations FROM=spree_faq'
+      end
+
+      def run_migrations
+        res = ask "Would you like to run the migrations now? [Y/n]"
+        if res == "" || res.downcase == "y"
+          run 'rake db:migrate'
+        else
+          puts "Skiping rake db:migrate, don't forget to run it!"
+        end
+      end
+    end
+  end
+end
+
diff --git a/lib/spree_faq.rb b/lib/spree_faq.rb
index 2e308e0..d081fe1 100644
--- a/lib/spree_faq.rb
+++ b/lib/spree_faq.rb
@@ -1,3 +1,22 @@
 require 'spree_core'
-require 'spree_faq_hooks'
-require 'spree_faq/engine'
+
+module SpreeFaq
+  class Engine < Rails::Engine
+    engine_name 'spree_faq'
+
+    config.autoload_paths += %W(#{config.root}/lib)
+
+    def self.activate
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
+        Rails.env.production? ? require(c) : load(c)
+      end
+
+      Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/**/*.rb")) do |c|
+        Rails.env.production? ? require(c) : load(c)
+      end
+    end
+
+    config.to_prepare &method(:activate).to_proc
+  end
+end
+
diff --git a/lib/spree_faq/engine.rb b/lib/spree_faq/engine.rb
deleted file mode 100644
index 4d3eacd..0000000
--- a/lib/spree_faq/engine.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require "spree_faq"
-
-module SpreeFaq
-
-  class Engine < Rails::Engine
-
-    def self.activate
-    end
-
-  end
-
-end
diff --git a/lib/spree_faq_hooks.rb b/lib/spree_faq_hooks.rb
deleted file mode 100644
index ff0ac4f..0000000
--- a/lib/spree_faq_hooks.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-class SpreeFaqHooks < Spree::ThemeSupport::HookListener
-  insert_bottom :admin_tabs do
-    "<%=  tab(:question_categories, :label => :question_categories_admin) %>"
-  end
-end
-

From a51169cf8e9d2f1f275f32a4edec565ba394d327 Mon Sep 17 00:00:00 2001
From: Alberto Vena <kennyadsl@gmail.com>
Date: Thu, 29 Sep 2011 12:16:28 +0200
Subject: [PATCH 2/2] added italian locale

---
 config/locales/it.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 config/locales/it.yml

diff --git a/config/locales/it.yml b/config/locales/it.yml
new file mode 100644
index 0000000..65459f1
--- /dev/null
+++ b/config/locales/it.yml
@@ -0,0 +1,13 @@
+---
+it:
+  frequently_asked_questions: Domande Frequenti
+  question_categories_admin: FAQ
+  question_categories: Domande Frequenti
+  new_question_category: Nuova sezione
+  questions: Domande
+  create_category: Crea sezione
+  category_name: Nome della sezione
+  add_question: Aggiungi una domanda
+  question: Domanda
+  answer: Risposta
+  faq: Domande Frequenti
\ No newline at end of file