locomotivecms 3.0.0.rc4 → 3.0.0.rc5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc4
+  version: 3.0.0.rc5
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc6
+        version: 1.0.0.rc7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc6
+        version: 1.0.0.rc7
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -676,8 +676,8 @@ files:
 - app/assets/images/locomotive/site.png
 - app/assets/images/locomotive/user.png
 - app/assets/javascripts/locomotive.js
+- app/assets/javascripts/locomotive/account.js.coffee
 - app/assets/javascripts/locomotive/application.js.coffee
-- app/assets/javascripts/locomotive/not_logged_in.js.coffee
 - app/assets/javascripts/locomotive/utils/backbone_patches.js.coffee
 - app/assets/javascripts/locomotive/utils/core_ext.js
 - app/assets/javascripts/locomotive/utils/file.js.coffee
@@ -731,6 +731,13 @@ files:
 - app/assets/javascripts/locomotive/views/shared/sidebar_view.js.coffee
 - app/assets/javascripts/locomotive/views/sites/new_view.js.coffee
 - app/assets/javascripts/locomotive/views/translations/index_view.js.coffee
+- app/assets/stylesheets/locomotive/account.scss
+- app/assets/stylesheets/locomotive/account/_forms.scss
+- app/assets/stylesheets/locomotive/account/_keyframes.scss
+- app/assets/stylesheets/locomotive/account/_notify.scss
+- app/assets/stylesheets/locomotive/account/_public.scss
+- app/assets/stylesheets/locomotive/account/_type.scss
+- app/assets/stylesheets/locomotive/account/_variables.scss
 - app/assets/stylesheets/locomotive/application.scss
 - app/assets/stylesheets/locomotive/base/_all.scss
 - app/assets/stylesheets/locomotive/base/_buttons.scss
@@ -752,12 +759,8 @@ files:
 - app/assets/stylesheets/locomotive/base/form/_popover.scss
 - app/assets/stylesheets/locomotive/base/form/_rte.scss
 - app/assets/stylesheets/locomotive/base/form/_select2.scss
+- app/assets/stylesheets/locomotive/base/form/_tags.scss
 - app/assets/stylesheets/locomotive/base/form/_toggle.scss
-- app/assets/stylesheets/locomotive/base/not_logged_in/_all.scss
-- app/assets/stylesheets/locomotive/base/not_logged_in/_buttons.scss
-- app/assets/stylesheets/locomotive/base/not_logged_in/_form.scss
-- app/assets/stylesheets/locomotive/base/not_logged_in/_messages.scss
-- app/assets/stylesheets/locomotive/base/not_logged_in/_typography.scss
 - app/assets/stylesheets/locomotive/components/_activity_feed.scss
 - app/assets/stylesheets/locomotive/components/_content_assets.scss
 - app/assets/stylesheets/locomotive/components/_dashboard.scss
@@ -779,8 +782,6 @@ files:
 - app/assets/stylesheets/locomotive/components/misc/_modal.scss
 - app/assets/stylesheets/locomotive/components/misc/_nav.scss
 - app/assets/stylesheets/locomotive/components/misc/_notify.scss
-- app/assets/stylesheets/locomotive/components/not_logged_in/_passwords.scss
-- app/assets/stylesheets/locomotive/components/not_logged_in/_sign_in_and_up.scss
 - app/assets/stylesheets/locomotive/components/sidebar/_base.scss
 - app/assets/stylesheets/locomotive/components/sidebar/_content_types.scss
 - app/assets/stylesheets/locomotive/components/sidebar/_link.scss
@@ -789,19 +790,13 @@ files:
 - app/assets/stylesheets/locomotive/error.scss
 - app/assets/stylesheets/locomotive/globals/_mixins.scss
 - app/assets/stylesheets/locomotive/globals/_variables.scss
+- app/assets/stylesheets/locomotive/layouts/_error.scss
 - app/assets/stylesheets/locomotive/layouts/_live_editing.scss
 - app/assets/stylesheets/locomotive/layouts/_main.scss
 - app/assets/stylesheets/locomotive/layouts/_not_logged_in.scss
 - app/assets/stylesheets/locomotive/layouts/_responsive.scss
 - app/assets/stylesheets/locomotive/live_editing_error.scss
 - app/assets/stylesheets/locomotive/live_editing_iframe.scss
