cms-fortress 1.3.5 → 1.3.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f2bca720ab1f1da2525484105683827daabd9a25
+  data.tar.gz: 95d00bdc7e0a0f2e23b7ed3e5512060d1b084a38
+SHA512:
+  metadata.gz: 7f3fd08e8942bd50309526206a530c9c32c0075202053083269f7440ff3c1b696050fe86ae03904a49ec8f55e36d142eeb3cc4a37763a455ba2f5a0be7b50239
+  data.tar.gz: f99d3f5f81118ea2f369c998ed5a12be1d241a2fb49f02400481f53f8541076c5a18151b9b286ecb65370301efcc8e338f8cb9209df4b5d2ae459a3fb46dceee

data/Gemfile.lock

@@ -1,57 +1,61 @@
 PATH
   remote: .
   specs:
-    cms-fortress (1.3.4)
-      aasm (~> 3.2)
+    cms-fortress (1.3.6)
+      aasm (~> 4.0)
       cancancan (~> 1.9)
-      comfortable_mexican_sofa (~> 1.12.3)
+      comfortable_mexican_sofa (~> 1.12, >= 1.12.5)
       delayed_job (~> 4)
       devise (~> 3.2)
-      rails (>= 4.0.0)
-      tinymce-rails (~> 4.0.0)
+      rails (~> 4.0, >= 4.0.0)
+      tinymce-rails (~> 4.1, >= 4.1.0)
       tinymce-rails-langs (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aasm (3.4.0)
-    actionmailer (4.0.12)
-      actionpack (= 4.0.12)
+    aasm (4.0.8)
+    actionmailer (4.0.13)
+      actionpack (= 4.0.13)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.12)
-      activesupport (= 4.0.12)
+    actionpack (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     active_link_to (1.0.2)
       actionpack
-    activemodel (4.0.12)
-      activesupport (= 4.0.12)
+    activemodel (4.0.13)
+      activesupport (= 4.0.13)
       builder (~> 3.1.0)
-    activerecord (4.0.12)
-      activemodel (= 4.0.12)
+    activerecord (4.0.13)
+      activemodel (= 4.0.13)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.12)
+      activesupport (= 4.0.13)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.12)
+    activesupport (4.0.13)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    ansi (1.4.3)
+    ansi (1.5.0)
     arel (4.0.2)
+    autoprefixer-rails (5.0.0.3)
+      execjs
+      json
     bcrypt (3.1.9)
-    bootstrap-sass (3.3.1.0)
-      sass (~> 3.2)
+    bootstrap-sass (3.3.3)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.2.19)
     bootstrap_form (2.2.0)
     builder (3.1.4)
-    cancancan (1.9.2)
+    cancancan (1.10.1)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.4)
+    cocaine (0.5.5)
       climate_control (>= 0.0.3, < 1.0)
     codemirror-rails (4.8)
       railties (>= 3.0, < 5)
@@ -62,7 +66,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    comfortable_mexican_sofa (1.12.3)
+    comfortable_mexican_sofa (1.12.6)
       active_link_to (>= 1.0.0)
       bootstrap-sass (>= 3.2.0)
       bootstrap_form (>= 2.2.0)
@@ -71,16 +75,14 @@ GEM
       haml-rails (>= 0.3.0)
       jquery-rails (>= 3.0.0)
       jquery-ui-rails (>= 5.0.0)
-      kaminari (>= 0.14.0)
       kramdown (>= 1.0.0)
       paperclip (>= 4.0.0)
       plupload-rails (>= 1.2.1)
       rails (>= 4.0.0, < 5)
       rails-i18n (>= 4.0.0)
       sass-rails (>= 4.0.3)
