skylinecms 3.1.0 → 3.2.0

data/app/controllers/skyline/site/pages_controller.rb

@@ -13,7 +13,7 @@ class Skyline::Site::PagesController < ApplicationController
         renderer.assigns.update(:body => self.response.body)
       end      
       
-      render :text => renderer.render(@page_version) if renderer.assigns[:body].present?
+      render :text => renderer.render(@page_version) if renderer.assigns[:body]
     end    
 
     # ================================================
@@ -26,7 +26,7 @@ class Skyline::Site::PagesController < ApplicationController
   protected
 
   def handle_404
-    render :text => "Error 404 :: Page with url \"#{params[:url].join("/")}\" doesn't exist.", :status => :not_found    
+    render :text => "Error 404 :: Page with url \"#{params[:url]}\" doesn't exist.", :status => :not_found    
   end
   
   def find_site
@@ -34,7 +34,8 @@ class Skyline::Site::PagesController < ApplicationController
   end
   
   def find_page_version_and_url_parts
-    page, @url_parts = @site.pages.find_by_url(params[:url])
+    url = params[:url].to_s.split("/")
+    page, @url_parts = @site.pages.find_by_url(url)
     @page_version = page.andand.published_publication
   end
   

data/app/controllers/skyline/skyline2_controller.rb

@@ -1,7 +1,7 @@
 class Skyline::Skyline2Controller < Skyline::ApplicationController
   layout "general"
 
-  around_filter VersionStamper.instance  
+  around_filter ::Skyline::VersionStamper.instance  
 
   before_filter :load_implementation
 

data/app/controllers/skyline/users_controller.rb

@@ -15,13 +15,7 @@ class Skyline::UsersController < Skyline::ApplicationController
   
   def new
     @user = Skyline::User.new(params[:user])
-    @roles = @current_user.viewable_roles
-    
-    if request.xhr?
-      render :update do |p|
-        p << dialog(t(:dialog_title, :display_name => @user.display_name, :scope => [:user,:new]), :partial => "new", :width => 700)
-      end
-    end        
+    @roles = current_user.viewable_roles
   end
   
   def create
@@ -29,28 +23,17 @@ class Skyline::UsersController < Skyline::ApplicationController
     
     if @user.save
       notifications[:success] = t(:success, :scope => [:user,:create,:flashes])
-      render :update do |p|
-        p.redirect_to skyline_users_path(:page => page_number_for_user(@user))
-      end
+      javascript_redirect_to skyline_users_path(:page => page_number_for_user(@user))
     else
-      @roles = @current_user.viewable_roles
+      @roles = current_user.viewable_roles
       messages.now[:error] = t(:error,:scope => [:user,:create,:flashes])
-      render :update do |p|
-        p << "Skyline.Dialog.current.setContent('#{escape_javascript(render :partial => "new")}'); Skyline.Dialog.current.setup();"
-      end
     end
     
   end
   
   def edit
     @user = Skyline::User.find_by_id(params[:id])
-    @roles = @current_user.viewable_roles
-    
-    if request.xhr?
-      render :update do |p|
-        p << dialog(t(:dialog_title, :display_name => @user.display_name, :scope => [:user,:edit]), :partial => "edit", :width => 700)
-      end
-    end    
+    @roles = current_user.viewable_roles    
   end  
   
   def update
@@ -61,15 +44,10 @@ class Skyline::UsersController < Skyline::ApplicationController
     
     if @user.save
       notifications[:success] = t(:success, :scope => [:user,:update,:flashes])
-      render :update do |p|
-        p.redirect_to skyline_users_path(:page => page_number_for_user(@user))
-      end
+      javascript_redirect_to skyline_users_path(:page => page_number_for_user(@user))
     else
-      @roles = @current_user.viewable_roles
+      @roles = current_user.viewable_roles
       messages.now[:error] = t(:error,:scope => [:user,:update,:flashes])
-      render :update do |p|
-        p << "Skyline.Dialog.current.setContent('#{escape_javascript(render :partial => "edit")}'); Skyline.Dialog.current.setup();"
-      end
     end
   end
   
@@ -83,9 +61,7 @@ class Skyline::UsersController < Skyline::ApplicationController
       notifications[:error] = t(:error, :scope => [:user,:destroy,:flashes])
     end 
 
-    render :update do |p|
-      p.redirect_to skyline_users_path(:page => params[:page])
-    end
+    javascript_redirect_to skyline_users_path(:page => params[:page])
   end
   
 

