browsercms 3.3.4 → 3.4.0.rc1

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

@@ -7,9 +7,9 @@
 
 <div class="dashboard_wrap">
   <%= render :partial => 'page_drafts' %>
-  <img src="/images/cms/dashboard/bottom_cap.png" style="position: absolute; bottom: -9px; left: 0" />
+  <%= image_tag "cms/dashboard/bottom_cap.png", :style=>"position: absolute; bottom: -9px; left: 0"%>
 </div>
 <div class="dashboard_wrap tasks_margin">  
   <%= render :partial => 'tasks' %>
-  <img src="/images/cms/dashboard/bottom_cap.png" style="position: absolute; bottom: -9px; left: 0" />
+  <%= image_tag "cms/dashboard/bottom_cap.png", :style=>"position: absolute; bottom: -9px; left: 0"%>
 </div>

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

@@ -1,5 +1,5 @@
 <%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
-<%= form_for([:cms, @view]) do |f| %>
+<%= form_for(@view) do |f| %>
   <%= f.cms_error_messages %>
   <%= f.cms_text_field :name %>
   <%= f.cms_text_field :format %>
@@ -8,4 +8,4 @@
   <div class="buttons">
     <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
   </div>
-<% end %>
+<% end %>

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

@@ -1,4 +1,4 @@
-<% @page_title = @toolbar_title = "List #{dynamic_view_type.name.titleize.pluralize}" %>
+<% @page_title = @toolbar_title = "List #{dynamic_view_type.name.demodulize.titleize.pluralize}" %>
 <%= content_for(:html_head) do %>
   <%= javascript_tag do %>
     jQuery(function($){
@@ -12,17 +12,17 @@
         var id = match[2];
         $('table.data tbody tr').removeClass('selected');
         $(this).addClass('selected');
-        $('#edit_button').removeClass('disabled').attr('href', '/cms/<%= dynamic_view_type.name.underscore.pluralize %>/'+id+'/edit');
-        $('#delete_button').removeClass('disabled').attr('href', '/cms/<%= dynamic_view_type.name.underscore.pluralize %>/'+id)
+        $('#edit_button').removeClass('disabled').attr('href', '/cms/<%= dynamic_view_type.name.demodulize.underscore.pluralize %>/'+id+'/edit');
+        $('#delete_button').removeClass('disabled').attr('href', '/cms/<%= dynamic_view_type.name.demodulize.underscore.pluralize %>/'+id)
       })
     })
   <% end %>
 <% end %>
 
 <%= content_for :functions do %>
-    <%= add_button cms_new_path_for(dynamic_view_type.name.underscore) %>
+    <%= add_button cms_new_path_for(dynamic_view_type) %>
     <%= edit_button  %>
-    <%= delete_button :title => "Are you sure you want to delete this #{dynamic_view_type.name.underscore.titleize}?" %>
+    <%= delete_button :title => "Are you sure you want to delete this #{dynamic_view_type.name.demodulize.underscore.titleize}?" %>
 <% end %>
 
 <div class="roundedcorners">
@@ -34,7 +34,7 @@
       <th class="last"></th>
     </tr>
     <% @views.each do |view| %>
-      <tr id="<%= dynamic_view_type.name.underscore %>_<%= view.id %>">
+      <tr id="<%= dynamic_view_type.form_name %>_<%= view.id %>">
         <td class="first"></td>
         <td><div class="dividers" title="<%=h view.file_path %>"><%=h view.display_name %></div></td>
         <td><div><%= view.updated_at && view.updated_at.to_s(:date) %></div></td>
@@ -50,6 +50,6 @@
 <% if @views.size == 0 && params[:key_word]%>
   <div class="pagination">No results found for '<%= params[:key_word] %>'</div>
 <% elsif @views.total_pages > 1 %>
-  <%= render_pagination @views, dynamic_view_type.name.pluralize.underscore.to_sym %>
+  <%= render_pagination @views, dynamic_view_type.resource_name %>
 <% end %>
 

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

@@ -1,3 +1,3 @@
 <% @page_title = @toolbar_title = "New #{dynamic_view_type.name.titleize}" %>
