trusty-cms 2.0.11 → 2.0.12

data/app/assets/javascripts/admin/tabcontrol.js.erb

@@ -21,7 +21,7 @@
 
     TabControl.selectTab = function(id) {
         id = id.replace(/^tab_/, '').replace(/^page_/, '');
-        var underscored_id = id.replace(/_/g, "-");
+        var underscored_id = id.replace(/_/g, "-").toLowerCase();
         var $pages = $('div#tab_control .pages .page');
         var $tabs  = $('div#tab_control .tabs .tab');
 
@@ -39,8 +39,8 @@
   }
 
   TabControl.removeTab = function(id) {
-    id = id.replace(/^tab_/, '').replace(/^page_/, '');
-    var underscored_id = id.replace("_", "-");
+    id = id.replace(/^tab_/, '').replace(/^page_/, '').toLowerCase();
+    var underscored_id = id.replace("_", "-").toLowerCase();
     if(confirm('Remove the "' + id + '" part?')) {
       var $pages = $('div#tab_control .pages .page');
       var $tabs  = $('div#tab_control .tabs .tab');

data/config/database.mysql.yml

@@ -4,19 +4,19 @@
 #
 
 development:
-  adapter: mysql
+  adapter: mysql2
   database: trusty_cms_dev
   username: root
   password:
 
 test: &TEST
-  adapter: mysql
+  adapter: mysql2
   database: trusty_cms_test
   username: root
   password:
 
 production:
-  adapter: mysql
+  adapter: mysql2
   database: trusty_cms_live
   username: root
   password:

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = "2.0.11"
+    VERSION = "2.0.12"
   end
 end

data/lib/trusty_cms/initializer.rb

@@ -3,7 +3,7 @@ require 'rails'
 require 'jquery-rails'
 require 'haml-rails'
 require 'haml'
-require 'mysql'
+require 'mysql2'
 
 require 'trusty_cms/admin_ui'
 require 'trusty_cms/extension_loader'

data/trusty_cms.gemspec

@@ -36,7 +36,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency "haml",            "~> 4.0"
   s.add_dependency "haml-rails",      "~> 0.5" # 0.5 is rails 4+ only
   s.add_dependency "highline",        "~> 1.6"
-  s.add_dependency "mysql",           "~> 2.9"
+  s.add_dependency "mysql2",          "~> 0.4.2"
   s.add_dependency "rack",            "~> 1.4"
   s.add_dependency "rack-cache",      "~> 1.2"
   s.add_dependency "radius",          "~> 0.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.12
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -179,19 +179,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: mysql
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -475,7 +475,6 @@ files:
 - app/controllers/admin/users_controller.rb
 - app/controllers/admin/welcome_controller.rb
 - app/controllers/application_controller.rb
-- app/controllers/application_controller.rb.rails2
 - app/controllers/site_controller.rb
 - app/helpers/admin/configuration_helper.rb
 - app/helpers/admin/export_helper.rb
@@ -490,7 +489,6 @@ files:
 - app/helpers/admin/users_helper.rb
 - app/helpers/admin/welcome_helper.rb
 - app/helpers/application_helper.rb
-- app/helpers/application_helper.rb.rails2
 - app/helpers/site_helper.rb
 - app/models/deprecated_tags.rb
 - app/models/file_not_found_page.rb
@@ -549,13 +547,9 @@ files:
 - config/application.rb
 - config/boot.rb
 - config/database.mysql.yml
-- config/database.yml.rails2
 - config/environment.rb
-- config/environment.rb.rails2
 - config/environments/development.rb
-- config/environments/development.rb.rails2
 - config/environments/production.rb
-- config/environments/production.rb.rails2
 - config/environments/test.rb
 - config/initializers/active_record_extensions.rb
 - config/initializers/ckeditor.rb
@@ -570,7 +564,6 @@ files:
 - config/locales/en.yml
 - config/locales/en_available_tags.yml
 - config/routes.rb
-- config/routes.rb.rails2
 - config/trustygems.yml
 - db/migrate/001_create_radiant_tables.rb
 - db/migrate/002_insert_initial_data.rb
@@ -743,8 +736,6 @@ files:
 - public/favicon.ico
 - public/loading-iframe.html
 - public/robots.txt
-- public/stylesheets/admin/main.css
-- public/stylesheets/admin/overrides.css
 - script/extension
 - script/rails
 - spec/ci/database.mysql.yml
@@ -775,7 +766,6 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/db/schema.rb
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -793,95 +783,6 @@ files:
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/custom_actions.rb
-- test/test_helper.rb.rails2
-- tmp/cache/747/A70/TrustyCms%3A%3AConfig
-- tmp/cache/85C/FA0/TrustyCms.cache_mtime
-- tmp/cache_files_test/a.txt
-- tmp/cache_files_test/all.txt
-- tmp/cache_files_test/b.txt
-- tmp/config/radiant_config.yml
-- tmp/sass-cache/1a137f46a4706893cc07b2aa949a92cf851d936f/_boxes.sassc
-- tmp/sass-cache/1a137f46a4706893cc07b2aa949a92cf851d936f/_gradients.sassc
-- tmp/sass-cache/1a137f46a4706893cc07b2aa949a92cf851d936f/_links.sassc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_appearance.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_background-clip.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_background-origin.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_background-size.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_border-radius.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_box-shadow.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_box-sizing.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_box.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_columns.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_filter.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_font-face.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_hyphenation.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_images.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_inline-block.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_opacity.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_regions.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_shared.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_text-shadow.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_transform.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_transition.scssc
-- tmp/sass-cache/28de5f95620abb7d2385166aed681f8b13104764/_user-interface.scssc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_actions.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_avatars.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_content.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_dateinput.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_deprecated.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_dropdown.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_footer.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_forms.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_header.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_index.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_layout.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_messages.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_popup.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_tabcontrol.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_toolbar.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_typography.sassc
-- tmp/sass-cache/2f4278d4f2cc4f21f31aa67430e462fbca6b47a0/_validations.sassc
-- tmp/sass-cache/33c9f77b54ab77293741bf5159eedff124a39fc1/_color.scssc
-- tmp/sass-cache/33c9f77b54ab77293741bf5159eedff124a39fc1/_general.scssc
-- tmp/sass-cache/33c9f77b54ab77293741bf5159eedff124a39fc1/_sprites.scssc
-- tmp/sass-cache/33c9f77b54ab77293741bf5159eedff124a39fc1/_tables.scssc
-- tmp/sass-cache/5683573556a6b271b3ffade55f4ff32a60e7c0f0/_base.scssc
-- tmp/sass-cache/5683573556a6b271b3ffade55f4ff32a60e7c0f0/_sprite-img.scssc
-- tmp/sass-cache/6159fdf943b5ffc54b901a34cdfcfc7e6f736834/_alternating-rows-and-columns.scssc
-- tmp/sass-cache/6159fdf943b5ffc54b901a34cdfcfc7e6f736834/_borders.scssc
-- tmp/sass-cache/6159fdf943b5ffc54b901a34cdfcfc7e6f736834/_scaffolding.scssc
-- tmp/sass-cache/81fb0626d3f9dbbcc1f43df416db1c97b6ad512a/_links.scssc
-- tmp/sass-cache/81fb0626d3f9dbbcc1f43df416db1c97b6ad512a/_lists.scssc
-- tmp/sass-cache/81fb0626d3f9dbbcc1f43df416db1c97b6ad512a/_text.scssc
-- tmp/sass-cache/81fb0626d3f9dbbcc1f43df416db1c97b6ad512a/_vertical_rhythm.scssc
-- tmp/sass-cache/87c1de4edf14dc5f527f65e2080e0faa325354aa/_hover-link.scssc
-- tmp/sass-cache/87c1de4edf14dc5f527f65e2080e0faa325354aa/_link-colors.scssc
-- tmp/sass-cache/87c1de4edf14dc5f527f65e2080e0faa325354aa/_unstyled-link.scssc
-- tmp/sass-cache/8b412a89f899813981285eadb5f08e52b94dfb65/_css3.scssc
-- tmp/sass-cache/8b412a89f899813981285eadb5f08e52b94dfb65/_support.scssc
-- tmp/sass-cache/8b412a89f899813981285eadb5f08e52b94dfb65/_typography.scssc
-- tmp/sass-cache/8b412a89f899813981285eadb5f08e52b94dfb65/_utilities.scssc
-- tmp/sass-cache/92844cd19a320f87ef960171cea4f33d1a07339c/_contrast.scssc
-- tmp/sass-cache/a97de1041408f914478b9e7943c5c6c2d221d4c0/_ellipsis.scssc
-- tmp/sass-cache/a97de1041408f914478b9e7943c5c6c2d221d4c0/_force-wrap.scssc
-- tmp/sass-cache/a97de1041408f914478b9e7943c5c6c2d221d4c0/_nowrap.scssc
-- tmp/sass-cache/a97de1041408f914478b9e7943c5c6c2d221d4c0/_replacement.scssc
-- tmp/sass-cache/b3d80baefd48593d8c08815ba2d83e209f5dad6f/_grid-background.scssc
-- tmp/sass-cache/b92bfc773efa04d930ffa0b3331244a1f378caa7/_compass.scssc
-- tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_clearfix.scssc
-- tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_float.scssc
-- tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_hacks.scssc
-- tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_min.scssc
-- tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_reset.scssc
-- tmp/sass-cache/c055a2360b102aff9247707235d9dce9214f6c4f/_tag-cloud.scssc
-- tmp/sass-cache/c3fa060b99d9ed1d9740af472ecc747182e2ea93/_base.sassc
-- tmp/sass-cache/c3fa060b99d9ed1d9740af472ecc747182e2ea93/main.sassc
-- tmp/sass-cache/c3fa060b99d9ed1d9740af472ecc747182e2ea93/overrides.sassc
-- tmp/sass-cache/d2bf234de18cb20fe8238c9224b9863ed5d268c6/_bullets.scssc
-- tmp/sass-cache/d2bf234de18cb20fe8238c9224b9863ed5d268c6/_horizontal-list.scssc
-- tmp/sass-cache/d2bf234de18cb20fe8238c9224b9863ed5d268c6/_inline-block-list.scssc
-- tmp/sass-cache/d2bf234de18cb20fe8238c9224b9863ed5d268c6/_inline-list.scssc
-- tmp/sass-cache/dc9647e96d50c02214aff50e88308a74bf56d1d7/_utilities.scssc
 - trusty_cms.gemspec
 homepage: https://github.com/pgharts/trusty-cms
 licenses:
@@ -936,7 +837,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
@@ -967,7 +868,6 @@ test_files:
 - spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html