locomotivecms 3.0.0.pre.alpha → 3.0.0.pre.alpha.2

data/app/services/locomotive/page_tree_service.rb

@@ -0,0 +1,64 @@
+module Locomotive
+
+  class PageTreeService < Struct.new(:site)
+
+    # Returns the tree of pages from the site with the most minimal amount of queries.
+    # This method should only be used for read-only purpose since
+    # the mongodb returns the minimal set of required attributes to build
+    # the tree.
+    #
+    # @return [ Array ] The first array of pages (index + page not found + pages with depth == 1)
+    #
+    def build_tree
+      pages, page_not_found = pages_with_minimun_attributes, nil
+
+      [].tap do |tree|
+        while page = pages.shift
+          if page.not_found?
+            # move the "page not found" (404) at the end of the array
+            page_not_found = page
+          elsif page.index?
+            # make the index page without children
+            tree << [page, nil]
+          elsif !page.is_layout_or_related?
+            tree << _build_tree(page, pages)
+          end
+        end
+
+        tree << [page_not_found, nil]
+      end
+    end
+
+    protected
+
+    #:nodoc:
+    def pages_with_minimun_attributes
+      site.pages.unscoped.
+        minimal_attributes.
+        order_by_depth_and_position.
+        to_a
+    end
+
+    #:nodoc:
+    def _build_tree(current_page, pages)
+      i, children = 0, []
+
+      while !pages.empty?
+        page = pages[i]
+
+        break if page.nil? # end of the array
+
+        if page.parent_id == current_page.id
+          page = pages.delete_at(i)
+
+          children << _build_tree(page, pages)
+        else
+          i += 1
+        end
+      end
+
+      [current_page, children]
+    end
+
+  end
+end

data/app/views/locomotive/accounts/new.html.haml

@@ -5,7 +5,8 @@
 = locomotive_form_for @account, url: accounts_path(current_site) do |f|
 
   = f.inputs :information do
-    = f.input :name
+    = f.input :name, input_html: { class: 'input-lg' }
+
     - unless f.object.respond_to?(:password)
       = f.input :email
 

data/app/views/locomotive/current_site/form/_main.html.haml

@@ -1,5 +1,5 @@
 = f.inputs :information do
-  = f.input :name
+  = f.input :name, input_html: { class: 'input-lg' }
   = f.input :picture, as: :file
   = f.input :memberships, as: :array, template: :membership, new_item: policy(Locomotive::Membership).create? ? { label: t('.new_membership'), url: new_membership_path(current_site) } : nil, wrapper_html: { class: 'memberships' }
 

data/app/views/locomotive/custom_fields/select_options/edit.html.haml

@@ -11,4 +11,4 @@
       template:       :option,
       template_url:   new_option_custom_fields_select_options_path(current_site, @content_type.slug, @custom_field.name)
 
-  = f.actions back_url: content_entries_path(current_site, @content_type.slug),use_stored_location: true
+  = f.actions back_url: content_entries_path(current_site, @content_type.slug), use_stored_location: true

data/app/views/locomotive/memberships/new.html.haml

@@ -5,7 +5,7 @@
 = locomotive_form_for @membership, url: memberships_path(current_site) do |f|
 
   = f.inputs :membership_email, class: 'inputs email' do
-    = f.input :email
+    = f.input :email, input_html: { class: 'input-lg' }
 
   = f.actions do
     .row

data/app/views/locomotive/my_account/form/_actions.html.haml

@@ -1,6 +1 @@
-= f.actions do
-  .row
-    .col-xs-6.text-left.visible-xs-block
-      = link_to t(:logout, scope: 'locomotive.shared.header'), destroy_locomotive_account_session_path, data: { confirm: t('locomotive.messages.confirm') }, class:'btn btn-sm btn-danger'
-    .col-xs-6.col-sm-12.text-right
-      = f.action
+= f.actions back_url: params[:_location] || sites_path, use_stored_location: true

data/app/views/locomotive/my_account/form/_main.html.haml

@@ -1,5 +1,5 @@
 = f.inputs :information do
-  = f.input :name
+  = f.input :name, input_html: { class: 'input-lg' }
   = f.input :avatar, as: :file
   = f.input :locale, as: :select, collection: options_for_locale, include_blank: false, wrapper_html: { class: 'select2' }
 

data/app/views/locomotive/pages/form/_main.html.haml

@@ -1,12 +1,26 @@
 = f.inputs :information do
 