data/app/controllers/skyline/variant_current_editor_controller.rb

@@ -4,21 +4,21 @@ class Skyline::VariantCurrentEditorController < Skyline::ApplicationController
   skip_before_filter :handle_user_preferences
   
   def poll
-    return render(:nothing => true) if session[:user_id].blank?
+    return render(:nothing => true) if session[:skyline_user_identification].blank?
     
     response = {}
     data = Skyline::Variant.find_current_editor_for(params[:variant_id])
-    current_user_is_editor = data["current_editor_id"].nil? || data["current_editor_id"].to_i == session[:user_id]
+    current_user_is_editor = data["current_editor_id"].nil? || data["current_editor_id"].to_i == session[:skyline_user_identification]
 
     if current_user_is_editor || Skyline::Variant.editor_idle_time < (Time.zone.now - data["current_editor_timestamp"])
-      Skyline::Variant.update_current_editor(params[:variant_id],session[:user_id])
+      Skyline::Variant.update_current_editor(params[:variant_id],session[:skyline_user_identification])
       response[:current_editor] = true
     else
-      u = Skyline::User.find_by_id(data["current_editor_id"])
+      u = Skyline::Configuration.user_class.find_by_identification(data["current_editor_id"])
       response.update({
         :current_editor => false,
         :title => I18n.t(:dialog_title, :scope => [:variant_current_editor,:takeover]),
-        :message => render_to_string(:partial => "skyline/articles/takeover_action", :locals => {:current_editor => u})
+        :message => render_to_string(:partial => "/skyline/articles/takeover_action.html", :locals => {:current_editor => u})
       })
     end
 

data/app/controllers/skyline/variants_controller.rb

@@ -1,5 +1,5 @@
 class Skyline::VariantsController < Skyline::ApplicationController
-  insert_before_filter_after :authentication, :find_article
+  set_callback :authenticate, :after, :find_article
 
   authorize :create, :by => Proc.new{|user,controller,action| user.allow?(controller.article, :variant_create)  }
   authorize :destroy, :by => Proc.new{|user,controller,action| user.allow?(controller.article, :variant_delete)  }
@@ -19,7 +19,7 @@ class Skyline::VariantsController < Skyline::ApplicationController
     redirect_to edit_skyline_article_path(@article, :variant_id => variant.id)    
   end
   
-  def destroy
+  def destroy    
     return handle_unauthorized_user unless Skyline::Configuration.enable_multiple_variants
     
     variant = @article.variants.find_by_id(params[:id])
@@ -48,7 +48,7 @@ class Skyline::VariantsController < Skyline::ApplicationController
     if variant = @article.variants.find_by_id(params[:id])
       variant.edit_by!(current_user, :force => true)
       if request.xhr?
-        render(:update){|p| p.redirect_to edit_skyline_article_path(@article,:variant_id => variant)}
+        javascript_redirect_to edit_skyline_article_path(@article,:variant_id => variant)
       else
         redirect_to edit_skyline_article_path(@article,:variant_id => variant)
       end

data/app/helpers/skyline/application_helper.rb

@@ -58,17 +58,25 @@ module Skyline::ApplicationHelper
   # 
   # @option options [Class] :generator (Skyline::MessageGenerator) The generator to use to render the messages.
   def render_messages(options={})
-    _render_volatiles(self.messages,options)
+    javascript_tag render_messages_javascript(options)
   end
   
   # Actually render the notifications on screen.
   #
   # @option options [Class] :generator (Skyline::NotificationGenerator) The generator to use to render the messages.
   def render_notifications(options={})
+    javascript_tag render_notifications_javascript(options)
+  end
+
+  def render_messages_javascript(options={})
+    _render_volatiles(self.messages,options)    
+  end
+  
+  def render_notifications_javascript(options={})
     options.reverse_merge! :generator => Skyline::NotificationGenerator
     _render_volatiles(self.notifications,options)
   end
-    
+  
   protected
   
   def _render_volatiles(messages_hash, options={})
@@ -76,11 +84,14 @@ module Skyline::ApplicationHelper
     options.reverse_merge! :generator => Skyline::MessageGenerator
     generator = options.delete(:generator)
     out = messages_hash.inject([]) do |acc,v|
