skylinecms 3.1.0 → 3.2.0

data/app/views/skyline/content/presenters/_table.html.erb

@@ -32,7 +32,7 @@
                                                                                                           
     <% if presenter.fieldset.orderable? %>
     t.addEvent("reorder", function(row, adjecentRow, position){
-      (new Request({ url : "<%= url_for :action => "order", :types => stack.url_types %>"})).post({order : Application.getSequence("#<%= id %> tbody tr").join(",")} );
+      (new Request({url : "<%= url_for :action => "order", :types => stack.url_types %>"})).post({"authenticity_token" : '<%= form_authenticity_token %>', order : Application.getSequence("#<%= id %> tbody tr").join(",")} );
     });
     <% end %>
     

data/app/views/skyline/content_items/_content_item.html.erb

@@ -1,3 +1,3 @@
-<% fields_for "article[variants_attributes][1][sections_attributes][#{guid}][sectionable_attributes]", sectionable do |s| %>
-  <%=s.select :content_item_id, [["",""]] + @content_item_class.for_content_item_section.collect{|item| [item.respond_to?(:human_id) ? item.human_id : item.title, item.id]}%>
+<%= skyline_fields_for "article[variants_attributes][1][sections_attributes][#{guid}][sectionable_attributes]", sectionable do |s| %>
+  <%= s.select :content_item_id, [["",""]] + @content_item_class.for_content_item_section.collect{|item| [item.respond_to?(:human_id) ? item.human_id : item.title, item.id]}%>
 <% end %>

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

@@ -0,0 +1,6 @@
+<% if @content_item_class.present? %>
+  $("section-<%= params[:guid] %>-content-item-id").replaceHTML('<%= escape_javascript render(:partial => "content_item", :locals => {:guid => params[:guid], :sectionable => Skyline::Sections::ContentItemSection.new}) %>');
+<% else %>
+  $("section-<%= params[:guid] %>-content-item-id").replaceHTML("");
+  (new Fx.Scroll("contentEditPanel")).toBottom();
+<% end %>

data/app/views/skyline/content_sections/_tags.html.erb

@@ -1,4 +1,4 @@
-<% fields_for "article[variants_attributes][1][sections_attributes][#{guid}][sectionable_attributes]", sectionable do |s| %>
+<%= skyline_fields_for "article[variants_attributes][1][sections_attributes][#{guid}][sectionable_attributes]", sectionable do |s| %>
   <table class="fields" id="section-<%=guid%>-tags">
     <tbody>
       <tr>
@@ -7,7 +7,7 @@
           <dl class="tagselector">
             <dt></dt>
             <dd><%=s.text_area :raw_tags, :rows => nil %></dd>
-            <dt class="tags"><%=t(:available_tags, :scope => [:media_file, :edit])%></dt>
+            <dt class="tags"><%=t(:available_tags, :scope => [:tags, :index])%></dt>
             <dd class="tags">
               <%= render :partial => "/skyline/tags/available_tags"%>
             </dd>

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

@@ -0,0 +1,6 @@
+<% if @tags.present? %>
+  $("section-<%= params[:guid] %>-tags").replace('<%= escape_javascript render(:partial => "tags", :locals => {:guid => params[:guid], :sectionable => @taggable.new})%>');
+<% else %>
+  $("section-<%= params[:guid] %>-tags").replace("");
+  (new Fx.Scroll("contentEditPanel")).toBottom();
+<% end %>

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

@@ -2,7 +2,7 @@
 
 <li id="link_section_<%= link_guid %>" class="<%= ref_object_css_class(linked_object.andand.referable) %>">
   <div class="file">
-    <% sectionable_form.fields_for "links_attributes", link, :index => link_guid do |l| %>
+    <%= sectionable_form.fields_for "links_attributes", link, :index => link_guid do |l| %>
       <%= l.hidden_field :id unless link.new_record? %>
       <%= l.hidden_field :_destroy, :class => "delete" %>
       <%= l.positioning_field %>

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

@@ -0,0 +1,4 @@
+<%= skyline_fields_for params[:object_name], @link do |sectionable_form| %>
+  $("section-<%= params[:guid] %>-links").append("bottom", '<%= escape_javascript render(:partial => "form", :locals => {:sectionable_form => sectionable_form, :link => @link, :guid => params[:guid], :link_guid => @link_guid}) %>' );
+  linkSectionLinksSortable<%= params[:guid].to_s.gsub("-","") %>.addItem('link_section_<%= @link_guid %>');
+<% end %>

