locomotive_cms 2.1.4 → 2.2.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -124,13 +124,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
-  name: locomotive-mongoid_migration
+  name: mongoid_migration
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
+- !ruby/object:Gem::Dependency
+  name: mongo_session_store-rails3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: custom_fields
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +242,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '3.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +250,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.21'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: locomotive-tinymce-rails
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +258,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.8.1
+        version: 3.5.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -250,7 +266,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.8.1
+        version: 3.5.8.2
 - !ruby/object:Gem::Dependency
   name: locomotive-aloha-rails
   requirement: !ruby/object:Gem::Requirement
@@ -402,7 +418,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -410,7 +426,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -434,7 +450,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -442,7 +458,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.11.1
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -530,7 +546,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -538,7 +554,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -582,12 +598,16 @@ files:
 - app/assets/images/locomotive/icons/flags/pl.png
 - app/assets/images/locomotive/icons/flags/pt-BR.png
 - app/assets/images/locomotive/icons/flags/ru.png
+- app/assets/images/locomotive/icons/flags/zh-CN.png
 - app/assets/images/locomotive/icons/start.png
 - app/assets/images/locomotive/list/empty.png
 - app/assets/images/locomotive/list/item-left.png
 - app/assets/images/locomotive/nocoffee.png
 - app/assets/images/locomotive/plugins/sites_picker_top_arrow.png
 - app/assets/images/locomotive/rails.png
+- app/assets/javascripts/aloha/plugins/custom/inputcontrol/css/inputcontrol.css
+- app/assets/javascripts/aloha/plugins/custom/inputcontrol/lib/inputcontrol-plugin.js
+- app/assets/javascripts/aloha/plugins/custom/inputcontrol/package.json
 - app/assets/javascripts/aloha/plugins/custom/locomotive_media/css/image.css
 - app/assets/javascripts/aloha/plugins/custom/locomotive_media/img/image.gif
 - app/assets/javascripts/aloha/plugins/custom/locomotive_media/lib/locomotive_media-plugin.js
@@ -635,8 +655,7 @@ files:
 - app/assets/javascripts/locomotive/views/editable_elements/control_view.js.coffee
 - app/assets/javascripts/locomotive/views/editable_elements/edit_all_view.js.coffee
 - app/assets/javascripts/locomotive/views/editable_elements/file_view.js.coffee
-- app/assets/javascripts/locomotive/views/editable_elements/long_text_view.js.coffee
-- app/assets/javascripts/locomotive/views/editable_elements/short_text_view.js.coffee
+- app/assets/javascripts/locomotive/views/editable_elements/text_view.js.coffee
 - app/assets/javascripts/locomotive/views/inline_editor/application_view.js.coffee
 - app/assets/javascripts/locomotive/views/inline_editor/toolbar_view.js.coffee
 - app/assets/javascripts/locomotive/views/my_account/edit_view.js.coffee
@@ -646,6 +665,7 @@ files:
 - app/assets/javascripts/locomotive/views/pages/list_view.js.coffee
 - app/assets/javascripts/locomotive/views/pages/new_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/asset_picker_view.js.coffee
+- app/assets/javascripts/locomotive/views/shared/fields/belongs_to_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/fields/file_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/fields/has_many_view.js.coffee
 - app/assets/javascripts/locomotive/views/shared/fields/many_to_many_view.js.coffee
@@ -678,8 +698,18 @@ files:
 - app/assets/javascripts/tinymce/plugins/locomotive_media/editor_plugin.js
 - app/assets/javascripts/tinymce/plugins/locomotive_media/langs/de.js
 - app/assets/javascripts/tinymce/plugins/locomotive_media/langs/en.js
+- app/assets/javascripts/tinymce/plugins/locomotive_media/langs/es.js
+- app/assets/javascripts/tinymce/plugins/locomotive_media/langs/et.js
 - app/assets/javascripts/tinymce/plugins/locomotive_media/langs/fr.js
+- app/assets/javascripts/tinymce/plugins/locomotive_media/langs/it.js
+- app/assets/javascripts/tinymce/plugins/locomotive_media/langs/ja.js
+- app/assets/javascripts/tinymce/plugins/locomotive_media/langs/nb.js
+- app/assets/javascripts/tinymce/plugins/locomotive_media/langs/nl.js
+- app/assets/javascripts/tinymce/plugins/locomotive_media/langs/no.js
+- app/assets/javascripts/tinymce/plugins/locomotive_media/langs/pl.js
+- app/assets/javascripts/tinymce/plugins/locomotive_media/langs/pt.js
 - app/assets/javascripts/tinymce/plugins/locomotive_media/langs/ru.js
