browsercms 3.1.5 → 3.3.0.beta

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

@@ -1,6 +1,6 @@
 <%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
 
-<% content_for :functions do %>
+<%= content_for :functions do %>
   <% if @block && !@block.new_record? %>
     <%= render :partial => 'cms/blocks/toolbar_for_member' %>
   <% else %>

data/app/views/cms/blocks/_toolbar_for_collection.html.erb

@@ -1,4 +1,4 @@
-<% able_to? :publish_content do -%>
+<%= able_to? :publish_content do -%>
   <%= link_to span_tag('Publish'), "#", 
     :class => "http_put button disabled left", 
     :id => "publish_button" %>
@@ -19,8 +19,5 @@
 <%= link_to span_tag("List Versions"), "#", 
   :id => "revisions_button", 
   :class => "button #{ action_name == 'revisions' ? ' off' : ' disabled'}" %>
-  
-<%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), "#", 
-  :id => "delete_button", 
-  :class => "spacer button disabled http_delete confirm_with_title", 
-  :title => "Are you sure you want to delete this record?" %>
+
+<%= delete_button :title=>true %>

data/app/views/cms/blocks/_toolbar_for_member.html.erb

@@ -1,4 +1,4 @@
-<% able_to? :publish_content do -%>
+<%= able_to? :publish_content do -%>
   <% if @block.respond_to?(:live?) && !@block.live? %>
     <%= link_to span_tag('Publish'), block_path(:publish), 
       :class => "http_put button left#{' disabled' unless (current_user.able_to_publish?(@block) && @block.publishable?)}", 
@@ -32,7 +32,5 @@
     :id => "list_versions" %>
 <% end %>
 
-<%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), block_path, 
-  :class => "http_delete confirm_with_title button#{' disabled' unless current_user.able_to_publish?(@block)}", 
-  :title => "Are you sure you want to delete '#{@block.name}'?", 
-  :id => "delete_button" %>
+<%= delete_button :path=>block_path, :title=>"Are you sure you want to delete '#{@block.name}'?", :enabled=>current_user.able_to_publish?(@block) %>
+

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

@@ -1,16 +1,16 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag('cms/form_layout') %>
   <%= stylesheet_link_tag('cms/content_library') %>
 <% end %>
 <% page_title "Content Library / Edit #{content_type.display_name}" %>
 <% @toolbar_title = "Edit #{content_type.display_name} '#{@block.name}'" %>
-<% content_for :functions,  render(:partial => 'cms/blocks/toolbar') %>
+<%= content_for :functions,  render(:partial => 'cms/blocks/toolbar') %>
 
 <% if @block.respond_to?(:deleted) && @block.deleted %>
   <div class="header">This <%= @block.class.name %> has been deleted.</div>
 <% else %>
-<% form_for(@block, :url => block_path, :html => {:multipart => true}) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@block, :url => block_path, :html => {:multipart => true}) do |f| %>
+  <%= f.cms_error_messages %>
   <%= render :partial => 'cms/shared/exception', :object => @exception if @exception %>  
   <% if @other_version %>
     <%= render :partial => 'cms/shared/version_conflict_error', :locals => {:other_version => @other_version, :your_version => @block} %>

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

@@ -1,6 +1,6 @@
-<% content_for(:html_head) do %>
+<%= content_for(:html_head) do %>
 <%= javascript_include_tag "cms/content_library" %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     jQuery(function($){
       var collectionName = '<%= content_type.model_class.name.underscore.pluralize %>'
       
@@ -37,7 +37,7 @@
               .attr('title', 'Are You Sure You Want To Delete This Record?')
           }
         }        
