skylinecms 3.0.8 → 3.1.0

data/app/views/skyline/media/dirs/index.html.erb

@@ -0,0 +1,36 @@
+<% use_js_layout :media %>
+
+<dl id="leftPanel" class="panel">
+  <dt class="active">
+    <span class="content">
+      <%= link_to_remote button_text(:add), {
+            :url => skyline_media_dirs_path, 
+            :method => :post,
+            :data => "'parent_id=' + Application.getId($('dirtree').retrieve('skyline.tree').selectedNode.getParent('li').get('id'))"
+          },{
+            :class => "button small right"
+          }
+      %>
+
+      <%= t(:directories, :scope => [:media, :dirs, :index]) %>
+    </span>
+  </dt>
+  <dd class="last">
+    <div class="content scrollable">
+      <%= render :partial => "skyline/media/dirs/index" %>
+    </div>
+  </dd>
+</dl>
+
+<dl id="contentPanel">
+  <%= render :partial => "skyline/media/dirs/show" %>
+</dl>
+
+<div id="metaPanel" class="scrollable">
+  <% if @file %>
+    <%= render :partial => "skyline/media/files/edit" %>
+  <% end %>
+  <% if @dir %>
+    <%= render :partial => "skyline/media/dirs/edit" %>
+  <% end %>
+</div>

data/app/views/skyline/media/files/_edit.html.erb

@@ -0,0 +1,101 @@
+<dl class="panel">
+  <dt>
+    <span class="content">
+      <%= @file.name %>
+    </span>
+  </dt>
+  <% if @file.file_type == "image" %>
+    <dd>
+      <%= image_tag(url_for(
+            :action => :show, 
+            :controller => "media/data", 
+            :name => @file.name,
+            :size => '100x100'), 
+            :alt => @file.name) %>
+    </dd>
+  <% end %>
+  <dd>
+    <dl class="flow">
+      <% if @file.file_type == "image" && @file.dimension.present? %>
+        <dt><%= t(:size, :scope => [:media, :files, :edit])%>: </dt>
+        <dd><%= @file.dimension['width'] %>x<%= @file.dimension['height'] %></dd>
+      <%end%>
+      <dt><%= t(:type, :scope => [:media, :files, :edit] )%>: </dt>
+      <dd><%= @file.file_type %></dd>
+      <dt><%= t(:filesize, :scope => [:media, :files, :edit]) %>: </dt>
+      <dd><%= number_to_human_size(@file.size) %></dd>
+    </dl>    
+  </dd>
+  <dd class="last">
+    <div class="button">
+      <%= link_to t(:download, :scope => [:media, :files, :edit]), 
+            url_for(:action => :show, :controller => "media/data", :name => @file.name),
+            :target => "_blank",
+            :class => "button small" %>
+    </div>
+  </dd>
+</dl>
+<% remote_form_for @file, 
+      :url => skyline_media_dir_file_path(@dir, @file), 
+      :method => :put, 
+      :html => {:method=>:put} do |f|%>
+      
+  <dl class="panel">
+    <dt>
+      <span class="content">
+        <%= t(:metadata, :scope => [:media, :files, :edit]) %>
+      </span>
+    </dt>
+    <dd class="">
+      <dl class="line">
+        <dt><%= f.label :name, Skyline::MediaFile.human_attribute_name("name")%></dt>
+        <dd><%= f.text_field :name, :class => "full" %></dd>
+<!--
+        <dt><%= f.label :title, Skyline::MediaFile.human_attribute_name("title")%></dt>
+        <dd><%= f.text_field :title, :class => "full" %></dd>
+
+        <dt><%= f.label :description, Skyline::MediaFile.human_attribute_name("description")%></dt>
+        <dd><%= f.text_area :description, :cols=>20, :rows=>5%></dd>
+
+        <dt><%= f.label :date, Skyline::MediaFile.human_attribute_name("date")%></dt>
+        <dd><%= f.date_select :date, :use_month_numbers => true, :include_blank => true %></dd>
+-->
+      </dl>
+    </dd>
+      <!--    
+    <dd>
+      <dl class="tagselector line">
+        <dt><%= f.label :raw_tags, Skyline::MediaFile.human_attribute_name("file_tags")%></dt>
+        <dd><%= f.text_area :raw_tags, :rows => nil %></dd>
+        <dt class="tags"><%= t(:available_tags, :scope => [:media, :files, :edit])%></dt>
+        <dd class="tags">
+          <%= render :partial => "/skyline/tags/available_tags", :locals => {:tags => Skyline::MediaFile.available_tags}%>
+        </dd>
+      </dl>      
+    </dd>
+      -->    
+    <dd class="last submit">
+      <%= submit_button :save, :class => "small green"%>
+    </dd>
+  </dl>  
+<% end %>
+
+
+<dl class="panel">
+  <dt>
+    <span class="content">
+      <%= t(:actions, :scope => [:media, :files, :edit]) %>
+    </span>
+  </dt>
+  <dd class="last">
+    <div class="button">
+      <%=link_to_remote button_text(:delete), {
+          :url => skyline_media_dir_file_url(@dir,@file),
+          :method=> :delete,
+          :confirm => 'Weet u zeker dat u dit bestand wilt verwijderen?',
+          :href => url_for(:action => "destroy", :id => @file.id) },
+          { :class => "button small red" }
+      %>
+    </div>
+  </dd>
+</dl>