-  = f.input :title
+  = f.input :title, input_html: { class: 'input-lg' }
+
+  - if display_page_layouts?
+    = f.input :layout, as: :select, collection: options_for_page_layouts, include_blank: false
+
+  - if !@page.index? && !@page.not_found? && !@page.templatized?
+
+    = f.input :slug
 
-  - if not @page.index? and not @page.not_found?
     = f.input :parent_id, as: :select, collection: parent_pages_options, include_blank: false
 
+    = f.input :redirect, as: :toggle
+
+    = f.input :redirect_url, as: :string, wrapper_html: { class: "#{'hide' unless @page.redirect?}" }
+
+    = f.input :redirect_type, as: :select, collection: options_for_page_redirect_type, include_blank: false, wrapper_html: {class: "#{'hide' unless @page.redirect?}" }
+
   = f.input :published, as: :toggle
 
-  = f.input :listed, as: :toggle
+  - unless @page.not_found? || @page.templatized?
+
+    = f.input :listed, as: :toggle
 
 = render 'locomotive/pages/form/actions', f: f

data/app/views/locomotive/pages/form/_tabs.html.haml

@@ -1,12 +1,10 @@
 %ul.nav.nav-tabs{ role: 'tablist' }
-  = form_nav_tab :content do
-    = link_to t('simple_form.titles.locomotive.content'), editable_elements_path(current_site, @page)
+  - unless @page.templatized?
+    = form_nav_tab :content do
+      = link_to t('simple_form.titles.locomotive.content'), editable_elements_path(current_site, @page)
 
   = form_nav_tab :main, true do
     = link_to t('simple_form.titles.locomotive.information'), '#main', role: 'tab', data: { toggle: 'tab' }
 
   = form_nav_tab :seo do
     = link_to t('simple_form.titles.locomotive.seo'), '#seo', role: 'tab', data: { toggle: 'tab' }
-
-  / = form_nav_tab :advanced do
-  /   = link_to t('simple_form.titles.locomotive.advanced'), '#advanced', role: 'tab', data: { toggle: 'tab' }

data/app/views/locomotive/pages/new.html.haml

@@ -1,19 +1,16 @@
 - title t('.title')
 
-.alert.alert-danger
-  Under development
+= help t('.help', default: '')
 
+= locomotive_form_for @page, url: pages_path(current_site), html: { multipart: true } do |f|
 
-/ - content_for :submenu do
-/   = render 'locomotive/shared/menu/contents'
+  = f.inputs :information do
 
-/ - content_for :actions do
-/   = render 'locomotive/shared/actions/contents'
+    = f.input :title, input_html: { class: 'input-lg' }
 
-/ %p!= t('.help')
+    = f.input :parent_id, as: :select, collection: parent_pages_options, include_blank: false
 
-/ = semantic_form_for @page, url: pages_path do |form|
+    = f.input :layout, as: :select, collection: options_for_page_layouts, include_blank: false
 
-/   = render 'form', f: form
-
-/   = render 'locomotive/shared/form_actions', back_url: pages_path, button_label: :create
+  = f.actions do
+    = f.action

data/app/views/locomotive/shared/_sidebar.html.haml

@@ -11,3 +11,6 @@
 = render 'locomotive/shared/sidebar/link', icon: 'fa-gear', label: t('.settings'), url: edit_current_site_path(current_site)
 
 = render 'locomotive/shared/sidebar/link', icon: 'fa-suitcase', label: t(:sites, scope: 'locomotive.shared.header'), url: sites_path, section_class: 'visible-xs-block'
+
+= render 'locomotive/shared/sidebar/link', icon: 'fa-sign-out', label: t(:logout, scope: 'locomotive.shared.header'), url: destroy_locomotive_account_session_path, data: { confirm: t('locomotive.messages.confirm') }, section_class: 'visible-xs-block'
+

data/app/views/locomotive/shared/_sidebar_without_site.html.haml

@@ -1,3 +1,5 @@
 = render 'locomotive/shared/sidebar/my_account'
 
 = render 'locomotive/shared/sidebar/link', icon: 'fa-suitcase', label: t(:sites, scope: 'locomotive.shared.header'), url: sites_path
+
+= render 'locomotive/shared/sidebar/link', icon: 'fa-sign-out', label: t(:logout, scope: 'locomotive.shared.header'), url: destroy_locomotive_account_session_path, data: { confirm: t('locomotive.messages.confirm') }

data/app/views/locomotive/shared/header/_account_menu.html.haml

@@ -1,5 +1,5 @@
 %li= link_to t(:sites, scope: 'locomotive.shared.header'), sites_path