+- app/assets/javascripts/tinymce/plugins/locomotive_media/langs/zh-cn.js
 - app/assets/javascripts/tinymce/themes/advanced/skins/locomotive/content.css
 - app/assets/javascripts/tinymce/themes/advanced/skins/locomotive/dialog.css.scss
 - app/assets/javascripts/tinymce/themes/advanced/skins/locomotive/img/butt2.png
@@ -808,6 +838,7 @@ files:
 - app/models/locomotive/editable_file.rb
 - app/models/locomotive/editable_long_text.rb
 - app/models/locomotive/editable_short_text.rb
+- app/models/locomotive/editable_text.rb
 - app/models/locomotive/extensions/asset/types.rb
 - app/models/locomotive/extensions/asset/vignette.rb
 - app/models/locomotive/extensions/content_entry/csv.rb
@@ -825,6 +856,7 @@ files:
 - app/models/locomotive/extensions/site/first_installation.rb
 - app/models/locomotive/extensions/site/locales.rb
 - app/models/locomotive/extensions/site/subdomain_domains.rb
+- app/models/locomotive/extensions/site/timezone.rb
 - app/models/locomotive/membership.rb
 - app/models/locomotive/page.rb
 - app/models/locomotive/site.rb
@@ -840,8 +872,7 @@ files:
 - app/presenters/locomotive/editable_control_presenter.rb
 - app/presenters/locomotive/editable_element_presenter.rb
 - app/presenters/locomotive/editable_file_presenter.rb
-- app/presenters/locomotive/editable_long_text_presenter.rb
-- app/presenters/locomotive/editable_short_text_presenter.rb
+- app/presenters/locomotive/editable_text_presenter.rb
 - app/presenters/locomotive/membership_presenter.rb
 - app/presenters/locomotive/page_presenter.rb
 - app/presenters/locomotive/site_presenter.rb
@@ -917,6 +948,7 @@ files:
 - app/views/locomotive/shared/_header.html.haml
 - app/views/locomotive/shared/_locale_picker_link.html.haml
 - app/views/locomotive/shared/_main_app_head.html.haml
+- app/views/locomotive/shared/_main_app_head_before_backbone.html.haml
 - app/views/locomotive/shared/_site_picker.html.haml
 - app/views/locomotive/shared/actions/_contents.html.haml
 - app/views/locomotive/shared/menu/_contents.html.haml
@@ -958,6 +990,7 @@ files:
 - config/locales/admin_ui.pl.yml
 - config/locales/admin_ui.pt-BR.yml
 - config/locales/admin_ui.ru.yml
+- config/locales/admin_ui.zh-CN.yml
 - config/locales/carrierwave.de.yml
 - config/locales/carrierwave.en.yml
 - config/locales/carrierwave.es.yml
@@ -970,6 +1003,7 @@ files:
 - config/locales/carrierwave.pl.yml
 - config/locales/carrierwave.pt-BR.yml
 - config/locales/carrierwave.ru.yml
+- config/locales/carrierwave.zh-CN.yml
 - config/locales/default.de.yml
 - config/locales/default.en.yml
 - config/locales/default.es.yml
@@ -982,6 +1016,7 @@ files:
 - config/locales/default.pl.yml
 - config/locales/default.pt-BR.yml
 - config/locales/default.ru.yml
+- config/locales/default.zh-CN.yml
 - config/locales/devise.de.yml
 - config/locales/devise.en.yml
 - config/locales/devise.es.yml
@@ -994,6 +1029,7 @@ files:
 - config/locales/devise.pl.yml
 - config/locales/devise.pt-BR.yml
 - config/locales/devise.ru.yml
+- config/locales/devise.zh-CN.yml
 - config/locales/flash.de.yml
 - config/locales/flash.en.yml
 - config/locales/flash.es.yml
@@ -1006,6 +1042,7 @@ files:
 - config/locales/flash.pl.yml
 - config/locales/flash.pt-BR.yml
 - config/locales/flash.ru.yml
+- config/locales/flash.zh-CN.yml
 - config/locales/formtastic.de.yml
 - config/locales/formtastic.en.yml
 - config/locales/formtastic.es.yml
@@ -1018,6 +1055,7 @@ files:
 - config/locales/formtastic.pl.yml
 - config/locales/formtastic.pt-BR.yml
 - config/locales/formtastic.ru.yml
