skylinecms 3.1.0 → 3.2.0

data/app/models/skyline/user.rb

@@ -1,12 +1,12 @@
 class Skyline::User < ActiveRecord::Base
+  include Skyline::Authentication::User
+  
   set_table_name :skyline_users
   has_many :grants, :class_name => "Skyline::Grant", :dependent => :delete_all
   has_many :roles, :class_name => "Skyline::Role", :through => :grants
   has_many :rights, :class_name => "Skyline::Right", 
-    :finder_sql => 'SELECT DISTINCT r.* FROM skyline_rights AS r, skyline_grants AS g JOIN skyline_rights_skyline_roles AS rr ON rr.role_id = g.role_id WHERE g.user_id = #{id} AND r.id = rr.right_id'
+    :finder_sql => proc{ "SELECT DISTINCT r.* FROM skyline_rights AS r, skyline_grants AS g JOIN skyline_rights_skyline_roles AS rr ON rr.role_id = g.role_id WHERE g.user_id = #{id} AND r.id = rr.right_id" }
   
-  has_many :user_preferences, :class_name => "Skyline::UserPreference"  
-    
   # This must be set to change the password (by the user himself)
   attr_accessor :current_password
   
@@ -19,7 +19,7 @@ class Skyline::User < ActiveRecord::Base
     
   
   # Validations
-  validate_on_update :valid_current_password, :if => :editing_myself
+  validate :valid_current_password, :if => :editing_myself, :on => :update
 
   validates_presence_of :password, :if => :password_changed?
   validates_presence_of :password_confirmation, :message => :confirmation, :if => :password_changed?, :on => :update
@@ -33,7 +33,7 @@ class Skyline::User < ActiveRecord::Base
 
   validate :grants_didnt_change, :if => :editing_myself
 
-  before_validation_on_update :reset_password_on_empty_current_password
+  before_validation :reset_password_on_empty_current_password, :on => :update
   before_save :set_forced_password,:encrypt_password
   
   default_scope :order => "email ASC"
@@ -53,16 +53,20 @@ class Skyline::User < ActiveRecord::Base
       user && user || false
     end
     
+    def find_by_identification(identification)
+      self.find_by_id(identification)
+    end
+    
     def encrypt(pw)
       Digest::SHA1.hexdigest(pw)
     end
     
     def extract_valid_email_address(email)
-      if email.kind_of? TMail::Address
+      if email.kind_of? Mail::Address
         return email.address
       else
         begin
-          address = TMail::Address.parse(email.to_s)
+          address = Mail::Address.new(email.to_s)
         rescue
           return false
         end
@@ -78,6 +82,10 @@ class Skyline::User < ActiveRecord::Base
     
   end
   
+  def identification
+    self.id
+  end
+
   # Check if a user has a specific right
   #
   # ==== Parameters
@@ -161,6 +169,8 @@ class Skyline::User < ActiveRecord::Base
     end
   end
   
+
+  
   protected
   
   def set_forced_password

data/app/models/skyline/user_preference.rb

@@ -1,7 +1,7 @@
 class Skyline::UserPreference < ActiveRecord::Base
   set_table_name :skyline_user_preferences
   
-  belongs_to :user, :class_name => "Skyline::User"
+  belongs_to :user, :class_name => "::#{Skyline::Configuration.user_class.name}"
   
   class << self
     def set(key, value)

data/app/models/skyline/variant.rb

@@ -1,7 +1,7 @@
 class Skyline::Variant < Skyline::ArticleVersion
   include NestedAttributesPositioning
   
-  belongs_to :current_editor, :class_name => "Skyline::User"
+  belongs_to :current_editor, :class_name => "::#{Skyline::Configuration.user_class.name}"
   
   validate :validate_version_match
   
@@ -107,7 +107,7 @@ class Skyline::Variant < Skyline::ArticleVersion
   # ==== Returns
   # true,false:: true if the user is allowed to edit.
   def editable_by?(user)
