skylinecms 3.1.0 → 3.2.0

data/app/views/skyline/users/_edit.html.erb

@@ -1,3 +1,3 @@
-<% form_remote_for :user, @user, :url => skyline_user_path(@user), :html => {:method => :put} do |f|%>
+<%= skyline_form_for @user, :as => :user, :url => skyline_user_path(@user), :remote => true, :method => :put do |f|%>
   <%=  render :partial =>  "form", :locals => {:f => f, :password_attribute => :force_password, :password_confirmation_attribute => :force_password_confirmation}  %>
 <% end %>

data/app/views/skyline/users/_form.html.erb

@@ -49,7 +49,7 @@
           </td>
         </tr>
       <% else %>
-        <% f.fields_for "grants_attributes", (@user.grants.first || @user.grants.build), :index => 1 do |gf| %>
+        <%= f.fields_for "grants_attributes", (@user.grants.first || @user.grants.build), :index => 1 do |gf| %>
           <tr>
             <th>
               <%= gf.hidden_field :id unless gf.object.new_record? %>

data/app/views/skyline/users/_new.html.erb

@@ -1,3 +1,3 @@
-<% form_remote_for :user, @user, :url => skyline_users_path(), :html => {:method => :post} do |f|%>
+<%= skyline_form_for :user, @user, :url => skyline_users_path(), :remote => true, :method => :post do |f|%>
   <%=  render :partial =>  "form", :locals => {:f => f, :password_attribute => :password, :password_confirmation_attribute => :password_confirmation}  %>
 <% end %>

data/app/views/skyline/users/create.js.erb

@@ -0,0 +1,2 @@
+Skyline.Dialog.current.setContent('<%= escape_javascript(render :partial => "new") %>'); 
+Skyline.Dialog.current.setup();

data/app/views/skyline/users/edit.js.erb

@@ -0,0 +1 @@
+<%= dialog(t(:dialog_title, :display_name => @user.display_name, :scope => [:user,:edit]), :partial => "edit", :width => 700) %>

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

@@ -12,8 +12,14 @@
 <dl id="contentPanel" class="panel">
   <dt id="contentHeaderPanel">
     <span class="content">
-      <% if @current_user.allow?(:user_create) %>
-        <%= link_to_remote button_text(:add), {:url => new_skyline_user_path, :method => :get}, :class => "button small right", :style => "margin-top: 3px; visibility:visible;" %>
+      <% if current_user.allow?(:user_create) %>
+        <%= link_to(
+              button_text(:add),
+              new_skyline_user_path, 
+              :remote => true,
+              :method => :get, 
+              :class => "button small right", 
+              :style => "margin-top: 3px; visibility:visible;") %>
       <% end %>
       
       <%= t(:header, :scope => [:user, :index], :count => @users.total_entries) %>
@@ -39,11 +45,17 @@
                 <td><%= u.roles.map{|s| t(s.name, :scope => [:user,:roles], :default => s.name) }.to_sentence %></td>
                 <td><%= u.created_at.present? ? l(u.created_at, :format => :long) : "" %></td> 
                 <td class="right">
-                  <% if @current_user.allow?(:user_update) %>
+                  <% if current_user.allow?(:user_update) %>
                     <%= link_to button_text(:edit), edit_skyline_user_path(u), :class => "button small edit" %>
                   <% end %>
-                  <% if @current_user.allow?(:user_delete) %>
-                    <%= link_to_remote button_text(:delete), {:url => skyline_user_path(u,:page => params[:page]), :method => :delete, :confirm => t(:confirm_destroy, :scope => [:user,:index], :display_name => u.display_name)}, :class => "button #{@current_user == u ? "disabled" : "red"} small" %>
+                  <% if current_user.allow?(:user_delete) %>
+                    <%= link_to(
+                          button_text(:delete), 
+                          skyline_user_path(u,:page => params[:page]), 
+                          :remote => true,
+                          :method => :delete, 
+                          :confirm => t(:confirm_destroy, :scope => [:user,:index], :display_name => u.display_name), 
+                          :class => "button #{@current_user == u ? "disabled" : "red"} small") %>
                   <% end %>
                   
                 </td>
@@ -60,11 +72,14 @@
             });
             
             t.addEvent("selectRow",function(row,event){
+              if($(event.target).match("a:not(.edit),button,input[type=submit]") || $(event.target).getParent("a:not(.edit),button,input[type=submit]")){
+                return;
+              }
               event.stop();
               row.addClass("selected");
               var l = row.getElement("a.edit");
               if(l){
-                (new Request()).get(l.getProperty("href"));
+                (new Request({url : l.getProperty("href")})).get();
               }
             });
 