-%li= link_to t(:account, scope: 'locomotive.shared.header'), edit_my_account_path
+%li= link_to t(:account, scope: 'locomotive.shared.header'), edit_my_account_path(_location: request.fullpath)
 %li= link_to t(:help, scope: 'locomotive.shared.header'), 'http://doc.locomotivecms.com'
 %li.divider
 %li= link_to t(:logout, scope: 'locomotive.shared.header'), destroy_locomotive_account_session_path, data: { confirm: t('locomotive.messages.confirm') }

data/app/views/locomotive/shared/sidebar/_link.html.haml

@@ -1,6 +1,6 @@
 %section.link{ class: defined?(section_class) ? section_class : nil }
 
-  = link_to url do
+  = link_to url, data: defined?(data) ? data : {} do
 
     %span.arrow
       %i.fa.fa-angle-right

data/app/views/locomotive/shared/sidebar/_my_account.html.haml

@@ -1,6 +1,6 @@
 %section.link.my-account.visible-xs-block
 
-  = link_to edit_my_account_url do
+  = link_to edit_my_account_url(_location: request.fullpath) do
 
     = image_tag account_avatar_url(current_locomotive_account, '60x60#'), class: 'img-circle', alt: @current_locomotive_account.name_was
 

data/app/views/locomotive/shared/sidebar/_page.html.haml

@@ -19,7 +19,12 @@
       = render partial: 'locomotive/shared/sidebar/page', collection: page.nodes
 
       - if page.content_type
-        %li.new-content
+        %li.list-entries
+          %i.fa.fa-list-ul.icon
+          = link_to content_entries_path(current_site, page.templatized_page.content_type.slug) do
+            %span.text= t(:list_content_entries, name: page.content_type.name.pluralize, scope: 'locomotive.pages.index')
+
+        %li.new-entry
           %i.fa.fa-plus.icon
           = link_to new_content_entry_path(current_site, page.templatized_page.content_type.slug) do
             %span.text= t(:new_content_entry, name: page.content_type.name.singularize, scope: 'locomotive.pages.index')

data/app/views/locomotive/shared/sidebar/_pages.html.haml

@@ -5,7 +5,7 @@
 
     = render partial: 'locomotive/shared/sidebar/page', collection: nodes
 
-    %li.new-content
+    %li.new-page
       %i.fa.fa-plus.icon
       = link_to new_page_path(current_site) do
         %span.text= t(:new, scope: 'locomotive.pages.index')

data/app/views/locomotive/sites/new.html.haml

@@ -6,7 +6,7 @@
 = locomotive_form_for @site, url: sites_path, html: { multipart: true } do |f|
 
   = f.inputs :information do
-    = f.input :name
+    = f.input :name, input_html: { class: 'input-lg' }
     = f.input :handle
 
   = f.actions back_url: sites_path

data/config/locales/admin_ui.en.yml

@@ -181,8 +181,8 @@ en:
         help: "Pages are organized as a tree. You can order pages as well as folders"
         no_items: "There are no pages for now. Just click <a href=\"%{url}\">here</a> to create the first one."
         new: new page
+        list_content_entries: "List %{name}"
         new_content_entry: "New %{name}"
-        latest_entries: Latest pages
       new:
         title: New page
         help: "Please fill in the below form to create your page. Be careful, by default, the page is not published."
@@ -191,21 +191,11 @@ en:
       edit:
         title: "%{title} &mdash; <small>%{fullpath}</small>"
       form:
-        change_file: change
-        delete_file: delete
-        cancel: cancel
-        default_block: Default
-        no_layout: Do not use a layout
-        cache_strategy:
-          none: None
-          simple: Simple
-          hour: 1 hour
-          day: 1 day
-          week: 1 week
-          month: 1 month
-        redirect_type:
-          permanent: "Permanent (301)"
-          temporary: "Temporary (302)"
+        no_layout: Use the layout of the parent page
+        main:
+          redirect_type:
+            permanent: "Permanent (301)"
+            temporary: "Temporary (302)"
 
     sites:
       index:

data/lib/locomotive/simple_form.rb

@@ -58,8 +58,8 @@ module Locomotive
       back_button = back_button_action(options)
 
       template.content_tag(:div,
-        template.content_tag(:div, back_button, class: 'col-md-6 text-left') +
-        template.content_tag(:div, action, class: 'col-md-6 text-right'),
+        template.content_tag(:div, back_button, class: 'col-xs-6 text-left') +
+        template.content_tag(:div, action, class: 'col-xs-6 text-right'),
         class: 'row')
     end
 