-        <% able_to? :publish_content do -%>
+        <%= able_to? :publish_content do -%>
           if($(this).hasClass('draft') && publishable) {
             $('#publish_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id+'/publish?_redirect_to='+location.href)        
           }
@@ -50,6 +50,7 @@
 <% page_title "Content Library / List #{content_type.display_name_plural}" %>
 <% @toolbar_title = "List #{content_type.display_name_plural}" %>
 <%= render :partial => 'cms/blocks/toolbar' %>
+
 <div class="roundedcorners">
 <table id="blocks" class="data">
   <thead>
@@ -89,9 +90,8 @@
        col_ct += 1 if content_type.model_class.publishable? %>
     <% @blocks.each do |b| %>
       <% block = b.class.versioned? ? b.as_of_draft_version : b %>
-
-    <%= block_row_tag(block) %>
-    <td class="first"></td>
+      <tr id="<%= block.class.name.underscore %>_<%= block.id %>" class="<%= block.class.name.underscore %> <%= block.class.publishable? && !block.published? ? 'draft' : 'published' %> <%= 'non-editable' unless current_user.able_to_edit?(block) %> <%= 'non-publishable' unless current_user.able_to_publish?(block) %>">
+	<td class="first"></td>
         <% content_type.columns_for_index.each_with_index do |column, i| %>
           <td class="<%= column[:label].gsub(' ', '').underscore %>">
             <div<%= ' class="dividers"' if (i + 3 < col_ct) %>>
@@ -105,7 +105,7 @@
           </td>      
         <% end %>
         <% if content_type.model_class.respond_to?(:updated_at) %><td class="updated"><div class="dividers"><%= block.updated_at.to_s(:date) %></div></td><% end %>
-        <% if content_type.model_class.connectable? %><td class="used"><div class="dividers"><%= block.connected_pages.size %></div></td><% end %>
+        <% if content_type.model_class.connectable? %><td class="used"><div class="dividers"><%= block.connected_pages.count %></div></td><% end %>
         <% if content_type.model_class.publishable? %><td class="block_status"><%= status_icon(block.status) %> <div><%= block.status %></div></td><% end %>
 	<td class="last"></td>
       </tr>

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

@@ -1,12 +1,12 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag('cms/form_layout') %>
   <%= stylesheet_link_tag('cms/content_library') %>
 <% end %>
 <% page_title "Content Library / Add New #{content_type.display_name}" %>
 <% @toolbar_title = "Add New #{content_type.display_name}" %>
-<% content_for :functions,  render(:partial => 'cms/blocks/toolbar') %>
-<% form_for(@block, :url => blocks_path, :html => {:multipart => true}) do |f| %>
-  <%= f.error_messages %>
+<%= content_for :functions,  render(:partial => 'cms/blocks/toolbar') %>
+<%= form_for(@block, :url => blocks_path, :html => {:multipart => true}) do |f| %>
+  <%= f.cms_error_messages %>
   <%= render :partial => 'cms/shared/exception', :object => @exception if @exception %>
   <%= render :partial => 'cms/blocks/hidden_fields', :locals => {:f => f} %>
   <%= render :partial => block_form, :locals => {:f => f} %>

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

@@ -1,6 +1,6 @@
 <% page_title "Content Library / View #{content_type.display_name}" %>
 <% @toolbar_title = "View #{content_type.display_name} '#{ @block.name }'" %>
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag('cms/form_layout') %>
   <%= stylesheet_link_tag('cms/block') %>
   <%= stylesheet_link_tag('cms/content_library') %>
@@ -27,7 +27,7 @@
   <% if @block.class.connectable? %>
     <div class="nv_pair">
       <div class="header">Used on:</div> 
-      <div><%= link_to_usages(@block) %> <%= "page".pluralize(@block.connected_pages.count)%></div>
+      <div><%= link_to_usages(@block) %> <%= "page".pluralize_unless_one(@block.connected_pages.count)%></div>
     </div>
   <% end -%>
   <% if @block.respond_to?(:draft_version?) && !@block.draft_version? %>

data/app/views/cms/blocks/usages.html.erb

@@ -1,8 +1,8 @@
 <% page_title "Content Library / View Usages" %>
 <% @toolbar_title = "Pages Using #{content_type.display_name} '#{ @block.name }'" %>
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag("cms/content_library") %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     jQuery(function($) {
       $('#functions .button').addClass('disabled').attr('href','#');
       $('#view_button').removeClass('disabled')

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

@@ -1,8 +1,8 @@
 <% page_title "Content Library / List of Versions" %>
 <% @toolbar_title = "List Versions / '#{@block.name}' #{content_type.display_name}" %>
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
 <%= stylesheet_link_tag("cms/content_library") %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     jQuery(function($){
       var collectionName = '<%= @block.class.name.underscore.pluralize %>'
       
@@ -31,7 +31,7 @@
 
 <% end %>
 
-<% content_for :functions do %>
+<%= content_for :functions do %>
   <%= render :partial => 'cms/blocks/toolbar' %>
   <%= link_to span_tag("Revert"), "#", :id => "revert_button", :class => "http_put button disabled"  %>
 <% end %>
@@ -60,7 +60,7 @@
             <div class="dividers">
               <%= "v. #{r.version}" %>
               <%= '(LIVE)' if @block.version == r.version %>
-              <%= '<span class="current">(CURRENT)</span>' if i == 0 %>
+              <%= '<span class="current">(CURRENT)</span>'.html_safe if i == 0 %>
             </div>
           </td>
           <td>

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

@@ -1,10 +1,10 @@
 <% page_title @toolbar_title = "Page Cache Info" %>
 
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag("cms/form_layout") %>
 <% end %>
 
-<% content_for :functions do %>
+<%= content_for :functions do %>
   <%= link_to(span_tag("Clear Page Cache"), cms_cache_path, 
     :class => "button http_delete") %>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% if CategoryType.count > 0 %>
-  <% content_for :html_head do %>
+  <%= content_for :html_head do %>
     <script type="text/javascript">
       jQuery(function($){
         var categoriesByType = <%= CategoryType.category_map.to_json %>
@@ -25,7 +25,7 @@
 
 <% else %>
   <% page_title "Please Create A Category Type" %>
-  <% content_for :html_head do %>
+  <%= content_for :html_head do %>
     <script type="text/javascript">
       jQuery(function($){
         $('.buttons').remove()

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

@@ -1,8 +1,8 @@
 <% @toolbar_title = @page_title = "Add Existing Content to '#{@page.page_title}' Page" %>
 
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag("cms/content_library") %>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     jQuery(function($){
       var collectionName = '<%= @block_type.content_block_type %>'
       $('table.data tbody tr').hover(function(){
@@ -27,11 +27,11 @@
   <% end %>
 <% end %>
 
-<% content_for :functions do %>
+<%= content_for :functions do %>
   <h1><%=h @toolbar_title %></h1>
   <%= link_to span_tag("Add to Page"), "#", :id => "add_button", :class => "button disabled" %>
   <%= link_to span_tag("View Content"), "#", :id => "view_button", :class => "button disabled" %>
-  <% form_tag cms_connectors_path, :id => 'connect_form' do %>
+  <%= form_tag cms_connectors_path, :id => 'connect_form' do %>
     <%= hidden_field_tag :page_id, @page.to_param %>
     <%= hidden_field_tag :container,  @container %>
     <%= hidden_field_tag :connectable_type, '' %>
@@ -40,7 +40,7 @@
   <br clear="all" />
 <% end %>
 
-<% form_tag new_cms_connector_path, :method => :get do %>
+<%= form_tag new_cms_connector_path, :method => :get do %>
   <%= hidden_field_tag :page_id, @page.to_param %>
   <%= hidden_field_tag :container, @container %>
   <div style="margin: 20px 2px;">
@@ -50,9 +50,7 @@
     </label>
   </div>
 <% end %>
-    
-<%= error_messages_for :connector %>
-    
+
 <table class="data">
   <thead>
     <tr>

data/app/views/cms/content/no_page.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/content/show.html.erb

@@ -1,19 +1,14 @@
 <% page_title @page.page_title %>
 
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <meta name="generator" content="BrowserCMS <%= Cms.version %>"/>
 <% end %>
-
 <% if @show_toolbar %>
-  <% content_for :html_head do %>
-    <%= stylesheet_link_tag 'cms/page' %>
-  <% end %>
   <% flash.keep %>
-  <iframe src="<%=h cms_toolbar_path(:page_id => @page.id, :page_version => @page.version, :mode => @mode, :page_toolbar => @show_page_toolbar ? 1 : 0) %>" width="100%" height="<%= @show_page_toolbar ? 159 : 100 %>px" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" name="cms_toolbar"></iframe>
 <% end %>
 
 <% @_connectors.each_with_index do |connector, i| %>
-  <% content_for(connector.container.to_sym) do %>
+  <%= content_for(connector.container.to_sym) do %>
     <%= render_connector_and_connectable(connector, @_connectables[i]) %>
   <% end %>
 <% end %> 

data/app/views/cms/dashboard/_page_drafts.html.erb

@@ -1,7 +1,7 @@
 <div class="dashboard_unit" id="page_drafts">
   <h2 class="left">Page Drafts</h2>
 
-  <% form_tag publish_cms_pages_path, :method => :put do %>
+  <%= form_tag publish_cms_pages_path, :method => :put do %>
     <div class="roundedcorners" style="position: relative">
       <table class="data">
         <thead>

data/app/views/cms/dashboard/_tasks.html.erb

@@ -1,7 +1,7 @@
 <div class="dashboard_unit" id="tasks">
   <h2 class="left">Tasks</h2>
 
-  <% form_tag complete_cms_tasks_path, :method => :put do %>
+  <%= form_tag complete_cms_tasks_path, :method => :put do %>
     <div class="roundedcorners" style="position: relative">
       <table class="data">
         <thead>

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

@@ -1,6 +1,6 @@
 <% page_title "Dashboard" %>
 
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag('cms/dashboard') %>
   <%= stylesheet_link_tag('cms/form_layout') %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
-<% form_for([:cms, @view]) do |f| %>
-  <%= f.error_messages %>
+<%= form_for([:cms, @view]) do |f| %>
+  <%= f.cms_error_messages %>
   <%= f.cms_text_field :name %>
   <%= f.cms_text_field :format %>
   <%= f.cms_drop_down :handler, ActionView::Template.template_handler_extensions, :default => "erb" %>

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

@@ -1,6 +1,6 @@
 <% @page_title = @toolbar_title = "List #{dynamic_view_type.name.titleize.pluralize}" %>
-<% 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,14 +19,10 @@
   <% end %>
 <% end %>
 
-<% content_for :functions do %>
-  <%= link_to(span_tag("&nbsp;Add&nbsp;"), cms_new_path_for(dynamic_view_type.name.underscore), :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", 
-    :title => "Are you sure you want to delete this #{dynamic_view_type.name.underscore.titleize}?",
-    :class => "button disabled http_delete confirm_with_title"
-    %>
+<%= content_for :functions do %>
+    <%= add_button cms_new_path_for(dynamic_view_type.name.underscore) %>
+    <%= edit_button  %>
+    <%= delete_button :title => "Are you sure you want to delete this #{dynamic_view_type.name.underscore.titleize}?" %>
 <% end %>
 
 <div class="roundedcorners">
@@ -56,3 +52,4 @@
 <% elsif @views.total_pages > 1 %>
   <%= render_pagination @views, dynamic_view_type.name.pluralize.underscore.to_sym %>
 <% end %>
+

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

@@ -1,4 +1,4 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <style type="text/css">
     div.field {
       margin: 10px 0;
@@ -13,7 +13,7 @@
   </style>
 <% end %>
 
-<% content_for :functions do %>
+<%= content_for :functions do %>
   <%= link_to span_tag("List All"), cms_email_messages_path, :class => "button" %>
 <% end %>
 

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

@@ -3,15 +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 %>
+<%= 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 %>
         $('#file_block_attachment_file, #file_block_attachment_section_id').change(function(){ 
             $('#file_block_attachment_file_path').val(sectionIdPathMap[$('#file_block_attachment_section_id').val()]+'/'+$.cms.sanitizeFileName($('#file_block_attachment_file').val())) 
         })

data/app/views/cms/form_builder/_cms_fancy_drop_down.html.erb

@@ -1,6 +1,6 @@
 <% cms_options[:width] = "455px" unless cms_options[:width]%>
-<% content_for :html_head do %>
-  <% javascript_tag do %>
+<%= content_for :html_head do %>
+  <%= javascript_tag do %>
     jQuery(function($) {
       $('select.<%= object_name %>_<%= method %>').selectbox({width: '<%= cms_options[:width]%>'});
     })

data/app/views/cms/form_builder/_cms_file_field.html.erb

@@ -1,6 +1,6 @@
 <% if cms_options[:fancy] %>
-  <% content_for :html_head do %>
-  <% javascript_tag do %>
+  <%= content_for :html_head do %>
+  <%= javascript_tag do %>
     jQuery(function($) {
       $('#mock_<%= object_name %>_<%= method %>')
       .focus(function() {this.blur()})

data/app/views/cms/form_builder/_cms_tag_list.html.erb

@@ -1,5 +1,5 @@
-<% content_for :html_head do %>
-  <% javascript_tag do %>
+<%= content_for :html_head do %>
+  <%= javascript_tag do %>
   jQuery(function($) {
     $('.tag-list').tagList(tags)
   })

data/app/views/cms/form_builder/_cms_text_editor.html.erb

@@ -1,5 +1,5 @@
-<% content_for :html_head do %>
-  <% javascript_tag do %>
+<%= content_for :html_head do %>
+  <%= javascript_tag do %>
   jQuery(function($) {
     $('select.<%= object_name %>_<%= method %>_dhtml_selector').selectbox({width: '96px', dhtml_selector: '<%= object_name %>_<%= method %>'});
   })

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

@@ -1,26 +1,26 @@
-<% content_for :html_head do %>
+<%= content_for :html_head do %>
   <%= stylesheet_link_tag('cms/form_layout') %>
   <style type="text/css">
     .checkbox_group .checkboxes .instructions {
       padding-bottom: 10px;
     }
   </style>
-  <% javascript_tag do %>
+  <%= javascript_tag do %>
     jQuery(function($) {
       $('#group_group_type_id').selectbox();
     });
   <% end %>
 <% end %>
 
-<% content_for :functions do %> 
+<%= content_for :functions do %>
   <%= link_to(span_tag("List All"), cms_groups_path, 
     :id => "list_all_button", 
     :class => "button") %>
 <% end %>
 
-<% form_for [:cms, @group] do |f| %>
+<%= form_for [:cms, @group] do |f| %>
 
-  <%= f.error_messages %>
+  <%= f.cms_error_messages %>
   <div class="fields text_fields">
     <%= f.label :name, "Group Name" %>
     <%= f.text_field :name %>