-<%= content_for :functions, link_to(span_tag("List All"), cms_index_path_for(dynamic_view_type.name.underscore.pluralize), :class => "button") %>
+<%= content_for :functions, link_to(span_tag("List All"), cms_index_path_for(dynamic_view_type), :class => "button") %>
 <%= render :partial => 'form' %>

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

@@ -14,8 +14,8 @@
     <% @messages.each do |message|%>
       <tr>
         <td class="first"></td>
-        <td><div class="dividers"><%= link_to h(truncate(message.recipients)), [:cms, message] %></div></td>
-        <td><div class="dividers"><%= link_to h(truncate(message.subject)), [:cms, message] %></div></td>
+        <td><div class="dividers"><%= link_to h(truncate(message.recipients)),  message %></div></td>
+        <td><div class="dividers"><%= link_to h(truncate(message.subject)), message %></div></td>
         <td style="white-space: nowrap"><%=h time_on_date(message.delivered_at) %></td>
 	<td class="last"></td>
       </tr>

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

@@ -1,5 +1,5 @@
 <% 
-   root = Section.root.first
+   root = Cms::Section.root.first
    root.full_path = root.name
    @sections = []
    @sections << root
@@ -12,8 +12,8 @@
     jQuery(function($) {
       <% if @block.new_record? %>
         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())) 
+        $('#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()))
         })
       <% end %>      
     });    
@@ -28,3 +28,4 @@
 <%= f.cms_text_field :attachment_file_path, :label => "Path" %>
 <%= f.cms_tag_list %>
 
+

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

@@ -1,5 +1,5 @@
 <div id="file_block_<%= @content_block.id %>" class="file_block">
-  <img src="/images/cms/icons/file_types/<%= @content_block.attachment.icon %>.png" alt="<%=h @content_block.attachment.icon %>"/>
+  <%= image_tag "cms/icons/file_types/#{@content_block.attachment.icon}.png", :alt=>@content_block.attachment.icon %>
   <%= link_to @content_block.name, @content_block.attachment_link %>
   <%= @content_block.attachment.file_size.round_bytes %>
 </div>

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

@@ -1,6 +1,7 @@
 <div class="fields text_editor_fields">
   <%= f.label method, cms_options[:label] %>
   <%= f.drop_down "#{method}_handler", ActionView::Template.template_handler_extensions, :default_value => dropdown_options[:default_handler], :width=>"96px" %>
+  <br>
   <div class="template_editor">
     <%= f.text_area method, options %>
   </div>

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

@@ -13,13 +13,12 @@
 <% end %>
 
 <%= content_for :functions do %>