-- app/assets/stylesheets/locomotive/unauthorized.scss
-- app/assets/stylesheets/locomotive/unauthorized/_forms.scss
-- app/assets/stylesheets/locomotive/unauthorized/_keyframes.scss
-- app/assets/stylesheets/locomotive/unauthorized/_notify.scss
-- app/assets/stylesheets/locomotive/unauthorized/_public.scss
-- app/assets/stylesheets/locomotive/unauthorized/_type.scss
-- app/assets/stylesheets/locomotive/unauthorized/_variables.scss
 - app/controllers/locomotive/accounts_controller.rb
 - app/controllers/locomotive/base_controller.rb
 - app/controllers/locomotive/concerns/account_controller.rb
@@ -889,7 +884,6 @@ files:
 - app/models/locomotive/concerns/page/layout.rb
 - app/models/locomotive/concerns/page/listed.rb
 - app/models/locomotive/concerns/page/redirect.rb
-- app/models/locomotive/concerns/page/render.rb
 - app/models/locomotive/concerns/page/templatized.rb
 - app/models/locomotive/concerns/page/tree.rb
 - app/models/locomotive/concerns/shared/seo.rb
@@ -994,10 +988,10 @@ files:
 - app/views/locomotive/errors/500.html.slim
 - app/views/locomotive/errors/no_site.html.slim
 - app/views/locomotive/errors/no_site.json
+- app/views/locomotive/layouts/account.html.slim
 - app/views/locomotive/layouts/application.html.slim
 - app/views/locomotive/layouts/error.html.slim
 - app/views/locomotive/layouts/live_editing.html.slim
-- app/views/locomotive/layouts/not_logged_in.html.slim
 - app/views/locomotive/layouts/without_site.html.slim
 - app/views/locomotive/memberships/edit.html.slim
 - app/views/locomotive/memberships/new.html.slim
@@ -1047,6 +1041,7 @@ files:
 - app/views/locomotive/shared/sidebar/_my_account.html.slim
 - app/views/locomotive/shared/sidebar/_page.html.slim
 - app/views/locomotive/shared/sidebar/_pages.html.slim
+- app/views/locomotive/sites/_navigation.slim
 - app/views/locomotive/sites/_site.html.slim
 - app/views/locomotive/sites/index.html.slim
 - app/views/locomotive/sites/new.html.slim
@@ -1300,6 +1295,7 @@ files:
 - spec/models/locomotive/content_asset_spec.rb
 - spec/models/locomotive/content_entry_spec.rb
 - spec/models/locomotive/content_type_spec.rb
+- spec/models/locomotive/editable_element_spec.rb
 - spec/models/locomotive/membership_spec.rb
 - spec/models/locomotive/page_spec.rb
 - spec/models/locomotive/site_spec.rb
@@ -1327,12 +1323,132 @@ files:
 - spec/support/shared_contexts/api_site_setup.rb
 - spec/support/shared_examples/site_scope_examples.rb
 - vendor/assets/components/locomotive/backbone/backbone.js