-      type,messages = v[0],[v[1]].flatten
-      msg_options = messages.extract_options!
+      type, messages = v[0],[v[1]].flatten
+            
+      msg_options = messages.extract_options!      
       msg_options.reverse_merge! options
+            
       acc += messages.map{|msg| generator.new(type,msg,msg_options) }
     end
-    javascript_tag out.join("\n")    
+    out.join("\n").html_safe
   end
+  
 end

data/app/helpers/skyline/button_helper.rb

@@ -5,7 +5,7 @@ module Skyline::ButtonHelper
     
     contents = capture(&block)
     
-    concat <<-EOS
+    txt = <<-EOS
     <dl class="menubutton" id="#{options[:id]}">
       <dt>
         <span class="label">#{title}</span>
@@ -19,12 +19,14 @@ module Skyline::ButtonHelper
       new Skyline.MenuButton('#{options[:id]}')
     </script>
     EOS
+    
+    txt.html_safe
   end
   
   # Translates the key if it's a symbol otherwise just places key
   # --
   def button_text(key)
-    key.kind_of?(Symbol) ? t(key, :scope => :buttons) : key
+    (key.kind_of?(Symbol) ? t(key, :scope => :buttons) : key).html_safe
   end
   
   # Places a <button type="submit">..</button> tag
@@ -48,30 +50,22 @@ module Skyline::ButtonHelper
     html_options = html_options.stringify_keys
     disabled = html_options[:disabled]
     convert_boolean_attributes!(html_options, %w( disabled ))
-    
-    method_tag = ''
-    if (method = html_options.delete('method')) && %w{put delete}.include?(method.to_s)
-      method_tag = tag('input', :type => 'hidden', :name => '_method', :value => method.to_s)
-    end
-    
-    form_method = method.to_s == 'get' ? 'get' : 'post'
-    
-    request_token_tag = ''
-    if form_method == 'post' && protect_against_forgery?
-      request_token_tag = tag(:input, :type => "hidden", :name => request_forgery_protection_token.to_s, :value => form_authenticity_token)
+
+    if method = html_options.delete('method')
+      html_options["data-method"] = method
+    else
+      html_options["data-method"] = "post"
     end
     
     if confirm = html_options.delete("confirm")
-      html_options["onclick"] = "return #{confirm_javascript_function(confirm)};"
+      html_options["data-confirm"] = confirm
     end
     
-    url = options.is_a?(String) ? options : self.url_for(options)
-    name ||= url
+    html_options["data-url"] = options.is_a?(String) ? options : self.url_for(options)
     
     html_options.reverse_merge! :type => "submit"
     
-    "<form method=\"#{form_method}\" action=\"#{escape_once url}\" class=\"button-to\"><div>" +
-      method_tag + content_tag("button", button_text(label) ,html_options) + request_token_tag + "</div></form>"    
+    content_tag("button", button_text(label) ,html_options)
   end
   
 end

data/app/helpers/skyline/content_helper.rb

@@ -21,7 +21,7 @@ module Skyline::ContentHelper
     
     links << "<span>#{label_for(last)}</span>" if last
     
-    content_tag("div","#{t(:breadcrumb_prefix, :scope => :content)} " + links.join(" &raquo; "),:id => "breadcrumb")    
+    content_tag("div",("#{t(:breadcrumb_prefix, :scope => :content)} " + links.join(" &raquo; ")).html_safe ,:id => "breadcrumb")    
   end
   
   def label_for(type)
@@ -64,7 +64,7 @@ module Skyline::ContentHelper
     url_options = url_options_for_record(record, {:action => options[:action]})
     
     contents = ''
-    contents << content_fields(record.class,record_name, record)
+    contents << content_fields(record.class, record_name, record)
     
     contents << capture(&block) if block_given?
 		            
@@ -73,10 +73,10 @@ module Skyline::ContentHelper
 #      contents << hidden_field(record_name, :id) unless record.new_record?
       contents << hidden_field_tag(:version,record.current_version)
       
-      output = content_tag('form', contents, :id => "contentform", :action => object_url(record,url_options), :method => 'post', :enctype => options[:multipart] ? 'multipart/form-data': nil)
+      output = content_tag('form', contents.html_safe, :id => "contentform", :action => object_url(record,url_options), :method => 'post', :enctype => options[:multipart] ? 'multipart/form-data': nil)
                
     else
-      output = content_tag('div', contents, :id => "contentform")
+      output = content_tag('div', contents.html_safe, :id => "contentform")
     end
     
 