+- config/locales/formtastic.zh-CN.yml
 - config/routes.rb
 - lib/generators/locomotive/install/install_generator.rb
 - lib/generators/locomotive/install/templates/carrierwave.rb
@@ -1073,8 +1111,7 @@ files:
 - lib/locomotive/liquid/tags/editable/base.rb
 - lib/locomotive/liquid/tags/editable/control.rb
 - lib/locomotive/liquid/tags/editable/file.rb
-- lib/locomotive/liquid/tags/editable/long_text.rb
-- lib/locomotive/liquid/tags/editable/short_text.rb
+- lib/locomotive/liquid/tags/editable/text.rb
 - lib/locomotive/liquid/tags/editable.rb
 - lib/locomotive/liquid/tags/extends.rb
 - lib/locomotive/liquid/tags/fetch_page.rb
@@ -1094,7 +1131,6 @@ files:
 - lib/locomotive/liquid.rb
 - lib/locomotive/logger.rb
 - lib/locomotive/middlewares/cache.rb
-- lib/locomotive/middlewares/fonts.rb
 - lib/locomotive/middlewares/inline_editor.rb
 - lib/locomotive/middlewares/permalink.rb
 - lib/locomotive/middlewares/seo_trailing_slash.rb
@@ -1114,7 +1150,6 @@ files:
 - lib/locomotive/routing/default_constraint.rb
 - lib/locomotive/routing/site_dispatcher.rb
 - lib/locomotive/routing.rb
-- lib/locomotive/session_store.rb
 - lib/locomotive/version.rb
 - lib/locomotive.rb
 - lib/locomotive_cms.rb
@@ -1124,11 +1159,16 @@ files:
 - mongodb/migrate/20130326201349_rename_entry_to_content_entry.rb
 - mongodb/migrate/20130511121956_generate_checksum_for_theme_assets.rb
 - mongodb/migrate/20130530162559_api_key_for_all_accounts.rb
+- mongodb/migrate/20130621135025_create_editable_texts.rb
+- mongodb/migrate/20130627101548_localize_slugs_of_content_entries.rb
 - public/favicon.ico
 - vendor/assets/fonts/locomotive/fontawesome-webfont.eot
 - vendor/assets/fonts/locomotive/fontawesome-webfont.svg
 - vendor/assets/fonts/locomotive/fontawesome-webfont.ttf
 - vendor/assets/fonts/locomotive/fontawesome-webfont.woff
+- vendor/assets/images/select2-spinner.gif
+- vendor/assets/images/select2.png
+- vendor/assets/images/select2x2.png
 - vendor/assets/javascripts/locomotive/backbone.modelbinding.js
 - vendor/assets/javascripts/locomotive/backbone.sync.js
 - vendor/assets/javascripts/locomotive/cmd.js
@@ -1148,6 +1188,7 @@ files:
 - vendor/assets/javascripts/locomotive/tag-it.min.js
 - vendor/assets/javascripts/locomotive/toggle.js
 - vendor/assets/javascripts/locomotive/vendor.js
+- vendor/assets/javascripts/select2/select2.js
 - vendor/assets/stylesheets/locomotive/blueprint/ie.css
 - vendor/assets/stylesheets/locomotive/blueprint/print.css
 - vendor/assets/stylesheets/locomotive/blueprint/screen.css
@@ -1170,6 +1211,7 @@ files:
 - vendor/assets/stylesheets/locomotive/jquery.tagit.css
 - vendor/assets/stylesheets/locomotive/liquid_mode.css
 - vendor/assets/stylesheets/locomotive/toggle.css.scss
+- vendor/assets/stylesheets/select2/select2.css.scss
 - LICENSE
 - README.textile
 - features/api/accounts.feature
@@ -1200,6 +1242,7 @@ files:
 - features/backoffice/content_types/email.feature
 - features/backoffice/content_types/has_many.feature
 - features/backoffice/content_types/integer.feature
+- features/backoffice/content_types/localized.feature
 - features/backoffice/content_types/many_to_many.feature
 - features/backoffice/content_types/tags.feature
 - features/backoffice/content_types/uniqueness.feature
@@ -1283,9 +1326,10 @@ files:
 - spec/lib/locomotive/liquid/filters/translate_spec.rb
 - spec/lib/locomotive/liquid/tags/consume_spec.rb
 - spec/lib/locomotive/liquid/tags/csrf_spec.rb