+- vendor/assets/components/locomotive/bootstrap-tagsinput/bootstrap-tagsinput.css
+- vendor/assets/components/locomotive/bootstrap-tagsinput/bootstrap-tagsinput.js
 - vendor/assets/components/locomotive/underscore/underscore.js
 - vendor/assets/components/locomotive_sources/backbone/LICENSE
 - vendor/assets/components/locomotive_sources/backbone/backbone-min.js
 - vendor/assets/components/locomotive_sources/backbone/backbone-min.map
 - vendor/assets/components/locomotive_sources/backbone/backbone.js
 - vendor/assets/components/locomotive_sources/backbone/bower.json
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/Gruntfile.js
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/LICENSE
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/README.md
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/bootstrap-tagsinput.jquery.json
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/bower.json
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/dist/bootstrap-tagsinput-angular.js
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/dist/bootstrap-tagsinput-angular.min.js
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/dist/bootstrap-tagsinput-angular.min.js.map
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/dist/bootstrap-tagsinput-typeahead.css
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/dist/bootstrap-tagsinput.css
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/dist/bootstrap-tagsinput.js
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/dist/bootstrap-tagsinput.less
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/dist/bootstrap-tagsinput.min.js
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/dist/bootstrap-tagsinput.min.js.map
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/dist/bootstrap-tagsinput.zip
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/examples/assets/app.css
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/examples/assets/app.js
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/examples/assets/app_bs2.js
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/examples/assets/app_bs3.js
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/examples/assets/cities.json
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/examples/assets/citynames.json
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/examples/bootstrap-2.3.2.html
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/examples/index.html
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/karma.conf.js
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/package.json
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/src/bootstrap-tagsinput-angular.js
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/src/bootstrap-tagsinput-typeahead.css
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/src/bootstrap-tagsinput.css
+- vendor/assets/components/locomotive_sources/bootstrap-tagsinput/src/bootstrap-tagsinput.js
+- vendor/assets/components/locomotive_sources/jquery/MIT-LICENSE.txt
+- vendor/assets/components/locomotive_sources/jquery/bower.json
+- vendor/assets/components/locomotive_sources/jquery/dist/jquery.js
+- vendor/assets/components/locomotive_sources/jquery/dist/jquery.min.js
+- vendor/assets/components/locomotive_sources/jquery/dist/jquery.min.map
+- vendor/assets/components/locomotive_sources/jquery/src/ajax.js
+- vendor/assets/components/locomotive_sources/jquery/src/ajax/jsonp.js
+- vendor/assets/components/locomotive_sources/jquery/src/ajax/load.js
+- vendor/assets/components/locomotive_sources/jquery/src/ajax/parseJSON.js
+- vendor/assets/components/locomotive_sources/jquery/src/ajax/parseXML.js
+- vendor/assets/components/locomotive_sources/jquery/src/ajax/script.js
+- vendor/assets/components/locomotive_sources/jquery/src/ajax/var/nonce.js
+- vendor/assets/components/locomotive_sources/jquery/src/ajax/var/rquery.js
+- vendor/assets/components/locomotive_sources/jquery/src/ajax/xhr.js
+- vendor/assets/components/locomotive_sources/jquery/src/attributes.js
+- vendor/assets/components/locomotive_sources/jquery/src/attributes/attr.js
+- vendor/assets/components/locomotive_sources/jquery/src/attributes/classes.js
+- vendor/assets/components/locomotive_sources/jquery/src/attributes/prop.js
+- vendor/assets/components/locomotive_sources/jquery/src/attributes/support.js
+- vendor/assets/components/locomotive_sources/jquery/src/attributes/val.js
+- vendor/assets/components/locomotive_sources/jquery/src/callbacks.js
+- vendor/assets/components/locomotive_sources/jquery/src/core.js
+- vendor/assets/components/locomotive_sources/jquery/src/core/access.js
+- vendor/assets/components/locomotive_sources/jquery/src/core/init.js
+- vendor/assets/components/locomotive_sources/jquery/src/core/parseHTML.js
+- vendor/assets/components/locomotive_sources/jquery/src/core/ready.js
+- vendor/assets/components/locomotive_sources/jquery/src/core/var/rsingleTag.js
+- vendor/assets/components/locomotive_sources/jquery/src/css.js
+- vendor/assets/components/locomotive_sources/jquery/src/css/addGetHookIf.js
+- vendor/assets/components/locomotive_sources/jquery/src/css/curCSS.js
+- vendor/assets/components/locomotive_sources/jquery/src/css/defaultDisplay.js
+- vendor/assets/components/locomotive_sources/jquery/src/css/hiddenVisibleSelectors.js
+- vendor/assets/components/locomotive_sources/jquery/src/css/support.js
+- vendor/assets/components/locomotive_sources/jquery/src/css/swap.js
+- vendor/assets/components/locomotive_sources/jquery/src/css/var/cssExpand.js
+- vendor/assets/components/locomotive_sources/jquery/src/css/var/getStyles.js
+- vendor/assets/components/locomotive_sources/jquery/src/css/var/isHidden.js
+- vendor/assets/components/locomotive_sources/jquery/src/css/var/rmargin.js
+- vendor/assets/components/locomotive_sources/jquery/src/css/var/rnumnonpx.js
+- vendor/assets/components/locomotive_sources/jquery/src/data.js
+- vendor/assets/components/locomotive_sources/jquery/src/data/Data.js
+- vendor/assets/components/locomotive_sources/jquery/src/data/accepts.js
+- vendor/assets/components/locomotive_sources/jquery/src/data/var/data_priv.js
+- vendor/assets/components/locomotive_sources/jquery/src/data/var/data_user.js
+- vendor/assets/components/locomotive_sources/jquery/src/deferred.js
+- vendor/assets/components/locomotive_sources/jquery/src/deprecated.js
+- vendor/assets/components/locomotive_sources/jquery/src/dimensions.js
+- vendor/assets/components/locomotive_sources/jquery/src/effects.js
+- vendor/assets/components/locomotive_sources/jquery/src/effects/Tween.js
+- vendor/assets/components/locomotive_sources/jquery/src/effects/animatedSelector.js
+- vendor/assets/components/locomotive_sources/jquery/src/event.js
+- vendor/assets/components/locomotive_sources/jquery/src/event/ajax.js
+- vendor/assets/components/locomotive_sources/jquery/src/event/alias.js
+- vendor/assets/components/locomotive_sources/jquery/src/event/support.js
+- vendor/assets/components/locomotive_sources/jquery/src/exports/amd.js
+- vendor/assets/components/locomotive_sources/jquery/src/exports/global.js
+- vendor/assets/components/locomotive_sources/jquery/src/intro.js
+- vendor/assets/components/locomotive_sources/jquery/src/jquery.js
+- vendor/assets/components/locomotive_sources/jquery/src/manipulation.js
+- vendor/assets/components/locomotive_sources/jquery/src/manipulation/_evalUrl.js
+- vendor/assets/components/locomotive_sources/jquery/src/manipulation/support.js
+- vendor/assets/components/locomotive_sources/jquery/src/manipulation/var/rcheckableType.js
+- vendor/assets/components/locomotive_sources/jquery/src/offset.js
+- vendor/assets/components/locomotive_sources/jquery/src/outro.js
+- vendor/assets/components/locomotive_sources/jquery/src/queue.js
+- vendor/assets/components/locomotive_sources/jquery/src/queue/delay.js
+- vendor/assets/components/locomotive_sources/jquery/src/selector-native.js
+- vendor/assets/components/locomotive_sources/jquery/src/selector-sizzle.js
+- vendor/assets/components/locomotive_sources/jquery/src/selector.js
+- vendor/assets/components/locomotive_sources/jquery/src/serialize.js
+- vendor/assets/components/locomotive_sources/jquery/src/sizzle/dist/sizzle.js
+- vendor/assets/components/locomotive_sources/jquery/src/sizzle/dist/sizzle.min.js
+- vendor/assets/components/locomotive_sources/jquery/src/sizzle/dist/sizzle.min.map
+- vendor/assets/components/locomotive_sources/jquery/src/traversing.js
+- vendor/assets/components/locomotive_sources/jquery/src/traversing/findFilter.js
+- vendor/assets/components/locomotive_sources/jquery/src/traversing/var/rneedsContext.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/arr.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/class2type.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/concat.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/hasOwn.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/indexOf.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/pnum.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/push.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/rnotwhite.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/slice.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/strundefined.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/support.js
+- vendor/assets/components/locomotive_sources/jquery/src/var/toString.js
+- vendor/assets/components/locomotive_sources/jquery/src/wrap.js
 - vendor/assets/components/locomotive_sources/underscore/LICENSE
 - vendor/assets/components/locomotive_sources/underscore/README.md
 - vendor/assets/components/locomotive_sources/underscore/bower.json
