Fix bug where adding content to pages wasn't functional.

Author: peakpg

app/assets/javascripts/cms/page_editor.js

@@ -1,7 +1,7 @@
 //= require 'jquery'
 //= require 'jquery_ujs'
 //= require 'cms/core_library'
-//= require 'bootstrap-modal'
+//= require 'bootstrap/modal'
 //= require 'ckeditor-jquery'
 //= require 'cms/ajax'
 

app/assets/stylesheets/cms/application.css.scss

@@ -1,17 +1,23 @@
 @charset "utf-8";
 
+
+
 $experimental-support-for-khtml: false;
 @import "compass/reset";
 @import "compass/css3";
 @import "compass/typography";
 @import "compass/css3/box";
 
+// Basic items for making modals work
+@import "bootstrap/mixins";
+@import "bootstrap/variables";
+@import "bootstrap/modals";
+
 @import 'core';
 
 @import "cms/includes/_rem";
 @import "cms/includes/_animation";
 
-//@import "cms/sitemap";
 @import "cms/bootstrap-customizations";
 
 /* IMPORTING STYLES */

app/assets/stylesheets/cms/bootstrap-customizations.css.scss

@@ -1,5 +1,3 @@
-//@import "bootstrap";
-//@import "bootstrap-responsive";
 
 #form-preview {
 

app/views/cms/content/editing_frame.html.erb

@@ -1,2 +1,2 @@
-<%= content_for :button_bar, render('cms/pages/page_buttons') %>
+<%= content_for :button_bar, render('cms/toolbar/toolbar') %>
 <iframe name="page_content" src="<%= edit_content_path(current_page) %>" frameborder="0" marginheight="0" marginwidth="0" width="100%" height="100%" scrolling="auto"></iframe>

app/views/cms/page_components/new.html.erb

@@ -9,7 +9,7 @@
   <% @content_types.each_with_index do |type, i| %>
   <li><%= link_to h(type.display_name), new_engine_aware_path(type,
           "#{type.param_key}[connect_to_page_id]" => params[:connect_to_page_id],
-          "#{type.model_class_form_name}[connect_to_container]" => params[:connect_to_container]
+          "#{type.param_key}[connect_to_container]" => params[:connect_to_container]
         ), :target=> "_top" %></li>
   <% end %>
 </ul>

todo_v4.md

@@ -13,7 +13,6 @@ ruby -Ilib -Itest test/unit/models/content_type_mini_test.rb --name=/available_b
   - DSL for mapping groups to temp users.
   - Groups should have purpose/description field. Explain who this group represents.
   - Groups should have 'external' user flag to prevent deletion.
-* Multisite (for larger sites) 
 * User Management[Devise?]
   - Built in 'Temp' users (store arbitrary attributes in session)
   - Forgot Password (for admins) 
@@ -25,16 +24,8 @@ ruby -Ilib -Itest test/unit/models/content_type_mini_test.rb --name=/available_b
 * Can't edit the root section
 
 ## Admin Menu
-* Reduce the different admin layouts (why are there so many?)
-* Need to highlight active tab
-* Need to highlight the active menu item
 * Enforce link security for menus
 
-## New Features to implement
-
-* Implement search
-* Implement notifications
-
 ## UI Open Issues
 
 Things that need to be updated in the CSS for the new UI.