-- spec/lib/locomotive/liquid/tags/editable/short_text_spec.rb
+- spec/lib/locomotive/liquid/tags/editable/text_spec.rb
 - spec/lib/locomotive/liquid/tags/extends_spec.rb
 - spec/lib/locomotive/liquid/tags/javascript_spec.rb
+- spec/lib/locomotive/liquid/tags/link_to_spec.rb
 - spec/lib/locomotive/liquid/tags/locale_switcher_spec.rb
 - spec/lib/locomotive/liquid/tags/nav_spec.rb
 - spec/lib/locomotive/liquid/tags/paginate_spec.rb
@@ -1302,8 +1346,7 @@ files:
 - spec/models/locomotive/content_type_spec.rb
 - spec/models/locomotive/editable_control_spec.rb
 - spec/models/locomotive/editable_file_spec.rb
-- spec/models/locomotive/editable_long_text_spec.rb
-- spec/models/locomotive/editable_short_text_spec.rb
+- spec/models/locomotive/editable_text_spec.rb
 - spec/models/locomotive/extensions/page/editable_elements_spec.rb
 - spec/models/locomotive/extensions/page/redirect_spec.rb
 - spec/models/locomotive/extensions/page/render_spec.rb
@@ -1373,7 +1416,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1655850861227393750
+      hash: -31990377363803179
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1382,7 +1425,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1655850861227393750
+      hash: -31990377363803179
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -1418,6 +1461,7 @@ test_files:
 - features/backoffice/content_types/email.feature
 - features/backoffice/content_types/has_many.feature
 - features/backoffice/content_types/integer.feature
+- features/backoffice/content_types/localized.feature
 - features/backoffice/content_types/many_to_many.feature
 - features/backoffice/content_types/tags.feature
 - features/backoffice/content_types/uniqueness.feature
@@ -1501,9 +1545,10 @@ test_files:
 - spec/lib/locomotive/liquid/filters/translate_spec.rb
 - spec/lib/locomotive/liquid/tags/consume_spec.rb
 - spec/lib/locomotive/liquid/tags/csrf_spec.rb
-- spec/lib/locomotive/liquid/tags/editable/short_text_spec.rb
+- spec/lib/locomotive/liquid/tags/editable/text_spec.rb
 - spec/lib/locomotive/liquid/tags/extends_spec.rb
 - spec/lib/locomotive/liquid/tags/javascript_spec.rb
+- spec/lib/locomotive/liquid/tags/link_to_spec.rb
 - spec/lib/locomotive/liquid/tags/locale_switcher_spec.rb
 - spec/lib/locomotive/liquid/tags/nav_spec.rb
 - spec/lib/locomotive/liquid/tags/paginate_spec.rb
@@ -1520,8 +1565,7 @@ test_files:
 - spec/models/locomotive/content_type_spec.rb
 - spec/models/locomotive/editable_control_spec.rb
 - spec/models/locomotive/editable_file_spec.rb
-- spec/models/locomotive/editable_long_text_spec.rb
-- spec/models/locomotive/editable_short_text_spec.rb
+- spec/models/locomotive/editable_text_spec.rb
 - spec/models/locomotive/extensions/page/editable_elements_spec.rb
 - spec/models/locomotive/extensions/page/redirect_spec.rb
 - spec/models/locomotive/extensions/page/render_spec.rb

data/app/assets/javascripts/locomotive/views/editable_elements/long_text_view.js.coffee

@@ -1,36 +0,0 @@
-#= require ./short_text_view
-
-Locomotive.Views.EditableElements ||= {}
-
-class Locomotive.Views.EditableElements.LongTextView extends Backbone.View
-
-  tagName: 'li'
-
-  className: 'text input html'
-
-  render: ->
-    $(@el).html(ich.editable_text_input(@model.toJSON()))
-
-    return @
-
-  after_render: ->
-    settings = _.extend {}, @tinymce_settings(),    
-      oninit: ((editor) =>
-        $.cmd 'S', (() =>
-          @model.set(content: editor.getBody().innerHTML)
-          $(@el).parents('form').trigger('submit')
-        ), [], ignoreCase: true, document: editor.dom.doc),
-      onchange_callback: (editor) =>
-        @model.set(content: editor.getBody().innerHTML)
-
-    @$('textarea').tinymce(settings)
-
-  tinymce_settings: ->
-    _.extend { language: window.locale }, window.Locomotive.tinyMCE.defaultSettings
-
-  refresh: ->
-    # do nothing
-
-  remove: ->
-    @$('textarea').tinymce().destroy()
-    super