@@ -1348,7 +1464,6 @@ files:
 - vendor/assets/javascripts/locomotive/bootstrap-datetimepicker.js
 - vendor/assets/javascripts/locomotive/bootstrap-notify.js
 - vendor/assets/javascripts/locomotive/bootstrap-switch.js
-- vendor/assets/javascripts/locomotive/bootstrap-tagsinput.min.js
 - vendor/assets/javascripts/locomotive/canvas-to-blob.min.js
 - vendor/assets/javascripts/locomotive/cmd.js
 - vendor/assets/javascripts/locomotive/cookies.js
@@ -1370,7 +1485,6 @@ files:
 - vendor/assets/stylesheets/locomotive/bootstrap-colorpicker.scss
 - vendor/assets/stylesheets/locomotive/bootstrap-datetimepicker.css
 - vendor/assets/stylesheets/locomotive/bootstrap-switch.css
-- vendor/assets/stylesheets/locomotive/bootstrap-tagsinput.css
 - vendor/assets/stylesheets/locomotive/cropper.css
 - vendor/assets/stylesheets/locomotive/highlightjs/default.css
 - vendor/assets/stylesheets/locomotive/highlightjs/github.css
@@ -1451,6 +1565,7 @@ test_files:
 - spec/models/locomotive/content_asset_spec.rb
 - spec/models/locomotive/content_entry_spec.rb
 - spec/models/locomotive/content_type_spec.rb