data/app/views/skyline/media/files/_index.html.erb

@@ -0,0 +1,68 @@
+<table class="listing files" id="filelist">
+  <thead>
+    <tr>
+      <th><%= Skyline::MediaFile.human_attribute_name("name") %></th>
+      <th><%= Skyline::MediaFile.human_attribute_name("type") %></th>
+      <th><%= Skyline::MediaFile.human_attribute_name("size") %></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @dir.files.each do |file| %>
+      <tr class="<%= cycle("odd","even") %> <%= "selected" if file == @file %>" id="file_<%= file.id %>" data-url="<%= skyline_media_dir_file_path(@dir,file) %>">
+        <th>
+          <div class="file <%= file.file_type %>">
+            <%= link_to file.name, edit_skyline_media_dir_file_path(@dir, file), :id => "filelink_#{file.id}" %>
+          </div>
+        </th>
+        <td>
+          <%= file.file_type %>
+        </td>
+        <td>
+          <%= number_to_human_size file.size %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<script type="text/javascript" charset="utf-8">
+  (function(){
+    var f = $('filelist');
+    var t = new Skyline.Table(f, {draggable: true, droppables: ".dir"});
+    t.addEvent("selectRow",function(row,event){
+      event.stop();
+      row.addClass("selected");
+      var l = row.getElement("a");
+      (new Request()).get(l.getProperty("href"));
+    });
+          
+    t.addEvent("deselectRow",function(row){
+      row.removeClass("selected");
+    });
+    
+    t.addEvent("dropRow", function(row, target){
+      var id = Application.getId(target.getProperty("id"));
+      target.removeClass("drop");            
+      (new Request()).put(row.getProperty("data-url"), {"skyline_media_file" : {"parent_id" : id}});
+    });
+    
+    t.addEvent("enterDroppable", function(row, target){
+      target.addClass("drop");
+    });    
+    
+    t.addEvent("leaveDroppable", function(row, target){
+      target.removeClass("drop");      
+    });    
+    
+    // Make sure the contentPanel resizes our table!
+    $('contentPanel').addComponentEvent("skyline.layout","resize",function(panel,w,h){
+      $('filelist').retrieve("skyline.table").resize(w, "100%");
+    });
+    
+    var p = $('contentPanel').retrieve("skyline.layout");
+    if(p){
+      p.setup();
+    }
+    
+  })();
+</script>

data/app/views/skyline/media/files/_new.html.erb

@@ -0,0 +1,45 @@
+<div class="upload innerpanel" id="libraryuploader">
+	<div id="uploadarea" class="panelBody">
+    <form id="libraryuploaderform" class="upload innerpanel" action="<%= skyline_media_dir_files_path_with_session_information(@dir) %>">
+      <div class="upload-files">
+        <div class="body">
+          <div class="messages"></div>
+          <ul class="files" style="height: 100px">
+            <li class="blank"><%=t(:no_files, :scope => [:media, :files ,:new]) %></li>
+          </ul>
+          <div class="status" id="uploadstatus">
+            <span class="total-files">0</span> <%=t(:files, :scope => [:media, :files ,:new]) %>
+            <span class="total-size">0 kB</span>                    
+          </div>
+          <a href="#" class="button small browse" id="adduploadfiles"><%=t(:add_files, :scope => [:buttons]) %></a>
+        </div>
+        <div id="submit-buttons" class="submit">
+          <a id="cancelselect" href="#" class="cancel"><%=t(:cancel, :scope => [:media, :files ,:new]) %></a>
+          <%= submit_button :upload, :class => "small green upload", :id => "uploadbutton" %>
+          
+          <%= submit_button :ok, :class => "small green upload", :id => "finishedbutton" %>
+        </div>
+      </div>
+      <div class="upload-progress hide">
+        <div class="body">
+          <%=t(:file_progress, :scope => [:media, :files , :new]) %>
+          <div class="progressbar">
+            <div class="bar" style="width: 20%">&nbsp;</div>
+          </div>
+          <div class="progress-text">
+            <%=t(:percentage_progress, :scope => [:media, :files , :new]) %>
+          </div>
+        </div>
+        <div class="submit">
+          <a href="#" class="cancel button small red"><%=t(:cancel, :scope => [:media, :files ,:new]) %></a>
+        </div>
+      </div>
+    </form>
+
+	</div>	
+</div>
+<script type="text/javascript" charset="utf-8">
+  window.addEvent("domready", function(){
+    Application.Layout.Media.initializeUploadPanel("<%= skyline_media_dir_files_path(@dir) %>");
+  });
+</script>  

data/app/views/skyline/publications/_index.html.erb

@@ -2,7 +2,7 @@
   <div class="topPanel">
     <dl class="selectionPanel panel">
       <dt><span class="content"><%= t(:publications, :scope => [:publication,:index]) %></span></dt>
-      <dd class="scrollable">
+      <dd class="scrollable full">
     		<ul class="selectlist">
     			<% @article.publications.each do |publication| %>
       	  	<li>
@@ -17,7 +17,7 @@
     </dl>
     <dl class="previewPanel panel">
       <dt><span class="content"><%= t(:preview, :scope => [:publication,:index]) %></span></dt>
-      <dd>
+      <dd class="full">
         <iframe class="previewFrame preview" src="#" frameborder="0"></iframe>    
       </dd>
     </dl>

data/app/views/skyline/sections/_media_section.html.erb

@@ -1,14 +1,24 @@
 <table class="fields">
   <tr>
-    <th><%= sectionable_form.t :linked %></th>
-    <td><%= image_browser(sectionable_form, :linked, {:skip_class => true}) %></td>    
+    <th><%= sectionable_form.t :media %></th>
+    <td><%= image_browser(sectionable_form, :media, {:skip_class => true}) %></td>    
   </tr>
+  <tr>
+    <th><%= sectionable_form.t :link %></th>
+    <td><%= link_browser(sectionable_form, :link, {:skip_class => true}) %></td>    
+  </tr>  
   <tr>
     <th><%= sectionable_form.label_with_text :alignment %></th>
     <td>
       <%= sectionable_form.select :alignment, 
             Skyline::Sections::MediaSection::ALIGNMENT.map{|a| [t(a,:scope => [:activerecord, :attributes, :"skyline/sections/media_section", :alignments]),a]}, :class => "full"%></td>
   </tr>
+  <tr>
+    <th><%= sectionable_form.label_with_text :dimension %></th>
+    <td>
+      <%= sectionable_form.text_field :width, :class => "number" %> x <%= sectionable_form.text_field :height, :class => "number" %> 
+    </td>
+  </tr>
   <tr>
     <th><%= sectionable_form.label_with_text :caption %></th>
     <td><%= sectionable_form.text_field :caption, :class => "full" %></td>

