awesome_translations 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee1fd468bc911c56d14d80fc86df302a0d887b75
-  data.tar.gz: 32c3948ae1606de73d4a263c9a17ce23d026483c
+  metadata.gz: 2612f4e54832948cbc8795bfa88bb6bf458ecec4
+  data.tar.gz: 1c4fc8b58b69605a0d5b94c79548e20ef814e5b8
 SHA512:
-  metadata.gz: efeaa1afcac446d77b68d7041c52abce595ab0571ad11cffefc06de3bcfa0f49bd1c4089ce7f36c022dcce05e478464f3ef03bd1fdf34e939ec53af99c37d803
-  data.tar.gz: 9a9b52aaeecd6d93a765c83f42161bbe4cf6ae07a0bbc996e7278c9826e4f494a182822b672c97eb0d6315c854d26037cea0a2c37b5609c3cf1f3043b52f0116
+  metadata.gz: 92fe4b6b6632eedf9beaa788f4a9f8be2279030e8b63b4dc3e729d0c1cd13856ba32e79756e02143222a3957ad220962403a2952f4dbd0152aec7a1891bb3818
+  data.tar.gz: 47cd24f3919a6442a3ec2831989a5f96f5a07f214d2fe363018d5502161e7e2b7c622183d19063e423c99b6b3c1afe5b3e98a6b8e4eb9cea6ab918563935230f

data/app/assets/javascripts/awesome_translations/application.js.coffee

@@ -1,3 +1,4 @@
 #= require jquery
 #= require jquery_ujs
+#= require twitter/bootstrap
 #= require_tree .

data/app/assets/stylesheets/awesome_translations/{application.css.scss → application.scss}

@@ -9,6 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require awesome_translations/layout
+ *= require awesome_translations/bootstrap_and_overrides
  *= require awesome_translations/groups
 */

data/app/assets/stylesheets/awesome_translations/bootstrap_and_overrides.scss

@@ -0,0 +1,41 @@
+//= require twitter-bootstrap-static/bootstrap
+//
+// Use Font Awesome icons (default)
+// To use Glyphicons sprites instead of Font Awesome, replace with "require twitter-bootstrap-static/sprites"
+//= require twitter-bootstrap-static/fontawesome
+
+@import "twitter-bootstrap-static/bootstrap";
+
+// scss-lint:disable PlaceholderInExtend
+.hidden-lg-down {
+  @extend .hidden-lg, .hidden-md, .hidden-sm, .hidden-xs;
+}
+
+.hidden-md-down {
+  @extend .hidden-md, .hidden-sm, .hidden-xs;
+}
+
+.hidden-sm-down {
+  @extend .hidden-sm, .hidden-xs;
+}
+
+.hidden-xs-down {
+  @extend .hidden-xs;
+}
+
+.hidden-lg-up {
+  @extend .hidden-lg;
+}
+
+.hidden-md-up {
+  @extend .hidden-lg, .hidden-md;
+}
+
+.hidden-sm-up {
+  @extend .hidden-lg, .hidden-md, .hidden-sm;
+}
+
+.hidden-xs-up {
+  @extend .hidden-lg, .hidden-md, .hidden-sm, .hidden-xs;
+}
+// scss-lint:enable PlaceholderInExtend

data/app/assets/stylesheets/awesome_translations/{groups.css.scss → groups.scss}

