browsercms 3.3.4 → 3.4.0.rc1

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

@@ -1,3 +1,3 @@
 <% @page_title = @toolbar_title = "New Redirect" %>
-<%= content_for :functions, link_to(span_tag("List All"), cms_redirects_path, :class => "button") %>
+<%= content_for :functions, link_to(span_tag("List All"), redirects_path, :class => "button") %>
 <%= render :partial => 'form' %>

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

@@ -4,7 +4,7 @@
 <% end %>
 
 <div style="margin: 10px 0">
-  <%= form_tag cms_routes_path, :method => :get do %>
+  <%= form_tag routes_path, :method => :get do %>
     <label>
       Path to Test: <%= text_field_tag :path, @path, :size => 50 %>
     </label>

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

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

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

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

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

@@ -11,10 +11,10 @@ jQuery(function($){
 <% page_title "New Section" %>
 <%= content_for :functions  do %>
 <%= "<h1>#{ @page_title }</h1>" %> 
-<%= link_to(span_tag("list all"), cms_sitemap_path, :class => "button") %>
+<%= link_to(span_tag("list all"), sitemap_path, :class => "button") %>
 <br clear="all"/>
 <% end %>
-<%= form_for([:cms, @section], :id => 'section_form') do |f| %>
+<%= form_for(@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

@@ -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/_admin_sidebar.html.erb

@@ -1,8 +1,8 @@
 <div class="first">
   <h3>Users</h3>
   <ul>
-    <li<%= ' class="open"' if @menu_section == 'users' %>><%= link_to "Users", cms_users_path %></li>
-    <li<%= ' class="open"' if @menu_section == 'groups' %>><%= link_to "Groups", cms_groups_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'users' %>><%= link_to "Users", users_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'groups' %>><%= link_to "Groups", groups_path %></li>
   </ul>
 </div>
 <div class="bottom_cap bottom_pad"></div>
@@ -11,9 +11,9 @@
 <div>
   <h3>Templates</h3>
   <ul>  
-    <li<%= ' class="open"' if @menu_section == 'page_partials' %>><%= link_to "Page Partials", cms_page_partials_path %></li>
-    <li<%= ' class="open"' if @menu_section == 'page_templates' %>><%= link_to "Page Templates", cms_page_templates_path %></li>
-    <li<%= ' class="open"' if @menu_section == 'page_routes' %>><%= link_to "Page Routes", cms_page_routes_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'page_partials' %>><%= link_to "Page Partials", page_partials_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'page_templates' %>><%= link_to "Page Templates", page_templates_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'page_routes' %>><%= link_to "Page Routes", page_routes_path %></li>
   </ul>
 </div>
 <div class="bottom_cap bottom_pad"></div>
@@ -22,9 +22,9 @@
 <div>
   <h3>Tools</h3>
   <ul>  
-    <li<%= ' class="open"' if @menu_section == 'caching' %>><%= link_to "Page Caching", cms_cache_path %></li>
-    <li<%= ' class="open"' if @menu_section == 'redirects' %>><%= link_to "Redirects", cms_redirects_path %></li>
-    <li<%= ' class="open"' if @menu_section == 'email_messages' %>><%= link_to "Email Messages", cms_email_messages_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'caching' %>><%= link_to "Page Caching", cache_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'redirects' %>><%= link_to "Redirects", redirects_path %></li>
+    <li<%= ' class="open"' if @menu_section == 'email_messages' %>><%= link_to "Email Messages", email_messages_path %></li>
   </ul>
 </div>
 <div class="bottom_cap"></div>

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

@@ -29,7 +29,7 @@
             <td class="first"></td>
             <td class="name">
               <div class="dividers">
-                <%= link_to h(tg.taggable.name), [:cms, tg.taggable] %>
+                <%= link_to h(tg.taggable.name), tg.taggable %>
               </div>
             </td>              
             <td class="name">
@@ -50,4 +50,4 @@
 </div>
 <% if @taggings.total_pages > 1 %>
   <%= render_pagination @taggings, :tag, {:id => @content_block} %>
-<% end %>
+<% end %>

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

@@ -9,12 +9,12 @@
   <br clear="all"/>
 <% end %>
 
-<%= form_for([:cms, @page, @task]) do |f| %>
+<%= form_for(@task, :url => @task.new_record? ? cms_page_tasks_path(@page) : cms_page_task_path(@page, @task)) do |f| %>
 
   <%= 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 %>
+    <%= f.collection_select :assigned_to_id, Cms::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 %>
   </div>
   
   <div class="fields text_fields">

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

@@ -1,7 +1,7 @@
 <%= content_for :html_head do %>
   <%= stylesheet_link_tag('cms/form_layout') %>
 <% end %>
-<%= form_for([:cms, @user]) do |f| %>
+<%= form_for(@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? %>

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

@@ -1,7 +1,7 @@
 <div class="fields checkbox_group no_check_all">
   <label>Groups</label>
   <div class="checkboxes">
-    <% Group.find(:all).each do |g| %>
+    <% Cms::Group.find(:all).each do |g| %>
       <div class="checkbox_fields">
         <%= check_box_tag("group_ids[]", g.id, group_ids.include?(g.id), :id => "group_id_#{g.id}") %> <label for="group_id_<%= g.id -%>"><%= g.name %></label>
       </div>

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

@@ -12,8 +12,10 @@
 
 <% if @users %>
   <div class="box">
-    <%= 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>
+    <%= form_tag(users_path, :method => :get ) do %>
+    <div><%= text_field_tag "key_word", params[:key_word] %></div><div id="user_search_submit_container">
+        <%= image_submit_tag "cms/user_search_submit.gif", :alt=>"submit", :id=>"user_search_submit" %>
+    </div>
     <div><%= select_per_page %></div>
     <div><%= group_filter %></div>
     <div class="cb"><label><%= check_box_tag "show_expired", "yes", params[:show_expired] %><span>Show inactive?</span></label></div>

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

@@ -1,8 +1,8 @@
 <% @page_title = @toolbar_title = "Set New Password" %>
 <%= 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") %>
+    <%= link_to(span_tag("List All"), users_path, :id => "list_all_button", :class => "button") %>
+    <%= link_to(span_tag("Edit User"), edit_user_path(@user), :id => "edit_user_button", :class => "button") %>
   <% end %>
 
   <%= content_for :functions, render(:partial => "toolbar") %>
@@ -12,7 +12,7 @@
   <%= stylesheet_link_tag('cms/form_layout') %>
 <% end %>
 
-<%= form_for([:update_password, :cms, @user]) do |f| %>
+<%= form_for([:update_password, @user]) do |f| %>
   <%= f.cms_error_messages %>
   <%= render :partial => 'password', :locals => {:f => f} %>
   <div class="buttons">

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

@@ -1,10 +1,10 @@
 <% @page_title = @toolbar_title = "Edit User '#{h(@user.login)}'" %>
 
 <%= content_for :toolbar_links do %>
-  <%= link_to(span_tag("List All"), cms_users_path, 
+  <%= link_to(span_tag("List All"), users_path,
     :id => "list_all_button", 
     :class => "button") %>
-  <%= link_to(span_tag("Change Password"), [:change_password, :cms, @user], 
+  <%= link_to(span_tag("Change Password"), [:change_password, @user], 
     :id => "change_password_button", 
     :class => "button") %>
 <% end %>

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

@@ -2,7 +2,7 @@
 <% @toolbar_title = "List Users" %>
 
 <%= content_for :toolbar_links do %>
-  <%= link_to(span_tag("ADD USER"), new_cms_user_path, 
+  <%= link_to(span_tag("ADD USER"), new_user_path,
     :id => "add_user_button", 
     :class => "button") %>
 <% end %>
@@ -26,11 +26,11 @@
     <% @users.each do |user|%>
     <tr>
         <td class="first"></td>
-        <td><div class="dividers"><%= link_to "#{user.full_name_or_login}", edit_cms_user_path(user) %></div></td>
+        <td><div class="dividers"><%= link_to "#{user.full_name_or_login}", edit_user_path(user) %></div></td>
 	      <td><div class="dividers"><%= link_to user.email, "mailto:#{user.email}" %></div></td>
         <td>
             <div class="dividers">
-            <% user.groups.all(:order => "groups.name").each do |g| %>
+            <% user.groups.all(:order => "#{Cms::Group.table_name}.name").each do |g| %>
 	            <%= g.name %><br/>
 	          <% end %>
 	          </div>
@@ -39,10 +39,10 @@
         <td>
 	  <% unless user.expired? %>
 	  <span class="user_state">Active</span>
-            <%= link_to("<span>Disable</span>".html_safe, [:disable, :cms, user], :class => "http_put sm_button") if @users.size > 1 %>
+            <%= link_to("<span>Disable</span>".html_safe, [:disable, user], :class => "http_put sm_button") if @users.size > 1 %>
 	    <% else %>
 	  <span class="user_state">Inactive</span>
-            <%= link_to("<span>Enable</span>".html_safe, [:enable, :cms, user], :class => "http_put sm_button") %>
+            <%= link_to("<span>Enable</span>".html_safe, [:enable, user], :class => "http_put sm_button") %>
 	  <% end %>
         </td>
         <td class="last"></td>

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

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

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

@@ -1,10 +1,10 @@
 <% @page_title = @toolbar_title = h(@user.login) %>
 
 <%= content_for :toolbar_links do %>
-  <%= link_to(span_tag("List All"), cms_users_path, 
+  <%= link_to(span_tag("List All"), users_path,
     :id => "list_all_button", 
     :class => "button") if current_user.able_to?(:administrate) %>
-  <%= link_to(span_tag("Change Password"), [:change_password, :cms, @user], 
+  <%= link_to(span_tag("Change Password"), [:change_password, @user], 
     :id => "change_password_button", 
     :class => "button") %>
 <% end %>

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

@@ -2,14 +2,14 @@
   <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 %>
+      	<li><%= link_to image_tag("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("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("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("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>
-      	<li><%= link_to "Logout", cms_logout_path, :class => "http_delete", :target => "_top" %></li>
+	<li id="user_info"><a href="<%= current_user.able_to?(:administrate) ? cms.edit_user_path(current_user) : cms.user_path(current_user) %>" target="_top"><%= image_tag "cms/icons/user.png" %> <%= current_user.full_name %></a></li>
+      	<li><%= link_to "Logout", cms.logout_path, :class => "http_delete", :target => "_top" %></li>
       </ul>
       <% flash_class, flash_message = flash.to_a.first %>
       <div id="flash" style="display: none">
@@ -23,30 +23,30 @@
     jQuery(function($){
 <% unless tab == :dashboard %>
       $('#nav_dash_img').hover(function(){
-        $('#nav_dash_img').attr('src', '/images/cms/nav_dash_h.gif');
+        $('#nav_dash_img').attr('src', '<%= asset_path "cms/nav_dash_h.gif" %>');
       }, function(){
-        $('#nav_dash_img').attr('src', '/images/cms/nav_dash.gif');
+        $('#nav_dash_img').attr('src', '<%= asset_path "cms/nav_dash.gif" %>');
     });
 <% end %>
 <% unless tab == :sitemap %>
       $('#nav_sitemap_img').hover(function(){
-        $('#nav_sitemap_img').attr('src', '/images/cms/nav_sitemap_h.gif');
+        $('#nav_sitemap_img').attr('src', '<%= asset_path "cms/nav_sitemap_h.gif" %>');
       }, function(){
-        $('#nav_sitemap_img').attr('src', '/images/cms/nav_sitemap.gif');
+        $('#nav_sitemap_img').attr('src', '<%= asset_path "cms/nav_sitemap.gif" %>');
     });
 <% end %>
 <% unless tab == :content_library %>
       $('#nav_content_library_img').hover(function(){
-        $('#nav_content_library_img').attr('src', '/images/cms/nav_content_library_h.gif');
+        $('#nav_content_library_img').attr('src', '<%= asset_path "cms/nav_content_library_h.gif" %>');
       }, function(){
-        $('#nav_content_library_img').attr('src', '/images/cms/nav_content_library.gif');
+        $('#nav_content_library_img').attr('src', '<%= asset_path "cms/nav_content_library.gif" %>');
     });
 <% end %>
 <% unless tab == :administration %>
       $('#nav_admin_img').hover(function(){
-        $('#nav_admin_img').attr('src', '/images/cms/nav_admin_h.gif');
+        $('#nav_admin_img').attr('src', '<%= asset_path "cms/nav_admin_h.gif" %>');
       }, function(){
-        $('#nav_admin_img').attr('src', '/images/cms/nav_admin.gif');
+        $('#nav_admin_img').attr('src', '<%= asset_path "cms/nav_admin.gif" %>');
     });
 <% end %>
 

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

@@ -16,7 +16,7 @@
     <div class="page_attribute_label">Section:</div>
     <div class="page_attribute_value_container">
       <%= image_tag "cms/page_toolbar/page_toolbar_inset_l.gif", :style => "float: left;" %>
-      <div id="section_link" class="page_attribute_value"><%= link_to h(@page.section.name), cms_sections_path(:page_id => @page), :target => "_top" %></div>
+      <div id="section_link" class="page_attribute_value"><%= link_to h(@page.section.name), cms.sections_path(:page_id => @page), :target => "_top" %></div>
       <%= image_tag "cms/page_toolbar/page_toolbar_inset_r.gif", :style => "float: left;" %>
     </div>
   </div>
@@ -48,45 +48,45 @@
 <div class="buttons">
   
   <%= link_to "<span>Publish</span>".html_safe, 
-    @page.live? ? '#' : publish_cms_page_path(@page), 
+    @page.live? ? '#' : cms.publish_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>".html_safe,
-    new_cms_page_task_path(@page), 
+    cms.new_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>".html_safe,
-    @page.current_task ? complete_cms_task_path(@page.current_task) : '#', 
+    @page.current_task ? cms.complete_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>".html_safe,
-    [:edit, :cms, @page], 
+    [:edit, @page],
     :id => "edit_properties_button",
     :class => "spacer button#{ ' disabled' unless current_user.able_to_edit?(@page) }", 
     :target => "_top" %>
   
   <%= link_to "<span>List Versions</span>".html_safe, 
-    versions_cms_page_path(@page), 
+    cms.versions_page_path(@page),
     :class => "spacer button#{ ' disabled' unless current_user.able_to_edit?(@page) }",
     :target => "_top" %>
     
   <%= able_to? :publish_content do %>
     <% if @page.draft_version? %>  
       <%= link_to "<span><span class=\"delete_img\">&nbsp;</span>Delete</span>".html_safe,
-        [:cms, @page], 
+        [@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>".html_safe,
-        revert_to_cms_page_path(@page, @page.version), 
+        cms.revert_to_page_path(@page, @page.version),
         :id => "revert_button",
         :class => "button http_put", 
         :target => "_top" %>

data/app/views/layouts/browsercms/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Browsercms</title>
+  <%= stylesheet_link_tag    "browsercms/application" %>
+  <%= javascript_include_tag "browsercms/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/app/views/layouts/cms/_head.html.erb

@@ -4,7 +4,7 @@
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
   <title><%= @page_title %></title>
   <%= stylesheet_link_tag 'cms/application', 'cms/date_picker', 'cms/sitemap', 'cms/taglist' %>
-  <%= javascript_include_tag :bcms_core %>
+  <%= javascript_include_tag "cms/application", cms_content_editor %>
   <script type="text/javascript">
     jQuery(function($){
       <% if protect_against_forgery? %>      

data/app/views/layouts/cms/content_library.html.erb

@@ -7,9 +7,9 @@
   <% end %>
     jQuery(function($){
       $('#search_submit').hover(function(){
-        $('#search_submit').attr('src', '/images/cms/search_submit_h.gif');
+        $('#search_submit').attr('src', '<%= asset_path "cms/search_submit_h.gif"%>');
       }, function(){
-        $('#search_submit').attr('src', '/images/cms/search_submit.gif');
+        $('#search_submit').attr('src', '<%= asset_path "cms/search_submit.gif"%>');
     })});
   <% end %>
 <% end %>
@@ -30,17 +30,17 @@
                       <%= text_field_tag "search[term]", (params[:search] ? params[:search][:term] : nil) %>
                     </div>
                     <div id="search_submit_container">
-                      <input id="search_submit" type="image" src="/images/cms/search_submit.gif" alt="submit" />
+                      <%= image_submit_tag "cms/search_submit.gif", :alt=>"submit", :id=>"search_submit" %>
                     </div>
                     <div style="clear: both;"></div>
 
-                    <% if content_type.name == "HtmlBlock" -%>
+                    <% if content_type.name == "Cms::HtmlBlock" -%>
                       <div id="search_include_body_container">
                         <%= check_box_tag "search[include_body]", true, (params[:search] ? params[:search][:include_body] : false) %>
                         <label for="search_include_body">Include body?</label>
                       </div>
                     <%# TODO: Remove IE 6 Hack %>
-                    <% elsif %w[FileBlock ImageBlock].include?(content_type.name) && request.user_agent !~ /MSIE 6/ %>
+                    <% elsif %w[Cms::FileBlock Cms::ImageBlock].include?(content_type.name) %>
                       <p><%= select_tag 'section_id', searchable_sections(params[:section_id]) %></p>
                     <% end -%>
                   <% end -%>
@@ -52,15 +52,17 @@
                 <%= yield :sidebar %>
                 <h3>Content Types</h3>
                 <ul>
-                  <% ContentTypeGroup.all(:order => "content_type_groups.id").each do |group| %>
+                  <% Cms::ContentTypeGroup.menu_list.each do |group| %>
                     <li<%= ' class="open"'.html_safe if (group == content_type.content_type_group) %>>
                       <% if group.content_types.blank? %>
                         <%= link_to h(group.name), "#" %>
                       <% else %>
                         <%= link_to h(group.name), cms_index_path_for(group.content_types.first) %>
                         <ul>
-                          <% group.content_types.find(:all, :order => 'priority, name').each do |type| %>
-                            <li<%= ' class="on"'.html_safe if content_type.is_child_of?(type) %>><%= link_to h(type.display_name), cms_index_path_for(type) %></li>
+                          <% group.types.each do |type|  %>
+                            <%= select_content_type_tag(type) do %>
+                              <%= link_to h(type.display_name), cms_index_path_for(type) %>
+                            <% end %>
                           <% end -%>
                         </ul>
                       <% end -%>