Merge branch 'feature/translation-tabs' into develop

Author: fabn

.gitignore

@@ -1,3 +1,16 @@
 .bundle/
 .bin
 
+# sqlite files
+*.sqlite3
+
+# tmp files
+tmp/
+
+# ignore Gemfile.lock and other lockfiles
+*.lock
+
+# Dummy app ignored stuff
+spec/dummy/db/*.sqlite3
+spec/dummy/log/*.log
+spec/dummy/tmp/

.rspec

@@ -0,0 +1,2 @@
+--color
+--format progress

Gemfile

@@ -1,6 +1,45 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
+# Declare your gem's dependencies in activeadmin-globalize.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
 gemspec
 
-gem 'activeadmin', github: 'gregbell/active_admin', branch: 'master'
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
 
+# To use debugger
+# gem 'debugger'
+
+# Gems used by the dummy application
+group :assets do
+  gem 'sass-rails', '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  gem 'therubyracer', platforms: :ruby
+
+  gem 'uglifier', '>= 1.0.3'
+end
+
+# jquery-rails is
+gem 'jquery-rails'
+
+group :test do
+  gem 'sqlite3', '~> 1.3.5'
+  gem 'rspec-rails', '~> 2.14.0'
+  gem 'factory_girl_rails', '~> 4.2.1'
+  gem 'database_cleaner', '~> 1.0.1'
+  gem 'guard-rspec', require: false
+  gem 'spring', require: false
+  gem 'spring-commands-rspec', require: false
+  gem 'capybara', '~> 2.1.0'
+  gem 'capybara-screenshot'
+  gem 'poltergeist'
+  gem 'fuubar'
+  # Useful to debug tests
+  gem 'awesome_print'
+  gem 'pry'
+end

Gemfile.lock

@@ -0,0 +1,16 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec, cmd: 'spring rspec -f Fuubar' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^dummy/app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^dummy/app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^dummy/app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+
+end
+

Guardfile

@@ -0,0 +1,18 @@
+#!/usr/bin/env rake
+require 'bundler/gem_tasks'
+
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
+load 'rails/tasks/engine.rake'
+
+Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task default: %w(app:test:prepare spec)

Rakefile

@@ -1,21 +1,27 @@
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('../lib', __FILE__)
 
 # Maintain your gem's version:
-require "active_admin/globalize/version"
+require 'active_admin/globalize/version'
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = "activeadmin-globalize"
+  s.name        = 'activeadmin-globalize'
   s.version     = ActiveAdmin::Globalize::VERSION
-  s.authors     = ["Stefano Verna"]
-  s.email       = ["stefano.verna@gmail.com"]
-  s.homepage    = "http://github.com/stefanoverna/activeadmin-globalize"
-  s.summary     = "Handles globalize translations"
-  s.description = "Handles globalize translations"
+  s.authors     = ['Stefano Verna']
+  s.email       = ['stefano.verna@gmail.com']
+  s.homepage    = 'http://github.com/stefanoverna/activeadmin-globalize'
+  s.summary     = 'Handles globalize translations'
+  s.description = 'Handles globalize translations'
 
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "README.md"]
+  s.files = Dir['{app,config,db,lib}/**/*'] + %w(MIT-LICENSE README.md)
+
+  s.add_dependency 'activeadmin', '>= 0.6.3'
+  s.add_dependency 'globalize', '>= 3.0.4'
+
+  # development dependencies
+  s.add_development_dependency 'bundler', '~> 1.6.1'
+  s.add_development_dependency 'rake'
+  # Other development dependencies moved into Gemfile
 
-  s.add_dependency "activeadmin"
-  s.add_dependency "globalize", '>= 3.0.4'
 end
 

activeadmin-globalize.gemspec

@@ -23,10 +23,14 @@ $ ->
 
     $(".activeadmin-translations > ul").each ->
       $dom = $(this)
+      # true when tabs are used in show action, false in form
+      showAction = $dom.hasClass('locale-selector')
+
       if !$dom.data("ready")
         $dom.data("ready", true)
         $tabs = $("li > a", this)
-        $contents = $(this).siblings("fieldset")
+        # content to toggle is different according to current action
+        $contents = if showAction then $(this).siblings("div.field-translation") else $(this).siblings("fieldset")
 
         $tabs.click (e) ->
           $tab = $(this)
@@ -38,6 +42,9 @@ $ ->
 
         $tabs.eq(0).click()
 
+        # Add button and other behavior is not needed in show action
+        return if showAction
+
         # Collect tha available locales.
         availableLocales = []
         $tabs.not('.default').each ->
@@ -135,5 +142,13 @@ $ ->
       50
     )
 
+  # Used to toggle translations values for inline fields
+  $('a.ui-translation-trigger').click (e) ->
+    $locale = $(this).data('locale')
+    $td = $(this).closest('td')
+    $('.field-translation', $td).hide()
+    $(".locale-#{$locale}", $td).show()
+    e.preventDefault()
+
   translations()
 

app/assets/javascripts/active_admin/active_admin_globalize.js.coffee

@@ -5,11 +5,14 @@
 .flag
   width: 16px
   height: 11px
+  vertical-align: middle
   background: url(active_admin_image_path('flags.png')) no-repeat
   &.flag-ar // originally flag-ae
     background-position: -16px 0
   &.flag-br
     background-position: -32px 0
+  &.flag-pt-BR
+    background-position: -32px 0
   &.flag-de
     background-position: -48px 0
   &.flag-es
@@ -24,7 +27,26 @@
     background-position: 0 -22px
   &.flag-pt
     background-position: -16px -22px
+  &.flag-pt-PT
+    background-position: -16px -22px
   &.flag-tr
     background-position: -32px -22px
   &.flag-en // originally flag-us
-    background-position: -48px -22px
+    background-position: -48px -22px
+
+// Used to distantiate inline locale selector
+span.inline-locale-selector
+  margin-right: 10px
+
+.field-translation.hidden
+  display: none
+
+ul.locale-selector
+  margin-bottom: 0 !important
+
+div.field-translation
+  padding: 10px 10px
+  +inset-shadow(0, -40px, 40px, #ddd)
+  +border-top-radius(4px)
+  +border-bottom-radius(6px)
+  min-height: 80px

app/assets/stylesheets/active_admin/active_admin_globalize_flags.css.sass

@@ -0,0 +1,2 @@
+# Tell spring where the app is
+Spring.application_root = './spec/dummy'