-  <%= link_to(span_tag("List All"), cms_groups_path, 
+  <%= link_to(span_tag("List All"), groups_path,
     :id => "list_all_button", 
     :class => "button") %>
 <% end %>
 
-<%= form_for [:cms, @group] do |f| %>
-
+<%= form_for @group do |f| %>
   <%= f.cms_error_messages %>
   <div class="fields text_fields">
     <%= f.label :name, "Group Name" %>
@@ -29,7 +28,7 @@
   <% unless @group.guest? %>
     <div class="fields select_fields">
     	<%= f.label :group_type_id, "Type of User" %>
-    	<div><%= f.select :group_type_id, GroupType.non_guest.map { |g| [g.name, g.id] } %></div>
+    	<div><%= f.select :group_type_id, Cms::GroupType.non_guest.map { |g| [g.name, g.id] } %></div>
     	<div class="instructions">What kind of user does this group represent?</div>
   	<br clear="all" />
     </div>
@@ -42,4 +41,4 @@
     <%= lt_button_wrapper(f.submit("Save", :class => "submit")) %>
   </div>
 
-<% end %>
+<% end %>

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

@@ -1,7 +1,7 @@
 <%= 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 %>
+      var cms_access_group_ids = <%= Cms::GroupType.cms_access.all.map{|e| e.id.to_s}.to_json.html_safe %>
       $('#group_group_type_id').change(function() {
         if ($.inArray($('#group_group_type_id')[0].value, cms_access_group_ids) < 0) {
           $('#permissions').hide()
@@ -20,7 +20,7 @@
     <label>Global Permissions</label>
     <%= hidden_field_tag "group[permission_ids][]", "" %>  
     <div class="checkboxes">
-    <% Permission.all(:order => "name").each do |p| %>
+    <% Cms::Permission.all(:order => "name").each do |p| %>
       <div class="checkbox_fields">
           <%= check_box_tag "group[permission_ids][]", p.id, @group.permissions.include?(p), :id => "permission_ids_#{p.id}", :class => "permission_ids" %>
           <label for="permission_ids_<%= p.id %>" style="width: 400px;#padding-top: 6px;"><%=h p.full_name %></label>

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

@@ -2,7 +2,7 @@
   <label>Section Permissions</label>
   <%= hidden_field_tag "group[section_ids][]", "" %>
   <div class="checkboxes">
-  <% Section.all(:order => "path").each do |s|%>
+  <% Cms::Section.all(:order => "path").each do |s|%>
   <div class="checkbox_fields">
     <%= check_box_tag "group[section_ids][]", s.id, @group.sections.include?(s), :id => "section_ids_#{s.id}", :class => "section_ids" %>
     <label for= "section_ids_<%= s.id %>" style="width: 400px; padding-top: 0; #padding-top: 4px;"><%=h s.name %><span style="padding-top: 0; font-weight: lighter; display: inline; float: none;">(Path: <%=h s.path %>)</span></label>

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

@@ -2,7 +2,7 @@
 <% @toolbar_title = "List Groups" %>
 
 <%= content_for :functions do %>
-  <%= link_to(span_tag("Add Group"), new_cms_group_path, 
+  <%= link_to(span_tag("Add Group"), new_group_path,
     :id => "new_group_button", :class => "button") %>
 <% end %>
 
@@ -12,24 +12,24 @@
       <tr>
         <th colspan="2" class="first">
           <div class="dividers">
-            <%= link_to "Name", cms_groups_path(:order => determine_order(params[:order], "groups.name")) %>
+            <%= link_to "Name", groups_path(:order => determine_order(params[:order], "#{Cms::Group.table_name}.name")) %>
           </div>
         </th>
         <th>
           <div class="dividers">
-            <%= link_to "Type", cms_groups_path(:order => determine_order(params[:order], "group_types.name")) %>
+            <%= link_to "Type", groups_path(:order => determine_order(params[:order], "#{Cms::GroupType.table_name}.name")) %>
           </div>
         </th>
         <th colspan="2" class="last"><div class="dividers">Permissions</div></th>
       </tr>
     </thead>
-    <% section_count = Section.count %>
+    <% section_count = Cms::Section.count %>
     <% @groups.each do |g| %>
       <tr>
         <td class="first"></td>
         <td>
           <div class="dividers">
-            <%= link_to h(g.name), [:edit, :cms, g] %>
+            <%= link_to h(g.name), [:edit, g] %>
           </div>
         </td>
         <td>

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

@@ -1,5 +1,5 @@
 <% 
-   root = Section.root.first
+   root = Cms::Section.root.first
    root.full_path = root.name
    @sections = []
    @sections << root

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

@@ -1,14 +1,13 @@
 <% page_title "Edit '#{h(@link.name)}' Link" %>
 <%= 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, @link]) do |f| %>
-  
+<%= form_for(@link) do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <div class="buttons">
-    <%= lt_button_wrapper('<button type="submit" name="link[publish_on_save]" value="true" class="submit"><span>Save And Publish</span></button>') %>
+    <%= lt_button_wrapper('<button type="submit" name="cms_link[publish_on_save]" value="true" class="submit"><span>Save And Publish</span></button>') %>
     <%= lt_button_wrapper(f.submit("Save", :class => "submit")) %>
   </div>
 <% end %>

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

@@ -1,15 +1,14 @@
 <% @link_title = @page_title = "Add New Link to Sitemap" %>
 <%= 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, @link]) do |f| %>
+<%= form_for(@link) do |f| %>
   <%= hidden_field_tag :section_id, @link.section_id %>
-  
   <%= render :partial => 'form', :locals => {:f => f} %>
   <div class="buttons">
-    <%= lt_button_wrapper(%Q{<button type="submit" name="link[publish_on_save]" value="true" class="submit" tabindex="#{next_tabindex}"><span>Save And Publish</span></button>}) %>
+    <%= lt_button_wrapper(%Q{<button type="submit" name="cms_link[publish_on_save]" value="true" class="submit" tabindex="#{next_tabindex}"><span>Save And Publish</span></button>}) %>
     <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex )) %>
   </div>
 <% end %>

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