data/lib/locomotive/version.rb

@@ -1,3 +1,6 @@
+# http://semver.org/
+# MAJOR.MINOR.PATCH format.
+# 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive #:nodoc
-  VERSION = '3.0.0-alpha'
+  VERSION = '3.0.0-alpha.2'
 end

data/spec/models/locomotive/concerns/page/layout_spec.rb

@@ -47,4 +47,30 @@ describe Locomotive::Concerns::Page::Layout do
 
   end
 
+  describe '#is_layout_or_related?' do
+
+    let(:fullpath) { 'foo' }
+
+    before { allow(page).to receive(:fullpath).and_return(fullpath) }
+
+    subject { page.is_layout_or_related? }
+
+    it { is_expected.to eq false }
+
+    context 'page is the layouts folder' do
+
+      let(:fullpath) { 'layouts' }
+      it { is_expected.to eq true }
+
+    end
+
+    context 'page under layouts' do
+
+      let(:fullpath) { 'layouts/foo' }
+      it { is_expected.to eq true }
+
+    end
+
+  end
+
 end

data/vendor/assets/javascripts/locomotive/bootstrap-notify.js

@@ -0,0 +1,2 @@
+/* Project: Bootstrap Growl = v3.1.3 | Description: Turns standard Bootstrap alerts into "Growl-like" notifications. | Author: Mouse0270 aka Robert McIntosh | License: MIT License | Website: https://github.com/mouse0270/bootstrap-growl */
+!function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t("object"==typeof exports?require("jquery"):jQuery)}(function(t){function e(e,i,n){var i={content:{message:"object"==typeof i?i.message:i,title:i.title?i.title:"",icon:i.icon?i.icon:"",url:i.url?i.url:"#",target:i.target?i.target:"-"}};n=t.extend(!0,{},i,n),this.settings=t.extend(!0,{},s,n),this._defaults=s,"-"==this.settings.content.target&&(this.settings.content.target=this.settings.url_target),this.animations={start:"webkitAnimationStart oanimationstart MSAnimationStart animationstart",end:"webkitAnimationEnd oanimationend MSAnimationEnd animationend"},"number"==typeof this.settings.offset&&(this.settings.offset={x:this.settings.offset,y:this.settings.offset}),this.init()}var s={element:"body",position:null,type:"info",allow_dismiss:!0,newest_on_top:!1,showProgressbar:!1,placement:{from:"top",align:"right"},offset:20,spacing:10,z_index:1031,delay:5e3,timer:1e3,url_target:"_blank",mouse_over:null,animate:{enter:"animated fadeInDown",exit:"animated fadeOutUp"},onShow:null,onShown:null,onClose:null,onClosed:null,icon_type:"class",template:'<div data-notify="container" class="col-xs-11 col-sm-4 alert alert-{0}" role="alert"><button type="button" aria-hidden="true" class="close" data-notify="dismiss">&times;</button><span data-notify="icon"></span> <span data-notify="title">{1}</span> <span data-notify="message">{2}</span><div class="progress" data-notify="progressbar"><div class="progress-bar progress-bar-{0}" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"></div></div><a href="{3}" target="{4}" data-notify="url"></a></div>'};String.format=function(){for(var t=arguments[0],e=1;e<arguments.length;e++)t=t.replace(RegExp("\\{"+(e-1)+"\\}","gm"),arguments[e]);return t},t.extend(e.prototype,{init:function(){var t=this;this.buildNotify(),this.settings.content.icon&&this.setIcon(),"#"!=this.settings.content.url&&this.styleURL(),this.placement(),this.bind(),this.notify={$ele:this.$ele,update:function(e,s){var i={};"string"==typeof e?i[e]=s:i=e;for(var e in i)switch(e){case"type":this.$ele.removeClass("alert-"+t.settings.type),this.$ele.find('[data-notify="progressbar"] > .progress-bar').removeClass("progress-bar-"+t.settings.type),t.settings.type=i[e],this.$ele.addClass("alert-"+i[e]).find('[data-notify="progressbar"] > .progress-bar').addClass("progress-bar-"+i[e]);break;case"icon":var n=this.$ele.find('[data-notify="icon"]');"class"==t.settings.icon_type.toLowerCase()?n.removeClass(t.settings.content.icon).addClass(i[e]):(n.is("img")||n.find("img"),n.attr("src",i[e]));break;case"progress":var a=t.settings.delay-t.settings.delay*(i[e]/100);this.$ele.data("notify-delay",a),this.$ele.find('[data-notify="progressbar"] > div').attr("aria-valuenow",i[e]).css("width",i[e]+"%");break;case"url":this.$ele.find('[data-notify="url"]').attr("href",i[e]);break;case"target":this.$ele.find('[data-notify="url"]').attr("target",i[e]);break;default:this.$ele.find('[data-notify="'+e+'"]').html(i[e])}var o=this.$ele.outerHeight()+parseInt(t.settings.spacing)+parseInt(t.settings.offset.y);t.reposition(o)},close:function(){t.close()}}},buildNotify:function(){var e=this.settings.content;this.$ele=t(String.format(this.settings.template,this.settings.type,e.title,e.message,e.url,e.target)),this.$ele.attr("data-notify-position",this.settings.placement.from+"-"+this.settings.placement.align),this.settings.allow_dismiss||this.$ele.find('[data-notify="dismiss"]').css("display","none"),(this.settings.delay<=0&&!this.settings.showProgressbar||!this.settings.showProgressbar)&&this.$ele.find('[data-notify="progressbar"]').remove()},setIcon:function(){"class"==this.settings.icon_type.toLowerCase()?this.$ele.find('[data-notify="icon"]').addClass(this.settings.content.icon):this.$ele.find('[data-notify="icon"]').is("img")?this.$ele.find('[data-notify="icon"]').attr("src",this.settings.content.icon):this.$ele.find('[data-notify="icon"]').append('<img src="'+this.settings.content.icon+'" alt="Notify Icon" />')},styleURL:function(){this.$ele.find('[data-notify="url"]').css({backgroundImage:"url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)",height:"100%",left:"0px",position:"absolute",top:"0px",width:"100%",zIndex:this.settings.z_index+1}),this.$ele.find('[data-notify="dismiss"]').css({position:"absolute",right:"10px",top:"5px",zIndex:this.settings.z_index+2})},placement:function(){var e=this,s=this.settings.offset.y,i={display:"inline-block",margin:"0px auto",position:this.settings.position?this.settings.position:"body"===this.settings.element?"fixed":"absolute",transition:"all .5s ease-in-out",zIndex:this.settings.z_index},n=!1,a=this.settings;switch(t('[data-notify-position="'+this.settings.placement.from+"-"+this.settings.placement.align+'"]:not([data-closing="true"])').each(function(){return s=Math.max(s,parseInt(t(this).css(a.placement.from))+parseInt(t(this).outerHeight())+parseInt(a.spacing))}),1==this.settings.newest_on_top&&(s=this.settings.offset.y),i[this.settings.placement.from]=s+"px",this.settings.placement.align){case"left":case"right":i[this.settings.placement.align]=this.settings.offset.x+"px";break;case"center":i.left=0,i.right=0}this.$ele.css(i).addClass(this.settings.animate.enter),t.each(Array("webkit","moz","o","ms",""),function(t,s){e.$ele[0].style[s+"AnimationIterationCount"]=1}),t(this.settings.element).append(this.$ele),1==this.settings.newest_on_top&&(s=parseInt(s)+parseInt(this.settings.spacing)+this.$ele.outerHeight(),this.reposition(s)),t.isFunction(e.settings.onShow)&&e.settings.onShow.call(this.$ele),this.$ele.one(this.animations.start,function(){n=!0}).one(this.animations.end,function(){t.isFunction(e.settings.onShown)&&e.settings.onShown.call(this)}),setTimeout(function(){n||t.isFunction(e.settings.onShown)&&e.settings.onShown.call(this)},600)},bind:function(){var e=this;if(this.$ele.find('[data-notify="dismiss"]').on("click",function(){e.close()}),this.$ele.mouseover(function(){t(this).data("data-hover","true")}).mouseout(function(){t(this).data("data-hover","false")}),this.$ele.data("data-hover","false"),this.settings.delay>0){e.$ele.data("notify-delay",e.settings.delay);var s=setInterval(function(){var t=parseInt(e.$ele.data("notify-delay"))-e.settings.timer;if("false"===e.$ele.data("data-hover")&&"pause"==e.settings.mouse_over||"pause"!=e.settings.mouse_over){var i=(e.settings.delay-t)/e.settings.delay*100;e.$ele.data("notify-delay",t),e.$ele.find('[data-notify="progressbar"] > div').attr("aria-valuenow",i).css("width",i+"%")}t<=-e.settings.timer&&(clearInterval(s),e.close())},e.settings.timer)}},close:function(){var e=this,s=parseInt(this.$ele.css(this.settings.placement.from)),i=!1;this.$ele.data("closing","true").addClass(this.settings.animate.exit),e.reposition(s),t.isFunction(e.settings.onClose)&&e.settings.onClose.call(this.$ele),this.$ele.one(this.animations.start,function(){i=!0}).one(this.animations.end,function(){t(this).remove(),t.isFunction(e.settings.onClosed)&&e.settings.onClosed.call(this)}),setTimeout(function(){i||(e.$ele.remove(),e.settings.onClosed&&e.settings.onClosed(e.$ele))},600)},reposition:function(e){var s=this,i='[data-notify-position="'+this.settings.placement.from+"-"+this.settings.placement.align+'"]:not([data-closing="true"])',n=this.$ele.nextAll(i);1==this.settings.newest_on_top&&(n=this.$ele.prevAll(i)),n.each(function(){t(this).css(s.settings.placement.from,e),e=parseInt(e)+parseInt(s.settings.spacing)+t(this).outerHeight()})}}),t.notify=function(t,s){var i=new e(this,t,s);return i.notify},t.notifyDefaults=function(e){return s=t.extend(!0,{},s,e)},t.notifyClose=function(e){"undefined"==typeof e||"all"==e?t("[data-notify]").find('[data-notify="dismiss"]').trigger("click"):t('[data-notify-position="'+e+'"]').find('[data-notify="dismiss"]').trigger("click")}});