data/app/views/skyline/locales/show.js.erb

@@ -3,12 +3,12 @@
 } -%>
 <% @locale.each do |key,value| %>
   tinyMCE.addI18n("<%= I18n.locale %>.<%= key %>",
-    <%= value.update(@options).to_json %>
+    <%= value.update(@options).to_json.html_safe %>
   );
 <% end %>
 
 I18n = {};
 I18n.LibraryUploader = {
-  allUploadedMessage : "<%=t(:all_uploaded_message, :scope => [:media, :files, :new]) %>",
-  someUploadedMessage : "<%=t(:some_uploaded_message, :scope => [:media, :files, :new]) %>"
+  allUploadedMessage : "<%= t(:all_uploaded_message, :scope => [:media, :files, :new]).html_safe %>",
+  someUploadedMessage : "<%= t(:some_uploaded_message, :scope => [:media, :files, :new]).html_safe %>"
 };

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

@@ -1,4 +1,4 @@
-<% remote_form_for @dir, :url => skyline_media_dir_path(@dir), :method => :put do |f|%>
+<%= skyline_form_for @dir, :url => skyline_media_dir_path(@dir), :method => :put, :remote => true do |f|%>
   <%= f.hidden_field :parent_id %>
   <dl class="panel">
     <dt>
@@ -28,12 +28,14 @@
         <% if @dir.parent_id.blank? %>
           <%= link_to_function button_text(:delete_media_dir), "", :class => "button small disabled" %>
         <% else %>
-          <%= link_to_remote button_text(:delete_media_dir),{
-            :url => skyline_media_dir_url(@dir), 
-            :method => :delete,
-            :confirm => t(:message, :scope => [:media_dir,:destroy]),
-            :href => url_for(:action => "destroy", :id => @dir.id)},
-            { :class =>  "button small red"}
+          <%= link_to(
+                button_text(:delete_media_dir),
+                skyline_media_dir_url(@dir), 
+                :remote => true,
+                :method => :delete,
+                :confirm => t(:message, :scope => [:media, :dirs, :destroy]),
+                :href => url_for(:action => "destroy", :id => @dir.id),
+                :class =>  "button small red")
           %>
         <% end %>
       </div>

data/app/views/skyline/media/dirs/edit.js.erb

@@ -0,0 +1 @@
+$("metaPanel").replaceHTML('<%= escape_javascript(render :partial => "edit") %>');

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

@@ -3,14 +3,24 @@
 <dl id="leftPanel" class="panel">
   <dt class="active">
     <span class="content">
-      <%= link_to_remote button_text(:add), {
-            :url => skyline_media_dirs_path, 
+      <%= link_to(
+            button_text(:add),
+            skyline_media_dirs_path, 
+            :remote => true,
             :method => :post,
-            :data => "'parent_id=' + Application.getId($('dirtree').retrieve('skyline.tree').selectedNode.getParent('li').get('id'))"
-          },{
-            :class => "button small right"
-          }
+            :id => "add_directory",
+            :class => "button small right")
       %>
+      <script type="text/javascript" charset="utf-8">
+        (function(){
+          $('add_directory').addEvent("click", function(e){
+            e.stop();
+            var d = {"data" : {"parent_id" : Application.getId($('dirtree').retrieve('skyline.tree').selectedNode.getParent('li').get('id'))}}
+            var r = new Request.Rails(this, d);            
+            r.send();
+          })
+        })();
+      </script>
 
       <%= t(:directories, :scope => [:media, :dirs, :index]) %>
     </span>

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

@@ -0,0 +1,6 @@
+<%= render_messages_javascript %>;
+<%= render_notifications_javascript %>;
+
+$("dirtree").replace('<%= escape_javascript(render :partial => "index") %>');
+$("contentPanel").replaceHTML('<%= escape_javascript(render :partial => "show") %>');
+$("metaPanel").replaceHTML('<%= escape_javascript(render :partial => "edit") %>');

data/app/views/skyline/media/dirs/show.js.erb

@@ -0,0 +1,5 @@
+<%= render_messages_javascript %>;
+<%= render_notifications_javascript %>;
+
+$("contentPanel").replaceHTML('<%= escape_javascript(render :partial => "/skyline/media/dirs/show") %>');
+$("metaPanel").replaceHTML('<%= escape_javascript(render :partial => "/skyline/media/dirs/edit") %>');

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

