locomotive_cms 2.0.0.rc9 → 2.0.0.rc10

data/app/views/locomotive/notifications/new_content_entry.html.haml

@@ -20,7 +20,9 @@
         - when 'string', 'text', 'boolean', 'date'
           = value
         - when 'file'
-          = link_to File.basename(value.to_s), value.to_s
+          - url = value.guess_url
+          - url = url =~ /^http/ ? url : URI.join("http://#{@entry.site.domains.first}", url).to_s # Amazon S3 (http/https) or local files ?
+          = link_to File.basename(url), url
         - when 'select'
           = value
         - when 'belongs_to'

data/app/views/locomotive/public/pages/show_toolbar.html.haml

@@ -11,6 +11,10 @@
     %meta{ :name => 'key-param', :content => Rails.application.config.session_options[:key] }
     %meta{ :name => 'key-token', :content => cookies[key] }
 
+    %script{ :type => 'text/javascript' }
+      :plain
+        window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' };
+
     = stylesheet_link_tag     'locomotive/inline_editor', :media => 'screen'
     = javascript_include_tag  'locomotive/inline_editor'
 
@@ -19,7 +23,6 @@
         window.locale         = '#{I18n.locale}';
         window.content_locale = '#{::Mongoid::Fields::I18n.locale}';
 
