browsercms 3.1.5 → 3.3.0.beta

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

@@ -0,0 +1,10 @@
+<% r = defined?(root) %>
+<% if section_node.node && %w[Link Page Section].include?(section_node.node_type) %>
+  <%= render :partial => section_node.node_type.underscore, :locals => { 
+      :section_node => section_node,
+      :node => section_node.node, 
+      :display => display,
+      :root => r
+    } 
+  %>
+<% end %>

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

@@ -1,43 +1,31 @@
-<% content_for :html_head do %>
-    <%= stylesheet_link_tag 'cms/sitemap' %>
-    <%= javascript_include_tag 'cms/sitemap' %>
+<%= content_for :html_head do %>
+  <%= stylesheet_link_tag 'cms/sitemap' %>
+  <%= javascript_include_tag 'cms/sitemap' %>  
 <% end %>
 
 <% page_title "Sitemap" %>
 
-<% content_for :functions do %>
-    <h1>Sitemap</h1>
-    <%= link_to span_tag("Edit Page"), '#', :id => 'edit-button', :class => "button disabled left" %>
-    <%= link_to span_tag("Edit Properties"), '#', :id => 'properties-button', :class => "button disabled right" %>
-    <%= link_to span_tag("Add Page"), '#', :id => 'add-page-button', :class => "button disabled spacer left" %>
-    <%= link_to span_tag("Add Section"), '#', :id => 'add-section-button', :class => "button disabled middle" %>
-    <%= link_to span_tag("Add Link"), '#', :id => 'add-link-button', :class => "button disabled right" %>
-    <%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), '#', :id => 'delete-button', :class => "button disabled delete_button" %>
-    <br clear="all"/>
+<%= content_for :functions do %>
+  <h1>Sitemap</h1>
+  <%= link_to span_tag("Edit Page"), '#', :id => 'edit-button', :class => "button disabled left" %>
+  <%= link_to span_tag("Edit Properties"), '#', :id => 'properties-button', :class => "button disabled right" %>
+  <%= link_to span_tag("Add Page"), '#', :id => 'add-page-button', :class => "button disabled spacer left" %>
+  <%= link_to span_tag("Add Section"), '#', :id => 'add-section-button', :class => "button disabled middle" %>
+  <%= link_to span_tag("Add Link"), '#', :id => 'add-link-button', :class => "button disabled right" %>
+  <%= delete_button %>
+  <br clear="all" />
 <% end %>
 
 <div id="sitemap">
   <ul id="root_<%= @section.id %>" class="root" style="padding-left: 0">
     <li>
       <%= render :partial => "node", :locals => {
-              :node => @section,
-              :node_type => "section",
-              :icon => action_icon(:home),
-              :display => true
-      } %>
+          :node => @section, 
+          :node_type => "section", 
+          :icon => action_icon(:home),
+          :display => true
+        } %>
     </li>
   </ul>
-  <%
-     access_status = access_status(@section, @public_sections)
-     @sitemap[@root_section_node].keys.each do |child_section_node| %>
-      <%= render :partial => child_section_node.node.partial_for,
-                 :locals => {:access_icon => access_status,
-                             :node => child_section_node.node,
-                             :parent => @section,
-                             :child_hash => @sitemap[@root_section_node],
-                             :key => child_section_node
-                 }
-      %>
-  <% end %>
+  <%= render :partial => "section_node", :collection => @section.child_nodes.all(:order => 'position'), :locals => {:display => true, :root => true} %>    
 </div>
-

data/app/views/cms/sections/_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 :path %>
@@ -11,7 +11,7 @@
   </div>
 </div>
 
-<% able_to?(:administrate) do %>
+<%= able_to?(:administrate) do %>
   <div class="checkbox_group fields" style="float: left; width: 100%">
     <label>Public Permissions</label>
     <%= hidden_field_tag "section[group_ids][]", "", :id => nil %>
@@ -25,8 +25,7 @@
       <% end %>
       <div class="instructions">Which &ldquo;Public&rdquo; groups can view pages in this section?</div>
       <div class="check_uncheck">
-        <%= link_to_check_all 'input.public_group_ids' %>, 
-        <%= link_to_uncheck_all 'input.public_group_ids' %>
+        <%= check_uncheck_tag 'input.public_group_ids' %>
       </div>
     </div>
   </div>
@@ -46,8 +45,7 @@
       <% end %>
       <div class="instructions">Which &ldquo;CMS&rdquo; groups can edit pages and content in this section?</div>
       <div class="check_uncheck">