@@ -6,9 +6,8 @@
   </dt>
   <% if @file.file_type == "image" %>
     <dd>
-      <%= image_tag(url_for(
-            :action => :show, 
-            :controller => "media/data", 
+      <%= image_tag(skyline_media_dir_data_with_size_path(
+            :dir_id => @file.parent_id,
             :name => @file.name,
             :size => '100x100'), 
             :alt => @file.name) %>
@@ -29,14 +28,15 @@
   <dd class="last">
     <div class="button">
       <%= link_to t(:download, :scope => [:media, :files, :edit]), 
-            url_for(:action => :show, :controller => "media/data", :name => @file.name),
+            skyline_media_dir_data_path(:name => @file.name, :dir_id => @file.parent_id),
             :target => "_blank",
             :class => "button small" %>
     </div>
   </dd>
 </dl>
-<% remote_form_for @file, 
+<%= skyline_form_for @file, 
       :url => skyline_media_dir_file_path(@dir, @file), 
+      :remote => true,
       :method => :put, 
       :html => {:method=>:put} do |f|%>
       
@@ -89,12 +89,14 @@
   </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" }
+      <%= link_to(
+            button_text(:delete), 
+            skyline_media_dir_file_url(@dir,@file),
+            :remote => true,
+            :method => :delete,
+            :confirm => t(:confirm_destroy, :scope => [:media, :files, :edit], :name => @file.name),
+            :href => url_for(:action => "destroy", :id => @file.id),
+            :class => "button small red")
       %>
     </div>
   </dd>

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

@@ -33,7 +33,7 @@
       event.stop();
       row.addClass("selected");
       var l = row.getElement("a");
-      (new Request()).get(l.getProperty("href"));
+      (new Request({url : l.getProperty("href")})).get();
     });
           
     t.addEvent("deselectRow",function(row){
@@ -43,7 +43,7 @@
     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}});
