locomotive_cms 2.0.0.rc2 → 2.0.0.rc4

data/lib/locomotive/liquid/tags/editable/long_text.rb

@@ -7,14 +7,16 @@ module Locomotive
           protected
 
           def render_element(context, element)
-            if context.registers[:inline_editor]
+            content = element.default_content? ? render_default_content(context) : element.content
+
+            if editable?(context, element)
               %{
                 <div class='editable-long-text' data-element-id='#{element.id}' data-element-index='#{element._index}'>
-                  #{element.content}
+                  #{content}
                 </div>
               }
             else
-              element.content
+              content
             end
           end
 

data/lib/locomotive/liquid/tags/editable/short_text.rb

@@ -7,14 +7,16 @@ module Locomotive
           protected
 
           def render_element(context, element)
-            if context.registers[:inline_editor]
+            content = element.default_content? ? render_default_content(context) : element.content
+
+            if editable?(context, element)
               %{
                 <span class='editable-short-text' data-element-id='#{element.id}' data-element-index='#{element._index}'>
-                  #{element.content}
+                  #{content}
                 </span>
               }
             else
-              element.content
+              content
             end
           end
 
@@ -22,6 +24,10 @@ module Locomotive
             EditableShortText
           end
 
+          def editable?(context, element)
+            context.registers[:inline_editor] && (!element.fixed? || (element.fixed? && !element.from_parent?))
+          end
+
         end
 
         ::Liquid::Template.register_tag('editable_short_text', ShortText)

data/lib/locomotive/liquid/tags/extends.rb

@@ -34,7 +34,9 @@ module Locomotive
           raise PageNotFound.new("Page with fullpath '#{@template_name}' was not found") if @context[:parent_page].nil?
 
           # be sure to work with a copy of the parent template otherwise there will be conflicts
-          parent_template = @context[:parent_page].template.clone
+          parent_template = @context[:parent_page].template.try(:clone)
+
+          raise PageNotTranslated.new("Page with fullpath '#{@template_name}' was not translated") if parent_template.nil?
 
           @context[:parent_page].instance_variable_set(:@template, parent_template)
 

data/lib/locomotive/liquid/tags/locale_switcher.rb

@@ -11,11 +11,11 @@ module Locomotive
       #
       # options:
       #   - label: iso (de, fr, en, ...etc), locale (Deutsch, Français, English, ...etc), title (page title)
-      #   - sep: piece of html code seperating 2 locales
+      #   - sep: piece of html code separating 2 locales
       #
       # notes:
       #   - "iso" is the default choice for label
-      #   - " | " is the default seperating code
+      #   - " | " is the default separating code
       #
       class LocaleSwitcher < ::Liquid::Tag
 

data/lib/locomotive/liquid/tags/nav.rb