data/app/views/skyline/users/new.js.erb

@@ -0,0 +1 @@
+<%= dialog(t(:dialog_title, :display_name => @user.display_name, :scope => [:user,:new]), :partial => "new", :width => 700) %>

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

@@ -0,0 +1,2 @@
+Skyline.Dialog.current.setContent('<%= escape_javascript(render :partial => "edit") %>'); 
+Skyline.Dialog.current.setup();

data/config/initializers/dependencies.rb

@@ -7,20 +7,4 @@ require 'andand/andand'
 require 'weppos/url_validation'
 require 'digitpaint/unique_identifiers'
 require 'digitpaint/configure'
-require 'digitpaint/personify/personify'
-require 'digitpaint/nested_attributes_positioning'
-require 'mootools-on-rails/lib/mootools_on_rails'
-
-
-require "polyglot"
-require "sprockets"
-require "mime/types"
-require "RMagick"
-require "hpricot"
-require "guid"
-require "will_paginate"
-require "seed-fu"
-
-# If you are upgrading skyline from pre 3.0.8, it's easier to enable the
-# deprecation layer.
-# require 'skyline/deprecated/version3_0_8'
+require 'digitpaint/nested_attributes_positioning'

data/config/initializers/gem_dependencies.rb

@@ -0,0 +1,10 @@
+require 'personify'
+require "polyglot"
+require "sprockets"
+require "mime/types"
+require "RMagick"
+require "hpricot"
+require "guid"
+require "will_paginate"
+require "seed-fu"
+require 'mail'

data/config/initializers/locales.rb