data/app/views/skyline/sections/_wysiwyg_section.html.erb

@@ -1,7 +1,7 @@
 <%= sectionable_form.text_area :body, :rows => 3, :class => "wysiwyg", :style => "width: 100%; height: 5px", :value => sectionable_form.object.body(true) %>
 
 <script type="text/javascript" charset="utf-8">
-  var o = function(){
+  (function(){
     var e = new Skyline.Editor('<%= sectionable_form.dom_id :body %>',{
       contentCss : "/skyline/stylesheets/wysiwyg.css",
       <%= "enableEditHtml : true," if current_user.allow?("tinymce_edit_html") %>
@@ -16,6 +16,5 @@
     <% if controller.controller_name == "sections" && controller.action_name == "new" %>
       e.focus();
     <% end %>
-  };
-  o();
+  })();
 </script>

data/app/views/skyline/settings/index.html

@@ -0,0 +1,14 @@
+<dl id="contentPanel" class="panel">
+  <dt id="contentHeaderPanel">
+    <span class="content">
+      <%= t(:title, :scope => [:settings, :index, :blank]) %>
+    </span>
+  </dt>
+  <dd id="contentBodyPanel">
+    <div id="contentEditPanel" class="panel scrollable">
+      <div class="content editcontent">
+        <%= t(:content, :scope => [:settings, :index, :blank]) %>
+      </div>
+    </div>
+  </dd>
+</dl>

data/app/views/skyline/shared/_head.html.erb

@@ -24,6 +24,8 @@
 <script type="text/javascript" charset="utf-8">
   Application.formAuthenticityToken = "<%=form_authenticity_token%>";  
   Application.locale = "<%= I18n.locale %>";
+  Application.urlPrefix = "<%= Skyline::Configuration.url_prefix %>";
+  Application.UserPreferences.Url = "<%= skyline_user_preferences_path  %>";
 </script>
 
 <% plugin_hook :footer %>

data/app/views/skyline/shared/_header_area.html.erb

@@ -1,6 +1,6 @@
 <div id="headerArea">
   <div id="header">
-  	<img src="<%= Skyline::Configuration.skyline_logo %>" alt="" />
+  	<img src="<%= Skyline::Configuration.skyline_logo %>" alt="" height="19"/>
 
     <div id="usernavigation">
       <%= t(:logged_in_as, :user => current_user.display_name, :scope => [:authentication])  %>
@@ -14,9 +14,11 @@
   	  <img src="/skyline/images/logo.png" alt="powered by Skyline"  style="position: absolute; right: 10px; top: 5px"/>
   	<% end %>
     <ul>
-      <li>
-        <%= link_to t(:pages, :scope => [:navigation,:mainnavigation]), skyline_articles_path(:type => Skyline::Page), :class => (current_menu_item == :pages ? "active" : nil) %>
-      </li>
+      <% if Skyline::Configuration.enable_pages %>
+        <li>
+          <%= link_to t(:pages, :scope => [:navigation,:mainnavigation]), skyline_articles_path(:type => Skyline::Page), :class => (current_menu_item == :pages ? "active" : nil) %>
+        </li>
+      <% end %>
       <% if (Skyline::Configuration.articles + Skyline::Configuration.content_classes).any? %>
         <li>
           <%= link_to t(:content_library, :scope => [:navigation,:mainnavigation]), {:controller => "/skyline/content", :action => "index"}, :class => (current_menu_item == :content_library ? "active" : nil) %>
@@ -29,7 +31,7 @@
         <li class="has-children">
           <span <%= 'class="active"' if current_menu_item == :admin %>><%= t(:admin, :scope => [:navigation,:mainnavigation]) %></span>
           <ul>
-            <% if @current_user.allow?(:settings_update) %>
+            <% if @current_user.allow?(:settings_update) && Skyline::Content::Implementation.instance.has_settings? %>
               <li><%= link_to t(:settings, :scope => [:navigation,:mainnavigation]), skyline_settings_path %></li>
             <% end %>
             <% if @current_user.allow?(:user_show) %>            

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

@@ -12,22 +12,16 @@
 <dl id="contentPanel" class="panel">
   <dt id="contentHeaderPanel">
     <span class="content">
-      <%= t(:header, :scope => [:user, :index], :count => @users.size) %>
+      <% 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;" %>
+      <% end %>
+      
+      <%= t(:header, :scope => [:user, :index], :count => @users.total_entries) %>
     </span>
   </dt>
   <dd id="contentBodyPanel">
-    <div id="contentInfoPanel">  
-      <div class="innerpanel">
-        <div class="actions">
-          <% if @current_user.allow?(:user_create) %>
-            <%= link_to_remote button_text(:add), {:url => new_skyline_user_path, :method => :get}, :class => "button small", :style => "margin-top: 3px" %>
-          <% end %>
-        </div>
-      </div>
-    </div>
-    <div id="contentEditPanel" class="panel scrollable">        
-      <div class="content">
-        <table class="listing">
+    <div id="contentEditPanel" class="panel">        
+        <table class="listing" id="userListing">
           <thead>
             <tr>
               <th style="width: 25%"><%= Skyline::User.human_attribute_name("email") %></th>
@@ -43,10 +37,10 @@
                 <td><%= u.email %></td>
                 <td><%= u.name %></td>
                 <td><%= u.roles.map{|s| t(s.name, :scope => [:user,:roles], :default => s.name) }.to_sentence %></td>
-                <td><%= l(u.created_at, :format => :long) %></td> 
+                <td><%= u.created_at.present? ? l(u.created_at, :format => :long) : "" %></td> 
                 <td class="right">
                   <% if @current_user.allow?(:user_update) %>
-                    <%= link_to_remote button_text(:edit), {:url => edit_skyline_user_path(u), :method => :get}, :class => "button small" %>
+                    <%= 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" %>
@@ -57,7 +51,28 @@
             <% end %>
           </tbody>
         </table>
-      </div>
+        <script type="text/javascript" charset="utf-8">
+          (function(){
+            var t = new Skyline.Table("userListing", {draggable: false});
+            // Make sure the contentPanel resizes our table!
+            $('contentEditPanel').addComponentEvent("skyline.layout","resize",function(panel,w,h){
+              $('userListing').retrieve("skyline.table").resize(w, "100%");
+            });
+            
+            t.addEvent("selectRow",function(row,event){
+              event.stop();
+              row.addClass("selected");
+              var l = row.getElement("a.edit");
+              if(l){
+                (new Request()).get(l.getProperty("href"));
+              }
+            });
+
+            t.addEvent("deselectRow",function(row){
+              row.removeClass("selected");
+            });                        
+          })();
+        </script>
     </div>
   </dd>
   <% if @users.total_pages > 1 %>

data/config/initializers/dependencies.rb

@@ -4,6 +4,7 @@ require 'rss/2.0'
 require 'open-uri'
 
 require 'andand/andand'
+require 'weppos/url_validation'
 require 'digitpaint/unique_identifiers'
 require 'digitpaint/configure'
 require 'digitpaint/personify/personify'
@@ -18,4 +19,8 @@ require "RMagick"
 require "hpricot"
 require "guid"
 require "will_paginate"
-require "seed-fu"
+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'

data/config/initializers/observers.rb

@@ -1,5 +1,4 @@
 ActiveRecord::Base.observers = [
   "Skyline::FileCacheSweeper", 
-  "Skyline::ArticleVersionObserver", 
-  "Skyline::MediaFileObserver"
+  "Skyline::ArticleVersionObserver"
 ]

data/config/initializers/rails_defaults.rb

@@ -2,5 +2,5 @@ ActionView::Base.field_error_proc = Proc.new {|html_tag, instance|  %(#{html_tag
 
 # This has to happen on every request as the Constant may not be the same anymore (because of reloading)
 ActionController::Dispatcher.to_prepare(:form_builder) do
-  ActionView::Base.default_form_builder = Skyline::FormBuilderWithErrors
+  ActionView::Base.default_form_builder = Skyline::FormBuilder
 end