@@ -19,7 +19,7 @@ module Locomotive
         def initialize(tag_name, markup, tokens, context)
           if markup =~ Syntax
             @source = ($1 || 'page').gsub(/"|'/, '')
-            @options = { :id => 'nav', :depth => 1, :class => '', :active_class => 'on' }
+            @options = { :id => 'nav', :depth => 1, :class => '', :active_class => 'on', :bootstrap => false }
             markup.scan(::Liquid::TagAttributes) { |key, value| @options[key.to_sym] = value.gsub(/"|'/, '') }
 
             @options[:exclude] = Regexp.new(@options[:exclude]) if @options[:exclude]
@@ -56,8 +56,8 @@ module Locomotive
           output = children_output.join("\n")
 
           if @options[:no_wrapper] != 'true'
-            list_class = !@options[:class].blank? ? %( class="#{@options[:class]}") : ''
-            output = %{<ul id="#{@options[:id]}"#{list_class}>\n#{output}</ul>}
+            list_class  = !@options[:class].blank? ? %( class="#{@options[:class]}") : ''
+            output      = %{<ul id="#{@options[:id]}"#{list_class}>\n#{output}</ul>}
           end
 
           output
@@ -90,21 +90,35 @@ module Locomotive
 
           label = %{#{icon if @options[:icon] != 'after' }#{title}#{icon if @options[:icon] == 'after' }}
 
-          output  = %{<li id="#{page.slug.dasherize}-link" class="link#{selected} #{css}">}
-          output << %{<a href="/#{@site.localized_page_fullpath(page)}">#{label}</a>}
+          link_options = caret = ''
+          href    = "/#{page.fullpath}"
+
+          if render_children_for_page?(page, depth) && bootstrap?
+            css           += ' dropdown'
+            link_options  = %{ class="dropdown-toggle" data-toogle="dropdown"}
+            href          = '#'
+            caret         = %{ <b class="caret"></b>}
+          end
+
+          output  = %{<li id="#{page.slug.to_s.dasherize}-link" class="link#{selected} #{css}">}
+          output << %{<a href="#{href}"#{link_options}>#{label}#{caret}</a>}
           output << render_entry_children(page, depth.succ) if (depth.succ <= @options[:depth].to_i)
           output << %{</li>}
 
           output.strip
         end
 
+        def render_children_for_page?(page, depth)
+          depth.succ <= @options[:depth].to_i && page.children.reject { |c| !include_page?(c) }.any?
+        end
+
         # Recursively creates a nested unordered list for the depth specified
         def render_entry_children(page, depth)
           output = %{}
 
           children = page.children_with_minimal_attributes( @options[:add_attributes] ).reject { |c| !include_page?(c) }
           if children.present?
-            output = %{<ul id="#{@options[:id]}-#{page.slug.dasherize}">}
+            output = %{<ul id="#{@options[:id]}-#{page.slug.to_s.dasherize}" class="#{bootstrap? ? 'dropdown-menu' : ''}">}
             children.each do |c, page|
               css = []
               css << 'first' if children.first == c
@@ -129,8 +143,13 @@ module Locomotive
           end
         end
 
-        ::Liquid::Template.register_tag('nav', Nav)
+        def bootstrap?
+          @options[:bootstrap] == 'true'
+        end
+
       end
+
+      ::Liquid::Template.register_tag('nav', Nav)
     end
   end
 end

data/lib/locomotive/liquid/tags/paginate.rb

@@ -46,7 +46,7 @@ module Locomotive
             end
             page_count, current_page = pagination['total_pages'], pagination['current_page']
 
-            path = context['path']
+            path = sanitize_path(context['fullpath'])
 
             pagination['previous'] = link(I18n.t('pagination.previous'), current_page - 1, path) if pagination['previous_page']
             pagination['next'] = link(I18n.t('pagination.next'), current_page + 1, path) if pagination['next_page']
@@ -83,6 +83,12 @@ module Locomotive
 
         private
 
+        def sanitize_path(path)
+          _path = path.gsub(/page=[0-9]+&?/, '').gsub(/_pjax=true&?/, '')
+          _path = _path.slice(0..-2) if _path.last == '?' || _path.last == '&'
+          _path
+        end
+
         def window_size
           3
         end
@@ -92,7 +98,8 @@ module Locomotive
         end
 
         def link(title, page, path)
-          { 'title' => title, 'url' => path + "?page=#{page}", 'is_link' => true}
+          _path = %(#{path}#{path.include?('?') ? '&' : '?'}page=#{page})
+          { 'title' => title, 'url' => _path, 'is_link' => true }
         end
       end
 

data/lib/locomotive/middlewares.rb

@@ -1,3 +1,4 @@
 require 'locomotive/middlewares/fonts'
 require 'locomotive/middlewares/seo_trailing_slash'
-require 'locomotive/middlewares/cache'
+require 'locomotive/middlewares/cache'
+require 'locomotive/middlewares/inline_editor'

data/lib/locomotive/middlewares/inline_editor.rb

@@ -0,0 +1,31 @@
+module Locomotive
+  module Middlewares
+    class InlineEditor
+
+      def initialize(app, opts = {})
+        @app = app
+      end
+
+      def call(env)
+        response = @app.call(env)
+
+        unless response[1]['Editable'].blank?
+           html = response.last.body.to_s.gsub '</body>', %(
+            <a  href="_admin"
+                onmouseout="this.style.backgroundPosition='0px 0px'"
+                onmouseover="this.style.backgroundPosition='0px -45px'"
+                onmousedown="this.style.backgroundPosition='0px -90px'"
+                onmouseup="this.style.backgroundPosition='0px 0px'"
+                style="display: block;z-index: 1031;position: fixed;top: 10px; right: 10px;width: 48px; height: 45px;text-indent:-9999px;text-decoration:none;background: transparent url\('/assets/locomotive/icons/start.png'\) no-repeat 0 0;">
+            Admin</a>
+            </body>
+           )
+           [response[0], response[1], [html]]
+        else
+          response
+        end
+      end
+
+    end
+  end
+end

data/lib/locomotive/render.rb

@@ -26,23 +26,7 @@ module Locomotive
     end
 
     def locomotive_page
-      path = self.locomotive_page_path
-
-      if page = current_site.pages.any_in(:fullpath => [*path]).first
-        if not page.published? and current_locomotive_account.nil?
-          page = nil
-        else
-          if page.templatized?
-            @content_entry = page.fetch_target_entry(File.basename(path.first))
-
-            if @content_entry.nil? || (!@content_entry.visible? && current_locomotive_account.nil?) # content instance not found or not visible
-              page = nil
-            end
-          end
-        end
-      end
-
-      page || not_found_page
+      current_site.fetch_page self.locomotive_page_path, current_locomotive_account.present?
     end
 
     def locomotive_page_path
@@ -53,11 +37,6 @@ module Locomotive
 
       path = 'index' if path.blank? || path == '_edit'
 
-      if path != 'index'
-        dirname = File.dirname(path).gsub(/^\.$/, '') # also look for templatized page path
-        path = [path, File.join(dirname, 'content_type_template').gsub(/^\//, '')]
-      end
-
       path
     end
 
@@ -70,6 +49,7 @@ module Locomotive
         'current_page'      => self.params[:page],
         'params'            => self.params,
         'path'              => request.path,
+        'fullpath'          => request.fullpath,
         'url'               => request.url,
         'now'               => Time.now.utc,
         'today'             => Date.today,
@@ -83,8 +63,8 @@ module Locomotive
       assigns.merge!(flash.to_hash.stringify_keys) # data from public submissions
 
       if @page.templatized? # add instance from content type
-        assigns['entry'] = @content_entry
-        assigns[@page.target_entry_name] = @content_entry # just here to help to write readable liquid code
+        assigns['entry'] = @page.content_entry
+        assigns[@page.target_entry_name] = @page.content_entry # just here to help to write readable liquid code
       end
 
       registers = {
@@ -101,7 +81,7 @@ module Locomotive
     def prepare_and_set_response(output)
       flash.discard
 
-      response.headers['Content-Type']  = 'text/html; charset=utf-8'
+      response.headers['Content-Type']  = "#{@page.response_type}; charset=utf-8"
       response.headers['Editable']      = 'true' unless self.editing_page? || current_locomotive_account.nil?
 
       if @page.with_cache?
@@ -115,10 +95,6 @@ module Locomotive
       render :text => output, :layout => false, :status => page_status unless performed?
     end
 
-    def not_found_page
-      current_site.pages.not_found.published.first
-    end
-
     def editing_page?
       !!@editing
     end

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.0.0.rc2'
+  VERSION = '2.0.0.rc4'
 end

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

@@ -0,0 +1,31 @@
+/**
+ * Version 0.0.1
+ * Catch the CTRL+S keys combination and trigger a callback
+ * Didier Lafforgue
+ */
+
+$.cmd = function(key, callback, args, options) {
+  var keyCode = key.charCodeAt(0);
+  var altKeyCode = keyCode + (32 * (keyCode < 97 ? 1 : -1));
+
+  options = (options || { ignoreCase: false });
+
+  if (!options.ignoreCase) altKeyCode = null;
+
+  doc = options.document || window.document;
+
+  $(doc).keydown(function(e) {
+    var isCtrl = false;
+
+    if (!args) args = []; // IE barks when args is null
+
+    if (e.ctrlKey || e.metaKey) isCtrl = true;
+
+    if ((keyCode == e.which || altKeyCode == e.which) && isCtrl) {
+      e.preventDefault();
+      callback.apply(this, args);
+      return false;
+    }
+  });
+
+};

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

@@ -28,6 +28,6 @@ $.fn.toggleMe = function(settings) {
     });
   };
 
-  return $(this).bind("click", toggle);
+  return $(this).bind('click', toggle);
 
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153204100 !ruby/object:Gem::Requirement
+  requirement: &2156428480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153204100
+  version_requirements: *2156428480
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153203600 !ruby/object:Gem::Requirement
+  requirement: &2156426280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153203600
+  version_requirements: *2156426280
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &2153202920 !ruby/object:Gem::Requirement
+  requirement: &2156440220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153202920
+  version_requirements: *2156440220
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2153227140 !ruby/object:Gem::Requirement
+  requirement: &2156437720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *2153227140
+  version_requirements: *2156437720
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2153226560 !ruby/object:Gem::Requirement
+  requirement: &2156448180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153226560
+  version_requirements: *2156448180
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2153225680 !ruby/object:Gem::Requirement
+  requirement: &2156445200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,21 +76,21 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153225680
+  version_requirements: *2156445200
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2153224620 !ruby/object:Gem::Requirement
+  requirement: &2156444480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.5
+        version: 2.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2153224620
+  version_requirements: *2156444480
 - !ruby/object:Gem::Dependency
   name: locomotive-mongoid-tree
-  requirement: &2153223680 !ruby/object:Gem::Requirement
+  requirement: &2156443660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,21 +98,21 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153223680
+  version_requirements: *2156443660
 - !ruby/object:Gem::Dependency
   name: custom_fields
-  requirement: &2153222460 !ruby/object:Gem::Requirement
+  requirement: &2156457700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc8
+        version: 2.0.0.rc9
   type: :runtime
   prerelease: false
-  version_requirements: *2153222460
+  version_requirements: *2156457700
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2153220580 !ruby/object:Gem::Requirement
+  requirement: &2156456400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153220580
+  version_requirements: *2156456400
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2153212840 !ruby/object:Gem::Requirement
+  requirement: &2156451720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153212840
+  version_requirements: *2156451720
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2153247500 !ruby/object:Gem::Requirement
+  requirement: &2156466360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *2153247500
+  version_requirements: *2156466360
 - !ruby/object:Gem::Dependency
   name: rails-backbone
-  requirement: &2153245780 !ruby/object:Gem::Requirement
+  requirement: &2156465280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153245780
+  version_requirements: *2156465280
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
-  requirement: &2153244140 !ruby/object:Gem::Requirement
+  requirement: &2156463980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '2.21'
   type: :runtime
   prerelease: false
-  version_requirements: *2153244140
+  version_requirements: *2156463980
 - !ruby/object:Gem::Dependency
   name: locomotive-tinymce-rails
-  requirement: &2153242980 !ruby/object:Gem::Requirement
+  requirement: &2156461160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 3.4.7.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153242980
+  version_requirements: *2156461160
 - !ruby/object:Gem::Dependency
   name: locomotive-aloha-rails
-  requirement: &2153241900 !ruby/object:Gem::Requirement
+  requirement: &2156474220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 0.20.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153241900
+  version_requirements: *2156474220
 - !ruby/object:Gem::Dependency
   name: flash_cookie_session
-  requirement: &2153256760 !ruby/object:Gem::Requirement
+  requirement: &2156472380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153256760
+  version_requirements: *2156472380
 - !ruby/object:Gem::Dependency
   name: locomotive_liquid
-  requirement: &2153253320 !ruby/object:Gem::Requirement
+  requirement: &2156470960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -208,10 +208,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153253320
+  version_requirements: *2156470960
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &2153251760 !ruby/object:Gem::Requirement
+  requirement: &2156469420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153251760
+  version_requirements: *2156469420
 - !ruby/object:Gem::Dependency
   name: responders
-  requirement: &2153249860 !ruby/object:Gem::Requirement
+  requirement: &2156482960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,10 +230,10 @@ dependencies:
         version: 0.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *2153249860
+  version_requirements: *2156482960
 - !ruby/object:Gem::Dependency
   name: cells
-  requirement: &2153264800 !ruby/object:Gem::Requirement
+  requirement: &2156476380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -241,10 +241,10 @@ dependencies:
         version: 3.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153264800
+  version_requirements: *2156476380
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2153264000 !ruby/object:Gem::Requirement
+  requirement: &2156495100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -252,10 +252,10 @@ dependencies:
         version: 4.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *2153264000
+  version_requirements: *2156495100
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &2153263040 !ruby/object:Gem::Requirement
+  requirement: &2156493720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -263,10 +263,10 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153263040
+  version_requirements: *2156493720
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2153262020 !ruby/object:Gem::Requirement
+  requirement: &2156504940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -274,10 +274,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153262020
+  version_requirements: *2156504940
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &2153260720 !ruby/object:Gem::Requirement
+  requirement: &2156503960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -285,10 +285,10 @@ dependencies:
         version: 2.12.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153260720
+  version_requirements: *2156503960
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
-  requirement: &2153259320 !ruby/object:Gem::Requirement
+  requirement: &2156500700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -296,10 +296,21 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153259320
+  version_requirements: *2156500700
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: &2156515160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156515160
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2153257880 !ruby/object:Gem::Requirement
+  requirement: &2156512280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -307,10 +318,10 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153257880
+  version_requirements: *2156512280
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &2153277600 !ruby/object:Gem::Requirement
+  requirement: &2156509840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -318,10 +329,10 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *2153277600
+  version_requirements: *2156509840
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &2153272620 !ruby/object:Gem::Requirement
+  requirement: &2156508580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -329,10 +340,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2153272620
+  version_requirements: *2156508580
 - !ruby/object:Gem::Dependency
   name: mimetype-fu
-  requirement: &2153271060 !ruby/object:Gem::Requirement
+  requirement: &2156521480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -340,10 +351,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153271060
+  version_requirements: *2156521480
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2153286080 !ruby/object:Gem::Requirement
+  requirement: &2156516860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -351,10 +362,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *2153286080
+  version_requirements: *2156516860
 - !ruby/object:Gem::Dependency
   name: actionmailer-with-request
-  requirement: &2153300660 !ruby/object:Gem::Requirement
+  requirement: &2156515560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -362,7 +373,7 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153300660
+  version_requirements: *2156515560
 description: Locomotive is a next generation CMS system with sexy admin tools, liquid
   templating, and inline editing powered by mongodb and rails 3.2
 email:
@@ -404,6 +415,7 @@ files:
 - app/assets/images/locomotive/icons/flags/ru.png
 - app/assets/images/locomotive/icons/membership_edit.png
 - app/assets/images/locomotive/icons/membership_lock.png
+- app/assets/images/locomotive/icons/start.png
 - app/assets/images/locomotive/inline_editor/back.png
 - app/assets/images/locomotive/list/empty.png
 - app/assets/images/locomotive/list/icons/cross.png
@@ -473,6 +485,7 @@ files:
 - app/assets/javascripts/locomotive/views/content_types/new_view.js.coffee
 - app/assets/javascripts/locomotive/views/content_types/select_options_view.js.coffee
 - app/assets/javascripts/locomotive/views/current_site/edit_view.js.coffee
+- 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
@@ -618,12 +631,12 @@ files:
 - app/inputs/locomotive/toggle_input.rb
 - app/mailers/locomotive/devise_mailer.rb
 - app/mailers/locomotive/notifications.rb
-- app/middlewares/locomotive/inline_editor_middleware.rb
 - app/models/locomotive/ability.rb
 - app/models/locomotive/account.rb
 - app/models/locomotive/content_asset.rb
 - app/models/locomotive/content_entry.rb
 - app/models/locomotive/content_type.rb
+- app/models/locomotive/editable_control.rb
 - app/models/locomotive/editable_element.rb
 - app/models/locomotive/editable_file.rb
 - app/models/locomotive/editable_long_text.rb
@@ -654,6 +667,7 @@ files:
 - app/presenters/locomotive/content_asset_presenter.rb
 - app/presenters/locomotive/content_entry_presenter.rb
 - app/presenters/locomotive/content_type_presenter.rb
+- 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
@@ -837,15 +851,15 @@ files:
 - lib/locomotive/liquid/drops/site.rb
 - lib/locomotive/liquid/drops/uploader.rb
 - lib/locomotive/liquid/errors.rb
+- lib/locomotive/liquid/filters/base.rb
 - lib/locomotive/liquid/filters/date.rb
 - lib/locomotive/liquid/filters/html.rb
 - lib/locomotive/liquid/filters/misc.rb
 - lib/locomotive/liquid/filters/resize.rb
 - lib/locomotive/liquid/filters/text.rb
-- lib/locomotive/liquid/tags/blueprint.rb
 - lib/locomotive/liquid/tags/consume.rb
 - lib/locomotive/liquid/tags/editable/base.rb
-- lib/locomotive/liquid/tags/editable/content.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
@@ -854,7 +868,6 @@ files:
 - lib/locomotive/liquid/tags/google_analytics.rb
 - lib/locomotive/liquid/tags/inherited_block.rb
 - lib/locomotive/liquid/tags/inline_editor.rb
-- lib/locomotive/liquid/tags/jquery.rb
 - lib/locomotive/liquid/tags/locale_switcher.rb
 - lib/locomotive/liquid/tags/nav.rb
 - lib/locomotive/liquid/tags/paginate.rb
@@ -865,6 +878,7 @@ files:
 - lib/locomotive/logger.rb
 - lib/locomotive/middlewares/cache.rb
 - lib/locomotive/middlewares/fonts.rb
+- lib/locomotive/middlewares/inline_editor.rb
 - lib/locomotive/middlewares/seo_trailing_slash.rb
 - lib/locomotive/middlewares.rb
 - lib/locomotive/mongoid/document.rb
@@ -884,6 +898,7 @@ files:
 - public/favicon.ico
 - vendor/assets/javascripts/locomotive/backbone.modelbinding.js
 - vendor/assets/javascripts/locomotive/backbone.sync.js
+- vendor/assets/javascripts/locomotive/cmd.js
 - vendor/assets/javascripts/locomotive/cookies.js
 - vendor/assets/javascripts/locomotive/datepicker_fr.js
 - vendor/assets/javascripts/locomotive/editable_field.js
@@ -935,7 +950,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -83862072915478114
+      hash: 55090259143407847
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: