edit.html.erb in skylinecms-3.2.0

- old
+ new

@@ -1,17 +1,17 @@
-<% 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 %>
           <%= v.hidden_field :version %>
           <%= 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>
       
         <dd id="contentBodyPanel">
           <div id="contentInfoPanel">
@@ -28,20 +28,34 @@
               <% rescue ActionView::MissingTemplate %>
                 <% content = "" %>
               <% 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>
             </div>
           </div>
@@ -64,11 +78,11 @@
           </div>
         </dd>
       
         <% 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 %>
       
         <dd id="contentFooterPanel" class="footer">
           <div class="content">
@@ -109,10 +123,9 @@
     </div>
   </dd>
 </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 %>
 </script>