cms-fortress 1.3.5 → 1.3.6

data/config/locales/nl.yml

@@ -98,16 +98,25 @@ nl:
     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 @@ nl:
         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/pl.yml

@@ -98,16 +98,25 @@ pl:
     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 @@ pl:
         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/pt-BR.yml

@@ -98,16 +98,25 @@ pt-BR:
     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,16 @@ pt-BR:
         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/ru.yml

@@ -98,16 +98,26 @@ ru:
     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 +137,15 @@ ru:
         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/sv.yml

@@ -98,16 +98,25 @@ sv:
     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 @@ sv:
         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/zh-CN.yml

@@ -98,16 +98,25 @@ zh-CN:
     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 @@ zh-CN:
         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/db/schema.rb

@@ -137,7 +137,7 @@ ActiveRecord::Schema.define(version: 7) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "cached_timeout",                  default: 0
-    t.string   "aasm_state",                      default: "new"
+    t.string   "aasm_state",                      default: "drafted"
     t.date     "published_date"
   end
 

data/lib/cms-fortress.rb

@@ -3,6 +3,7 @@ require 'devise'
 require 'cancan'
 require 'aasm'
 require 'tinymce-rails'
+require 'tinymce-rails-langs'
 
 require_relative 'comfortable_mexican_sofa/fixture/page'
 

data/lib/cms/fortress/rails/engine.rb

@@ -58,7 +58,7 @@ module Cms
       end
 
       initializer :assets do |config|
-        Rails.application.config.assets.precompile += %w( cms/fortress/admin_overrides.css cms/fortress/session.css cms/fortress/themes/wide.css cms/fortress/themes/wide.js cms/fortress/media.js html5shiv.js cms/fortress/cms_fortress.js)
+        Rails.application.config.assets.precompile += %w( cms/fortress/admin_overrides.css cms/fortress/session.css cms/fortress/themes/wide.css cms/fortress/themes/wide.js cms/fortress/media.js html5shiv.js)
       end
     end
   end

data/test/controllers/comfy/admin/cms/pages_controller_test.rb

@@ -22,7 +22,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
                 { :identifier => 'default_field_text',
                   :content    => 'title content' }
             ]
-        }, :transition => 'draft'
+        }
         page = Comfy::Cms::Page.last
         assert_equal @comfy_cms_site, page.site
         assert page.drafted?

data/test/fixtures/comfy/cms/pages.yml

@@ -8,7 +8,7 @@ default:
   full_path: '/'
   children_count: 1
   position: 0
-  is_published: true
+  is_published: 0
   content_cache: |-
 
     layout_content_a
@@ -29,7 +29,7 @@ child:
   full_path: '/child-page'
   children_count: 0
   position: 0
-  is_published: true
+  is_published: 0
   content_cache: |-
     
     layout_content_a

data/test/models/comfy/cms/page_test.rb

@@ -4,7 +4,6 @@ class Comfy::Cms::PageTest < ActiveSupport::TestCase
 
   test "new page can be drafted" do
     @new = comfy_cms_pages(:default)
-    @new.draft
     assert(@new.drafted?)
     assert(!@new.is_published)
   end

metadata

@@ -1,270 +1,261 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.3.5
-  prerelease: 
+  version: 1.3.6
 platform: ruby
 authors:
 - Melvin Sembrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: comfortable_mexican_sofa
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.3
+        version: '1.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.12.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.3
+        version: 1.12.5
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: tinymce-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: tinymce-rails-langs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: aasm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-spec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Comfortable Mexican Sofa (CMS) - User and role management extension
@@ -275,8 +266,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -340,9 +331,11 @@ files:
 - app/views/cms/fortress/users/passwords/new.html.haml
 - app/views/cms/fortress/users/sessions/.DS_Store
 - app/views/cms/fortress/users/sessions/new.html.haml
+- app/views/comfy/admin/cms/files/_page_form.html.haml
 - app/views/comfy/admin/cms/pages/_form.html.haml
 - app/views/comfy/admin/cms/pages/edit.html.haml
 - app/views/comfy/admin/cms/partials/_body_before.html.haml
+- app/views/devise/shared/_links.html.haml
 - app/views/layouts/cms/fortress/session.html.haml
 - app/views/layouts/comfy/admin/cms/_body.html.haml
 - app/views/layouts/comfy/admin/cms/_footer.html.haml
@@ -379,6 +372,7 @@ files:
 - config/locales/sv.yml
 - config/locales/zh-CN.yml
 - config/roles.yml
+- config/routes.rb
 - config/secrets.yml
 - db/migrate/01_devise_create_cms_fortress_users.rb
 - db/migrate/02_create_cms_fortress_role_details.rb
@@ -439,27 +433,26 @@ files:
 homepage: http://github.com/melvinsembrano/cms-fortress
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Comfortable Mexican Sofa (CMS) - User and role management extension
 test_files:
 - test/controllers/cms/fortress/roles_controller_test.rb