@@ -1,11 +1,11 @@
 <%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
-<%= form_for([:cms, @page_route]) do |f| %>
+<%= form_for(@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_drop_down :page_id, Cms::Page.all(:order => "path").map{|p| ["#{p.path} (#{p.name})", p.id]}%>
   <%= f.cms_text_field :name %>
   <%= f.cms_text_field :pattern %>
   <%= f.cms_text_area :code, :style => "height: 200px" %>
   <div class="buttons">
     <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
   </div>
-<% end %>
+<% end %>

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

@@ -1,3 +1,3 @@
 <% @toolbar_title = page_title "Edit Page Route" %>
-<%= content_for :functions, link_to(span_tag("List All"), cms_page_routes_path, :class => "button") %>
+<%= content_for :functions, link_to(span_tag("List All"), page_routes_path, :class => "button") %>
 <%= render :partial => 'form' %>

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

@@ -20,11 +20,11 @@
 <% end %>
 
 <%= content_for :functions do %>
-  <%= add_button new_cms_page_route_path %>
+  <%= add_button new_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") %>
+  <%= link_to(span_tag("View Rails Routes"), routes_path, :class => "button") %>
 <% end %>
 
 <div class="roundedcorners">

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

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

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

@@ -1,11 +1,10 @@
 <% @toolbar_title = page_title "'#{@page_route.name}' Page Route" %>
-
 <%= 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") %>
+  <%= add_button new_page_route_path %>
+  <%= edit_button :path=>edit_page_route_path(@page_route), :enabled=>true %>
+  <%= delete_button :path=>@page_route, :title => "Are you sure you want to delete this Page Route?", :enabled=>true %>
+  <%= link_to(span_tag("List All"), page_routes_path, :class => "button") %>
+  <%= link_to(span_tag("View Rails Routes"), routes_path, :class => "button") %>
 <% end %>
 
 <%= @page_route.name %>

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

@@ -1,15 +1,15 @@
-<div id="connector_<%= connector.id %>" class="cms_edit_connectable" style="display: block; height: auto; position: relative; border: 1px solid #999; margin: 1px -6px 0 -6px; padding: 25px 5px 0 5px;  background: url(/images/cms/containers/beta.png) repeat-x 0 0;">
+<div id="connector_<%= connector.id %>" class="cms_edit_connectable" style="display: block; height: auto; position: relative; border: 1px solid #999; margin: 1px -6px 0 -6px; padding: 25px 5px 0 5px;  background: url(<%= asset_path "cms/containers/beta.png"%>) repeat-x 0 0;">
   <div style="display: block; width: 100%; position: absolute; top: 5px; left: 5px; height: 30px;">
     <%= link_to image_tag("cms/pages/show_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms_connectable_path(connectable), :title => "View this content (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
     <%= link_to image_tag("cms/pages/edit_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), edit_cms_connectable_path(connectable, :_redirect_to => @page.path), :title => "Edit this content (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
     <% if @page.connectors.for_page_version(@page.version).in_container(connector.container).count > 1 %>
-      <%= link_to image_tag("cms/pages/up_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), move_up_cms_connector_path(connector), :class => "http_put", :title => "Move this content up (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
-      <%= link_to image_tag("cms/pages/down_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), move_down_cms_connector_path(connector), :class => "http_put", :title => "Move this content down (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
+      <%= link_to image_tag("cms/pages/up_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms.move_up_connector_path(connector), :class => "http_put", :title => "Move this content up (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
+      <%= link_to image_tag("cms/pages/down_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms.move_down_connector_path(connector), :class => "http_put", :title => "Move this content down (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
     <% else %>
       <%= image_tag("cms/pages/up_connectable_disabled.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;") %>
       <%= image_tag("cms/pages/down_connectable_disabled.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;") %>
     <% end %>
-    <%= link_to image_tag("cms/pages/delete_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms_connector_path(connector, :_redirect_to => @page.path), :class => "confirm_with_title http_delete", :title => "Remove this content from page (#{connectable.name}).  It will remain available in the Content Library." , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
+    <%= link_to image_tag("cms/pages/delete_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms.connector_path(connector, :_redirect_to => @page.path), :class => "confirm_with_title http_delete", :title => "Remove this content from page (#{connectable.name}).  It will remain available in the Content Library." , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
     <%= status_icon connector.status,
           :class => "published_status", 
           :title => connector.live? ? "This content is published and can be seen by site visitors." : "This content is a draft and won't be seen by site visitors until this page is published." , 
@@ -17,8 +17,8 @@
   </div>
     <%= render_connectable connectable %>
 </div>
-<% require_javascript_include ['jquery', 'cms/application'] %>
 <%= content_for :html_head do %>
+    <%= javascript_include_tag 'cms/core_library' %>
     <% 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/_edit_container.html.erb

@@ -1,7 +1,7 @@
-<div class="cms_edit_container" style="height: auto; background: url(/images/cms/containers/alpha.png) repeat-x 0 0; border: 1px solid #999; margin: -8px 0 0 -8px; padding: 24px 7px 1px 7px; position: relative;">
+<div class="cms_edit_container" style="height: auto; background: url(<%= asset_path "cms/containers/alpha.png" %>) repeat-x 0 0; border: 1px solid #999; margin: -8px 0 0 -8px; padding: 24px 7px 1px 7px; position: relative;">
     <div style="display: block; width: 100%; position: absolute; top: 5px; left: 5px; height: 30px;">
-      <%= link_to image_tag("cms/pages/add_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms_content_types_path(:connect_to_page_id => @page, :connect_to_container => name), :title => "Add new content to this container (#{name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
-      <%= link_to image_tag("cms/pages/connect_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), new_cms_connector_path(:page_id => @page, :container => name), :title => "Insert existing content into this container (#{name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
+      <%= link_to image_tag("cms/pages/add_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms.content_types_path(:connect_to_page_id => @page, :connect_to_container => name), :title => "Add new content to this container (#{name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
+      <%= link_to image_tag("cms/pages/connect_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms.new_connector_path(:page_id => @page, :container => name), :title => "Insert existing content into this container (#{name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;", :id=>"insert_existing_content_#{name}"%>
       <%= image_tag "cms/#{@page.container_published?(name) ? 'published' : 'draft'}_status.gif", 
             :class => "published_status",
             :title => @page.container_published?(name) ? "This content is published and can be seen by site visitors." : "This content is a draft and won't be seen by site visitors until this page is published.", 

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

@@ -10,7 +10,7 @@
 <%= f.cms_text_field :name %>
 <%= f.cms_text_field :title, :instructions => "(Leave blank if same as name)" %>
 <%= f.cms_text_field :path %>
-<%= f.cms_drop_down :template_file_name, PageTemplate.options, {:label => "Template"}, :tabindex => next_tabindex %>
+<%= f.cms_drop_down :template_file_name, Cms::PageTemplate.options, {:label => "Template"}, :tabindex => next_tabindex %>
 
 <div class="checkbox_group fields no_check_all">
   <div class="checkbox_fields">

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

@@ -1,11 +1,11 @@
 <% page_title "Edit Properties / '#{h(@page.name)}' Page" %>
 <%= 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") %>
 <%= link_to(span_tag("edit content"), @page.path, :class => "button") %>
 <br clear="all" />
 <% end %>
-<%= form_for([:cms, @page]) do |f| %>
+<%= form_for(@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

@@ -3,7 +3,7 @@
 jQuery(function($){
   $("#page_name").keyup(function(){
     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());
+    var page_name = $.trim($("#page_name").val())
     if (page_name == section.name || page_name == 'Overview') {
       $("#page_path").val(section.path)
     } else {
@@ -19,10 +19,10 @@ jQuery(function($){
 <% page_title "New Page" %>
 <%= 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, @page]) do |f| %>
+<%= form_for(@page) do |f| %>
   <%= hidden_field_tag :section_id, @page.section_id %>
   
   <%= render :partial => 'form', :locals => {:f => f} %>

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

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

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

@@ -19,7 +19,7 @@
   <% end %>
 <% end %>
 <%= content_for :functions do %>
-    <%= add_button new_cms_redirect_path %>
+    <%= add_button new_redirect_path %>
     <%= edit_button %>
     <%= delete_button :title => "Are you sure you want to delete this Redirect?" %>
 <% end -%>