comfortable_mexican_sofa 2.0.3 → 2.0.4

data/config/locales/nb.yml

@@ -171,7 +171,6 @@ nb:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ nb:
 
         categories:
           index:
-            label: Kategorier
             edit: Endre
             done: Ferdig
-            all: Alle
+            all: Alle Kategorier
             add: Legg til
             add_placeholder: Legg til kategori
           show:

data/config/locales/nl.yml

@@ -171,7 +171,6 @@ nl:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ nl:
 
         categories:
           index:
-            label: Categorieën
             edit: Bewerk
             done: Klaar
-            all: Alle
+            all: Alle Categorieën
             add: Toevoegen
             add_placeholder: Categorie Toevoegen
           show:

data/config/locales/pl.yml

@@ -171,7 +171,6 @@ pl:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ pl:
 
         categories:
           index:
-            label: Kategorie
             edit: Edytuj
             done: Zrobione
-            all: Wszystko
+            all: Wszystko Kategorie
             add: Dodaj
             add_placeholder: Dodaj Kategorię
           show:

data/config/locales/pt-BR.yml

@@ -171,7 +171,6 @@ pt-BR:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ pt-BR:
 
         categories:
           index:
-            label: Categorias
             edit: Editar
             done: Pronto
-            all: Todas
+            all: Todas Categorias
             add: Adicionar
             add_placeholder: Adicione uma Categoria
           show:

data/config/locales/ru.yml

@@ -171,7 +171,6 @@ ru:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ ru:
 
         categories:
           index:
-            label: Категории
             edit: Редактировать
             done: Применить
-            all: Все
+            all: Все Категории
             add: Добавить
             add_placeholder: добавить категорию
           show:

data/config/locales/sk.yml

@@ -171,7 +171,6 @@ sk:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ sk:
 
         categories:
           index:
-            label: Kategórie
             edit: Upraviť
             done: Hotovo
-            all: Všetky
+            all: Všetky Kategórie
             add: Pridať
             add_placeholder: Pridať kategóriu
           show:

data/config/locales/sv.yml

@@ -171,7 +171,6 @@ sv:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ sv:
 
         categories:
           index:
-            label: Kategorier
             edit: Ändra
             done: Klar
-            all: Alla
+            all: Alla Kategorier
             add: Lägg till
             add_placeholder: Lägga Kategori
           show:

data/config/locales/tr.yml

@@ -171,7 +171,6 @@ tr:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ tr:
 
         categories:
           index:
-            label: Kategoriler
             edit: Düzenle
             done: Tamam
-            all: Hepsi
+            all: Hepsi Kategoriler
             add: Ekle
             add_placeholder: Kategori Ekle
           show:

data/config/locales/uk.yml

@@ -171,7 +171,6 @@ uk:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ uk:
 
         categories:
           index:
-            label: Категорії
             edit: Редагувати
             done: Зроблено
-            all: Всі
+            all: Всі Категорії
             add: Додати
             add_placeholder: Додати Категорію
           show:

data/config/locales/zh-CN.yml

@@ -171,7 +171,6 @@ zh-CN:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ zh-CN:
 
         categories:
           index:
-            label: 分类
             edit: 编辑
             done: 完成
-            all: 全部
+            all: 全部 分类
             add: 创建
             add_placeholder: 添加类别
           show:

data/config/locales/zh-TW.yml

@@ -171,7 +171,6 @@ zh-TW:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ zh-TW:
 
         categories:
           index:
-            label: 分類
             edit: 編輯
             done: 完成
-            all: 全部
+            all: 全部 分類
             add: 創建
             add_placeholder: 添加類別
           show:

data/lib/comfortable_mexican_sofa/engine.rb

@@ -14,8 +14,6 @@ require "codemirror-rails"
 require "bootstrap"
 require "plupload-rails"
 
-require "font-awesome-rails"
-
 module ComfortableMexicanSofa
   class Engine < ::Rails::Engine
 

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,5 +1,5 @@
 module ComfortableMexicanSofa
 
-  VERSION = "2.0.3".freeze
+  VERSION = "2.0.4".freeze
 
 end

data/lib/generators/comfy/scaffold/templates/views/index.haml.tt

@@ -1,5 +1,5 @@
 .page-header
-  = link_to 'New <%= class_name.titleize %>', new_admin_<%= file_name %>_path, class: 'btn btn-secondary pull-right'
+  = link_to 'New <%= class_name.titleize %>', new_admin_<%= file_name %>_path, class: 'btn btn-secondary float-right'
   %h2= '<%= class_name.pluralize.titleize %>'
 
 = paginate @<%= file_name.pluralize %>, theme: 'comfy'

data/test/fixtures/generators/scaffold/views/index.haml

@@ -1,5 +1,5 @@
 .page-header
-  = link_to 'New Foo', new_admin_foo_path, class: 'btn btn-secondary pull-right'
+  = link_to 'New Foo', new_admin_foo_path, class: 'btn btn-secondary float-right'
   %h2= 'Foos'
 
 = paginate @foos, theme: 'comfy'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2017-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_link_to
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0.beta1
-- !ruby/object:Gem::Dependency
-  name: font-awesome-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -311,6 +297,7 @@ files:
 - app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/vn.js
 - app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/zh-CN.js
 - app/assets/javascripts/comfy/admin/cms/lib/flatpickr/i18n/zh-TW.js
+- app/assets/javascripts/comfy/admin/cms/lib/fontawesome.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/definedlinks.js
 - app/assets/javascripts/comfy/admin/cms/lib/redactor/filemanager.js
@@ -372,6 +359,7 @@ files:
 - app/assets/stylesheets/comfy/admin/cms/codemirror_overrides.sass
 - app/assets/stylesheets/comfy/admin/cms/custom.sass
 - app/assets/stylesheets/comfy/admin/cms/lib/flatpickr.min.css
+- app/assets/stylesheets/comfy/admin/cms/lib/fontawesome.css
 - app/assets/stylesheets/comfy/admin/cms/lib/redactor.css
 - app/assets/stylesheets/comfy/admin/cms/redactor_overrides.sass
 - app/controllers/application_controller.rb