-        Locomotive.mounted_on       = '#{Locomotive.mounted_on}';
         Locomotive.current_site     = new Locomotive.Models.Site(#{j current_site.to_json.html_safe});
         Locomotive.current_account  = new Locomotive.Models.Account(#{j current_locomotive_account.to_json.html_safe});
 

data/config/locales/admin_ui.de.yml

@@ -9,7 +9,7 @@ de:
         title: Seite nicht gefunden
         notice: "Die angefragte Seite existiert nicht."
         link: "→ Zurück zur Anwendung"
-        
+
     locales:
       en: Englisch
       de: Deutsch
@@ -20,7 +20,7 @@ de:
       nb: Norwegisch
       es: Spanisch
       ru: Russisch
-      
+
     buttons:
       login: Einloggen
       send_password: Senden
@@ -91,7 +91,6 @@ de:
 
       form:
         required: Pflichtfeld
-        optional: Optional
         default_label: Feldname
         select_options:
           ask_name: "Geben Sie den Namen der Auswahloption an."
@@ -295,7 +294,7 @@ de:
         explanations: "Es ist fast geschafft. Bitte geben Sie Ihrer ersten Webseite einen Namen und wählen Sie eine Sprache aus."
         default_site_locale: Sprachauswahl
         default_site_locales_hints: Sie können später weitere Sprachen im Einstellungsdialog vornehmen.
-        next: Webseite erstellen      
+        next: Webseite erstellen
         back_to_default_template: "Klicken Sie <a href='#'>hier</a> um die Standardeinstellungen wieder herzustellen"
 
 

data/config/locales/admin_ui.en.yml

@@ -91,7 +91,6 @@ en:
 
       form:
         required: Required
-        optional: Optional
         default_label: Field name
         select_options:
           ask_name: "Type the label of the option"
@@ -267,6 +266,7 @@ en:
       edit:
         title: '%{type} — editing entry'
       form:
+        edit_select_options: edit options
         has_many:
           new_entry: New entry
 

data/config/locales/admin_ui.fr.yml

@@ -85,11 +85,10 @@ fr:
           empty: La liste est vide. Ajouter une entrée depuis la liste ci-dessous.
 
       form:
-        required: Required
-        optional: Optional
-        default_label: Field name
+        required: Requis
+        default_label: Nom du champ
         select_options:
-          ask_name: "Type the label of the option"
+          ask_name: "Tapez le nom de l'option"
 
     sessions:
       new:
@@ -263,6 +262,7 @@ fr:
       edit:
         title: '%{type} — édition élément'
       form:
+        edit_select_options: éditer options
         has_many:
           new_item: Nouvel élément
 

data/config/locales/admin_ui.nb.yml

@@ -91,7 +91,6 @@ nb:
 
       form:
         required: Nødvendig
-        optional: Valgfri
         default_label: Feltnavn
         select_options:
           ask_name: "Skriv inn etiketten for dette valget"

data/config/locales/admin_ui.ru.yml

@@ -90,7 +90,6 @@ ru:
           empty: Список пуст. Добавьте элемент из селекта ниже.
       form:
         required: Обязательное
-        optional: Опциональное
         default_label: Название поля
         select_options:
           ask_name: "Введите название элемента"

data/lib/locomotive/custom_fields.rb

@@ -30,6 +30,18 @@ module CustomFields
           "sites/#{model.site_id}/content_#{model.class.model_name.demodulize.underscore}/#{model.id}/files"
         end
 
+        # In some situations, for instance, for the notification email when a content entry is created,
+        # we need to know the url of the file without breaking the upload process.
+        # Actually, the uploaded file will be written on the filesystem after the email is sent.
+        #
+        # @return [ String ] The url to the soon uploaded file
+        #
+        def guess_url
+          this = self.class.new(model, mounted_as)
+          this.retrieve_from_store!(model.read_uploader(mounted_as))
+          this.url.to_s
+        end
+
         def cache_dir
           "#{Rails.root}/tmp/uploads"
         end

data/lib/locomotive/liquid/drops/content_entry.rb

@@ -23,7 +23,7 @@ module Locomotive
         # {% endif %}
         #
         def next
-          self._source.next.to_liquid
+          @next ||= self._source.next.to_liquid
         end
 
         # Returns the previous content for the parent content type.
@@ -36,7 +36,7 @@ module Locomotive
         # {% endif %}
         #
         def previous
-          self._source.previous.to_liquid
+          @previous ||= self._source.previous.to_liquid
         end
 
         def before_method(meth)

data/lib/locomotive/liquid/drops/content_types.rb

@@ -31,6 +31,8 @@ module Locomotive
 
           if (meth.to_s =~ /^group_by_(.+)$/) == 0
             klass.send(:group_by_select_option, $1, @content_type.order_by_definition)
+          elsif (meth.to_s =~ /^(.+)_options$/) == 0
+            klass.send(:"#{$1}_options").map { |option| option['name'] }
           else
             Locomotive.log :warn, "[Liquid template] trying to call #{meth} on a content_type object"
           end

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

@@ -28,6 +28,10 @@ module Locomotive
             context.registers[:inline_editor] && (!element.fixed? || (element.fixed? && !element.from_parent?))
           end
 
+          def default_element_attributes
+            super.merge(:content_from_default => self.render_default_content(nil))
+          end
+
         end
 
         ::Liquid::Template.register_tag('editable_short_text', ShortText)

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

@@ -6,23 +6,25 @@ module Liquid
         def render(context)
           if context.registers[:current_locomotive_account] && context.registers[:inline_editor]
 
-            controller = context.registers[:controller]
-
             plugins = 'common/format,common/table,common/list,common/link,common/highlighteditables,common/block,common/undo,common/contenthandler,common/paste,common/commands,common/abbr,common/align,common/horizontalruler,custom/locomotive_media'
 
-            %{
-              <meta content="true" name="inline-editor" />
+            controller = context.registers[:controller]
+            controller.instance_variable_set(:@plugins, plugins)
+
+            html = <<-HTML
+              %meta{ :content => true, :name => 'inline-editor' }
 
-              #{controller.view_context.stylesheet_link_tag    'aloha/css/aloha.css'}
-              #{controller.view_context.javascript_include_tag 'locomotive/aloha', :'data-aloha-plugins' => plugins}
+              = stylesheet_link_tag 'aloha/css/aloha.css'
+              = javascript_include_tag 'locomotive/aloha', :'data-aloha-plugins' => @plugins
 
-              <script type="text/javascript">
-                Aloha.ready(function() \{
-                  window.parent.application_view.set_page(#{context.registers[:page].to_presenter.as_json_for_html_view.to_json});
-                \});
-              </script>
+              %script{ :type => 'text/javascript' }
+                :plain
+                  Aloha.ready(function() \{
+                    window.parent.application_view.set_page(#{controller.view_context.j context.registers[:page].to_presenter.as_json_for_html_view.to_json.html_safe});
+                  \});
+            HTML
 
-            }
+            Haml::Engine.new(html.gsub(/\n+/, "\n").gsub(/^\s{14}/, ''), :escape_html => true).render(controller.view_context)
           else
             ''
           end

data/lib/locomotive/middlewares/inline_editor.rb

@@ -7,22 +7,27 @@ module Locomotive
       end
 
       def call(env)
-        response = @app.call(env)
+        status, headers, 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
+        response = modify(response) unless headers['Editable'].blank?
+
+        [status, headers, response]
+      end
+
+      def modify(response)
+        [].tap do |parts|
+          response.each do |part|
+            parts << part.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>
+             ))
+          end
         end
       end
 

data/lib/locomotive/render.rb

@@ -5,6 +5,9 @@ module Locomotive
 
     protected
 
+    # Render a Locomotive page from the request fullpath and the current site.
+    # If the page corresponds to a redirect, then a 301 redirection is made.
+    #
     def render_locomotive_page
       if request.fullpath =~ /^\/#{Locomotive.mounted_on}\//
         render :template => '/locomotive/errors/404', :layout => '/locomotive/layouts/not_logged_in', :status => :not_found
@@ -21,14 +24,69 @@ module Locomotive
       end
     end
 
+    # Render the page which tells that no page exists.
+    # This case should not happen since all the sites contains
+    # the "Page Not Found" page.
+    #
     def render_no_page_error
       render :template => '/locomotive/errors/no_page', :layout => false
     end
 
+    # Prepare and set the response object for the Locomotive page retrieved
+    # from the path. The caching (with Varnish for instance) if defined is done here.
+    # It is also here that the content type of the request is set (html or json).
+    # Behind the scene, it just calls simply the Rails render method.
+    #
+    # @param [ String ] The rendered Locomotive page
+    #
+    def prepare_and_set_response(output)
+      flash.discard
+
+      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?
+        fresh_when :etag => @page, :last_modified => @page.updated_at.utc, :public => true
+
+        if @page.cache_strategy != 'simple' # varnish
+          response.headers['Editable']      = ''
+          response.cache_control[:max_age]  = @page.cache_strategy
+        end
+      end
+
+      render :text => output, :layout => false, :status => page_status unless performed?
+    end
+
+    # Tell if the current Locomotive page is being edited.
+    #
+    # @return [ Boolean ] True if being edited.
+    #
+    def editing_page?
+      !!@editing
+    end
+
+    # Get the symbol matching the status of the current Locomotive page.
+    # It can be either :ok or :not_found (404)
+    #
+    # @return [ Symbol ] :ok if the page is not the "Page not found" one.
+    #
+    def page_status
+      @page.not_found? ? :not_found : :ok
+    end
+
+    # Get the Locomotive page matching the request and scoped by the current Locomotive site
+    #
+    # @return [ Object ] The Locomotive::Page
+    #
     def locomotive_page
       current_site.fetch_page self.locomotive_page_path, current_locomotive_account.present?
     end
 
+    # Build the path that can be understood by Locomotive in order to retrieve
+    # the matching Locomotive page (see the locomotive_page method)
+    #
+    # @return [ String ] The path to the Locomotive page
+    #
     def locomotive_page_path
       path = (params[:path] || params[:page_path] || request.fullpath).clone # TODO: params[:path] is more consistent
       path = path.split('?').first # take everything before the query string or the lookup fails
@@ -40,9 +98,36 @@ module Locomotive
       path
     end
 
+    # Build the Liquid context used to render the Locomotive page. It
+    # stores both assigns and registers.
+    #
+    # @return [ Object ] A Liquid::Context object.
+    #
     def locomotive_context
-      assigns = {
-        'site'              => current_site,
+      assigns = self.locomotive_default_assigns
+
+      assigns.merge!(Locomotive.config.context_assign_extensions)
+
+      assigns.merge!(flash.to_hash.stringify_keys) # data from public submissions
+
+      if @page.templatized? # add instance from content type
+        content_entry = @page.content_entry.to_liquid
+        ['content_entry', 'entry', @page.target_entry_name].each do |key|
+          assigns[key] = content_entry
+        end
+      end
+
+      # Tip: switch from false to true to enable the re-thrown exception flag
+      ::Liquid::Context.new({}, assigns, self.locomotive_default_registers, false)
+    end
+
+    # Return the default Liquid assigns used inside the Locomotive Liquid context
+    #
+    # @return [ Hash ] The default liquid assigns object
+    #
+    def locomotive_default_assigns
+      {
+        'site'              => current_site.to_liquid,
         'page'              => @page,
         'models'            => Locomotive::Liquid::Drops::ContentTypes.new,
         'contents'          => Locomotive::Liquid::Drops::ContentTypes.new, # DEPRECATED
@@ -58,51 +143,20 @@ module Locomotive
         'locales'           => current_site.locales,
         'current_user'      => Locomotive::Liquid::Drops::CurrentUser.new(current_locomotive_account)
       }
+    end
 
-      assigns.merge!(Locomotive.config.context_assign_extensions)
-
-      assigns.merge!(flash.to_hash.stringify_keys) # data from public submissions
-
-      if @page.templatized? # add instance from content type
-        assigns['content_entry'] = assigns['entry'] = @page.content_entry
-        assigns[@page.target_entry_name] = @page.content_entry # just here to help to write readable liquid code
-      end
-
-      registers = {
+    # Return the default Liquid registers used inside the Locomotive Liquid context
+    #
+    # @return [ Hash ] The default liquid registers object
+    #
+    def locomotive_default_registers
+      {
         :controller     => self,
         :site           => current_site,
         :page           => @page,
         :inline_editor  => self.editing_page?,
         :current_locomotive_account => current_locomotive_account
       }
-
-      ::Liquid::Context.new({}, assigns, registers, false) # switch from false to true to enable the re-thrown exception flag
-    end
-
-    def prepare_and_set_response(output)
-      flash.discard
-
-      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?
-        fresh_when :etag => @page, :last_modified => @page.updated_at.utc, :public => true
-
-        if @page.cache_strategy != 'simple' # varnish
-          response.headers['Editable']      = ''
-          response.cache_control[:max_age]  = @page.cache_strategy
-        end
-      end
-
-      render :text => output, :layout => false, :status => page_status unless performed?
-    end
-
-    def editing_page?
-      !!@editing
-    end
-
-    def page_status
-      @page.not_found? ? :not_found : :ok
     end
 
   end

data/lib/locomotive/version.rb

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

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

@@ -22,7 +22,7 @@ $.fn.formSubmitNotification = function(settings) {
 
   return this.each(function() {
     var form    = $(this);
-    var message = form.attr('data-sending-form-message');
+    var message = form.attr('data-sending-form-message') || form.attr('data-sending_form_message');
 
     if (typeof(message) == 'undefined')
       message = form.find('input[type=submit]').attr('data-sending-form-message');