@@ -1,6 +1,6 @@
-body.controller_groups {
-  &.action_show {
-    table.translations {
+body.controller-groups {
+  &.action-show {
+    table {
       width: 100%;
       table-layout: fixed;
 
@@ -17,22 +17,6 @@ body.controller_groups {
           }
         }
 
-        td.line-content .container {
-          font-family: Monospace;
-          border: 1px solid black;
-          background-color: lightgrey;
-          padding: 5px;
-          overflow-x: auto;
-
-          pre {
-            margin: 0px;
-          }
-        }
-
-        td.line-spacer {
-          height: 10px;
-        }
-
         td.translation {
           .translation-input {
             width: 100%;

data/app/controllers/awesome_translations/caches_controller.rb

@@ -3,7 +3,7 @@ class AwesomeTranslations::CachesController < AwesomeTranslations::ApplicationCo
   end
 
   def create
-    cache_db_generator = AwesomeTranslations::CacheDatabaseGenerator.new(debug: false)
+    cache_db_generator = AwesomeTranslations::CacheDatabaseGenerator.new(debug: true)
     cache_db_generator.cache_translations
 
     flash[:notice] = "The cache was updated"

data/app/controllers/awesome_translations/groups_controller.rb

@@ -26,7 +26,7 @@ class AwesomeTranslations::GroupsController < AwesomeTranslations::ApplicationCo
     generator = AwesomeTranslations::CacheDatabaseGenerator.current
     generator.update_translations_for_group(@handler, @group)
 
-    redirect_to handler_group_path(@handler, @group)
+    redirect_to :back
   end
 
 private

data/app/controllers/awesome_translations/handler_translations_controller.rb

@@ -0,0 +1,12 @@
+class AwesomeTranslations::HandlerTranslationsController < AwesomeTranslations::ApplicationController
+  def index
+    @ransack_values = params[:q] || {}
+
+    @ransack = AwesomeTranslations::CacheDatabaseGenerator::HandlerTranslation
+      .ransack(@ransack_values)
+
+    @handler_translations = @ransack
+      .result
+      .includes(:group, :handler)
+  end
+end

data/app/controllers/awesome_translations/handlers_controller.rb

@@ -9,7 +9,7 @@ class AwesomeTranslations::HandlersController < AwesomeTranslations::Application
     generator = AwesomeTranslations::CacheDatabaseGenerator.current
     generator.update_handlers
 
-    redirect_to :handlers
+    redirect_to :back
   end
 
   def update_groups_cache
@@ -19,11 +19,33 @@ class AwesomeTranslations::HandlersController < AwesomeTranslations::Application
       generator.update_groups_for_handler(handler_model)
     end
 
-    redirect_to @handler
+    redirect_to :back
   end
 
   def show
-    @groups = @handler.groups.order(:name)
+    if params[:q]
+      @ransack_values = params[:q]
+    else
+      @ransack_values = {
+        with_translations: "only_with"
+      }
+    end
+
+    @ransack = @handler
+      .groups
+      .ransack(@ransack_values)
+
+    @groups = @ransack
+      .result
+      .includes(handler_translations: :translation_key)
+      .order(:name)
+
+    case @ransack_values[:with_translations]
+    when "only_with"
+      @groups = @groups.select { |group| group.handler_translations.any? }
+    when "only_without"
+      @groups = @groups.select { |group| group.handler_translations.empty? }
+    end
   end
 
 private
@@ -32,4 +54,9 @@ private
     @handler = AwesomeTranslations::CacheDatabaseGenerator::Handler.find_by(identifier: params[:id])
     raise "No such handler: #{params[:id]}" unless @handler
   end
+
+  helper_method :with_translations_collection
+  def with_translations_collection
+    {"Only with translations" => "only_with", "Only without translations" => "only_without"}
+  end
 end

data/app/helpers/awesome_translations/application_helper.rb

@@ -1,4 +1,7 @@
-module AwesomeTranslations::ApplicationHelper
+module ::AwesomeTranslations::ApplicationHelper
+  include BootstrapBuilders::ApplicationHelper
+  include SimpleFormRansackHelper
+
   def helper_t(key, args = {})
     AwesomeTranslations::GlobalTranslator.translate(key, helper: true, caller_number: 1, translation_args: [args])
   end

data/app/views/awesome_translations/caches/index.html.haml

@@ -1,3 +1,3 @@
 %h1 Cache
 
-= link_to "Update cache", caches_path, method: :post, data: {confirm: "Are you sure?"}, class: "button"
+= bb_btn caches_path, "Update cache", method: :post, data: {confirm: "Are you sure?"}, class: "btn-primary"

data/app/views/awesome_translations/clean_ups/new.html.haml

@@ -1,7 +1,7 @@
 - content_for(:header_title) { "Clean Up" }
 
 = form_for :clean_ups, url: clean_ups_path do |f|
-  %table
+  = bb_panel "Clean Up", table: true do
     %thead
       %th{colspan: 2} Key
       %th File
@@ -15,4 +15,4 @@
         %tr
           %td{colspan: 3} No translations were found
 
-  = f.submit "Delete"
+  = f.submit "Delete", class: ["btn", "btn-danger"]

data/app/views/awesome_translations/groups/show.html.haml

@@ -1,15 +1,14 @@
 - content_for(:header_title) { "Show group: #{truncate(@group.name.reverse, length: 45).reverse}" }
 - content_for(:header_right) do
-  = link_to "Update translations", [:update_translations_cache, @handler, @group], method: :post, class: "button", data: {confirm: "Are you sure?"}
+  = bb_btn [:update_translations_cache, @handler, @group], "Update translations", method: :post, sm: true, icon: "refresh", data: {confirm: "Are you sure?"}
 
-= simple_form_for :q, method: :get do |f|
-  = f.input :translation_key_key_cont, label: "Key contains", input_html: {value: @ransack_params[:translation_key_key_cont]}
-  = f.button :submit, "Filter"
+= bb_panel "Filter" do
+  = simple_form_for :q, method: :get do |f|
+    = f.input :translation_key_key_cont, label: "Key contains", input_html: {value: @ransack_params[:translation_key_key_cont]}, autofocus: true
+    = f.button :submit, "Filter", class: ["btn", "btn-primary"]
 
-%br
-
-= form_for :group, url: handler_group_path(@handler, @group), method: :put do |f|
-  %table.translations
+= form_for :group, url: handler_group_path(@handler, @group), method: :put, class: "translations" do |f|
+  = bb_panel @group.name, table: true do
     %thead
       %th Last Key
       - I18n.available_locales.each do |locale|
@@ -27,15 +26,14 @@
         - if translation.file_line_content? || translation.default.present?
           %tr.line-content-row
             %td.line-content{colspan: 1 + I18n.available_locales.length}
-              .container
+              .code-container
                 - if translation.file_line_content?
                   %pre= translation.file_line_content
                 - elsif translation.default.present?
                   Default: #{translation.default}
-          %tr
-            %td.line-spacer{colspan: 1 + I18n.available_locales.length}
       - if @translations.empty?
         %tr
-          %td.error{colspan: 2} No translations were found.
-
-  = f.submit "Save"
+          %td.error{colspan: 1 + I18n.available_locales.length} No translations were found.
+    %tr
+      %td{colspan: 1 + I18n.available_locales.length}
+        = f.submit "Save", class: ["btn", "btn-primary"]

data/app/views/awesome_translations/handler_translations/index.html.haml

@@ -0,0 +1,24 @@
+- content_for(:header_title) { "Translations" }
+
+= bb_panel "Filter" do
+  = simple_search_form_for @ransack do |f|
+    = f.input :translation_key_key_cont, label: "Key", autofocus: true
+    = f.input :handler_name_cont
+    = f.input :group_name_cont
+    = f.button :submit, "Filter", class: ["btn", "btn-primary"]
+
+= bb_panel "Translations", table: true do
+  %thead
+    %tr
+      %th Key
+      %th.hidden-sm-down Handler
+      %th.hidden-xs-down Group
+  %tbody
+    - @handler_translations.each do |handler_translation|
+      %tr
+        %td= link_to handler_translation.key, [handler_translation.handler, handler_translation.group]
+        %td.hidden-sm-down= link_to handler_translation.handler.name, handler_translation.handler
+        %td.hidden-xs-down= link_to handler_translation.group.name, [handler_translation.handler, handler_translation.group]
+    - if @handler_translations.empty?
+      %tr
+        %td{colspan: 3} No translations

data/app/views/awesome_translations/handlers/index.html.haml

@@ -1,14 +1,16 @@
-- content_for(:header_title) { Handlers }
-- content_for(:header_right) { link_to "Update", update_cache_handlers_path, method: :post, class: "button", data: {confirm: "Are you sure?"} }
+- content_for(:header_title) { "Handlers" }
+- content_for(:header_right) { bb_btn update_cache_handlers_path, "Update", method: :post, sm: true, icon: "refresh", data: {confirm: "Are you sure?"} }
 
-%table
+= bb_panel "Handlers", table: true do
   %thead
     %tr
       %th Handler
+      %th.hidden-xs-down Translations
   %tbody
     - @handlers.each do |handler|
       %tr
         %td= link_to handler.name, handler_path(handler)
+        %td.hidden-xs-down= handler.handler_translations.length
     - if @handlers.empty?
       %tr
-        %td.error{colspan: 1} No handlers were found.
+        %td.error{colspan: 2} No handlers were found.

data/app/views/awesome_translations/handlers/show.html.haml

@@ -1,20 +1,26 @@
 - content_for(:header_title) { "Show handler: #{@handler.name}" }
 - content_for(:header_right) do
-  = link_to "Update groups", [:update_groups_cache, @handler], method: :post, class: "button", data: {confirm: "Are you sure?"}
+  = bb_btn [:update_groups_cache, @handler], "Update groups", method: :post, sm: true, icon: "refresh", data: {confirm: "Are you sure?"}
 
-%table
+= bb_panel "Filter" do
+  = simple_search_form_for @ransack, url: @handler do |f|
+    = f.input :name_cont, autofocus: true
+    = f.input :with_translations, label: "With translations", collection: with_translations_collection
+    = f.button :submit, "Filter", class: ["btn", "btn-primary"]
+
+= bb_panel @handler.name, table: true do
   %thead
     %th Group
-    %th Translations
-    %th Finished
-    %th Unfinished
+    %th.text-right Translations
+    %th.text-right.hidden-xs-down Finished
+    %th.text-right.hidden-md-down Unfinished
   %tbody
-    - @groups.includes(handler_translations: :translation_key).each do |group|
+    - @groups.each do |group|
       %tr
         %td= link_to group.name, handler_group_path(@handler, group)
-        %td= group.handler_translations.count
-        %td= group.handler_translations.count(&:finished?)
-        %td= group.handler_translations.count(&:unfinished?)
+        %td.text-right= group.handler_translations.count
+        %td.text-right.hidden-xs-down= group.handler_translations.select(&:finished?).length
+        %td.text-right.hidden-md-down= group.handler_translations.select(&:unfinished?).length
     - if @groups.empty?
       %tr
         %td.error{colspan: 4} No groups were found.

data/app/views/awesome_translations/migrations/new.html.haml

@@ -1,7 +1,7 @@
 - content_for(:header_title) { "Migrate translations into AwesomeTranslations" }
 
 = form_for :migration, url: migrations_path do |f|
-  %table
+  = bb_panel "Migrate", table: true do
     %thead
       %tr
         %th{colspan: 2} Key
@@ -18,4 +18,4 @@
         %tr
           %td{colspan: 4} No translations were found
 
-  = f.submit "Migrate"
+  = f.submit "Migrate", class: ["btn", "btn-danger"]

data/app/views/layouts/awesome_translations/application.html.haml

@@ -1,36 +1,44 @@
 !!! 5
-%html
-%head
-  %title AwesomeTranslations
+%html{lang: I18n.locale}
+  %head
+    %meta{charset: "utf-8"}
+    %meta{content: "IE=Edge,chrome=1", http: {equiv: "X-UA-Compatible"}}
+    %meta{name: "viewport", content: "width=device-width, initial-scale=1.0"}
 
-  = stylesheet_link_tag "awesome_translations/application", media: "all"
-  = stylesheet_link_tag "http://fonts.googleapis.com/css?family=Open+Sans:400"
-  = stylesheet_link_tag "http://fonts.googleapis.com/css?family=Raleway:400"
+    %title= content_for?(:header_title) ? content_for(:header_title) : "AwesomeTranslations"
 
-  = javascript_include_tag "awesome_translations/application"
+    = csrf_meta_tags
+    = favicon_link_tag
+    = stylesheet_link_tag "awesome_translations/application", media: "all"
+    = javascript_include_tag "awesome_translations/application", defer: true
+    = content_for(:header_script)
 
-  = csrf_meta_tags
+  %body{class: ["controller-#{controller_name}", "action-#{action_name}"]}
+    .navbar.navbar-default.navbar-static-top
+      .container
+        %button.navbar-toggle{type: "button", data: {toggle: "collapse", target: ".navbar-responsive-collapse"}}
+          %span.icon-bar
+          %span.icon-bar
+          %span.icon-bar
 
-%body{class: ["controller_#{controller_name}", "action_#{action_name}"]}
-  %table.main-table
-    %tbody
-      %tr
-        %td.main-logo Awesome Translations
-      %tr
-        %td.main-menu
-          .menu-item= link_to "Handlers", handlers_path
-          .menu-item= link_to "Clean Up", new_clean_up_path
-          .menu-item= link_to "Migrate", new_migration_path
-          .menu-item= link_to "Cache", caches_path
-      %tr
-        %td.main-content
-          %table{width: "100%"}
-            %tbody
-              %tr
-                %td
-                  - if content_for(:header_title)
-                    %h1= content_for(:header_title)
-                %td{align: "right", width: "170px"}
-                  = content_for(:header_right)
+        = link_to "Awesome Translations", "/awesome_translations", class: "navbar-brand"
 
-          = yield
+        .navbar-collapse.collapse.navbar-responsive-collapse
+          %ul.nav.navbar-nav
+            %li= link_to "Handlers", handlers_path
+            %li= link_to "Translations", handler_translations_path
+            %li= link_to "Clean Up", new_clean_up_path
+            %li= link_to "Migrate", new_migration_path
+            %li= link_to "Cache", caches_path
+
+    .container
+      - if content_for?(:header_title)
+        .row
+          .col-md-9
+            %h1= content_for(:header_title)
+          - if content_for?(:header_right)
+            .col-md-3
+              .pull-right
+                = content_for(:header_right)
+      = bootstrap_flash
+      = yield

data/config/initializers/simple_form_ransack.rb

@@ -0,0 +1 @@
+Rails.application.config.i18n.load_path += SimpleFormRansack.locale_files