-      tinymce-rails (>= 4.0.0)
-    delayed_job (4.0.4)
-      activesupport (>= 3.0, < 4.2)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
     devise (3.4.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -93,28 +95,32 @@ GEM
     execjs (2.2.2)
     haml (4.0.6)
       tilt
-    haml-rails (0.5.3)
+    haml-rails (0.7.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
+      html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     hashie (3.3.2)
     hike (1.2.3)
-    i18n (0.6.11)
+    html2haml (2.0.0)
+      erubis (~> 2.7.0)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
+    i18n (0.7.0)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
-    json (1.8.1)
-    kaminari (0.16.1)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    json (1.8.2)
     kramdown (1.5.0)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
-    minitest (4.7.3)
+    mini_portile (0.6.2)
+    minitest (4.7.5)
     minitest-rails (1.0.1)
       minitest (~> 4.7)
       minitest-test (~> 1.0)
@@ -130,47 +136,53 @@ GEM
     minitest-test (1.1.0)
       minitest (~> 4.0)
     multi_json (1.10.1)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
-    paperclip (4.2.0)
+    paperclip (4.2.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
     plupload-rails (1.2.1)
       rails (>= 3.1)
-    powerbar (1.0.11)
-      ansi (~> 1.4.0)
+    powerbar (1.0.12)
+      ansi (~> 1.5.0)
       hashie (>= 1.1.0)
     rack (1.5.2)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.12)
-      actionmailer (= 4.0.12)
-      actionpack (= 4.0.12)
-      activerecord (= 4.0.12)
-      activesupport (= 4.0.12)
+    rails (4.0.13)
+      actionmailer (= 4.0.13)
+      actionpack (= 4.0.13)
+      activerecord (= 4.0.13)
+      activesupport (= 4.0.13)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.12)
+      railties (= 4.0.13)
       sprockets-rails (~> 2.0)
     rails-i18n (4.0.3)
       i18n (~> 0.6)
       railties (~> 4.0)
-    railties (4.0.12)
-      actionpack (= 4.0.12)
-      activesupport (= 4.0.12)
+    railties (4.0.13)
+      actionpack (= 4.0.13)
+      activesupport (= 4.0.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.0)
-    rdoc (4.1.2)
+    rake (10.4.2)
+    rdoc (4.2.0)
       json (~> 1.4)
     responders (1.1.2)
       railties (>= 3.2, < 4.2)
-    sass (3.2.19)
-    sass-rails (4.0.5)
+    ruby_parser (3.6.4)
+      sexp_processor (~> 4.1)
+    sass (3.4.10)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
+    sexp_processor (4.4.5)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -181,7 +193,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -189,7 +201,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    tinymce-rails (4.0.28.2)
+    tinymce-rails (4.1.6)
       railties (>= 3.1.1)
     tinymce-rails-langs (4.20140129)
       tinymce-rails (~> 4.0)
@@ -203,7 +215,7 @@ PLATFORMS
 DEPENDENCIES
   bundler
   cms-fortress!
-  minitest (~> 4.7.3)
+  minitest (~> 4.7, >= 4.7.3)
   minitest-rails
   minitest-reporters
   minitest-spec-rails

data/app/assets/javascripts/cms/fortress/media.js.coffee

@@ -2,6 +2,11 @@ window.media =
   init: ->
     this.dlg = $("#media-box-dialog")
     # this.dlg.modal(show: false, backdrop: false)
+    @eventListeners()
+
+  eventListeners: ->
+    ($ 'button.js-blank').on 'click', (e) =>
+      ($ e.target).closest('form').attr('target', '_blank')
 
   loading: "<p>Loading...</p>"
 

data/app/assets/javascripts/cms/fortress/themes/wide.js.erb

@@ -1,9 +1,9 @@
-#= require tinymce-jquery
-#= require '../site_selector'
+//= require tinymce-jquery
+//= require '../site_selector'
 
 
 window.CMS.wysiwyg = function () {
-    return <%= tinymce_init %>
+  return <%= tinymce_init %>
 }
 
 $(document).ready( function() {

data/app/assets/stylesheets/cms/fortress/admin_overrides.css

@@ -28,3 +28,12 @@
 .site_selector {
   width: 250px;
 }
+
+h2.pull-right{
+  font-size: 27px;
+}
+.btn-scheduled, .btn-drafted, .btn-reviewed, .btn-published{color:#fff;}
+.btn-scheduled{background-color:#f0ad4e;}
+.btn-drafted{background-color:#5bc0de;}
+.btn-reviewed{background-color:#428bca;}
+.btn-published{background-color:#5cb85c;}

data/app/helpers/cms/fortress/application_helper.rb

@@ -74,7 +74,7 @@ module Cms::Fortress::ApplicationHelper
       elsif type.eql?(:video)
         cms_fortress_files_videos_path
       else
-        cms_fortress_files_others_url(format: :json)
+        cms_fortress_files_others_path(format: :json)
       end
     end
   end
@@ -122,8 +122,8 @@ module Cms::Fortress::ApplicationHelper
         include?(controller_name)
   end
 
-  def settings
-    Cms::Fortress::Settings.new(:global_settings)
+  def settings(type = :global_settings)
+    Cms::Fortress::Settings.new(type)
   end
 end
 

data/app/helpers/cms/fortress/sprocket_helper.rb

@@ -2,12 +2,7 @@ module Cms::Fortress::SprocketHelper
   include TinyMCE::Rails::Helper
 
   def tinymce_init
-    path = File.join(Rails.root, 'config', 'tinymce.yml')
-    if File.exist?(path)
-      config = YAML.load_file(path)
-    else
-      config = {}
-    end
+    config = Cms::Fortress::Settings.new(:tinymce).to_h rescue {}
 
     options = {
       menubar: "tools format view",
@@ -15,16 +10,16 @@ module Cms::Fortress::SprocketHelper
       toolbar2: "",
       plugins: ["code", "fullscreen", "media", "link", "table"],
       language: "en"
-    }.stringify_keys.merge(config)
+    }.merge(config)
 
   <<-EOF
   tinymce.init({
-      #{configuration_from_options(options)},
+      #{configuration_from_options(options)}
+      #{configuration_from_options_as_string(options)}
       selector: 'textarea[data-cms-rich-text]',
       link_list: CmsFortress.media.othersUrl(),
 
       setup: function(ed) {
-
         ed.addButton('image', {
           title: 'Insert Image',
           onclick: function() {
@@ -40,19 +35,27 @@ module Cms::Fortress::SprocketHelper
             return CmsFortress.media.showVideoDialog(ed);
           }
         });
-
       }
-
     });
   EOF
   end
 
   private
 
+  def configuration_from_options_as_string(options)
+    config = options.map do |k, v|
+      "#{k.to_s.gsub('[plain]', '')}: #{v}," if k.to_s =~ /\[plain\]/
+    end
+    config.join() if config.present?
+  end
+
   def configuration_from_options(options)
-    options.map do |k, v|
-      v.is_a?(Array) ? "#{k}: #{v}" : "#{k}: #{boolean_value(v)}"
-    end.join(',')
+    config = options.map do |k, v|
+      unless k.to_s =~ /\[plain\]/
+        v.is_a?(Array) ? "#{k}: #{v}," : "#{k}: #{boolean_value(v)},"
+      end
+    end
+    config.join()
   end
 
   def boolean_value(v)

data/app/helpers/comfy/admin/cms/pages_helper.rb

@@ -1,10 +1,10 @@
 module Comfy::Admin::Cms::PagesHelper
   def page_actions(page)
-    states = page.aasm.permissible_events
-    states.select! do |state|
-      can?(:manage, 'contents.page.'+state.to_s)
+    events = page.aasm.events(permitted: true).map(&:name)
+    events.select! do |event|
+      can?(:manage, 'contents.page.' + event.to_s)
     end
-    states
+    events
   end
 
   def cached_timeout_for_select

data/app/views/cms/fortress/themes/wide/_menu.html.haml

@@ -65,6 +65,6 @@
             %span.caret
           %ul.dropdown-menu(role="menu")
             %li
-              = link_to t('cms.fortress.logout'), destroy_cms_fortress_user_session_path, :method => 'delete'
+              = link_to t('cms.fortress.logout'), destroy_cms_fortress_user_session_path, :method => 'get'
 
 

data/app/views/cms/fortress/users/passwords/edit.html.haml

@@ -4,16 +4,16 @@
     .col-sm-6.col-sm-offset-3
 
       = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put, role: 'form', class: 'form-reset-password' }) do |f|
-        %h3 Change your password
+        %h3= t('login.change_your_password')
         = devise_error_messages!
         = f.hidden_field :reset_password_token
         .form-group
-          = f.label :password, "New password"
+          = f.label :password, t('login.new_password')
           = f.password_field :password, autofocus: true, autocomplete: "off", class: 'form-control'
         .form-group
-          = f.label :password_confirmation, "Confirm new password"
+          = f.label :password_confirmation, t('login.confirm_new_password')
           = f.password_field :password_confirmation, autocomplete: "off", class: 'form-control'
 
-        = f.submit "Change my password"
+        = f.submit t('login.change_my_password')
 
         = render "devise/shared/links"

data/app/views/cms/fortress/users/passwords/new.html.haml

@@ -3,12 +3,12 @@
   .row
     .col-sm-6.col-sm-offset-3
       = form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post, role: 'form', class: 'form-reset-password' }) do |f|
-        %h3 Forgot your password?
+        %h3= t('login.forgot_your_password')
         = devise_error_messages!
         .form-group
           = f.label :email
           = f.email_field :email, autofocus: true, class: 'form-control'
 
-        = f.submit "Send me reset password instructions", class: 'btn btn-default'
+        = f.submit t('login.send_me_reset_password_instructions'), class: 'btn btn-default'
 
         = render "devise/shared/links"