comfortable_mexican_sofa 2.0.3 → 2.0.4

data/app/views/comfy/admin/cms/categories/_edit.html.haml

@@ -4,4 +4,4 @@
     = form.text_field :label, class: "form-control form-control-sm"
     .input-group-btn
       %button.btn.btn-primary.btn-sm
-        = t('.save')
+        %i.fas.fa-fw.fa-check

data/app/views/comfy/admin/cms/categories/_index.html.haml

@@ -1,29 +1,28 @@
-.categories-widget
-  %span.btn.btn-sm
-    %strong= t('.label')
+.box.categories-widget
 
-  %span.categories.read
-
-    %button.toggle-cat-edit.btn.btn-secondary.btn-sm
+  .read
+    .categories
+      .category
+        - active_class = params[:categories].blank?? "active" : nil
+        = link_to t('.all'), {categories: nil}, class: "btn btn-sm btn-light btn-block #{active_class}"
+      - @site.categories.of_type(type).each do |category|
+        = render "comfy/admin/cms/categories/show", category: category, read: true
+    %button.toggle-cat-edit.btn.btn-secondary.btn-sm.btn-block
       = t(".edit")
 
-    .category
-      - active_class = params[:categories].blank?? "btn-dark" : "btn-light"
-      = link_to t('.all'), {categories: nil}, class: "btn btn-sm #{active_class}"
-    - @site.categories.of_type(type).each do |category|
-      = render "comfy/admin/cms/categories/show", category: category, read: true
-
-  %span.categories.editable
-    - @site.categories.of_type(type).each do |category|
-      = render "comfy/admin/cms/categories/show", category: category
+  .editable
+    .categories
+      - @site.categories.of_type(type).each do |category|
+        = render "comfy/admin/cms/categories/show", category: category
 
     - url = comfy_admin_cms_site_categories_path(@site)
-    = form_for :category, url: url, remote: true, html: {id: "new_category"} do |form|
+    = form_for :category, url: url, remote: true, html: {id: "new-category"} do |form|
       = form.hidden_field :categorized_type, value: type
       .input-group
         = form.text_field :label, placeholder: t('.add_placeholder'), class: 'form-control form-control-sm'
         .input-group-btn
           %button#cat-add-button.btn.btn-primary.btn-sm
-            = t(".add")
-          %button.toggle-cat-edit.btn.btn-light.btn-sm
-            = t(".done")
+            %i.fas.fa-fw.fa-plus
+
+    %button.toggle-cat-edit.btn.btn-light.btn-sm.btn-block
+      = t(".done")

data/app/views/comfy/admin/cms/categories/_show.html.haml

@@ -4,11 +4,11 @@
 
 .category{id: dom_id(category)}
   - if read
-    - active_class = active ? "btn-dark" : "btn-light"
+    - active_class = active ? "active" : nil
     - categories = active ? categories.reject{|c| c == category.label} : categories << category.label
-    = link_to category.label, {categories: categories}, class: "btn btn-sm #{active_class}"
+    = link_to category.label, {categories: categories}, class: "btn btn-sm btn-light btn-block text-left text-truncate #{active_class}"
   - else
-    .btn-group
-      = link_to category.label, edit_comfy_admin_cms_site_category_path(@site, category), remote: true, class: "btn btn-sm btn-light"
+    .btn-group.d-flex
+      = link_to category.label, edit_comfy_admin_cms_site_category_path(@site, category), remote: true, class: "btn btn-sm btn-light w-100 text-left text-truncate"
       = link_to comfy_admin_cms_site_category_path(@site, category), method: :delete, remote: true, data: {confirm: t('.are_you_sure')}, class: 'btn btn-sm btn-danger' do
-        = fa_icon "times"
+        %i.fas.fa-fw.fa-times

data/app/views/comfy/admin/cms/categories/create.js.erb

