cms-fortress 1.3.5 → 1.3.6

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

@@ -0,0 +1,17 @@
+- block ||= page_form
+
+- if (files = block.files).present?
+  .files
+    - files.each do |file|
+      .file{:class => dom_id(file)}
+        = link_to file.file.url, :target => '_blank' do
+          -geometry = Paperclip::Geometry.from_file(file.file)
+          #{file.label} | #{file.file_file_name} | #{geometry.width.to_i} x #{geometry.height.to_i} px|  #{file.file_content_type} | #{number_to_human_size(file.file_file_size, precision: 4)}
+          %br
+          %img{src: file.file.url(:cms_thumb)}
+        = link_to t('.delete'), comfy_admin_cms_site_file_path(@site, file), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-danger'
+
+  :coffeescript
+    $ ->
+      $("a[data-remote]").on "ajax:success", (e, data, status, xhr) ->
+        location.reload()

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

@@ -2,22 +2,21 @@
 
   = link_to t('.revision', :count => @page.revisions.count), comfy_admin_cms_site_page_revisions_path(@site, @page), :class => 'btn btn-default pull-right'
 
-  /%h2.pull-right
-  /  -if @page.drafted?
-  /    %span.label.label-info
-  /      Draft
-  /  -if @page.reviewed?
-  /    %span.label.label-primary
-  /      Reviewed
-  /  -if @page.scheduled?
-  /    %span.label.label-warning
-  /      Scheduled
-  /  -if @page.published?
-  /    %span.label.label-success
-  /      Published
+  %h2.pull-right
+    -if @page.drafted?
+      %span.label.label-info
+        =t('.drafted')
+    -if @page.reviewed?
+      %span.label.label-primary
+        =t('.reviewed')
+    -if @page.scheduled?
+      %span.label.label-warning
+        =t('.scheduled')
+    -if @page.published?
+      %span.label.label-success
+        =t('.published')
   %h2= t('.title')
 
-
 - content_for :right_column do
   = render 'comfy/admin/cms/sites/mirrors', :object => @page
 

data/app/views/devise/shared/_links.html.haml

@@ -0,0 +1,18 @@
+- if controller_name != 'sessions'
+  = link_to t('login.log_in'), new_session_path(resource_name)
+
+- if devise_mapping.registerable? && controller_name != 'registrations'
+  = link_to t('login.sign_up'), new_registration_path(resource_name)
+
+- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
+  = link_to t('login.forgot_your_password'), new_password_path(resource_name)
+
+- if devise_mapping.confirmable? && controller_name != 'confirmations'
+  = link_to t('login.didnt_receive_confirmation_instructions'), new_confirmation_path(resource_name)
+
+- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+  = link_to t('login.didnt_receive_unlock_instructions'), new_unlock_path(resource_name)
+
+- if devise_mapping.omniauthable?
+  - resource_class.omniauth_providers.each do |provider|
+    = link_to t('login.sign_in_with'), omniauth_authorize_path(resource_name, provider)

data/app/views/layouts/cms/fortress/session.html.haml

@@ -12,4 +12,3 @@
       = javascript_include_tag 'html5shiv.js'
   %body
     = yield
-    = javascript_include_tag 'cms/fortress/cms_fortress'

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

@@ -3,8 +3,7 @@
   %title= settings.title
   = csrf_meta_tag
 
-  = stylesheet_link_tag 'comfortable_mexican_sofa/application'
-  = stylesheet_link_tag 'comfortable_mexican_sofa/admin/application'
+  = stylesheet_link_tag 'comfy/admin/cms/application'
 
   = stylesheet_link_tag "cms/fortress/admin_overrides"
 
@@ -12,8 +11,7 @@
     = stylesheet_link_tag "cms/fortress/themes/#{ theme_name }"
 
 
-  = javascript_include_tag 'comfortable_mexican_sofa/application'
-  = javascript_include_tag 'comfortable_mexican_sofa/admin/application'
+  = javascript_include_tag 'comfy/admin/cms/application'
   = javascript_include_tag 'cms/fortress/media'
 
   - unless default_theme?
@@ -22,6 +20,4 @@
 
   = yield :head
 
-  = render 'comfy/admin/cms/partials/html_head'
-
-
+  = render 'comfy/admin/cms/partials/html_head'

data/cms-fortress.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name      = "cms-fortress"
-  s.version   = "1.3.5"
+  s.version   = "1.3.6"
 
   s.authors           = ["Melvin Sembrano"]
-  s.date              = "2014-12-09"
+  s.date              = "2015-01-24"
   s.description       = "Comfortable Mexican Sofa (CMS) - User and role management extension"
   s.email             = "melvinsembrano@gmail.com"
   s.extra_rdoc_files  = [ "LICENSE.txt", "README.rdoc" ]