-    user_id = user.kind_of?(Skyline::User) ? user.id : user
+    user_id = user.kind_of?(Skyline::Configuration.user_class) ? user.id : user
     return true unless Skyline::Configuration.enable_enforce_only_one_user_editing
     self.current_editor_id.nil? || self.current_editor_timestamp.nil? || self.current_editor_id == user_id || self.class.editor_idle_time < (Time.zone.now - self.current_editor_timestamp)
   end
@@ -122,13 +122,17 @@ class Skyline::Variant < Skyline::ArticleVersion
   def edit_by!(user, options = {})
     options.reverse_merge! :force => false
     options[:new_editor] = true
-    user_id = user.kind_of?(Skyline::User) ? user.id : user
+    user_id = user.kind_of?(Skyline::Configuration.user_class) ? user.id : user
     self.class.update_current_editor(self.id, user_id, options)
   end
   
   def destroyable?
     if self.article.andand.published_publication
+      # This variant should not be the published variant
       self.article.published_publication.variant != self
+    elsif self.article && self.article.variants.size == 1
+      # If this is the only variant we should check if the article can be destroyed
+      self.article.destroyable?
     else
       # also yield true if self.article doesn't exist (this happens when the article is already destroyed)
       true
@@ -136,8 +140,10 @@ class Skyline::Variant < Skyline::ArticleVersion
   end
   
   def destroy_with_removing_page
-    self.destroy_without_removing_page
-    self.article.destroy if self.article.variants(true).empty?
+    Skyline::Article.transaction do
+      self.destroy_without_removing_page
+      self.article.destroy if self.article.variants(true).empty?
+    end
   end
   alias_method_chain :destroy, :removing_page
 

data/app/templates/skyline/page/default/index.html.erb

@@ -7,7 +7,7 @@
 	<title><%= article_version.data.title %></title>
 
   <% if redirect_section = article_version.sections.detect{|section| section.sectionable.kind_of?(Skyline::Sections::RedirectSection)} %>
-    <%= tag ("meta", "http-equiv" => "refresh", "content" => "#{redirect_section.sectionable.delay};url=#{redirect_section.sectionable.url(request)}")%>
+    <%= tag("meta", {"http-equiv" => "refresh", "content" => "#{redirect_section.sectionable.delay};url=#{redirect_section.sectionable.url(request)}"}) %>
   <% end %>
 </head>
 

data/app/templates/skyline/sections/raw_section/default/index.html.erb

@@ -1 +1 @@
-<%= raw_section.body %>
+<%= raw_section.body.html_safe %>

data/app/templates/skyline/sections/wysiwyg_section/default/index.html.erb

@@ -1,3 +1,3 @@
 <div class="text">
-  <%=wysiwyg_section.body%>
+  <%= wysiwyg_section.body.html_safe %>
 </div>

data/app/views/skyline/articles/_currently_editing.html.erb

@@ -1,4 +1,4 @@
-<% form_remote_tag :url => force_edit_skyline_article_variant_path(@article, @variant), :method => :put do %>
+<%= form_tag force_edit_skyline_article_variant_path(@article, @variant), :method => :put, :remote => true do %>
   <% if current_user.allow?(:variant_force_edit) %>
     <span class="button">
       <%= t(:force_editing, :scope => [@article.class, :edit]) %>

data/app/views/skyline/articles/_meta.html.erb

@@ -4,10 +4,10 @@
   <dt><a href="#"><span><%= t(:general, :scope => [:article, :headers]) %></span></a></dt>
   <dd>
     <dl class="details">
-      <% if Skyline::Configuration.enable_multiple_variants && @article.enable_multiple_variants? %>
+      <% if Skyline::Configuration.enable_multiple_variants && @article.can_have_multiple_variants? %>
         <dt><%= t(:current_variant, :scope => [:article, :edit]) %></dt>
         <dd>