@@ -1,7 +1,7 @@
-$('.categories-widget .categories.editable form#new_category').before(
+$('.categories-widget .editable .categories').append(
   '<%= escape_javascript(render "show", category: @category) %>'
 );
-$('.categories-widget .categories.read').append(
+$('.categories-widget .read .categories').append(
   '<%= escape_javascript(render "show", category: @category, read: true) %>'
 );
-$('.categories-widget .categories.editable form#new_category input#category_label').val('');
+$('.categories-widget .editable form#new-category input#category_label').val('');

data/app/views/comfy/admin/cms/categories/edit.js.erb

@@ -1,3 +1,3 @@
-$('.categories.editable .category#<%= dom_id(@category) %>').replaceWith(
+$('.editable .category#<%= dom_id(@category) %>').replaceWith(
   '<%= escape_javascript(render "edit", category: @category ) %>'
 );

data/app/views/comfy/admin/cms/categories/update.js.erb

@@ -1,6 +1,6 @@
-$('.categories.editable form#<%= dom_id(@category) %>').replaceWith(
+$('.editable form#<%= dom_id(@category) %>').replaceWith(
   '<%= escape_javascript(render "show", category: @category ) %>'
 );
-$('.categories.read .category#<%= dom_id(@category) %>').replaceWith(
+$('.read .category#<%= dom_id(@category) %>').replaceWith(
   '<%= escape_javascript(render "show", category: @category, read: true) %>'
 );

data/app/views/comfy/admin/cms/files/_file.html.haml

@@ -4,7 +4,7 @@
       .item-controls.d-none.d-lg-block
         - if !params[:categories].present? && @site.files.count > 1
           .dragger
-            = fa_icon("bars")
+            %i.fas.fa-bars
       .item-content
         .item-title
           - if file.attachment.image?

data/app/views/comfy/admin/cms/files/index.html.haml

@@ -1,14 +1,15 @@
+- content_for :right_column do
+  = render "comfy/admin/cms/categories/index", type: "Comfy::Cms::File"
+
 #cms-uploader
   #cms-uploader-drag-drop-target
 
   .page-header
-    = link_to t('.new_link'), new_comfy_admin_cms_site_file_path(@site), class: "btn btn-secondary pull-right", id: "cms-uploader-browse"
+    = link_to t('.new_link'), new_comfy_admin_cms_site_file_path(@site), class: "btn btn-secondary float-right", id: "cms-uploader-browse"
     %h2= t('.title')
 
   = comfy_admin_partial "comfy/admin/cms/partials/files_before"
 
-  = render "comfy/admin/cms/categories/index", type: "Comfy::Cms::File"
-
   = comfy_paginate @files
 
   %ul.list.sortable.cms-uploader-filelist

data/app/views/comfy/admin/cms/layouts/_index_branch.html.haml

@@ -7,7 +7,7 @@
       .item-controls.d-none.d-md-block
         - if has_siblings
           .dragger
-            = fa_icon("bars")
+            %i.fas.fa-bars
 
       .item-content
         .item-title

data/app/views/comfy/admin/cms/layouts/index.html.haml

@@ -1,5 +1,5 @@
 .page-header
-  = link_to t('.new_link'), new_comfy_admin_cms_site_layout_path(@site), class: "btn btn-secondary pull-right"
+  = link_to t('.new_link'), new_comfy_admin_cms_site_layout_path(@site), class: "btn btn-secondary float-right"
   %h2= t('.title')
 
 = comfy_admin_partial "comfy/admin/cms/partials/layouts_before"

data/app/views/comfy/admin/cms/pages/_index_branch.html.haml

@@ -14,14 +14,14 @@
         .item-controls
           - if has_siblings
             .dragger.d-none.d-md-block
-              = fa_icon("bars")
+              %i.fas.fa-bars
 
           - if has_children && !page.root?
             - status = branch_open ? "open" : ""
             - url = toggle_branch_comfy_admin_cms_site_page_path(@site, page)
             = link_to url, remote: true, title: t(".toggle"), class: "toggle #{status}" do
-              = fa_icon("plus-square", class: "expand")
-              = fa_icon("minus-square", class: "collapse")
+              %i.fas.fa-plus-square.expand
+              %i.fas.fa-minus-square.collapse
 
       .item-content
         .item-title

data/app/views/comfy/admin/cms/pages/index.html.haml

@@ -1,11 +1,12 @@
+- content_for :right_column do
+  = render "comfy/admin/cms/categories/index", type: "Comfy::Cms::Page"
+
 .page-header
-  = link_to t('.new_link'), new_comfy_admin_cms_site_page_path(@site), class: "btn btn-secondary pull-right"
+  = link_to t('.new_link'), new_comfy_admin_cms_site_page_path(@site), class: "btn btn-secondary float-right"
   %h2= t('.title')
 
 = comfy_admin_partial "comfy/admin/cms/partials/pages_beforea"
 
-= render "comfy/admin/cms/categories/index", type: "Comfy::Cms::Page"
-
 %ul.list.sortable
   = render partial: "index_branch", collection: @pages
 

data/app/views/comfy/admin/cms/revisions/_sidebar.html.haml

@@ -1,2 +1,2 @@
 .box.revisions
-  = link_to t('.revision', count: record.revisions.count), link, class: "btn btn-info d-block"
+  = link_to t('.revision', count: record.revisions.count), link, class: "btn btn-sm btn-info d-block"

data/app/views/comfy/admin/cms/revisions/show.html.haml

@@ -1,7 +1,7 @@
 - content_for :right_column do
   .box.revisions
     - @record.revisions.order(created_at: :desc).each do |revision|
-      = active_link_to l(revision.created_at, format: :short), {id: revision.id}, class: "btn btn-sm btn-outline-light d-block text-primary mb-1"
+      = active_link_to l(revision.created_at, format: :short), { id: revision.id }, class: "btn btn-sm btn-light d-block text-primary mb-1"
 
 .page-header
   %h2
@@ -30,7 +30,7 @@
           .current.d-none= content
           .content
 
-= comfy_form_for @revision, url: {action: :revert} do |form|
+= comfy_form_for @revision, url: { action: :revert } do |form|
   = form.form_actions do
-    = form.submit t('.update'), class: "btn btn-primary"
+    = form.submit t(".update"), class: "btn btn-primary"
     = link_to t(".cancel"), record_path, class: "btn btn-link"

data/app/views/comfy/admin/cms/sites/index.html.haml

@@ -1,5 +1,5 @@
 .page-header
-  = link_to t('.new_link'), new_comfy_admin_cms_site_path, class: "btn btn-secondary pull-right"
+  = link_to t('.new_link'), new_comfy_admin_cms_site_path, class: "btn btn-secondary float-right"
   %h2= t('.title')
 
 = comfy_admin_partial "comfy/admin/cms/partials/sites_before"

data/app/views/comfy/admin/cms/snippets/index.html.haml

@@ -1,11 +1,12 @@
+- content_for :right_column do
+  = render "comfy/admin/cms/categories/index", type: "Comfy::Cms::Snippet"
+
 .page-header
-  = link_to t('.new_link'), new_comfy_admin_cms_site_snippet_path(@site), class: "btn btn-secondary pull-right"
+  = link_to t('.new_link'), new_comfy_admin_cms_site_snippet_path(@site), class: "btn btn-secondary float-right"
   %h2= t('.title')
 
 = comfy_admin_partial "comfy/admin/cms/partials/snippets_before"
 
-= render "comfy/admin/cms/categories/index", type: "Comfy::Cms::Snippet"
-
 %ul.list.sortable
   - @snippets.each do |snippet|
     %li{id: dom_id(snippet)}

data/app/views/comfy/admin/cms/translations/_sidebar.html.haml

@@ -1,13 +1,19 @@
 .box.translations
+
+  = active_link_to edit_comfy_admin_cms_site_page_path(@site, @page), class: "btn btn-block btn-sm btn-light text-left text-truncate mb-1" do
+    = content_tag(:span, @site.locale, class: "badge badge-light text-uppercase")
+    = @page.label
+
   - @page.translations.each do |translation|
     .btn-group.btn-group-sm.d-flex.mb-1
       - url = edit_comfy_admin_cms_site_page_translation_path(@site, @page, translation)
-      - badge = content_tag(:span, translation.locale, class: "badge badge-primary")
-      - name = "#{badge} #{translation.label}".html_safe
       - published_css_class = translation.is_published? ? "published" : "draft"
-      = link_to name, url, class: "#{published_css_class} translation btn btn-outline-light w-100"
+      = active_link_to url, class: "#{published_css_class} translation btn text-left text-truncate btn-light w-100" do
+        = content_tag(:span, translation.locale, class: "badge badge-light text-uppercase")
+        = translation.label
 
       - url = comfy_admin_cms_site_page_translation_path(@site, @page, translation)
-      = link_to t(".delete"), url, method: :delete, data: {confirm: t(".confirm")}, class: "btn btn-danger"
+      = link_to url, method: :delete, data: {confirm: t(".confirm")}, class: "btn btn-danger" do
+        %i.fas.fa-fw.fa-times
 
-  = link_to t(".new"), new_comfy_admin_cms_site_page_translation_path(@site, @page), class: "btn btn-secondary d-block mb-1"
+  = link_to t(".new"), new_comfy_admin_cms_site_page_translation_path(@site, @page), class: "btn btn-sm btn-secondary d-block mb-1"

data/app/views/layouts/comfy/admin/cms/_left.html.haml

@@ -2,7 +2,7 @@
 
 %nav.navbar.navbar-expand-lg
   %button.navbar-toggler{type: "button", data: {toggle:"collapse", target: "#leftnav"}, aria: {controls: "navbarSupportedContent", expanded: "false", label: "Toggle navigation"}}
-    = fa_icon "bars"
+    %i.fas.fa-bars
 
   #leftnav.navbar-collapse.collapse
 
@@ -24,7 +24,7 @@
         %li.nav-item
           - unless is_active_link?(comfy_admin_cms_site_files_path(@site))
             %a.cms-files-open-modal{href: '#', title: "Open library"}
-              = fa_icon "bars"
+              %i.fas.fa-bars
           = active_link_to comfy_admin_cms_site_files_path(@site), class: "nav-link" do
             = t('comfy.admin.cms.base.files')
 

data/comfortable_mexican_sofa.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency "codemirror-rails",      ">= 5.16.0"
   s.add_dependency "coffee-rails",          ">= 4.2.0"
   s.add_dependency "comfy_bootstrap_form",  ">= 4.0.0.beta1"
-  s.add_dependency "font-awesome-rails",    ">= 4.7.0"
   s.add_dependency "haml-rails",            ">= 1.0.0"
   s.add_dependency "jquery-rails",          ">= 4.3.1"
   s.add_dependency "jquery-ui-rails",       ">= 6.0.1"

data/config/locales/cs.yml

@@ -171,7 +171,6 @@ cs:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ cs:
 
         categories:
           index:
-            label: Kategorie
             edit: Upravit
             done: Hotovo
-            all: Všechny
+            all: Všechny Kategorie
             add: Přidat
             add_placeholder: Přidat kategorii
           show:

data/config/locales/da.yml

@@ -171,7 +171,6 @@ da:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ da:
 
         categories:
           index:
-            label: Kategorier
             edit: Rediger
             done: Udført
-            all: Alle
+            all: Alle Kategorier
             add: Tilføj
             add_placeholder: Tilføj kategori
           show:

data/config/locales/de.yml

@@ -171,7 +171,6 @@ de:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ de:
 
         categories:
           index:
-            label: Kategorien
             edit: Bearbeiten
             done: Erledigt
-            all: Alle
+            all: Alle Kategorien
             add: Hinzuzufügen
             add_placeholder: Kategorie hinzuzufügen
           show:

data/config/locales/en.yml

@@ -171,7 +171,6 @@ en:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ en:
 
         categories:
           index:
-            label: Categories
             edit: Edit
             done: Done
-            all: All
+            all: All Categories
             add: Add
             add_placeholder: Add Category
           show:

data/config/locales/es.yml

@@ -171,7 +171,6 @@ es:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ es:
 
         categories:
           index:
-            label: Categorias
             edit: Editar
             done: Listo
-            all: Todos
+            all: Todos Categorias
             add: Agregar
             add_placeholder: Añadir Categoría
           show:

data/config/locales/fr.yml

@@ -171,7 +171,6 @@ fr:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ fr:
 
         categories:
           index:
-            label: Catégories
             edit: Modifier les catégories
             done: Terminé
-            all: Tout
+            all: Tout Catégories
             add: Ajouter
             add_placeholder: Ajouter la Catégorie
           show:

data/config/locales/it.yml

@@ -171,7 +171,6 @@ it:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ it:
 
         categories:
           index:
-            label: Categorie
             edit: Modifica
             done: Fatto
-            all: Tutte
+            all: Tutte Categorie
             add: Aggiungi
             add_placeholder: Aggiungi categoria
           show:

data/config/locales/ja.yml

@@ -171,7 +171,6 @@ ja:
             cancel: Return to Page
           sidebar:
             new: New Translation
-            delete: Delete
             confirm: Are you sure?
 
         snippets:
@@ -251,10 +250,9 @@ ja:
 
         categories:
           index:
-            label: カテゴリー
             edit: 編集
             done: 完了
-            all: すべて
+            all: すべて カテゴリー
             add: 追加
             add_placeholder: カテゴリを追加
           show: