comfortable_mexican_sofa 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bc7965bfa47a37f8d1217bd041709ce13d46e6d
-  data.tar.gz: 84a087c57db21caceeea2ed16fb4273e7e7f6adf
+  metadata.gz: b44e849fc5e9ae2bf75d22a0976d8852f30e1606
+  data.tar.gz: 7a26fcd671fb42318a968aa3f6ede11d67d233ba
 SHA512:
-  metadata.gz: a514cb92363623a5686f9f09347e3ef500788d5cecfddf12df793097970bbaaea26e571909920bbfc5a54592dddadb2fd338857e8cbcecb02597ae5684397e7e
-  data.tar.gz: 5bc3dd4e4d1508f47a00d8374b787fc808eda804cdf217fbf595de06f82e38d26259813847e4295f6891df47d233879a25f3d2ced369047042aae7224c67d395
+  metadata.gz: 2c102b76ac471fda8769a9dfbfb29289c1133c3c963ebddc3cbe4d5b69714fa7a294c30979e3a2634c5ebdf26ec9efe983f860b2bb860608c97d84abbabef39d
+  data.tar.gz: 7d704fc6e99d1fead6caaa51ff00f033a4a20941aa29f079b227a143bf97251830382dcf708296cf7ee8f89e5de29bbc4364298d536e9d37fc5d2f8bc19c212f

data/README.md

@@ -97,4 +97,4 @@ Twitter: [@GroceryBagHead](https://twitter.com/grocerybaghead)
 
 ComfortableMexicanSofa is released under the [MIT license](https://github.com/comfy/comfortable-mexican-sofa/raw/master/LICENSE)
 
-Copyright 20010-2017 Oleg Khabarov
+Copyright 2010-2017 Oleg Khabarov

data/app/assets/stylesheets/comfy/admin/cms/base.sass

@@ -228,7 +228,7 @@ body#comfy
           width: 100%
 
   // -- Revisions --------------------------------------------------------------
-  &.c-comfy-admin-cms-revisions
+  &[class*="c-comfy-admin-cms-revisions-"], &[class*="c-comfy-admin-blog-revisions-"]
     .label
       padding: 15px 0
       font-weight: bold

data/app/controllers/comfy/admin/cms/revisions/base_controller.rb

@@ -0,0 +1,47 @@
+class Comfy::Admin::Cms::Revisions::BaseController < Comfy::Admin::Cms::BaseController
+
+  helper_method :record_path
+
+  before_action :load_record
+  before_action :load_revision, except: :index
+  before_action :authorize
+
+  def index
+    revision = @record.revisions.order(created_at: :desc).first
+    if revision
+      redirect_to action: :show, id: revision.id
+    else
+      redirect_to record_path
+    end
+  end
+
+  def show
+    @current_content    = @record.revision_fields.inject({}){|c, f| c[f] = @record.send(f); c }
+    @versioned_content  = @record.revision_fields.inject({}){|c, f| c[f] = @revision.data[f]; c }
+
+    render "comfy/admin/cms/revisions/show"
+  end
+
+  def revert
+    @record.restore_from_revision(@revision)
+    flash[:success] = I18n.t('comfy.admin.cms.revisions.reverted')
+    redirect_to record_path
+  end
+
+protected
+
+  def load_record
+    raise "not implemented"
+  end
+
+  def load_revision
+    @revision = @record.revisions.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:danger] = I18n.t('comfy.admin.cms.revisions.not_found')
+    redirect_to record_path
+  end
+
+  def record_path
+    raise "no implemented"
+  end
+end

data/app/controllers/comfy/admin/cms/revisions/layout_controller.rb

@@ -0,0 +1,15 @@
+class Comfy::Admin::Cms::Revisions::LayoutController < Comfy::Admin::Cms::Revisions::BaseController
+
+private
+
+  def load_record
+    @record = @site.layouts.find(params[:layout_id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
+    redirect_to comfy_admin_cms_site_layouts_path(@site)
+  end
+
+  def record_path
+    edit_comfy_admin_cms_site_layout_path(@site, @record)
+  end
+end

data/app/controllers/comfy/admin/cms/revisions/page_controller.rb

@@ -0,0 +1,22 @@
+class Comfy::Admin::Cms::Revisions::PageController < Comfy::Admin::Cms::Revisions::BaseController
+
+  def show
+    @current_content    = @record.fragments.inject({}){|c, b| c[b.identifier] = b.content; c }
+    @versioned_content  = @record.fragments.inject({}){|c, b| c[b.identifier] = @revision.data['fragments_attributes'].detect{|r| r[:identifier] == b.identifier}.try(:[], :content); c }
+
+    render "comfy/admin/cms/revisions/show"
+  end
+
+private
+
+  def load_record
+    @record = @site.pages.find(params[:page_id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
+    redirect_to comfy_admin_cms_site_pages_path(@site)
+  end
+
+  def record_path
+    edit_comfy_admin_cms_site_page_path(@site, @record)
+  end
+end

data/app/controllers/comfy/admin/cms/revisions/snippet_controller.rb

@@ -0,0 +1,15 @@
+class Comfy::Admin::Cms::Revisions::SnippetController < Comfy::Admin::Cms::Revisions::BaseController
+
+private
+
+  def load_record
+    @record = @site.snippets.find(params[:snippet_id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
+    redirect_to comfy_admin_cms_site_snippets_path(@site)
+  end
+
+  def record_path
+    edit_comfy_admin_cms_site_snippet_path(@site, @record)
+  end
+end

data/app/controllers/comfy/admin/cms/revisions/translation_controller.rb

@@ -0,0 +1,23 @@
+class Comfy::Admin::Cms::Revisions::TranslationController < Comfy::Admin::Cms::Revisions::BaseController
+
+  def show
+    @current_content    = @record.fragments.inject({}){|c, b| c[b.identifier] = b.content; c }
+    @versioned_content  = @record.fragments.inject({}){|c, b| c[b.identifier] = @revision.data['fragments_attributes'].detect{|r| r[:identifier] == b.identifier}.try(:[], :content); c }
+
+    render "comfy/admin/cms/revisions/show"
+  end
+
+private
+
+  def load_record
+    @page   = @site.pages.find(params[:page_id])
+    @record = @page.translations.find(params[:translation_id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
+    redirect_to comfy_admin_cms_site_pages_path(@site)
+  end
+
+  def record_path
+    edit_comfy_admin_cms_site_page_translation_path(@site, @page, @record)
+  end
+end

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

@@ -1,6 +1,6 @@
 - content_for :right_column do
-  .box.revisions
-    = link_to t('.revision', count: @layout.revisions.count), comfy_admin_cms_site_layout_revisions_path(@site, @layout), class: "btn btn-info d-block"
+  - link = comfy_admin_cms_site_layout_revisions_path(@site, @layout)
+  = render "comfy/admin/cms/revisions/sidebar", record: @layout, link: link
 
 .page-header
   %h2= t('.title')

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

@@ -1,8 +1,7 @@
 - content_for :right_column do
-  .box.revisions
-    = link_to t('.revision', count: @page.revisions.count), comfy_admin_cms_site_page_revisions_path(@site, @page), class: 'btn btn-info d-block'
-
-  = render partial: "comfy/admin/cms/translations/sidebar"
+  - link = comfy_admin_cms_site_page_revisions_path(@site, @page)
+  = render "comfy/admin/cms/revisions/sidebar", record: @page, link: link
+  = render "comfy/admin/cms/translations/sidebar"
 
 .page-header
   %h2= t('.title')

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

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

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

@@ -1,6 +1,6 @@
 - content_for :right_column do
   .box.revisions
-    - @record.revisions.each do |revision|
+    - @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"
 
 .page-header
@@ -8,7 +8,6 @@
     = t('.title')
     = @record.class.to_s.demodulize
 
-
 .row.d-none.d-lg-flex
   .col-lg-10.ml-auto
     .row
@@ -34,4 +33,4 @@
 = comfy_form_for @revision, url: {action: :revert} do |form|
   = form.form_actions do
     = form.submit t('.update'), class: "btn btn-primary"
-    = link_to t(".cancel"), record_path(@record), class: "btn btn-link"
+    = link_to t(".cancel"), record_path, class: "btn btn-link"

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

@@ -1,7 +1,6 @@
 - content_for :right_column do
-  .box.revisions
-    = link_to comfy_admin_cms_site_snippet_revisions_path(@site, @snippet), class: "btn btn-info d-block" do
-      = t('.revision', count: @snippet.revisions.count)
+  - link = comfy_admin_cms_site_snippet_revisions_path(@site, @snippet)
+  = render "comfy/admin/cms/revisions/sidebar", record: @snippet, link: link
 
 .page-header
   %h2= t('.title')

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

@@ -2,7 +2,7 @@
   - @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-light")
+      - 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"

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

@@ -1,8 +1,7 @@
 - content_for :right_column do
-  .box.revisions
-    = link_to t('.revision', count: @translation.revisions.count), comfy_admin_cms_site_page_translation_revisions_path(@site, @page, @translation), class: "btn btn-info d-block"
-
-  = render partial: "comfy/admin/cms/translations/sidebar"
+  - link = comfy_admin_cms_site_page_translation_revisions_path(@site, @page, @translation)
+  = render "comfy/admin/cms/revisions/sidebar", record: @translation, link: link
+  = render "comfy/admin/cms/translations/sidebar"
 
 .page-header
   %h2= t('.title')

data/config/environments/development.rb

@@ -57,4 +57,6 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 
   config.active_job.queue_adapter = :inline
+
+  config.action_view.raise_on_missing_translations = true
 end

data/config/environments/test.rb

@@ -44,4 +44,6 @@ defined?(ComfortableMexicanSofa::Application) && ComfortableMexicanSofa::Applica
   # config.action_view.raise_on_missing_translations = true
 
   config.active_job.queue_adapter = :inline
+
+  config.action_view.raise_on_missing_translations = true
 end

data/config/locales/cs.yml

@@ -110,12 +110,6 @@ cs:
             title: Nové rozložení
           edit:
             title: Úprava rozložení
-            revision: &revision
-              zero: Žádné revize
-              one: '%{count} revize'
-              few: '%{count} revize'
-              many: '%{count} revizí'
-              other: '%{count} revizí'
           form:
             select_parent_layout: Zvolte rodičovské rozložení
             select_app_layout: Zvolte rozložení aplikace
@@ -145,8 +139,6 @@ cs:
             title: Nová stránka
           edit:
             title: Úprava stránky
-            revision:
-              <<: *revision
           form:
             select_target_page: Bez přesměrování
             preview: Náhled
@@ -171,8 +163,6 @@ cs:
             title: New Translation
           edit:
             title: Editing Translation
-            revision:
-              <<: *revision
           form:
             preview: Preview
             create: Create
@@ -201,8 +191,6 @@ cs:
             title: Nový úryvek
           edit:
             title: Upravit úryvek
-            revision:
-              <<: *revision
           form:
             create: Vytvořit úryvek
             cancel: Zrušit
@@ -222,6 +210,13 @@ cs:
             changes: Změny
             previous: Předchozí
             current: Aktuální
+          sidebar:
+            revision:
+              zero: Žádné revize
+              one: '%{count} revize'
+              few: '%{count} revize'
+              many: '%{count} revizí'
+              other: '%{count} revizí'
 
         files:
           created: Soubory nahrány

data/config/locales/da.yml

@@ -110,12 +110,6 @@ da:
             title: Nyt layout
           edit:
             title: Rdiger layout
-            revision: &revision
-              zero: Ingen revisioner
-              one: '%{count} revision'
-              few: '%{count} revisioner'
-              many: '%{count} revisioner'
-              other: '%{count} revisioner'
           form:
             select_parent_layout: Vælg overordnet layout
             select_app_layout: Vælg applikationens layout
@@ -145,8 +139,6 @@ da:
             title: Ny side
           edit:
             title: Rediger side
-            revision:
-              <<: *revision
           form:
             select_target_page: Ingen viderestilling
             preview: Preview
@@ -171,8 +163,6 @@ da:
             title: New Translation
           edit:
             title: Editing Translation
-            revision:
-              <<: *revision
           form:
             preview: Preview
             create: Create
@@ -201,8 +191,6 @@ da:
             title: Ny snippet
           edit:
             title: Rediger snippet
-            revision:
-              <<: *revision
           form:
             create: Opret snippet
             cancel: Annuller
@@ -222,6 +210,13 @@ da:
             changes: Ændringer
             previous: Forrige
             current: Nuværende
+          sidebar:
+            revision:
+              zero: Ingen revisioner
+              one: '%{count} revision'
+              few: '%{count} revisioner'
+              many: '%{count} revisioner'
+              other: '%{count} revisioner'
 
         files:
           created: Filer sendt

data/config/locales/de.yml

@@ -110,12 +110,6 @@ de:
             title: Neues Layout
           edit:
             title: Layout bearbeiten
-            revision: &revision
-              zero: Keine Versionen
-              one: '%{count} Version'
-              few: '%{count} Versionen'
-              many: '%{count} Versionen'
-              other: '%{count} Versionen'
           form:
             select_parent_layout: Übergeordnetes Layout auswählen
             select_app_layout: Grundlegendes Layout auswählen
@@ -145,8 +139,6 @@ de:
             title: Seite erstellen
           edit:
             title: Seite bearbeiten
-            revision:
-              <<: *revision
           form:
             select_target_page: Keine Weiterleitung
             preview: Vorschau
@@ -171,8 +163,6 @@ de:
             title: New Translation
           edit:
             title: Editing Translation
-            revision:
-              <<: *revision
           form:
             preview: Preview
             create: Create
@@ -201,8 +191,6 @@ de:
             title: Schnipsel erstellen
           edit:
             title: Schnipsel bearbeiten
-            revision:
-              <<: *revision
           form:
             create: Schnipsel erstellen
             cancel: Abbrechen
@@ -222,6 +210,13 @@ de:
             changes: Änderungen
             previous: Vorherige Version
             current: Aktuell
+          sidebar:
+            revision:
+              zero: Keine Versionen
+              one: '%{count} Version'
+              few: '%{count} Versionen'
+              many: '%{count} Versionen'
+              other: '%{count} Versionen'
 
         files:
           created: Datei hochgeladen

data/config/locales/en.yml

@@ -110,12 +110,6 @@ en:
             title: New Layout
           edit:
             title: Editing Layout
-            revision: &revision
-              zero: No Revisions
-              one: '%{count} Revision'
-              few: '%{count} Revisions'
-              many: '%{count} Revisions'
-              other: '%{count} Revisions'
           form:
             select_parent_layout: Select Parent Layout
             select_app_layout: Select Application Layout
@@ -145,8 +139,6 @@ en:
             title: New Page
           edit:
             title: Editing Page
-            revision:
-              <<: *revision
           form:
             select_target_page: No Redirect
             preview: Preview
@@ -171,8 +163,6 @@ en:
             title: New Translation
           edit:
             title: Editing Translation
-            revision:
-              <<: *revision
           form:
             preview: Preview
             create: Create
@@ -201,8 +191,6 @@ en:
             title: New Snippet
           edit:
             title: Editing Snippet
-            revision:
-              <<: *revision
           form:
             create: Create Snippet
             cancel: Cancel
@@ -222,6 +210,13 @@ en:
             changes: Changes
             previous: Previous
             current: Current
+          sidebar:
+            revision:
+              zero: No Revisions
+              one: '%{count} Revision'
+              few: '%{count} Revisions'
+              many: '%{count} Revisions'
+              other: '%{count} Revisions'
 
         files:
           created: Files uploaded