+- spec/models/locomotive/editable_element_spec.rb
 - spec/models/locomotive/membership_spec.rb
 - spec/models/locomotive/page_spec.rb
 - spec/models/locomotive/site_spec.rb

data/app/assets/stylesheets/locomotive/base/not_logged_in/_all.scss

@@ -1,4 +0,0 @@
-@import "./typography";
-@import "./form";
-@import "./buttons";
-@import "./messages";

data/app/assets/stylesheets/locomotive/base/not_logged_in/_buttons.scss

@@ -1,10 +0,0 @@
-button[type=submit], input[type=submit] {
-  @media (min-width: $screen-md-min) {
-    margin-top: 4em;
-  }
-  @extend .btn-block;
-  @extend .btn-danger;
-  @extend .btn;
-
-  font-family: $alt-font-family-sans-serif;
-}

data/app/assets/stylesheets/locomotive/base/not_logged_in/_form.scss

@@ -1,72 +0,0 @@
-$form_input_label_color:  #333;
-$form_input_border_color: #4999b2;
-
-.simple_form {
-  width: 100%;
-
-  fieldset {
-
-    > .input {
-
-      padding: 0px;
-      background: transparent;
-
-      .form-wrapper {
-        display: block;
-        margin-top: 0px;
-        border: 3px solid $form_input_border_color;
-      }
-
-      .control-label {
-        text-transform: uppercase;
-        font-size: $font-size-base - 3;
-        line-height: 18px;
-        color: $form_input_label_color;
-      }
-
-      select {
-        -webkit-appearance: none;
-        -webkit-border-radius: 0px;
-        border-radius: 0px;
-      }
-
-      .help-inline, .error-inline {
-        margin-left: 10px;
-        font-family: $alt-font-family-sans-serif;
-      }
-
-      .help-inline {
-        color: #000;
-        @include opacity(0.4);
-      }
-
-      .error-inline {
-        color: $state-danger-text;
-        @include opacity(1.0);
-      }
-
-    }
-
-  }
-
-  a {
-    color: #000;
-  }
-
-  .form-actions {
-    input[type="submit"] {
-      margin-top: 0px;
-    }
-
-    p {
-      text-align: center;
-      margin-top: 10px;
-      a {
-        font-size: $font-size-base - 1;
-        color: #fff;
-        @include opacity(0.8);
-      }
-    }
-  }
-
-}

data/app/assets/stylesheets/locomotive/base/not_logged_in/_messages.scss

@@ -1,4 +0,0 @@
-.application-message {
-  @include opacity(0.6);
-  margin-bottom: 20px;
-}

data/app/assets/stylesheets/locomotive/base/not_logged_in/_typography.scss

@@ -1,12 +0,0 @@
-h1 {
-  text-align: center;
-  min-height: 50px;
-  // letter-spacing: 2px;
-  margin-bottom: 50px;
-
-  @media (max-width: $screen-sm-max) {
-    margin-bottom: 30px;
-    font-size: ceil(($font-size-base * 1.25));
-    font-weight: 400;
-  }
-}

data/app/assets/stylesheets/locomotive/components/not_logged_in/_passwords.scss

@@ -1,9 +0,0 @@
-.passwords {
-  .content {
-    @include make-sm-column-offset(3);
-    @include make-sm-column(6);
-
-    @include make-md-column-offset(4);
-    @include make-md-column(4);
-  }
-}