@@ -84,12 +84,12 @@ module Skyline::ContentHelper
     # functionality.
     output << postponed_editors.map(&:output).join("\n") if postponed_editors.any?
     
-    concat output
+    output
   end  
 
-  def content_fields(fieldset,record_name, record)
+  def content_fields(fieldset, record_name, record)
     out = ""
-
+    
     fieldset.each_field do |field|
       next if (field.hidden_in(:edit) && !record.new_record?) || 
               (field.hidden_in(:create) && record.new_record?)
@@ -101,11 +101,11 @@ module Skyline::ContentHelper
           out <<  render(:partial => "skyline/content/group", :locals => {:title => field.singular_title, :content => content_fields(field, record_name, record)})
       end
     end
-    out
+    out.html_safe
   end  
   
   def content_field(fieldset,record_name,field, record)
-    e = Skyline::Editors::Editor.create(field,[record_name],record,@template)
+    e = Skyline::Editors::Editor.create(field,[record_name],record,self)
     if e.postpone?
       postponed_editors << e
       ""
@@ -117,7 +117,7 @@ module Skyline::ContentHelper
   # Outputs an object list with the right presenter
   # defaults to Table currently.
   def presenter_for(records,fieldset)
-    Skyline::Presenters::Presenter.create(fieldset.settings.presenter,records,fieldset,@template).output
+    Skyline::Presenters::Presenter.create(fieldset.settings.presenter,records,fieldset,self).output
   end
   
   # Postponed editors are editors like inline_list that should not be in the form but provide their own form/list
@@ -136,7 +136,7 @@ module Skyline::ContentHelper
   
   def record_with_errors(content, record, field)
     if record.errors.on(field.attribute_name) 
-      content_tag("div", content, :class => "fieldWithErrors")
+      content_tag("div", content.html_safe, :class => "fieldWithErrors")
     else
       content
     end

data/app/helpers/skyline/dialog_helper.rb

@@ -14,8 +14,8 @@ module Skyline::DialogHelper
     
     options.each do |k,v|
       options[k] = case v
-        when String,Symbol : "'" + escape_javascript(v.to_s) + "'"
-        when Hash : options_for_javascript(v)
+        when String,Symbol then "'" + escape_javascript(v.to_s) + "'"
+        when Hash then options_for_javascript(v)
         else v
       end
     end    
@@ -26,6 +26,7 @@ module Skyline::DialogHelper
     p << "sd.setContent('#{escape_javascript(content)}');"
     p << "sd.setup(); sd.show();"
     p << "})()"
+    p.html_safe
   end
   
 end

data/app/helpers/skyline/editors/checkable_list.rb

@@ -23,7 +23,8 @@ class Skyline::Editors::CheckableList < Skyline::Editors::Editor
   def render_records
     collection = @target_class.all
     if collection.any?
-      collection.collect{|record| render_record(record)}.join("\n")
+      out = hidden_field_tag(input_name(self.attribute_names + [random_prefix(0), "_target_id"]), "-")
+      out << collection.collect{|record| render_record(record)}.join("\n")
     else
       t(:blank, :scope => [:content,:editors, :checkable_list], :class => @target_class.plural_name.downcase)
     end
@@ -39,7 +40,8 @@ class Skyline::Editors::CheckableList < Skyline::Editors::Editor
   end
   
   def random_prefix(row)
-    "n_" + row.id.to_s + "_n" + Time.now.to_i.to_s + Time.now.usec.to_s 
+    id = row.respond_to?(:id) ? row.id : row
+    "n_" + id.to_s + "_n" + Time.now.to_i.to_s + Time.now.usec.to_s 
   end
   
   def row_id(id)

data/app/helpers/skyline/editors/date_time.rb

@@ -4,7 +4,7 @@ class Skyline::Editors::DateTime < Skyline::Editors::Editor
     value ||= Time.now
     select_day(value, :field_name => "#{field.attribute_name}(3i)", :prefix => input_name(self.attribute_names[0..-2])) + 
     select_month(value, :field_name => "#{field.attribute_name}(2i)", :prefix => input_name(self.attribute_names[0..-2])) + 