-        <%= link_to_check_all 'input.cms_group_ids' %>, 
-        <%= link_to_uncheck_all 'input.cms_group_ids' %>
+        <%= check_uncheck_tag 'input.cms_group_ids' %>
       </div>
     </div>
   </div>

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

@@ -1,10 +1,10 @@
 <% page_title "Edit Properties / '#{h(@section.name)}' Section" %>
-<% 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, @section]) do |f| %>
+<%= form_for([:cms, @section]) do |f| %>
   
   <%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>

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

@@ -1,14 +1,14 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= javascript_include_tag 'cms/sitemap' %>
 <% end %>
-<% content_for :title do %>Sitemap<% end %>
+<%= content_for :title do %>Sitemap<% end %>
 
 <div class="buttons">
   <%= link_to "Edit", '#', :id => 'edit-button', :disabled => "disabled" %>
   |
   <%= link_to "Properties", '#', :id => 'properties-button', :disabled => "disabled" %>
   |
-  <%= link_to "Delete", '#', :id => 'delete-button', :disabled => "disabled" %>
+  <%= link_to "Delete", '#', :id => 'delete_button', :disabled => "disabled" %>
   |
   <%= link_to "Add Page", '#', :id => 'add-page-button', :disabled => "disabled" %>
   |

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

@@ -1,4 +1,4 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
 <script type="text/javascript">
 jQuery(function($){
   $("#section_name").keyup(function(){
@@ -9,12 +9,12 @@ jQuery(function($){
 </script>
 <% end %>
 <% page_title "New Section" %>
-<% 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, @section], :id => 'section_form') do |f| %>
+<%= form_for([:cms, @section], :id => 'section_form') do |f| %>
   <%= hidden_field_tag :section_id, @parent.id %>
   
   <%= render :partial => 'form', :locals => {:f => f} %>

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

@@ -1,6 +1,6 @@
 <% page_title "CMS Login" %>
-<% content_for :html_head do %>
-  <% javascript_tag do %>
+<%= content_for :html_head do %>
+  <%= javascript_tag do %>
       jQuery(function($){
         $('#login_button').hover(function(){
           $('#login_button').css('background-image', 'url(/images/cms/buttons/button_cap_h.png)');
@@ -14,7 +14,7 @@
 
 <% @login ||= "Username" %>
 <% @password ||= "Password" %>
-<% form_tag cms_login_path, :id => 'login_form' do %>
+<%= form_tag cms_login_path, :id => 'login_form' do %>
   <div class="field">
     <%= text_field_tag 'login', @login, :onfocus => "if(this.value == 'Username') this.value = '';", :onblur => "if(this.value == '') this.value = 'Username';", :tabindex => 1 %>
   </div>

data/app/views/cms/shared/_pagination.html.erb

@@ -12,7 +12,7 @@
     <%= link_to "&nbsp;", previous_page_path, :id => "previous_page_link" %>
     <span>
       <% url = URI.parse(current_page_path) %>
-      <% form_tag url.path, :method => :get, :class => "current_page" do %>
+      <%= form_tag url.path, :method => :get, :class => "current_page" do %>
         <% url.query.to_s.split('&').each do |p|; k, v = p.split('=') %>
           <%= hidden_field_tag(k, CGI::unescape(v.to_s), :id => "pagination_hidden_#{k}") unless k == "page" %>
         <% end %>

data/app/views/cms/shared/error.html.erb

@@ -11,7 +11,7 @@
 <%= content_for :functions, "<h1>#{ @page_title }</h1>" %>
 
 <% @content_for_html_head = "" %>
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <style type="text/css">
     .cms_error {
       overflow: auto;

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

@@ -1,6 +1,6 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
     <%= stylesheet_link_tag "cms/content_library" %>
-    <% javascript_tag do %>
+    <%= javascript_tag do %>
       jQuery(function($){
         $('#block_content .header').html("Content tagged with '<%= escape_javascript(h(@content_block.name)) %>'")
       })

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

@@ -1,17 +1,17 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag 'cms/form_layout' %>
 <% end %>
 
 <% page_title "Assign Page '#{@page.name}'" %>
-<% content_for :functions do %>
+<%= content_for :functions do %>
   <h1><%=h @page_title %></h1>
   <%= link_to(span_tag("Back To Page"), @page.path, :class => "button") %>
   <br clear="all"/>
 <% end %>
 
-<% form_for([:cms, @page, @task]) do |f| %>
+<%= form_for([:cms, @page, @task]) do |f| %>
 
-  <%= f.error_messages %>
+  <%= f.cms_error_messages %>
   <div class="fields text_fields">
     <%= f.label :assigned_to_id, "Assign To" %>
     <%= f.collection_select :assigned_to_id, User.active.able_to_edit_or_publish_content.all(:order => "first_name, last_name, login"), :id, :full_name_with_login, :include_blank => true, :tabindex => next_tabindex %>

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

@@ -1,8 +1,8 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag('cms/form_layout') %>
 <% end %>
-<% form_for([:cms, @user]) do |f| %>
-  <%= f.error_messages %>
+<%= form_for([:cms, @user]) do |f| %>
+  <%= f.cms_error_messages %>
   <%= render :partial => 'user_fields', :locals => {:f => f} unless @change_password %>
   <%= render :partial => 'password', :locals => {:f => f} if @user.new_record? %>
   <%= render :partial => 'groups' %>

data/app/views/cms/users/_toolbar.html.erb

@@ -1,6 +1,6 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag('cms/selectbox') %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     jQuery(function($) {
       $('#per_page').selectbox({width: '127px'});
       $('#group_id').selectbox({width: '126px'});
@@ -12,7 +12,7 @@
 
 <% if @users %>
   <div class="box">
-    <% form_tag(cms_users_path, :method => :get ) do %> 
+    <%= form_tag(cms_users_path, :method => :get ) do %>
     <div><%= text_field_tag "key_word", params[:key_word] %></div><div id="user_search_submit_container"><input id="user_search_submit" type="image" src="/images/cms/user_search_submit.gif" alt="submit" /></div>
     <div><%= select_per_page %></div>
     <div><%= group_filter %></div>

data/app/views/cms/users/change_password.html.erb

@@ -1,6 +1,6 @@
 <% @page_title = @toolbar_title = "Set New Password" %>
-<% able_to? :administrate do %>
-  <% content_for :toolbar_links do %>
+<%= able_to? :administrate do %>
+  <%= content_for :toolbar_links do %>
     <%= link_to(span_tag("List All"), url_for(:controller => "users", :action => "index"), :id => "list_all_button", :class => "button") %>
     <%= link_to(span_tag("Edit User"), url_for(:controller => "users", :action => "edit", :id => @user.id), :id => "edit_user_button", :class => "button") %>
   <% end %>
@@ -8,12 +8,12 @@
   <%= content_for :functions, render(:partial => "toolbar") %>
 <% end %>
 
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag('cms/form_layout') %>
 <% end %>
 
-<% form_for([:update_password, :cms, @user]) do |f| %>
-  <%= f.error_messages %>
+<%= form_for([:update_password, :cms, @user]) do |f| %>
+  <%= f.cms_error_messages %>
   <%= render :partial => 'password', :locals => {:f => f} %>
   <div class="buttons">
     <%= lt_button_wrapper(f.submit("Save", :class => "submit")) %>

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

@@ -1,6 +1,6 @@
 <% @page_title = @toolbar_title = "Edit User '#{h(@user.login)}'" %>
 
-<% content_for :toolbar_links do %>
+<%= content_for :toolbar_links do %>
   <%= link_to(span_tag("List All"), cms_users_path, 
     :id => "list_all_button", 
     :class => "button") %>
@@ -9,7 +9,7 @@
     :class => "button") %>
 <% end %>
 
-<% content_for :functions do %> 
+<%= content_for :functions do %>
   <%= render(:partial => "toolbar") %>
 <% end %>
 

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

@@ -1,13 +1,13 @@
 <% page_title "Administration / User Browser" %>
 <% @toolbar_title = "List Users" %>
 
-<% content_for :toolbar_links do %>
+<%= content_for :toolbar_links do %>
   <%= link_to(span_tag("ADD USER"), new_cms_user_path, 
     :id => "add_user_button", 
     :class => "button") %>
 <% end %>
 
-<% content_for :functions do %>
+<%= content_for :functions do %>
   <%= render(:partial => "toolbar") %>
 <% end %>
 
@@ -39,10 +39,10 @@
         <td>
 	  <% unless user.expired? %>
 	  <span class="user_state">Active</span>
-            <%= link_to("<span>Disable</span>", [:disable, :cms, user], :class => "http_put sm_button") if @users.size > 1 %>	  
+            <%= link_to("<span>Disable</span>".html_safe, [:disable, :cms, user], :class => "http_put sm_button") if @users.size > 1 %>
 	    <% else %>
 	  <span class="user_state">Inactive</span>
-            <%= link_to("<span>Enable</span>", [:enable, :cms, user], :class => "http_put sm_button") %>
+            <%= link_to("<span>Enable</span>".html_safe, [:enable, :cms, user], :class => "http_put sm_button") %>
 	  <% end %>
         </td>
         <td class="last"></td>

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

@@ -1,12 +1,12 @@
 <% @page_title = @toolbar_title = "New User" %>
 
-<% content_for :toolbar_links do %>
+<%= content_for :toolbar_links do %>
   <%= link_to(span_tag("List All"), cms_users_path, 
     :id => "list_all_button", 
     :class => "button") %>
 <% end %>
 
-<% content_for :functions do %>
+<%= content_for :functions do %>
   <%= render(:partial => "toolbar") %>
 <% end %>
 

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

@@ -1,6 +1,6 @@
 <% @page_title = @toolbar_title = h(@user.login) %>
 
-<% content_for :toolbar_links do %>
+<%= content_for :toolbar_links do %>
   <%= link_to(span_tag("List All"), cms_users_path, 
     :id => "list_all_button", 
     :class => "button") if current_user.able_to?(:administrate) %>
@@ -9,33 +9,33 @@
     :class => "button") %>
 <% end %>
 
-<% content_for :functions do %> 
+<%= content_for :functions do %>
   <%= render(:partial => "toolbar") %>
 <% end %>
 
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag('cms/form_layout') %>
 <% end %>
 
 <div class="faux_form">
   <div class="fields">
     <span class="label">Username</span>
-    <%=h @user.login %>
-  </div>
+    <%=h @user.login %>
+  </div>
   
-  <div class="fields">
-    <span class="label">Email</span>
-    <%=h @user.email %>
-  </div>
+  <div class="fields">
+    <span class="label">Email</span>
+    <%=h @user.email %>
+  </div>
   
-  <div class="fields">
-    <span class="label">First name</span>
-    <%=h @user.first_name %>
-  </div>
+  <div class="fields">
+    <span class="label">First name</span>
+    <%=h @user.first_name %>
+  </div>
   
-  <div class="fields">
-    <span class="label">Last name</span>
-    <%=h @user.last_name %>
+  <div class="fields">
+    <span class="label">Last name</span>
+    <%=h @user.last_name %>
   </div>
   
   <div class="fields">

data/app/views/layouts/_cms_toolbar.html.erb

@@ -1,11 +1,11 @@
-<% able_to? :edit_content, :publish_content, :administrate do -%>
+<%= able_to? :edit_content, :publish_content, :administrate do -%>
   <div id="nav">
   	<h1><%= link_to image_tag("cms/browsercms_logo.png"), "/", :target => "_top" %></h1>
     	<ul id="section">
       	<li><%= link_to image_tag("/images/cms/nav_dash#{'_on' if tab == :dashboard}.gif", :id => 'nav_dash_img'), cms_dashboard_path, :target => "_top" %></li>
-        <% able_to?(:edit_content, :publish_content) do %><li><%= link_to image_tag("/images/cms/nav_sitemap#{'_on' if tab == :sitemap}.gif", :id => 'nav_sitemap_img'), cms_sitemap_path, :target => "_top" %></li><% end %>
-        <% able_to?(:edit_content, :publish_content) do %><li><%= link_to image_tag("/images/cms/nav_content_library#{'_on' if tab == :content_library}.gif", :id => 'nav_content_library_img'), cms_content_library_path, :target => "_top" %></li><% end %>
-        <% able_to?(:administrate) do %><li><%= link_to image_tag("/images/cms/nav_admin#{'_on' if tab == :administration}.gif", :id => 'nav_admin_img'), cms_administration_path, :target => "_top" %></li><% end %>
+        <%= able_to?(:edit_content, :publish_content) do %><li><%= link_to image_tag("/images/cms/nav_sitemap#{'_on' if tab == :sitemap}.gif", :id => 'nav_sitemap_img'), cms_sitemap_path, :target => "_top" %></li><% end %>
+        <%= able_to?(:edit_content, :publish_content) do %><li><%= link_to image_tag("/images/cms/nav_content_library#{'_on' if tab == :content_library}.gif", :id => 'nav_content_library_img'), cms_content_library_path, :target => "_top" %></li><% end %>
+        <%= able_to?(:administrate) do %><li><%= link_to image_tag("/images/cms/nav_admin#{'_on' if tab == :administration}.gif", :id => 'nav_admin_img'), cms_administration_path, :target => "_top" %></li><% end %>
       </ul>
       <ul id="userlinks">
 	<li id="user_info"><a href="<%= current_user.able_to?(:administrate) ? edit_cms_user_path(current_user) : cms_user_path(current_user) %>" target="_top"><%= image_tag "cms/icons/user.png" %> <%= current_user.full_name %></a></li>
@@ -19,7 +19,7 @@
       </div>
   </div>
 <% end -%>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     jQuery(function($){
 <% unless tab == :dashboard %>
       $('#nav_dash_img').hover(function(){

data/app/views/layouts/_page_toolbar.html.erb

@@ -47,45 +47,45 @@
 </div>  
 <div class="buttons">
   
-  <%= link_to "<span>Publish</span>", 
+  <%= link_to "<span>Publish</span>".html_safe, 
     @page.live? ? '#' : publish_cms_page_path(@page), 
     :id => "publish_button",
     :class => "http_put button#{' disabled' if !current_user.able_to?(:publish_content) || !current_user.able_to_edit?(@page) || @page.version != @page.draft.version || @page.live?} left",
     :target => "_top" %>
     
-  <%= link_to "<span>Assign</span>", 
+  <%= link_to "<span>Assign</span>".html_safe,
     new_cms_page_task_path(@page), 
     :id => "assign_button",
     :class => "button#{ ' disabled' if @page.assigned_to == current_user || !current_user.able_to_edit?(@page) } middle",
     :target => "_top" %>
     
-  <%= link_to "<span>Complete Task</span>", 
+  <%= link_to "<span>Complete Task</span>".html_safe,
     @page.current_task ? complete_cms_task_path(@page.current_task) : '#', 
     :id => "complete_task_button",
     :class => "http_put button#{ ' disabled' if @page.assigned_to != current_user || !current_user.able_to_edit?(@page) } right", 
     :target => "_top" %>
 
-  <%= link_to "<span>Edit Properties</span>", 
+  <%= link_to "<span>Edit Properties</span>".html_safe,
     [:edit, :cms, @page], 
     :id => "edit_properties_button",
     :class => "spacer button#{ ' disabled' unless current_user.able_to_edit?(@page) }", 
     :target => "_top" %>
   
-  <%= link_to "<span>List Versions</span>", 
+  <%= link_to "<span>List Versions</span>".html_safe, 
     versions_cms_page_path(@page), 
     :class => "spacer button#{ ' disabled' unless current_user.able_to_edit?(@page) }",
     :target => "_top" %>
     
-  <% able_to? :publish_content do %>
+  <%= able_to? :publish_content do %>
     <% if @page.draft_version? %>  
-      <%= link_to "<span><span class=\"delete_img\">&nbsp;</span>Delete</span>",    
+      <%= link_to "<span><span class=\"delete_img\">&nbsp;</span>Delete</span>".html_safe,
         [:cms, @page], 
         :id => "delete_button",
         :title => "Are you sure you want to delete '#{@page.name}'?", 
         :target => "_top", 
         :class => "spacer button confirm_with_title http_delete#{ ' disabled' unless current_user.able_to_publish?(@page) }" %>
     <% else %>
-      <%= link_to "<span>Revert to this Version</span>",
+      <%= link_to "<span>Revert to this Version</span>".html_safe,
         revert_to_cms_page_path(@page, @page.version), 
         :id => "revert_button",
         :class => "button http_put", 
@@ -105,13 +105,13 @@
         </div>
         <div class="visual_editor_toggle_container">
           <% if @mode == "edit" %>
-          <div class="sm_button"><%= link_to '<span id="visual_editor_action">TURN OFF</span>', url_with_mode(request.referrer, "view"), :target => "_top", :class => "sm_button" %></div>    
+          <div class="sm_button"><%= link_to '<span id="visual_editor_action">TURN OFF</span>'.html_safe, url_with_mode(request.referrer, "view"), :target => "_top", :class => "sm_button" %></div>
 	  <% else %>
-          <div class="sm_button"><%= link_to '<span id="visual_editor_action">TURN ON</span>', url_with_mode(request.referrer, "edit"), :target => "_top", :class => "sm_button" %></div>    	  <% end %>
+          <div class="sm_button"><%= link_to '<span id="visual_editor_action">TURN ON</span>'.html_safe, url_with_mode(request.referrer, "edit"), :target => "_top", :class => "sm_button" %></div>    	  <% end %>
 	</div>
 <% else %>
 	</div>
-      <%= link_to("<span>View Current Version</span>", @page.path, :class => "button current_version", :target => "_top") %>
+      <%= link_to("<span>View Current Version</span>".html_safe, @page.path, :class => "button current_version", :target => "_top") %>
     <% end %>
   </div>
 </div>