@@ -19,19 +19,19 @@ Gem::Specification.new do |s|
   s.test_files        = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths     = ["lib"]
 
-  s.add_dependency 'rails',                     '>= 4.0.0'
-  s.add_dependency 'comfortable_mexican_sofa',  '~> 1.12.3'
+  s.add_dependency 'rails', '~> 4.0', '>= 4.0.0'
+  s.add_dependency 'comfortable_mexican_sofa', '~> 1.12', '>= 1.12.5'
   s.add_dependency 'devise',                    '~> 3.2'
   s.add_dependency 'cancancan',                 '~> 1.9'
   s.add_dependency 'delayed_job',               '~> 4'
-  s.add_dependency 'tinymce-rails',             '~> 4.0.0'
+  s.add_dependency 'tinymce-rails', '~> 4.1', '>= 4.1.0'
   s.add_dependency 'tinymce-rails-langs',       '~> 4.0'
-  s.add_dependency 'aasm',                      '~> 3.2'
+  s.add_dependency 'aasm',                      '~> 4.0'
 
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'minitest',      '~> 4.7.3'
+  s.add_development_dependency 'minitest', '~> 4.7', '>= 4.7.3'
   s.add_development_dependency 'minitest-rails'
   s.add_development_dependency 'minitest-spec-rails'
   s.add_development_dependency 'minitest-reporters'

data/config/locales/da.yml

@@ -98,16 +98,25 @@ da:
     admin:
       cms:
         pages:
-          form:
+          form: &pages_form
             review: Approve
             reviewed: Reviewed
             schedule: Publish Date
+            scheduled: Scheduled
             publish: Publish Now
             published: Published
             draft: save as draft
             drafted: Draft
             reset: Reset to Draft
 
+          edit:
+            <<: *pages_form
+
+        files:
+          form:
+            are_you_sure: Are you sure to delete?
+            delete: Delete!
+
   activerecord:
     attributes:
       cms/fortress/user:
@@ -127,3 +136,15 @@ da:
         parent_id: Parent page
         slug: Slug
 
+  login:
+    forgot_your_password: Forgot your password?
+    send_me_reset_password_instructions: Send me reset password instructions
+    change_your_password: Change your password
+    new_password: New password
+    confirm_new_password: Confirm new password
+    change_my_password: Change my password
+    log_in: Log in
+    sign_up: Sign up
+    didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
+    didnt_receive_unlock_instructions: Didn't receive unlock instructions?
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/de.yml

@@ -95,16 +95,24 @@ de:
     admin:
       cms:
         pages:
-          form:
+          form: &pages_form
             review: Freigeben
             reviewed: Freigegeben
             schedule: Publizierung planen
+            scheduled: Geplant
             publish: Jetzt publizieren
             published: Publiziert
             draft: Als Entwurf speichern
             drafted: Entwurf
             reset: Auf Entwurf zurücksetzen
 
+          edit:
+            <<: *pages_form
+        files:
+          form:
+            are_you_sure: Wirklich löschen?
+            delete: Löschen!
+
   activerecord:
     attributes:
       cms/fortress/user:
@@ -124,3 +132,15 @@ de:
         parent_id: Übergeordnete Seite
         slug: URL-Pfad
 
+  login:
+    forgot_your_password: Forgot your password?
+    send_me_reset_password_instructions: Send me reset password instructions
+    change_your_password: Change your password
+    new_password: New password
+    confirm_new_password: Confirm new password
+    change_my_password: Change my password
+    log_in: Log in
+    sign_up: Sign up
+    didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
+    didnt_receive_unlock_instructions: Didn't receive unlock instructions?
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/en.yml

@@ -98,16 +98,25 @@ en:
     admin:
       cms:
         pages:
-          form:
+          form: &pages_form
             review: Approve
             reviewed: Reviewed
             schedule: Publish Date
+            scheduled: Scheduled
             publish: Publish Now
             published: Published
             draft: save as draft
             drafted: Draft
             reset: Reset to Draft
 
+          edit:
+            <<: *pages_form
+
+        files:
+          form:
+            are_you_sure: Are you sure to delete?
+            delete: Delete!
+
   activerecord:
     attributes:
       cms/fortress/user:
@@ -126,3 +135,15 @@ en:
         full_path: Path
         parent_id: Parent page
         slug: Slug
+  login:
+    forgot_your_password: Forgot your password?
+    send_me_reset_password_instructions: Send me reset password instructions
+    change_your_password: Change your password
+    new_password: New password
+    confirm_new_password: Confirm new password
+    change_my_password: Change my password
+    log_in: Log in
+    sign_up: Sign up
+    didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
+    didnt_receive_unlock_instructions: Didn't receive unlock instructions?
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/es.yml