-    select_year(value, :field_name => "#{field.attribute_name}(1i)", :prefix => input_name(self.attribute_names[0..-2])) + " &mdash; " +
+    select_year(value, :field_name => "#{field.attribute_name}(1i)", :prefix => input_name(self.attribute_names[0..-2])) + " &mdash; ".html_safe +
     select_hour(value, :field_name => "#{field.attribute_name}(4i)", :prefix => input_name(self.attribute_names[0..-2])) + " : " +
     select_minute(value, :field_name => "#{field.attribute_name}(5i)", :prefix => input_name(self.attribute_names[0..-2]))
   end

data/app/helpers/skyline/editors/display.rb

@@ -5,7 +5,7 @@ class Skyline::Editors::Display < Skyline::Editors::Editor
   
   def value
     case value = field.value(record)
-      when Date,Time : value.to_formatted_s(:long)
+      when Date,Time then value.to_formatted_s(:long)
       else value
     end
   end

data/app/helpers/skyline/editors/editable_list.rb

@@ -45,15 +45,20 @@ class Skyline::Editors::EditableList < Skyline::Editors::Editor
   protected
   
   def add_new_link
-    link_to_remote(t(:add_more, :scope => [:content], :class => @target_class.plural_name), {
-      :url => {:controller => "skyline/content/editors/editable_list", 
-               :action => "new", 
-               :source_type => self.record.class.to_s.demodulize.underscore, 
-               :source_id => self.record,
-               :association => self.field},
+    #TODO - link_to :remote => true,  has not been tested     
+    link_to(
+      t(:add_more, :scope => [:content], :class => @target_class.plural_name),
+      {
+        :controller => "skyline/content/editors/editable_list", 
+        :action => "new", 
+        :source_type => self.record.class.to_s.demodulize.underscore, 
+        :source_id => self.record,
+        :association => self.field
+      },
+      :remote => true,
 			:loading => "Application.toggleSpin('#{js_object_name}_add','#{t(:loading, :scope => [:global])}')",
-			:complete => "Application.toggleSpin('#{js_object_name}_add')" 
-    }, :class => "add")
+			:complete => "Application.toggleSpin('#{js_object_name}_add')", 
+      :class => "add")
   end
   
   

data/app/helpers/skyline/editors/editor.rb

@@ -49,9 +49,9 @@ module Skyline::Editors
     def output
       out = heading
       if self.respond_to? :output_without_errors
-        out << field_with_errors([field_prefix,output_without_errors,field_suffix].join)
+        out << field_with_errors([field_prefix, output_without_errors, field_suffix].join.html_safe)
       end
-      content_tag("div",out, :id  => "field_#{input_id(field_names)}", :class => "editor #{"invalid" if record.errors.on(field.attribute_name)}")
+      content_tag("div",out.html_safe, :id  => "field_#{input_id(field_names)}", :class => "editor #{"invalid" if record.errors.on(field.attribute_name)}")
     end
   
     def errors
@@ -64,14 +64,14 @@ module Skyline::Editors
     end
   
     def heading
-      out = content_tag("h3",content_tag("label",field.singular_title + " " + errors.to_s, :for => input_id(attribute_names)))
-      out << content_tag("p",field.description,:class => "description") unless field.description.blank?
+      out = content_tag("h3",content_tag("label",(field.singular_title + " " + errors.to_s).html_safe, :for => input_id(attribute_names)))
+      out << content_tag("p",field.description.html_safe ,:class => "description") unless field.description.blank?
       out
     end
   
     def field_with_errors(content)
       if self.record.errors.on(self.field.attribute_name) 
-        content_tag("div", content, :class => "fieldWithErrors")
+        content_tag("div", content.html_safe, :class => "fieldWithErrors")
       else
         content
       end
@@ -79,25 +79,25 @@ module Skyline::Editors
   
     def field_prefix
       value = field_text(field.prefix)
-      @template.content_tag("span",value, :class => "prefix") if value.any?
+      @template.content_tag("span",value.html_safe, :class => "prefix") if value.present?
     end
   
     def field_suffix
       value = field_text(field.suffix)    
-      @template.content_tag("span",value, :class => "suffix") if value.any?
+      @template.content_tag("span",value.html_safe, :class => "suffix") if value.present?
     end
   
     def field_text(att)
       case att
-        when Proc : perform_proc(att)
+        when Proc then perform_proc(att)
         else att.to_s
       end
     end
   
     def perform_proc(proc)
       case proc.arity
-        when 1 : proc.call(record)
-        when -1,0 : proc.call()
+        when 1 then proc.call(record)
+        when -1,0 then proc.call()
         else
           []
       end