data/vendor/assets/javascripts/locomotive/resizeImage.js

@@ -23,7 +23,6 @@
     self.ctx.imageSmoothingEnabled       = true
     self.ctx.mozImageSmoothingEnabled    = true
     self.ctx.oImageSmoothingEnabled      = true
-    self.ctx.webkitImageSmoothingEnabled = true
 
     if (img.naturalWidth <= width || img.naturalHeight <= height) {
       console.log("FAST resizing image", img.naturalWidth, img.naturalHeight, "=>", width, height)
@@ -215,7 +214,6 @@
     context.imageSmoothingEnabled       = true
     context.mozImageSmoothingEnabled    = true
     context.oImageSmoothingEnabled      = true
-    context.webkitImageSmoothingEnabled = true
 
     return context
   }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha
+  version: 3.0.0.pre.alpha.2
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.alpha.1
+        version: 1.0.0.pre.alpha.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre.alpha.1
+        version: 1.0.0.pre.alpha.2
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -686,6 +686,7 @@ files:
 - app/assets/javascripts/locomotive/utils/backbone_patches.js.coffee
 - app/assets/javascripts/locomotive/utils/core_ext.js
 - app/assets/javascripts/locomotive/utils/layout_utils.js.coffee
+- app/assets/javascripts/locomotive/utils/notify.js.coffee
 - app/assets/javascripts/locomotive/utils/rails_ujs.js.coffee
 - app/assets/javascripts/locomotive/utils/select2.js.coffee
 - app/assets/javascripts/locomotive/utils/wysihtml5.js.coffee