data/app/assets/stylesheets/locomotive/components/not_logged_in/_sign_in_and_up.scss

@@ -1,34 +0,0 @@
-$sign_in_legend_color: #a2e4f1;
-
-body.sessions, body.registrations, body.passwords {
-  .content {
-    @include make-sm-column-offset(3);
-    @include make-sm-column(6);
-
-    @include make-md-column-offset(4);
-    @include make-md-column(4);
-  }
-
-  h1 {
-    text-transform: capitalize;
-    font-size: $font-size-base + 2;
-    font-family: $alt-font-family-sans-serif;
-
-    img {
-      position: relative;
-      top: -2px;
-      width: 16px;
-    }
-
-    small {
-      display: block;
-      width: 100%;
-      text-align: center;
-      text-transform: lowercase;
-      color: $sign_in_legend_color;
-      font-size: $font-size-base;
-      font-weight: 200;
-      margin-top: 10px;
-    }
-  }
-}

data/app/models/locomotive/concerns/page/render.rb

@@ -1,99 +0,0 @@
-# module Locomotive
-#   module Concerns
-#     module Page
-#       module Render
-
-#         extend ActiveSupport::Concern
-
-#         def render(context)
-#           self.template.render(context)
-#         end
-
-#         module ClassMethods
-
-#           # Given both a site and a path, this method tries
-#           # to get the matching page.
-#           # If the page is templatized, the related content entry is
-#           # associated to the page (page.content_entry stores the entry).
-#           # If no page is found, then it returns the 404 one instead.
-#           #
-#           # @param [ Site ] site The site where to find the page
-#           # @param [ String ] path The fullpath got from the request
-#           # @param [ Boolean ] logged_in True if someone is logged in Locomotive
-#           #
-#           # @return [ Page ] The page matching the criteria OR the 404 one if none
-#           #
-#           def fetch_page_from_path(site, path, logged_in)
-#             page  = nil
-#             depth = path == 'index' ? 0 : path.split('/').size
-
-#             matching_paths = path == 'index' ? %w(index) : path_combinations(path)
-
-#             query = if I18n.locale != I18n.default_locale
-#               site.pages.where(depth: depth).any_of({:fullpath.in => matching_paths}, {"fullpath.#{I18n.default_locale}" => {'$in' => matching_paths}})
-#             else
-#               site.pages.where(depth: depth, :fullpath.in => matching_paths)
-#             end
-
-#             query.each do |_page|
-#               if !_page.published? && !logged_in
-#                 next
-#               else
-#                 if _page.templatized?
-#                   %r(^#{_page.fullpath.gsub('content_type_template', '([^\/]+)')}$) =~ path
-
-#                   permalink = $1
-
-#                   _page.content_entry = _page.fetch_target_entry(permalink)
-
-#                   if _page.content_entry.nil? || (!_page.content_entry.visible? && !logged_in) # content instance not found or not visible
-#                     next
-#                   end
-#                 end
-#               end
-
-#               page = _page
-
-#               break
-#             end
-
-#             page || site.pages.not_found.published.first
-#           end
-
-#           # Calculate all the combinations possible based on the
-#           # fact that one of the segment of the path could be
-#           # a content type from a templatized page.
-#           # We postulate that there is only one templatized page in a path
-#           # (ie: no nested templatized pages)
-#           #
-#           # @param [ String ] path The path to the page
-#           #
-#           # @return [ Array ] An array of all the combinations
-#           #
-#           def path_combinations(path)
-#             _path_combinations(path.split('/'))
-#           end
-
-#           #:nodoc:
-#           def _path_combinations(segments, can_include_template = true)
-#             return nil if segments.empty?
-
-#             segment = segments.shift
-
-#             (can_include_template ? [segment, 'content_type_template'] : [segment]).map do |_segment|
-#               if (_combinations = _path_combinations(segments.clone, can_include_template && _segment != 'content_type_template'))
-#                 [*_combinations].map do |_combination|
-#                   File.join(_segment, _combination)
-#                 end
-#               else
-#                 [_segment]
-#               end
-#             end.flatten
-#           end
-
-#         end
-
-#       end
-#     end
-#   end
-# end