@@ -98,16 +98,25 @@ es:
     admin:
       cms:
         pages:
-          form:
+          form: &pages_form
             review: Approve
             reviewed: Reviewed
             schedule: Publish Date
+            scheduled: Scheduled
             publish: Publish Now
             published: Published
             draft: save as draft
             drafted: Draft
             reset: Reset to Draft
 
+          edit:
+            <<: *pages_form
+
+        files:
+          form:
+            are_you_sure: Are you sure to delete?
+            delete: Delete!
+
   activerecord:
     attributes:
       cms/fortress/user:
@@ -127,3 +136,15 @@ es:
         parent_id: Parent page
         slug: Slug
 
+  login:
+    forgot_your_password: Forgot your password?
+    send_me_reset_password_instructions: Send me reset password instructions
+    change_your_password: Change your password
+    new_password: New password
+    confirm_new_password: Confirm new password
+    change_my_password: Change my password
+    log_in: Log in
+    sign_up: Sign up
+    didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
+    didnt_receive_unlock_instructions: Didn't receive unlock instructions?
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/fr.yml

@@ -98,16 +98,25 @@ fr:
     admin:
       cms:
         pages:
-          form:
+          form: &pages_form
             review: Approve
             reviewed: Reviewed
             schedule: Publish Date
+            scheduled: Scheduled
             publish: Publish Now
             published: Published
             draft: save as draft
             drafted: Draft
             reset: Reset to Draft
 
+          edit:
+            <<: *pages_form
+
+        files:
+          form:
+            are_you_sure: Are you sure to delete?
+            delete: Delete!
+
   activerecord:
     attributes:
       cms/fortress/user:
@@ -127,3 +136,15 @@ fr:
         parent_id: Parent page
         slug: Slug
 
+  login:
+    forgot_your_password: Forgot your password?
+    send_me_reset_password_instructions: Send me reset password instructions
+    change_your_password: Change your password
+    new_password: New password
+    confirm_new_password: Confirm new password
+    change_my_password: Change my password
+    log_in: Log in
+    sign_up: Sign up
+    didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
+    didnt_receive_unlock_instructions: Didn't receive unlock instructions?
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/it.yml

@@ -98,16 +98,25 @@ it:
     admin:
       cms:
         pages:
-          form:
+          form: &pages_form
             review: Approve
             reviewed: Reviewed
             schedule: Publish Date
+            scheduled: Scheduled
             publish: Publish Now
             published: Published
             draft: save as draft
             drafted: Draft
             reset: Reset to Draft
 
+          edit:
+            <<: *pages_form
+
+        files:
+          form:
+            are_you_sure: Are you sure to delete?
+            delete: Delete!
+
   activerecord:
     attributes:
       cms/fortress/user:
@@ -127,3 +136,15 @@ it:
         parent_id: Parent page
         slug: Slug
 
+  login:
+    forgot_your_password: Forgot your password?
+    send_me_reset_password_instructions: Send me reset password instructions
+    change_your_password: Change your password
+    new_password: New password
+    confirm_new_password: Confirm new password
+    change_my_password: Change my password
+    log_in: Log in
+    sign_up: Sign up
+    didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
+    didnt_receive_unlock_instructions: Didn't receive unlock instructions?
+    sign_in_with: Sign in with #{provider.to_s.titleize}

data/config/locales/ja.yml

@@ -98,16 +98,25 @@ ja:
     admin:
       cms:
         pages:
-          form:
+          form: &pages_form
             review: Approve
             reviewed: Reviewed
             schedule: Publish Date
+            scheduled: Scheduled
             publish: Publish Now
             published: Published
             draft: save as draft
             drafted: Draft
             reset: Reset to Draft
 
+          edit:
+            <<: *pages_form
+
+        files:
+          form:
+            are_you_sure: Are you sure to delete?
+            delete: Delete!
+
   activerecord:
     attributes:
       cms/fortress/user:
@@ -127,3 +136,15 @@ ja:
         parent_id: Parent page
         slug: Slug
 
+  login:
+    forgot_your_password: Forgot your password?
+    send_me_reset_password_instructions: Send me reset password instructions
+    change_your_password: Change your password
+    new_password: New password
+    confirm_new_password: Confirm new password
+    change_my_password: Change my password
+    log_in: Log in
+    sign_up: Sign up
+    didnt_receive_confirmation_instructions: Didn't receive confirmation instructions?
+    didnt_receive_unlock_instructions: Didn't receive unlock instructions?
+    sign_in_with: Sign in with #{provider.to_s.titleize}