@@ -760,6 +761,7 @@ files:
 - app/assets/stylesheets/locomotive/components/header/_base.scss
 - app/assets/stylesheets/locomotive/components/header/_responsive.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
@@ -931,6 +933,7 @@ files:
 - app/services/locomotive/membership_service.rb
 - app/services/locomotive/page_parsing_service.rb
 - app/services/locomotive/page_service.rb
+- app/services/locomotive/page_tree_service.rb
 - app/services/locomotive/site_service.rb
 - app/uploaders/locomotive/content_asset_uploader.rb
 - app/uploaders/locomotive/editable_file_uploader.rb
@@ -990,8 +993,6 @@ files:
 - app/views/locomotive/my_account/form/_tabs.html.haml
 - app/views/locomotive/notifications/new_content_entry.html.haml
 - app/views/locomotive/pages/_editable_elements.html.haml
-- app/views/locomotive/pages/_form.html.haml
-- app/views/locomotive/pages/_page.html.haml
 - app/views/locomotive/pages/edit.html.haml
 - app/views/locomotive/pages/form/_actions.html.haml
 - app/views/locomotive/pages/form/_main.html.haml
@@ -1456,7 +1457,7 @@ files:
 - vendor/assets/images/select2.png
 - vendor/assets/images/select2x2.png
 - vendor/assets/javascripts/locomotive/bootstrap-datetimepicker.js
-- vendor/assets/javascripts/locomotive/bootstrap-growl.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