+      (new Request({url: row.getProperty("data-url")})).put({"skyline_media_file" : {"parent_id" : id}});
     });
     
     t.addEvent("enterDroppable", function(row, target){

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

@@ -22,12 +22,12 @@
       </div>
       <div class="upload-progress hide">
         <div class="body">
-          <%=t(:file_progress, :scope => [:media, :files , :new]) %>
+          <%=t(:file_progress, :scope => [:media, :files , :new]).html_safe %>
           <div class="progressbar">
             <div class="bar" style="width: 20%">&nbsp;</div>
           </div>
           <div class="progress-text">
-            <%=t(:percentage_progress, :scope => [:media, :files , :new]) %>
+            <%=t(:percentage_progress, :scope => [:media, :files , :new]).html_safe %>
           </div>
         </div>
         <div class="submit">

data/app/views/skyline/media/files/edit.js.erb

@@ -0,0 +1,4 @@
+<%= render_messages_javascript %>;
+<%= render_notifications_javascript %>;
+
+$("metaPanel").replaceHTML('<%= escape_javascript(render :partial => "edit") %>');

data/app/views/skyline/media/files/index.js.erb

@@ -0,0 +1,4 @@
+<%= render_messages_javascript %>;
+<%= render_notifications_javascript %>;
+
+$("contentEditPanel").replaceHTML('<%= escape_javascript(render :partial => "index") %>');

data/app/views/skyline/media/files/update.js.erb

@@ -0,0 +1,8 @@
+<%= render_messages_javascript %>;
+<%= render_notifications_javascript %>;
+
+<% if @saved %>
+  $("contentEditPanel").replaceHTML('<%= escape_javascript(render :partial => "index") %>');
+<% end %>
+
+$("metaPanel").replaceHTML('<%= escape_javascript(render :partial => "edit") %>');

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

@@ -1,4 +1,4 @@
-<% form_tag "", :class => "unsubmittable" do %>
+<%= form_tag "", :class => "unsubmittable" do %>
   <div class="topPanel">
     <dl class="selectionPanel panel">
       <dt><span class="content"><%= t(:publications, :scope => [:publication,:index]) %></span></dt>
@@ -18,7 +18,7 @@
     <dl class="previewPanel panel">
       <dt><span class="content"><%= t(:preview, :scope => [:publication,:index]) %></span></dt>
       <dd class="full">
-        <iframe class="previewFrame preview" src="#" frameborder="0"></iframe>    
+        <iframe class="previewFrame preview" src="javascript:''" frameborder="0"></iframe>    
       </dd>
     </dl>
   </div>

data/app/views/skyline/publications/index.js.erb

@@ -0,0 +1,9 @@
+(function(){
+  var sd = new Skyline.Dialog({width: 700, height: 500});
+  sd.setTitle('<%= escape_javascript(t(:dialog_title, :scope => [:publication,:index])) %>');
+  sd.setContent('<%= escape_javascript(render(:partial => "index")) %>');
+  sd.setup(); 
+  sd.show();
+  sd.layout = new Application.Layouts.History(sd.contentEl.getElement('form'));
+  sd.layout.rollbackUrl = '<%= escape_javascript(rollback_skyline_article_publication_path(@article, "000")) %>';
+})();

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

@@ -1,11 +1,11 @@
 <table class="fields">
   <tr>
-    <th><%=sectionable_form.label :content_type, Skyline::Sections::ContentCollectionSection.human_attribute_name("content_type")%></th>
-    <td><%=sectionable_form.select :content_type, [["",""]] + Skyline::Tag.taggable_content_models.collect{|klass| [klass.human_name(:count => 2), klass.to_s]}%></td>
-  </tr>
-  <tr>
-    <th><%=sectionable_form.label :number, Skyline::Sections::ContentCollectionSection.human_attribute_name("number")%></th>
-    <td><%=sectionable_form.text_field :number, :class => "number"%></td>
+    <th><%= sectionable_form.label :content_type, Skyline::Sections::ContentCollectionSection.human_attribute_name("content_type")%></th>
+    <td><%= sectionable_form.select :content_type, [["",""]] + Skyline::Tag.taggable_content_models.collect{|klass| [klass.model_name.human(:count => 2), klass.to_s]}%></td>
+  </tr>     
+  <tr>      
+    <th><%= sectionable_form.label :number, Skyline::Sections::ContentCollectionSection.human_attribute_name("number")%></th>
+    <td><%= sectionable_form.text_field :number, :class => "number"%></td>
   </tr>
 </table>
 

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

@@ -1,7 +1,7 @@
 <table class="fields">
   <tr>
     <th><%= sectionable_form.label_with_text :content_item_type %></th>
-    <td><%= sectionable_form.select :content_item_type, [["",""]] + Skyline::Sections::ContentItemSection.selectable_content_models.collect{|klass| [klass.human_name, klass.to_s]} %></td>
+    <td><%= sectionable_form.select :content_item_type, [["",""]] + Skyline::Sections::ContentItemSection.selectable_content_models.collect{|klass| [klass.model_name.human, klass.to_s]} %></td>
   </tr>
   <tr>
     <th><%= sectionable_form.label_with_text :content_item_id %></th>

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

@@ -1,17 +1,17 @@
 <% sectionable_type = section.sectionable.andand.class.to_s.demodulize.underscore %>
 <li id="section_<%=guid%>" class="<%= sectionable_type.camelcase(:lower) %> <%= section.sectionable.andand.errors.any? ? "invalid" : "" %>">
-  <% variant_form.fields_for "sections_attributes", section, :index => guid do |section_form| %>
+  <%= variant_form.fields_for "sections_attributes", section, :index => guid do |section_form| %>
     <%= section_form.hidden_field :id unless section_form.object.new_record? %>
     <%= section_form.hidden_field :_destroy, :class => "delete" %>
     <%= section_form.positioning_field %>
     
-    <% section_form.fields_for "sectionable_attributes", section_form.object.sectionable do |sectionable_form| %>
+    <%= section_form.fields_for "sectionable_attributes", section_form.object.sectionable do |sectionable_form| %>
       <%= sectionable_form.hidden_field :id unless sectionable_form.object.new_record? %>
       <%= sectionable_form.hidden_field :class if sectionable_form.object.new_record? %>    
 
       <div class="undestroy">
         <%= link_to_function button_text(:undo), "PageHelper.unDestroy('section_#{guid}')", :class => "undo button small" %>
-        <%= t(:will_be_destroyed, :section => section.sectionable.class.human_name, :scope => [:section, :form]) %>
+        <%= t(:will_be_destroyed, :section => section.sectionable.class.model_name.human, :scope => [:section, :form]) %>
       </div>  
       <div class="section">   	        
         <% if section.sectionable.default_interface %>
@@ -19,7 +19,7 @@
         		<div class="tools">
         		  <%= renderable_templates_select(section.sectionable, section_form) %>
         		</div>
-        		<%= section.sectionable.class.human_name %>
+        		<%= section.sectionable.class.model_name.human %>
         	</div>
         	<div class="body">
             <%= render :partial => "skyline/sections/#{sectionable_type}", :locals => {:section_form => section_form, :sectionable_form => sectionable_form, :guid => guid} %>

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

@@ -29,5 +29,10 @@
 </script>
 
 <div class="submit body">
-  <%= link_to_remote( button_text(:add_link), {:url => new_skyline_link_section_link_path(:object_name => sectionable_form.object_name_with_index, :guid => guid), :method => :get}, :class => "button small") %>
+  <%= link_to(
+        button_text(:add_link), 
+        new_skyline_link_section_link_path(:object_name => sectionable_form.object_name_with_index, :guid => guid),
+        :remote => true,
+        :method => :get, 
+        :class => "button small") %>
 </div>

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

@@ -1 +1 @@
-<span><%= sectionable_form.object.class.human_name %></span>
+<span><%= sectionable_form.object.class.model_name.human %></span>

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">
-  (function(){
+  setTimeout(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,5 +16,5 @@
     <% if controller.controller_name == "sections" && controller.action_name == "new" %>
       e.focus();
     <% end %>
-  })();
+  }, 0);
 </script>

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

@@ -0,0 +1,12 @@
+<% if params[:after_section]
+  pos, id = :after, params[:after_section]          
+else
+  pos, id = :bottom, "contentlist"
+end %>
+      
+<%= skyline_fields_for params[:object_name] do |variant_form| %>
+  $('<%= id %>').append('<%= pos %>', '<%= escape_javascript(render :partial => "form", :locals => {:variant_form => variant_form, :section => @section, :guid => @section_guid}) %>')
+<% end %>
+
+$('contentlist').retrieve('application.sections').addSection('section_<%= @section_guid %>');
+$('contentEditPanel').scrollTo(0, $('contentEditPanel').getScroll().y + $('section_<%= @section_guid %>').getPosition("contentEditPanel").y);

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

@@ -11,7 +11,7 @@
   </dd>
 <% end %>
 
-<% form_for :settings, @settings, :url => skyline_setting_path(@settings.page.name), :html => {:method => :put} do |f| %>
+<%= skyline_form_for @settings, :as => :settings, :url => skyline_setting_path(@settings.page.name), :html => {:method => :put} do |f| %>
   <dl id="contentPanel" class="panel">
     <dt id="contentHeaderPanel">
       <span class="content">

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

@@ -28,4 +28,7 @@
   Application.UserPreferences.Url = "<%= skyline_user_preferences_path  %>";
 </script>
 
+<meta name="csrf-token" id="csrf-token" content="<%= form_authenticity_token %>" />
+<meta name="csrf-param" id="csrf-param" content="authenticity_token" />
+
 <% plugin_hook :footer %>

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

@@ -3,8 +3,8 @@
   	<img src="<%= Skyline::Configuration.skyline_logo %>" alt="" height="19"/>
 
     <div id="usernavigation">
-      <%= t(:logged_in_as, :user => current_user.display_name, :scope => [:authentication])  %>
-      (<%= link_to_remote t(:logout, :scope => [:authentication]), :url => skyline_authentication_path  ,:method => :delete  %>)
+      <%= t(:logged_in_as, :user => h(current_user.display_name), :scope => [:authentication]).html_safe  %>
+      (<%= link_to t(:logout, :scope => [:authentication]), :url => skyline_authentication_path, :method => :delete, :remote => true  %>)
     </div>
   </div>
 
@@ -27,14 +27,14 @@
       <li>
         <%= link_to t(:media_library, :scope => [:navigation,:mainnavigation]), skyline_media_dirs_path, :class => (current_menu_item == :media_library ? "active" : nil) %>
       </li>
-      <% if @current_user.allow?(:settings_update) || @current_user.allow?(:user_show) %>
+      <% if current_user.allow?(:settings_update) || current_user.allow?(:user_show) %>
         <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) && Skyline::Content::Implementation.instance.has_settings? %>
+            <% 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) %>            
+            <% if current_user.allow?(:user_show) %>            
               <li><%= link_to t(:users, :scope => [:navigation,:mainnavigation]), skyline_users_path %></li>
             <% end %>
             <% plugin_hook :admin_submenu %>