-          <% form_tag edit_skyline_article_path(@article), {:method => :get, :id => "change_variant_form"} do %>
+          <%= form_tag edit_skyline_article_path(@article), {:method => :get, :id => "change_variant_form"} do %>
             <%= select_tag "variant_id", 
                   options_for_select(
                       @article.variants.map{|v| ["#{v.name}#{" (#{t(:published, :scope => [:article, :edit])})" if v.published_variant?}",v.id] }, 
@@ -21,19 +21,25 @@
       <dt><%= t(:created_at, :scope => [:article, :edit]) %></dt>
       <dd>
         <%= l(@variant.created_at, :format => :short) %>
-        <%= "<br/>#{@variant.creator.display_name}" if @variant.creator %>
+        <% if @variant.creator %>
+          <br/>
+          <%= @variant.creator.display_name %>
+        <% end %>
       </dd>
     
       <dt><%= t(:updated_at, :scope => [:article, :edit]) %></dt>
       <dd>
         <%= l(@variant.updated_at, :format => :short) %>
-        <%= "<br/>#{@variant.last_updated_by.display_name}" if @variant.last_updated_by %>              
+        <% if @variant.last_updated_by %>
+          <br/>
+          <%= @variant.last_updated_by.display_name %>              
+        <% end %>
       </dd>
     </dl>
   </dd>
 </dl>
 
-<% if @article.enable_publishing? %>
+<% if @article.class.publishable? %>
   <dl class="advanced">
     <dt><a href="#"><span><%= t(:publication, :scope => [:article, :headers]) %></span></a></dt>
     <dd>
@@ -44,10 +50,10 @@
           <table class="details">
             <tbody>
               <tr>
-                <th><%= @article.class.human_name %></th>
+                <th><%= @article.class.model_name.human %></th>
                 <td class="center"><%= tick_image(@article.published?) %></td>
               </tr>
-              <% if Skyline::Configuration.enable_multiple_variants && @article.enable_multiple_variants? %>
+              <% if Skyline::Configuration.enable_multiple_variants && @article.can_have_multiple_variants? %>
                 <% if @article.published? %>
                   <tr>
                     <th><%= t(:current_variant, :scope => [:article, :edit]) %></th>
@@ -77,15 +83,22 @@
           <dt><%= t(:last_published, :scope => [:article, :edit]) %></dt>
           <dd>
             <%= l(@article.publications.first.created_at, :format => :short) %>
-            <%= "<br/>#{@article.publications.first.last_updated_by.display_name}" if @article.publications.first.last_updated_by %>
+            <% if @article.publications.first.last_updated_by %>
+              <br/>
+              <%= @article.publications.first.last_updated_by.display_name  %>
+            <% end %>
           </dd>
           <% if @article.keep_history? %>
             <dt><%= t(:publication_history, :scope => [:article, :edit]) %></dt>
             <dd>
-              <%= t(:number_of_publications, :count => @article.publications.size, :scope => [@article.class, :edit]) %>
+              <%= t(:number_of_publications, :count => @article.publications.size, :scope => [@article.class, :edit]).html_safe %>
             </dd>
             <dd>
-              <%= link_to_remote t(:publication_history_link, :scope => [:article, :edit]), :url => skyline_article_publications_path(@article), :method => :get %>
+              <%= link_to( 
+                    t(:publication_history_link, :scope => [:article, :edit]), 
+                    skyline_article_publications_path(@article), 
+                    :method => :get, 
+                    :remote => true) %>
             </dd>
           <% end %>
         <% end %>                
@@ -125,7 +138,7 @@
       <% end %>
     </div>
     
-    <% if Skyline::Configuration.enable_multiple_variants && @article.enable_multiple_variants? %>
+    <% if Skyline::Configuration.enable_multiple_variants && @article.can_have_multiple_variants? %>
       <div class="button">
         <% if @variant.destroyable? && @variant.editable_by?(current_user) %>
           <%= submit_button_to :delete_variant, skyline_article_variant_path(@article, @variant), :method => :delete, :class => "small", :confirm => t(:confirm_delete_variant, :scope => [:article,:edit]) %>

data/app/views/skyline/articles/_security.html.erb

@@ -1,4 +1,4 @@
-<% if Skyline::Configuration.enable_locking && @article.enable_locking? %>
+<% if Skyline::Configuration.enable_locking && @article.lockable? %>
   <dl class="advanced" id="article_security">
     <dt><a href="#"><span><%= t(:security, :scope => [:article, :headers]) %></span></a></dt>
     <dd>
@@ -13,7 +13,7 @@
         </tbody>
       </table>
       <% if  @variant.editable_by?(current_user) && current_user.allow?(@article, :lock) %>
-        <% remote_form_for(:article, @article, :url => skyline_article_path(@article, :variant_id => @variant), :html => {:method => "put"}) do |f| %>
+        <%= skyline_form_for(:article, @article, :url => skyline_article_path(@article, :variant_id => @variant), :html => {:method => "put"}, :remote => true) do |f| %>
           <div class="button" style="margin-top: 5px">
     		    <% if @article.locked? %>
     		      <%= f.hidden_field :locked, :value => "0" %>

data/app/views/skyline/articles/_takeover_action.html.erb

@@ -1,4 +1,4 @@
-<% form_tag "#", :onsubmit => "Application.Poller.current.handleTakeOverAction(); return false", :id => "takeoverActionDialog" do %>
+<%= form_tag "#", :onsubmit => "Application.Poller.current.handleTakeOverAction(); return false", :id => "takeoverActionDialog" do %>
   <div class="topPanel">
     <div class="messages">
       <p class="message error"><%= t(:message, :user => current_editor.display_name, :scope => [:variant_current_editor, :takeover]) %></p>

data/app/views/skyline/articles/edit.html.erb

@@ -1,7 +1,7 @@
-<% form_for :article, @article, :url => skyline_article_path(@article), :html => {:method => :put, :id => "page_form"} do |a| %>
+<%= skyline_form_for @article, :as => :article, :url => skyline_article_path(@article), :html => {:method => :put, :id => "page_form"} do |a| %>
   <dl id="contentPanel" class="panel">    
-    <% a.fields_for :variants_attributes, @variant, :index => 1 do |v| %>
-      <% v.fields_for :data_attributes, v.object.data do |vd| %>
+    <%= a.fields_for :variants_attributes, @variant, :index => 1 do |v| %>
+      <%= v.fields_for :data_attributes, v.object.data do |vd| %>
         <dt id="contentHeaderPanel">    
           <%= hidden_field_tag :clone_variant, "0" %>
           <%= v.hidden_field :id %>
@@ -9,7 +9,7 @@
           <%= vd.hidden_field :id %>
           <%= vd.hidden_field :class, :value => a.object.data_class.name if vd.object.new_record? %>
           <span class="content">
-            <%= a.object.class.human_name %>: <%= vd.object.title %>
+            <%= a.object.class.model_name.human %>: <%= vd.object.title %>
           </span>
         </dt>
       
@@ -30,16 +30,30 @@
               <% end %>
               <%= content %>
               <div class="actions">
-                <% menu_button t(:add_section, :scope => [:article, :edit]), :id => "add_section_button" do %>
-                  <ul>
-                    <% Skyline::Rendering::Renderer.renderables(:sections, a.object.class).each do |section| %>                    
-                      <li>
-                        <%= link_to_remote(section.human_name, 
-                              :url => new_skyline_section_path(:sectionable_type => section.name, :object_name => v.object_name_with_index, :renderable_scope => @renderable_scope.serialize), 
-                              :method => :get, 
-                              :data => "(new Hash({'after_section' : $('contentlist').retrieve('application.sections').getCurrentActiveId()})).toQueryString()") %></li>
-                    <% end %>
-                  </ul>              
+                <% if Skyline::Rendering::Renderer.renderables(:sections, a.object.class).present? %>
+                  <%= menu_button t(:add_section, :scope => [:article, :edit]), :id => "add_section_button" do %>
+                    <ul>
+                      <% Skyline::Rendering::Renderer.renderables(:sections, a.object.class).each do |section| %>                    
+                        <li>
+                          <%= link_to(
+                                section.model_name.human, 
+                                new_skyline_section_path(:sectionable_type => section.name, :object_name => v.object_name_with_index, :renderable_scope => @renderable_scope.serialize)) %></li>
+                      <% end %>
+                    </ul>                           
+                  <% end %>
+                  <script type="text/javascript" charset="utf-8">
+                    (function(){
+                      var c = function(ev){
+                        ev.stop();
+                        var r = new Request.Rails(this);            
+                        r.send((new Hash({'after_section' : $('contentlist').retrieve('application.sections').getCurrentActiveId()})).toQueryString());
+                      }
+                      $("add_section_button").getElements("ul a").each(function(a){
+                        a.addEvent("click", c);                        
+                      });
+                    })();
+                  </script>
+
                 <% end %>
                 <div id="mceToolbarContainer" class="tinymce"></div>
               </div>
@@ -66,7 +80,7 @@
       
         <% if a.object.previewable? %>
           <dd id="contentPreviewPanel">
-            <iframe id="contentPreview" src="#" class="preview" frameborder="0" data-url="<%= skyline_article_article_version_url(@article, @variant) %>"></iframe>
+            <iframe id="contentPreview" src="javascript:''" class="preview" frameborder="0" data-url="<%= skyline_article_article_version_url(@article, @variant) %>"></iframe>
           </dd>
         <% end %>
       
@@ -111,7 +125,6 @@
 </dl>
 
 <script type="text/javascript" charset="utf-8">
-  
   <% if Skyline::Configuration.enable_enforce_only_one_user_editing %>
     new Application.Poller("/<%= Skyline::Configuration.url_prefix %>/variants/<%= @variant.id %>/current_editor");
   <% end %>

data/app/views/skyline/articles/edit_preview_only.html.erb

@@ -1,9 +1,9 @@
 <dl id="contentPanel" class="panel">    
   <dt id="contentHeaderPanel">    
-    <span class="content"><%= @article.class.human_name %>: <%= @variant.data.title %></span>
+    <span class="content"><%= @article.class.model_name.human %>: <%= @variant.data.title %></span>
   </dt>
   <dd id="contentPreviewPanel">
-    <iframe id="contentPreview" src="<%= @article.previewable? ? skyline_article_article_version_url(@article, @variant) : "" %>" <%= @article.previewable? ? "data-url-\"#{skyline_article_article_version_url(@article, @variant)}\"" : '' %>class="preview" frameborder="0"></iframe>
+    <iframe id="contentPreview" src="<%= @article.previewable? ? skyline_article_article_version_url(@article, @variant) : "javascript:''" %>" <%= @article.previewable? ? "data-url-\"#{skyline_article_article_version_url(@article, @variant)}\"" : '' %>class="preview" frameborder="0"></iframe>
   </dd>
 </dl>
 <dl id="metaPanel" class="panel">

data/app/views/skyline/articles/index.html.erb

@@ -1,7 +1,7 @@
 <dl id="contentPanel" class="panel">    
   <dt id="contentHeaderPanel">    
     <span class="content">
-      <%= controller.class_from_type.human_name(:count => 2) %>
+      <%= controller.class_from_type.model_name.human(:count => 2) %>
     </span>
   </dt>
      
@@ -21,7 +21,7 @@
           <%= render :partial => "list" %>          
         <% end %>
       <% else %>
-        <em><%= t(:blank, :scope => [:article, :index], :name => controller.class_from_type.human_name(:count => 2).downcase) %></em>
+        <em><%= t(:blank, :scope => [:article, :index], :name => controller.class_from_type.model_name.human(:count => 2).downcase) %></em>
       <% end %>
     </div>
   </dd>    

data/app/views/skyline/articles/page/_header.html.erb

@@ -19,7 +19,7 @@
         <% else %>
           <div class="fake-textfield" id="page_url_path">
             <span><%= a.object.path %></span>
-            <%= vd.text_field :url_part %>
+            <span><%= vd.text_field :url_part %></span>
           </div>
         <% end %>
       </td>

data/app/views/skyline/articles/page/_index.html.erb

@@ -1,16 +1,22 @@
 <dt id="leftPageHeaderPanel" class="<%= local_assigns[:active] ? "active" : "" %>">
   <span class="content">
     <% if @article.andand.kind_of?(Skyline::Page) %>
-      <% menu_button t(:add_page, :scope => [:article, :edit]), :id => "add_page_button" do %>
+      <%= menu_button t(:add_page, :scope => [:article, :edit]), :id => "add_page_button" do %>
         <ul>
           <% possible_positions = @article.root? ? %w{in} : %w{in below} %>
           <% possible_positions.each do |pos| %>
-            <li><%= link_to_remote(t("add_page_#{pos}", :scope => [@article.class, :edit]), :url => skyline_articles_path(:article_id => @article, :type => "skyline/page"), :method => :post, :data => "'position=#{pos}'") %></li>
+            <li><%= 
+              link_to(
+                t("add_page_#{pos}", :scope => [@article.class, :edit]), 
+                skyline_articles_path(:article_id => @article, :type => "skyline/page", :position => pos), 
+                :method => :post, 
+                :remote => true) 
+              %></li>
           <% end %>
         </ul>
       <% end %>
     <% end %>
-    <%= Skyline::Page.human_name(:count => 2) %>
+    <%= Skyline::Page.model_name.human(:count => 2) %>
   </span>
 </dt>
 <dd  id="leftPageContentPanel">

data/app/views/skyline/articles/page_fragment/_index.html.erb

@@ -1,8 +1,13 @@
 <% if current_user.allow?(Skyline::PageFragment, :index) %>
   <dt id="leftFragmentHeaderPanel" class="<%= local_assigns[:active] ? "active" : "" %>">
   	<span class="content" style="position: relative; overflow: hidden">
-  		<%= link_to_remote button_text(:plus), {:url => skyline_articles_path(:type => Skyline::PageFragment), :method => :post}, :class => "button small" %>
-  		<%= Skyline::PageFragment.human_name(:count => 2) %>
+  		<%= link_to(
+  		      button_text(:plus),
+  		      skyline_articles_path(:type => Skyline::PageFragment),
+  		      :remote => true,
+  		      :method => :post, 
+  		      :class => "button small") %>
+  		<%= Skyline::PageFragment.model_name.human(:count => 2) %>
   	</span>
   </dt>
   <dd  id="leftFragmentContentPanel" class="scrollable">

data/app/views/skyline/articles/update.js.erb

@@ -0,0 +1,20 @@
+<% if @saved %>
+  <% if @article.locked? %>
+    <%= notification :success, t(:locked, :scope => [@article.class, :update, :flashes]) %>;
+    <% if @article.kind_of?(Skyline::Page) %>
+      $$('#article_<%= @article.id %> span')[0].addClass('locked');
+    <% end %>
+  <% else %>
+    <%= notification :success, t(:unlocked, :scope => [@article.class, :update, :flashes]) %>;
+    <% if @article.kind_of?(Skyline::Page) %>
+      $$('#article_<%= @article.id %> span')[0].removeClass('locked');
+    <% end %>
+  <% end %>
+<% else %>
+  <% if @article.locked? %>
+    <%= message :error, t(:lock_failed, :scope => [@article.class, :update, :flashes]) %>;
+  <% else %>
+    <%= message :error, t(:unlock_failed, :scope => [@article.class, :update, :flashes]) %>;
+  <% end %>
+<% end %>
+$("article_security").replace('<%= escape_javascript(render :partial => "security") %>');