browsercms 3.1.5 → 3.3.0.beta

data/app/views/cms/groups/_permissions.html.erb

@@ -1,5 +1,5 @@
-<% content_for :html_head do %>
-  <% javascript_tag do %>
+<%= content_for :html_head do %>
+  <%= javascript_tag do %>
     jQuery(function($){
       var cms_access_group_ids = <%= GroupType.cms_access.all.map{|e| e.id.to_s}.to_json %>
       $('#group_group_type_id').change(function() {
@@ -13,6 +13,7 @@
       }).change()      
     });
   <% end %>
+  
 <% end %>
 <div id="permissions">
   <div class="checkbox_group">
@@ -27,8 +28,7 @@
       <div class="instructions"><%=h p.description %></div>
     <% end %>
     <div class="check_uncheck">
-  	  <%= link_to_check_all 'input.permission_ids' %>, 
-  	  <%= link_to_uncheck_all 'input.permission_ids' %>
+      <%= check_uncheck_tag 'input.permission_ids' %>
     </div>
   </div>
     <br clear="all" />

data/app/views/cms/groups/_sections.html.erb

@@ -10,8 +10,7 @@
   <% end %>
   <div class="instructions">What sections should group members be allowed to <span id="section-action"><%= @group.cms_access? ? 'edit' : 'view' %></span>?</div>
   <div class="check_uncheck">
-    <%= link_to_check_all 'input.section_ids' %>, 
-    <%= link_to_uncheck_all 'input.section_ids' %>
+    <%= check_uncheck_tag 'input.section_ids' %>
   </div>
   </div>
   <br clear="all" />

data/app/views/cms/groups/index.html.erb

@@ -1,7 +1,7 @@
 <% page_title "Administration / Group Browser" %>
 <% @toolbar_title = "List Groups" %>
 
-<% content_for :functions do %> 
+<%= content_for :functions do %>
   <%= link_to(span_tag("Add Group"), new_cms_group_path, 
     :id => "new_group_button", :class => "button") %>
 <% end %>

data/app/views/cms/html_blocks/render.html.erb

@@ -1 +1 @@
-<%= @content_block.content %>
+<%= @content_block.content.html_safe %>

data/app/views/cms/image_blocks/_form.html.erb

@@ -3,16 +3,15 @@
    root.full_path = root.name
    @sections = []
    @sections << root
-   @sections += root.master_section_list
+   @sections += root.all_children_with_name
    @sections.each {|s| s.full_path = "/" + s.full_path unless s == root }
   @block.attachment_file_path = @block.attachment.file_path if @block.attachment_file_path.blank? && !@block.new_record?
 %>