@@ -4,7 +4,14 @@ skyline_locales = Dir[Skyline.root + "config/locales/*.{yml,rb}"]
 
 # We'll be inserting our locales before the default config/locales directive
 idx = I18n.load_path.index(I18n.load_path.grep(/#{Rails.root}\/config\/locales.+/).first)
-I18n.load_path.insert(idx,*skyline_locales)
+
+if idx
+  I18n.load_path.insert(idx,*skyline_locales)
+else
+  skyline_locales.each do |locale|
+    I18n.load_path << locale
+  end
+end
 
 # And we set a default (this can be overridden in an intializer)
 I18n.locale = "en-US"

data/config/initializers/middlewares.rb

@@ -1,9 +1,13 @@
 # The parameter needs to be a proc because we want it to evaluate on instantiation.
-ActionController::Dispatcher.middleware.use Skyline::FlashSessionCookieMiddleware, Proc.new{ ActionController::Base.session_options[:session_key] || ActionController::Base.session_options[:key] }
+Rails.application.config.middleware.insert_before(
+  ActionDispatch::Session::CookieStore,
+  Skyline::FlashSessionCookieMiddleware, 
+  Proc.new{ Rails.application.config.session_options[:key] }
+)
 
 # Only needed for development, the files will be cached in Production.
 # --
-ActionController::Dispatcher.middleware.use(Skyline::SprocketsMiddleware, Rails.public_path, "skyline/javascripts/src", :cache => (Rails.env == "production") ) do |env|
+Rails.application.config.middleware.use(Skyline::SprocketsMiddleware, Rails.public_path, "skyline/javascripts/src", :cache => (Rails.env == "production") ) do |env|
   env.register_load_location("skyline/src")
   env.register_load_location("skyline/vendor/*")
   env.register_load_location("skyline.editor/src")  
@@ -16,5 +20,5 @@ ActionController::Dispatcher.middleware.use(Skyline::SprocketsMiddleware, Rails.
 end
 
 if !Rails.configuration.cache_classes && Rails.configuration.reload_plugins
-  ActionController::Dispatcher.middleware.use(Skyline::PluginsLoaderMiddleware)
+  Rails.application.config.middleware.use(Skyline::PluginsLoaderMiddleware)
 end

data/config/initializers/observers.rb

@@ -1,4 +1,6 @@
-ActiveRecord::Base.observers = [
-  "Skyline::FileCacheSweeper", 
-  "Skyline::ArticleVersionObserver"
-]
+unless ( File.basename($0) == "rake" && ARGV.include?("skyline:db:migrate") )
+  ActiveRecord::Base.observers = [
+    "Skyline::FileCacheSweeper", 
+    "Skyline::ArticleVersionObserver"
+  ]
+end

data/config/locales/en-US.yml

@@ -10,7 +10,10 @@
     abbr_day_names: [su, mo, tu, we, th, fr, sa]
     month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
     abbr_month_names: [~, jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec]
-    order: [:day, :month, :year]
+    order: 
+      - :day
+      - :month
+      - :year
     days: 
       sunday: sunday
       monday: monday
@@ -192,7 +195,7 @@
       # custom blank validation message for login attribute of User model.
       #models:
         
-      # Translate model names. Used in Model.human_name().
+      # Translate model names. Used in Model.model_name.human().
       #models:
         # For example,
         #   user: "Dude"
@@ -402,37 +405,7 @@
       flashes:
         success: "User details where changed successfully."
         error: "The user details could not be saved, please check your input and try again."
-  media_dir:
-    directories: "Folders"
-    new: "New"
-    destroy:
-      message: "Are you sure you want to delete this folder?"
-  media_file:
-    update:
-      flashes: 
-        success: "File succesfully saved."
-        failed: "File could not be saved, please check your input and try again."
-    index:
-      files_in: "Files in %{directory}"
-    new:
-      header: "Upload files in"
-      no_files: "No files selected"
-      cancel: "cancel"
-      upload: "upload"
-      files: "files"
-      add_files: "add file(s)"
-      file_progress:  "Uploading file <span class=\"current-file\">1</span> of <span class=\"total-files\">2</span>"
-      percentage_progress: "<span class=\"current-percentage\">20%</span> done (<span class=\"current-size\">20 kB</span> of <span class=\"total-size\">100 kB</span>)"      
-      all_uploaded_message: "The following files where uploaded:"   
-      some_uploaded_message: "Not all files could be uploaded:"  
-    edit:
-      preview: "Preview"
-      download: "Download"
-      size: "Size (wxh)"
-      type: "Type"
-      filesize: "Filesize"
-      available_tags: "Available tags:"
-      meta_data: "Details"
+
   variant_current_editor:
     takeover:
       dialog_title: "Editing has been taken over"
@@ -611,6 +584,7 @@
   browser:
     tabs:
       "Skyline::Page" : "Pages"
+      "Skyline::Linkable" : "Content"
       "Skyline::MediaFile" : "Media library"
       "Skyline::ReferableUri" : "External"
     external_link:
@@ -749,6 +723,14 @@
       edit:
         actions: "Actions"
         edit: "Edit"
+      update:
+        flashes:
+          success: "Successfully changed folder"
+          failed: "Could not change folder, please try again"
+      destroy:
+        message: "Are you sure you want to delete this folder?"
+        flashes:
+          success: "Successfully removed directory"
     files:
       new:
         files: "files"
@@ -762,14 +744,42 @@
         actions: "Actions"
         preview: "Preview"
         download: "Download"
-        size: "Size (wxh)"
+        size: "Size (WxH)"
         type: "Type"
         filesize: "Filesize"
         available_tags: "Existing tags:"
         metadata: "Details"
         destroy: "Delete"
         confirm_destroy: "Are your sure you want to delete %{name}?"
+      update:
+        flashes:
+          success: "Successfully changed file."
+          failed: "Could not change file, please try again"
+      destroy:
+        flashes:
+          success: "Successfully removed file"
   
+  tags:
+    index:
+      available_tags: "Available tags:"
+  
+  will_paginate:
+    previous_label: "&#8592; Previous"
+    next_label: "Next &#8594;"
+    page_gap: "&hellip;"
+
+    page_entries_info:
+      single_page:
+        zero:  "No %{model} found"
+        one:   "Displaying 1 %{model}"
+        other: "Displaying all %{count} %{model}"
+      single_page_html:
+        zero:  "No %{model} found"
+        one:   "Displaying <b>1</b> %{model}"
+        other: "Displaying <b>all&nbsp;%{count}</b> %{model}"
+
+      multi_page: "Displaying %{model} %{from} - %{to} of %{count} in total"
+      multi_page_html: "Displaying %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{count}</b> in total"  
           
   tinymce:
     skyline_table: {

data/config/locales/nl-NL.yml

@@ -10,7 +10,10 @@
     abbr_day_names: [zo, ma, di, wo, do, vr, za]
     month_names: [~, januari, februari, maart, april, mei, juni, juli, augustus, september, oktober, november, december]
     abbr_month_names: [~, jan, feb, mrt, apr, mei, jun, jul, aug, sep, okt, nov, dec]
-    order: [:day, :month, :year]
+    order: 
+      - :day
+      - :month
+      - :year
     days: 
       sunday: zondag
       monday: maandag
@@ -192,7 +195,7 @@
       # custom blank validation message for login attribute of User model.
       #models:
         
-      # Translate model names. Used in Model.human_name().
+      # Translate model names. Used in Model.model_name.human().
       #models:
         # For example,
         #   user: "Dude"
@@ -402,37 +405,7 @@
       flashes:
         success: "Gegevens van gebruiker successvol gewijzigd."
         error: "De gegevens van de gebruiker konden niet worden opgeslagen, controleer uw invoer en probeer het opnieuw."
-  media_dir:
-    directories: "Mappen"
-    new: "Toevoegen"
-    destroy:
-      message: "Weet u zeker dat u deze folder wilt verwijderen?"
-  media_file:
-    update:
-      flashes: 
-        success: "Bestand succesvol opgeslagen."
-        failed: "Bestand kon niet worden opgeslagen, controleer uw invoer en probeer het opnieuw."
-    index:
-      files_in: "Bestanden in %{directory}"
-    new:
-      header: "Bestanden uploaden in"
-      no_files: "Nog geen bestanden gekozen"
-      cancel: "annuleren"
-      upload: "uploaden"
-      files: "bestanden"
-      add_files: "bestand(en) toevoegen"
-      file_progress:  "Bezig met uploaden bestand <span class=\"current-file\">1</span> van <span class=\"total-files\">2</span>"
-      percentage_progress: "<span class=\"current-percentage\">20%</span> gereed (<span class=\"current-size\">20 kB</span> van in totaal <span class=\"total-size\">100 kB</span>)"      
-      all_uploaded_message: "De volgende bestanden zijn geupload:"   
-      some_uploaded_message: "Niet alle bestanden konden worden geupload:"  
-    edit:
-      preview: "Preview"
-      download: "Download"
-      size: "Afmeting (bxh)"
-      type: "Type"
-      filesize: "Bestandsgrootte"
-      available_tags: "Beschikbare tags:"
-      meta_data: "Gegevens"
+
   variant_current_editor:
     takeover:
       dialog_title: "Bewerken overgenomen"
@@ -611,6 +584,7 @@
   browser:
     tabs:
       "Skyline::Page" : "Pagina's"
+      "Skyline::Linkable" : "Content"      
       "Skyline::MediaFile" : "Media library"
       "Skyline::ReferableUri" : "Extern"
     external_link:
@@ -748,6 +722,15 @@
       edit:
         actions: "Actions"
         edit: "Edit"
+      update:
+        flashes:
+          success: "Map succesvol gewijzigd"
+          failed: "Map kon niet gewijzigd worden, probeer het opnieuw"
+      destroy:
+        message: "Weet u zeker dat u deze folder wilt verwijderen?"
+        flashes:
+          success: "Map succesvol verwijderd"
+
     files:
       new:
         files: "bestanden"
@@ -768,6 +751,35 @@
         metadata: "Gegevens"
         destroy: "Verwijderen"
         confirm_destroy: "Weet u zeker dat u %{name} wilt verwijderen?"
+      update:
+        flashes:
+          success: "Bestand gewijzigd"
+          failed: "Bestand kon niet gewijzigd worden, proveer het opnieuw"
+      destroy:
+        flashes:
+          success: "Bestand succesvol verwijderd"        
+    
+  tags:
+    index:
+      available_tags: "Beschikbare tags:"
+       
+  will_paginate:
+    previous_label: "&#8592; Vorige"
+    next_label: "Volgende &#8594;"
+    page_gap: "&hellip;"
+
+    page_entries_info:
+      single_page:
+        zero:  "Geen %{model} gevonden"
+        one:   "1 %{model}"
+        other: "alle %{count} %{model}"
+      single_page_html:
+        zero:  "Geen %{model} gevonden"
+        one:   "<b>1</b> %{model}"
+        other: "<b>all&nbsp;%{count}</b> %{model}"
+
+      multi_page: "%{model} %{from} - %{to} van %{count}"
+      multi_page_html: "%{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> van <b>%{count}</b>"        
            
   tinymce:
     skyline_table: {

data/config/routes.rb

@@ -1,93 +1,84 @@
-ActionController::Routing::Routes.draw do |map|
- 
-  # =================
-  # = Skyline url's =
-  # =================
-  map.namespace :skyline, :path_prefix => ("/#{Skyline::Configuration.url_prefix}" || "/skyline")  do |skyline|
-     
-    skyline.root :controller => "articles", :action => "index", :type => "skyline/page"
-     
-    skyline.resources :articles, :collection => {:reorder => :put} do |page|
-      page.resources :article_versions
-      page.resources :variants, :member => {:force_edit => :put}
-      page.resources :publications, :member => {:rollback => :post}
-      page.resource :published_publication
+Rails.application.routes.draw do
+  namespace :skyline, :path => ("#{Skyline::Configuration.url_prefix}" || "skyline") do
+    root Skyline::Configuration.default_route
+    
+    resources :articles do
+      collection do
+        put :reorder
+      end
+      resources :article_versions
+      resources :variants do
+        member do
+          put :force_edit
+        end
+      end
+      resources :publications do
+        member do
+          post :rollback
+        end
+      end
+      resource :published_publication
     end
-     
-    # These are currently just used for polling
-    skyline.resources :variants do |variant|
-      variant.map "current_editor", :controller => "variant_current_editor", :action => "poll"
+    
+    resources :variants do
+      match "current_editor" => "variant_current_editor#poll"
     end
- 
-    skyline.resource :authentication
-    skyline.resources :users
-    skyline.resources :user_preferences
     
-     
-    skyline.resources :sections
-    skyline.resources :content_sections
-    skyline.resources :content_items
-    skyline.resources :link_section_links
-    skyline.resources :redirects, :only => [:new]
-     
-    skyline.resources :locales, :only => [:show]
- 
-    skyline.namespace :media do |media|
-      media.resources :dirs do |dirs|
+    resource :authentication
+    resources :users
+    resources :user_preferences
+    
+    resources :sections
+    resources :content_sections
+    resources :content_items
+    resources :link_section_links
+    resources :redirects, :only => [:new]    
+    
+    resources :locales, :only => [:show]
+    
+    namespace :media do
+      resources :dirs do
         # Alert! Routes hard coded in app/views/skyline/media_files/_index.html.erb        
-        dirs.resources :files
-         
-        dirs.connect 'data/:size/:name.:format',
-            :controller => 'data',
-            :action => 'show',
-            :conditions => { :method => :get }
-        dirs.connect 'data/:name.:format',
-            :controller => 'data',
-            :action => 'show',
-            :conditions => { :method => :get }        
-      end
+        resources :files      
+        
+        match 'data/:size/:name', :to => "data#show", :via => :get, :name => /[^\/]+/, :as => :data_with_size
+        match 'data/:name', :to => "data#show", :via => :get, :name => /[^\/]+/, :as => :data
+      end      
     end   
-     
-    skyline.namespace :browser do |browser|
-      browser.resources :images
-      browser.resources :links
-      browser.resources :pages
-      browser.resources :files
-      browser.namespace :tabs do |tabs|
-        tabs.namespace :media_library do |media_library|
-          media_library.resources :media_dirs do |media_dir|
-            media_dir.resources :media_files
+  
+    namespace :browser do
+      resources :images
+      resources :links
+      resources :pages
+      resources :files
+      namespace :tabs do
+        namespace :media_library do
+          resources :media_dirs do
+            resources :media_files
           end
         end
+        resources :linkables        
       end         
     end
      
-    skyline.namespace :content do |content|
-      content.namespace :editors do |editors|
-        editors.connect 'editable_list/:action/:id', :controller => "editable_list"
-        editors.connect 'joinable_list/:action/:id', :controller => "joinable_list"
+    namespace :content do
+      namespace :editors do
+        match 'editable_list/(:action(/:id))', :to => "editable_list"
+        match 'joinable_list/(:action(/:id))', :to => "joinable_list"
       end
     end
-    skyline.connect 'content/:action/*types', :controller => "content"
-     
-    skyline.resources :settings, :except => [:create, :destroy]
+    
+    match 'content/(:action/(*types))', :to => "content"
      
+    resources :settings, :except => [:create, :destroy]    
   end
- 
+  
   # ========================
   # = Implementation url's =
   # ========================
   #Media files data route
-   
-  map.connect 'media/dirs/:media_dir_id/data/:size/:name.:format',
-      :controller => 'skyline/site/media_files_data',
-      :action => 'show',
-      :conditions => { :method => :get }
-  map.connect 'media/dirs/:media_dir_id/data/:name.:format',
-      :controller => 'skyline/site/media_files_data',
-      :action => 'show',
-      :conditions => { :method => :get }
-             
-  # Default pages renderer.
-  # map.connect '*url', :controller => "skyline/site/pages", :action => "show"
+     
+  match 'media/dirs/:dir_id/data/:size/:name', :to => "skyline/site/media_files_data#show", :via => :get, :name => /[^\/]+/
+  match 'media/dirs/:dir_id/data/:name', :to => "skyline/site/media_files_data#show", :via => :get, :name => /[^\/]+/
+     
 end