-<% content_for :html_head do %>
-  <% javascript_tag do %>
-    var regex = <%= Cms::Behaviors::Attaching::SANITIZATION_REGEXES.to_json %>
+<%= content_for :html_head do %>
+  <%= javascript_tag do %>
     jQuery(function($) {
       <% if @block.new_record? %>
-        var sectionIdPathMap = <%= @sections.inject({}){|map, sec| map[sec.id.to_s] = sec.path.sub(/\/$/,''); map}.to_json %>
+        var sectionIdPathMap = <%= @sections.inject({}){|map, sec| map[sec.id.to_s] = sec.path.sub(/\/$/,''); map}.to_json.html_safe %>
         $('#image_block_attachment_file, #image_block_attachment_section_id').change(function(){
           $('#image_block_attachment_file_path').val(sectionIdPathMap[$('#image_block_attachment_section_id').val()]+'/'+$.cms.sanitizeFileName($('#image_block_attachment_file').val()))
         });

data/app/views/cms/links/_form.html.erb

@@ -1,5 +1,5 @@
 <%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
-<%= f.error_messages %>
+<%= f.cms_error_messages %>
 
 <%= f.cms_text_field :name %>
 <%= f.cms_text_field :url %>

data/app/views/cms/links/edit.html.erb

@@ -1,10 +1,10 @@
 <% page_title "Edit '#{h(@link.name)}' Link" %>
-<% content_for :functions do %>
+<%= content_for :functions do %>
 <%= "<h1>#{ @page_title }</h1>" %> 
 <%= link_to(span_tag("list all"), cms_sitemap_path, :class => "button") %>
 <br clear="all"/>
 <% end %>
-<% form_for([:cms, @link]) do |f| %>
+<%= form_for([:cms, @link]) do |f| %>
   
   <%= render :partial => 'form', :locals => {:f => f} %>
   <div class="buttons">

data/app/views/cms/links/new.html.erb

@@ -1,10 +1,10 @@
 <% @link_title = @page_title = "Add New Link to Sitemap" %>
-<% content_for :functions do %>
+<%= content_for :functions do %>
 <%= "<h1>#{ @page_title }</h1>" %> 
 <%= link_to(span_tag("list all"), cms_sitemap_path, :class => "button") %>
 <br clear="all"/>
 <% end %>
-<% form_for([:cms, @link]) do |f| %>
+<%= form_for([:cms, @link]) do |f| %>
   <%= hidden_field_tag :section_id, @link.section_id %>
   
   <%= render :partial => 'form', :locals => {:f => f} %>

data/app/views/cms/page_routes/_form.html.erb

@@ -1,6 +1,6 @@
 <%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
-<% form_for([:cms, @page_route]) do |f| %>
-  <%= f.error_messages %>
+<%= form_for([:cms, @page_route]) do |f| %>
+  <%= f.cms_error_messages %>
   <%= f.cms_drop_down :page_id, Page.all(:order => "path").map{|p| ["#{p.path} (#{p.name})", p.id]}%>
   <%= f.cms_text_field :name %>
   <%= f.cms_text_field :pattern %>

data/app/views/cms/page_routes/index.html.erb

@@ -1,6 +1,6 @@
 <% @toolbar_title = page_title "List Page Routes" %>
-<% content_for(:html_head) do %>
-  <% javascript_tag do %>
+<%= content_for(:html_head) do %>
+  <%= javascript_tag do %>
     jQuery(function($){
       $('table.data tbody tr').hover(function(){
         $(this).addClass('hover')
@@ -19,13 +19,10 @@
   <% end %>
 <% end %>
 
-<% content_for :functions do %>
-  <%= link_to(span_tag("&nbsp;Add&nbsp;"), new_cms_page_route_path, :class => "button") %>
-  <%= link_to(span_tag("&nbsp;Edit&nbsp;"), '#', :id => 'edit_button', :class => "button disabled") %>
-  <%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), "#", 
-    :id => "delete_button", 
-    :class => "button http_delete confirm_with_title disabled", 
-    :title => "Are you sure you want to delete this Page Route?" %>
+<%= content_for :functions do %>
+  <%= add_button new_cms_page_route_path %>
+  <%= edit_button %>
+  <%= delete_button :title => "Are you sure you want to delete this Page Route?" %>
   <%= link_to(span_tag("View"), "#", :id => 'view_button', :class => "button") %>
   <%= link_to(span_tag("View Rails Routes"), cms_routes_path, :class => "button") %>
 <% end %>

data/app/views/cms/page_routes/show.html.erb

@@ -1,13 +1,10 @@
 <% @toolbar_title = page_title "'#{@page_route.name}' Page Route" %>
 
-<% content_for :functions do %>
-  <%= link_to(span_tag("&nbsp;Add&nbsp;"), new_cms_page_route_path, :class => "button") %>
-  <%= link_to(span_tag("&nbsp;Edit&nbsp;"), edit_cms_page_route_path(@page_route), :id => 'edit_button', :class => "button") %>
-  <%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), [:cms, @page_route], 
-    :id => "delete_button", 
-    :class => "button http_delete confirm_with_title", 
-    :title => "Are you sure you want to delete this Page Route?" %>
-  <%= link_to(span_tag("List All"), cms_page_routes_path, :class => "button") %>    
+<%= content_for :functions do %>
+  <%= add_button new_cms_page_route_path %>
+  <%= edit_button :path=>edit_cms_page_route_path(@page_route), :enabled=>true %>
+  <%= delete_button :path=>[:cms, @page_route], :title => "Are you sure you want to delete this Page Route?", :enabled=>true %>
+  <%= link_to(span_tag("List All"), cms_page_routes_path, :class => "button") %>
   <%= link_to(span_tag("View Rails Routes"), cms_routes_path, :class => "button") %>
 <% end %>
 

data/app/views/cms/pages/_edit_connector.html.erb

@@ -18,7 +18,7 @@
     <%= render_connectable connectable %>
 </div>
 <% require_javascript_include ['jquery', 'cms/application'] %>
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
     <% if  @authenticity_token_loaded.nil? && protect_against_forgery? %><script type="text/javascript">
       jQuery(function($){
         $.cms.authenticity_token = '<%= form_authenticity_token %>'

data/app/views/cms/pages/_form.html.erb

@@ -1,12 +1,12 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag('cms/form_layout') %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
   jQuery(function($) {
     $('#page_template').selectbox({width: '440px'});
   });
   <% end %>
 <% end %>
-<%= f.error_messages %>
+<%= f.cms_error_messages %>
 <%= f.cms_text_field :name %>
 <%= f.cms_text_field :title, :instructions => "(Leave blank if same as name)" %>
 <%= f.cms_text_field :path %>

data/app/views/cms/pages/edit.html.erb

@@ -1,11 +1,11 @@
 <% page_title "Edit Properties / '#{h(@page.name)}' Page" %>
-<% content_for :functions  do%>
+<%= content_for :functions  do%>
 <h1><%= @page_title %></h1>
 <%= link_to(span_tag("list all"), cms_sitemap_path, :class => "button") %>
 <%= link_to(span_tag("edit content"), @page.path, :class => "button") %>
 <br clear="all" />
 <% end %>
-<% form_for([:cms, @page]) do |f| %>
+<%= form_for([:cms, @page]) do |f| %>
   <% if @other_version %>
     <%= render :partial => 'cms/shared/version_conflict_error', :locals => {:other_version => @other_version, :your_version => @page} %>
     <%= f.hidden_field :lock_version, :value => @other_version.lock_version %>

data/app/views/cms/pages/new.html.erb

@@ -1,9 +1,9 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
 <script type="text/javascript">
 jQuery(function($){
   $("#page_name").keyup(function(){
-    var section = { name: <%= @page.section.name.to_json %>, path: <%= @page.section.path.to_json %> }
-    var page_name = $.trim($("#page_name").val())
+    var section = { name: <%= @page.section.name.to_json.html_safe %>, path: <%= @page.section.path.to_json.html_safe %> };
+    var page_name = $.trim($("#page_name").val());
     if (page_name == section.name || page_name == 'Overview') {
       $("#page_path").val(section.path)
     } else {
@@ -11,18 +11,18 @@ jQuery(function($){
         section.path.replace(/\/$/, '') + "/" + $.cms.slug(page_name)
       )
     }
-  })
-})
+  });
+});
 </script>
 <% end %>
 
 <% page_title "New Page" %>
-<% content_for :functions do %>
+<%= content_for :functions do %>
 <%= "<h1>#{ @page_title }</h1>" %> 
 <%= link_to(span_tag("list all"), cms_sitemap_path, :class => "button") %>
 <br clear="all"/>
 <% end %>
-<% form_for([:cms, @page]) do |f| %>
+<%= form_for([:cms, @page]) do |f| %>
   <%= hidden_field_tag :section_id, @page.section_id %>
   
   <%= render :partial => 'form', :locals => {:f => f} %>

data/app/views/cms/pages/versions.html.erb

@@ -1,6 +1,6 @@
 <% @page_title = @toolbar_title = "List Versions / '#{@page.name}' Page" %>
-<% content_for(:html_head) do %>
-  <% javascript_tag do %>
+<%= content_for(:html_head) do %>
+  <%= javascript_tag do %>
     jQuery(function($){
       $('table.data tbody tr').hover(function(){
         $(this).addClass('hover')
@@ -32,13 +32,13 @@
   <%= stylesheet_link_tag("cms/content_library") %>
   <%= stylesheet_link_tag("cms/form_layout") %>
 <% end %>
-<% content_for :functions do %>
+<%= content_for :functions do %>
   <%=  "<h1>#{ @toolbar_title }</h1>" %>
   <%= link_to span_tag("view"), "#", :id => "view_button", :class => "button disabled" %>
   <%= link_to span_tag("edit content"), "#", :id => "edit_content_button", :class => "button disabled" %>
   <%= link_to span_tag("edit properties"), "#", :id => "edit_properties_button", :class => "button disabled" %>
   <%= link_to span_tag("revert"), "#", :id => "revert_button", :class => "button disabled", :onclick => "$('#revert_form').submit(); return false;" %>
-  <% form_tag '', :method => 'put', :id => "revert_form" do %>
+  <%= form_tag '', :method => 'put', :id => "revert_form" do %>
   <%= hidden_field_tag :version, '', :id => 'revert_form_version'  %>
   <% end %>
   <br clear="all" />

data/app/views/cms/redirects/_form.html.erb

@@ -1,6 +1,6 @@
 <%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
-<% form_for([:cms, @redirect]) do |f| %>
-  <%= f.error_messages %>
+<%= form_for([:cms, @redirect]) do |f| %>
+  <%= f.cms_error_messages %>
   <div class="fields text_fields">
     <%= f.label :from_path, "From" %>
     <%= f.text_field :from_path, :size => 50 %>

data/app/views/cms/redirects/index.html.erb

@@ -1,6 +1,6 @@
 <% @page_title = @toolbar_title = "List Redirects" %>
-<% content_for(:html_head) do %>
-  <% javascript_tag do %>
+<%= content_for(:html_head) do %>
+  <%= javascript_tag do %>
     jQuery(function($){
       $('table.data tbody tr').hover(function(){
         $(this).addClass('hover')
@@ -18,11 +18,12 @@
     })
   <% end %>
 <% end %>
-<% content_for :functions do %>
-<%= link_to(span_tag("&nbsp;Add&nbsp;"), new_cms_redirect_path, :class => "button") %>
-<%= link_to(span_tag("&nbsp;Edit&nbsp;"), '#', :id => 'edit_button', :class => "button disabled") %>
-<%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), "#", :id => "delete_button", :class => "button disabled http_delete confirm_with_title", :title => "Are you sure you want to delete this redirect?" %>
-<% end %>
+<%= content_for :functions do %>
+    <%= add_button new_cms_redirect_path %>
+    <%= edit_button %>
+    <%= delete_button :title => "Are you sure you want to delete this Redirect?" %>
+<% end -%>
+
 <div class="roundedcorners">
 <table class="data">
   <thead>

data/app/views/cms/routes/index.html.erb

@@ -1,10 +1,10 @@
 <% page_title "Rails Routes" %>
-<% content_for :functions do %>
+<%= content_for :functions do %>
   <h1><%=h page_title %></h1>
 <% end %>
 
 <div style="margin: 10px 0">
-  <% form_tag cms_routes_path, :method => :get do %>
+  <%= form_tag cms_routes_path, :method => :get do %>
     <label>
       Path to Test: <%= text_field_tag :path, @path, :size => 50 %>
     </label>

data/app/views/cms/section_nodes/_link.html.erb

@@ -1,14 +1,11 @@
-<% first_level =  in_first_level?(node)
- %>
-<%= sitemap_ul_tag(node) %>
+<ul id="section_node_<%= section_node.id %>" class="section_node<%= " rootlet" if root %>" style="display: <%= display ? "''" : "none" %>">
   <li>
     <%= render :partial => "node", :locals => {
         :node => node, 
         :node_type => "link", 
-        :icon => action_icon(first_level ? :root_link : :link),
+        :icon => action_icon(root ? :root_link : :link),
         :published_status_icon => status_icon(node.status),
-        :published_status_label => node.published? ? "Published" : "Draft",
-        :parent => parent
+        :published_status_label => node.published? ? "Published" : "Draft"
       } %>
   </li>
 </ul>

data/app/views/cms/section_nodes/_node.html.erb

@@ -4,33 +4,24 @@
   published_status_icon = defined?(published_status_icon) ? published_status_icon : nil
   published_status_label = defined?(published_status_label) ? published_status_label : nil
 
-  editable_class = ""
-  case node_type
-  when "section"
-    editable_class = "non-editable" unless @modifiable_sections.include?(node)
-  else
-    editable_class = "non-editable" unless defined?(parent) && @modifiable_sections.include?(parent)
-  end
-
-  node_type_class = node_type == "section" && node.root? ? 'root' : ''
 %>
 <div class="roundedcorners">
   <table class="section_node <%= node_type %> <%= "movable" if current_user.able_to?(:publish_content) %>" width="100%" cellspacing="0" cellpadding="0">
     <tr><td colspan="4" class="drop-before"></td></tr>
     <tr<%= ' class="doubled"' if access_icon && hidden %>>
-      <td id="<%= node_type %>_<%= node.id %>" class="<%= node_type_class %> <%= node_type %> node <%= editable_class %>">
-	      <%= icon %>
+      <td id="<%= node_type %>_<%= node.id %>" class="<%= node_type == "section" && node.root? ? 'root' : '' %> <%= node_type %> node <%= 'non-editable' unless current_user.able_to_edit?(node) %>">
+	      <%= raw icon %>
 	      <div><%= h(node.name) %></div>
       </td>
       <td class="sitemap_hidden divided">
         <a href="#" class="hidden"><%= status_icon(:hidden) if hidden %><span>HIDDEN</span></a>
       </td>
       <td class="sitemap_access divided">
-        <%= access_icon ? access_icon : "&nbsp;" %>
+        <%= access_icon ? access_icon : raw("&nbsp;") %>
       </td>
       <td class="sitemap_published_status">
         <div>
-          <%= published_status_icon ? published_status_icon : "&nbsp;" %>
+          <%= published_status_icon ? published_status_icon : raw("&nbsp;") %>
           <div><%= published_status_label if published_status_label %></div>
         </div>
       </td>

data/app/views/cms/section_nodes/_page.html.erb

@@ -1,20 +1,14 @@
-<%
-   page = node
-   status_icon = page.archived? ? :archived : page.status
-       first_level = in_first_level?(node)
-
-%>
-<%= sitemap_ul_tag(node) %>
+<% status = node.archived? ? :archived : node.status %>
+<ul id="section_node_<%= section_node.id %>" class="section_node<%= " rootlet" if root %>" style="display: <%= display ? "''" : "none" %>">
   <li>
     <%= render :partial => "node", :locals => {
         :node => node, 
         :node_type => "page", 
-        :icon => action_icon(first_level ? :root_page : :page),
-        :hidden => page.hidden?,
-        :access_icon => status_icon(access_icon),
-        :published_status_icon => status_icon(status_icon),
-        :published_status_label => status_icon.to_s.titleize,
-        :parent => parent
+        :icon => action_icon(root ? :root_page : :page),
+        :hidden => node.hidden?,
+        :access_icon => status_icon(node.section ? node.section.status : ''),
+        :published_status_icon => status_icon(status),
+        :published_status_label => status.to_s.titleize
       } %>
   </li>
 </ul>

data/app/views/cms/section_nodes/_section.html.erb

@@ -1,28 +1,12 @@
-<%
-   children = child_hash[key].keys
-   section_node = key
-   access_status = access_status(node, @public_sections)
-   first_level = in_first_level?(node)
-%>
-<%= sitemap_ul_tag(node) %>
+<ul id="section_node_<%= section_node.id %>" class="section_node<%= " rootlet" if root %>" style="display: <%= display ? "''" : "none" %>">
   <li>
     <%= render :partial => "node", :locals => {
-            :node => node,
-            :node_type => "section",
-            :icon => "#{section_icons(section_node, children)} #{action_icon(first_level ? :root_folder : :folder, :class => "folder")}",
-            :hidden => node.hidden?,
-            :access_icon => status_icon(access_status),
-            :parent => parent
-    } %>
-    <% children.each do |child_section_node| %>
-        <%= render :partial => child_section_node.node.partial_for,
-                   :locals => {:access_icon => access_status,
-                               :node => child_section_node.node,
-                               :parent => node,
-                               :child_hash => child_hash[key],
-                               :key => child_section_node
-                   } %>
-    <% end %>
-
+        :node => node, 
+        :node_type => "section", 
+        :icon => "#{section_icons(node)} #{action_icon(root ? :root_folder : :folder, :class => "folder")}",
+        :hidden => node.hidden?,
+        :access_icon => status_icon(node.status),
+      } %>
+    <%= render :partial => "section_node", :collection => node.child_nodes.all(:order => 'position'), :locals => {:display => false} %>    
   </li>
 </ul>