browsercms-artirix 4.0.0.rc1.art4

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

@@ -0,0 +1,9 @@
+<% content_for :buttons, 'save_buttons'  %>
+<%= simple_form_for(@view) do |f| %>
+    <%= render layout: 'form_with_buttons', locals: {f: f} do %>
+        <%= f.input :name, hint: @view.hint, placeholder: @view.placeholder %>
+        <%= f.input :format %>
+        <%= f.input :handler, collection: ActionView::Template.template_handler_extensions, default: "erb" %>
+        <%= f.input :body, as: :text, input_html: {:style => "height: 500px", :cols => 80} %>
+    <% end %>
+<% end %>

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

@@ -0,0 +1,2 @@
+<% use_page_title "Edit '#{@view.name}' #{dynamic_view_type.title}" %>
+<%= render 'form' %>

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

@@ -0,0 +1,33 @@
+<% use_page_title "#{dynamic_view_type.name.demodulize.titleize.pluralize}" %>
+<%= render layout: 'page_title' do %>
+    <%= link_to "Add", new_engine_aware_path(dynamic_view_type), class: 'btn btn-primary btn-small right' %>
+<% end %>
+<%= render layout: 'main_content' do %>
+  <table class="data cms-content-table table table-striped table-bordered table-hover">
+	<thead>
+		<tr>
+	      <th>Name</th>
+          <th>Path</th>
+	      <th>Updated At</th>
+	      <th>Actions</th>
+	    </tr>
+	</thead>
+    <% @views.each do |view| %>
+      <tr>
+        <td><%= view.display_name %></td>
+        <td><%= view.path %></td>
+        <td><%= view.updated_at && view.updated_at.to_s(:date) %></td>
+        <td>
+          <%= link_to "Edit", edit_polymorphic_path(view), class: "btn btn-mini" %>
+          <%= link_to "Delete", polymorphic_path(view), class: "btn btn-mini btn-danger", method: 'delete',  data: {confirm: 'Are you sure you want to delete this view?'} %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
+<% 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 %>
+<% end %>
+

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

@@ -0,0 +1,2 @@
+<% use_page_title "New #{dynamic_view_type.title}" %>
+<%= render 'form' %>

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

@@ -0,0 +1,36 @@
+<% use_page_title "Email Messages" %>
+<%= render layout: 'page_title' do
+end %>
+
+<%= render layout: 'main_content' do %>
+    <table class="data table table-striped table-bordered table-hover">
+      <thead>
+      <tr>
+        <th>To</th>
+        <th>Subject</th>
+        <th>Delivered</th>
+      </tr>
+      </thead>
+      <tbody>
+      <% @messages.each do |message| %>
+          <tr>
+            <td><%= link_to truncate(message.recipients), message %>
+            </td>
+            <td>
+              <%= message.subject %>
+            </td>
+            <td style="white-space: nowrap"><%= h time_on_date(message.delivered_at) %></td>
+          </tr>
+      <% end %>
+      <% if @messages.empty? %>
+          <tr>
+            <td colspan="3">No email messages.</td>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+
+<% end %>
+<% if @messages.total_pages > 1 %>
+    <%= render_pagination @messages, Cms::EmailMessage %>
+<% end %>

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

@@ -0,0 +1,50 @@
+<%= content_for :functions do %>
+    <%= link_to span_tag("List All"), cms.email_messages_path, :class => "button" %>
+<% end %>
+
+<% use_page_title "Email Message" %>
+<%= render layout: 'page_title' do %>
+    <%= link_to "Email Messages", cms.email_messages_path, :class => "btn btn-primary right btn-small" %>
+<% end %>
+
+<%= render layout: 'main_with_sidebar' do %>
+    <dl>
+      <dt>Delivered At:</dt>
+      <dd><%= time_on_date(@message.delivered_at) %></dd>
+    </dl>
+
+    <% unless @message.content_type.blank? %>
+        <dl>
+          <dt>Content-Type:</dt>
+          <dd><%= h @message.content_type %></dd>
+        </dl>
+    <% end %>
+    <dl>
+      <dt>From:</dt>
+      <dd><%= h @message.sender %></dd>
+    </dl>
+    <dl>
+      <dt>To:</dt>
+      <dd><%= h @message.recipients %></dd>
+    </dl>
+    <% unless @message.cc.blank? %>
+        <dl>
+          <dt>CC:</dt>
+          <dd><%= h @message.cc %></dd>
+        </dl>
+    <% end %>
+    <% unless @message.bcc.blank? %>
+        <dl>
+          <dt>BCC:</dt>
+          <dd><%= h @message.bcc %></dd>
+        </dl>
+    <% end %>
+    <dl>
+      <dt>Subject:</dt>
+      <dd><%= h @message.subject %></dd>
+    </dl>
+    <dl>
+      <dt>Body</dt>
+      <dd><%= h @message.body %></dd>
+    </dl>
+<% end %>

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

@@ -0,0 +1,3 @@
+<%= f.input :name %>
+<%= f.input :file, hint: "Select a file to upload.", as: :file_picker %>
+<%= f.cms_tag_list %>

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

@@ -0,0 +1,13 @@
+<%
+   root = Cms::Section.root.first
+   root.full_path = root.name
+   @sections = []
+   @sections << root
+   @sections += root.master_section_list
+   @sections.each {|s| s.full_path = "/" + s.full_path unless s == root }
+%>
+<span style="display: hidden">
+<% @sections.each do |s| -%>
+    <%= tag :span, :class=>"section_id_map",  :data=>{:id=> s.id, :path => s.prependable_path}  %>
+<% end %>
+</span>

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

@@ -0,0 +1,5 @@
+<div id="file_block_<%= @content_block.id %>" class="file_block">
+  <%= image_tag "cms/icons/file_types/#{@content_block.file.icon}.png", :alt=>@content_block.file.icon %>
+  <%= link_to @content_block.name, attachment_path_for(@content_block.file) %>
+  <%= @content_block.file_size %>
+</div>

data/app/views/cms/forgot_password_mailer/reset_password.text.html.erb

@@ -0,0 +1,3 @@
+This email is in response to your request to reset your password. Please follow the link below and fill in the password fields to the new credentials you wish to use to authenticate yourself.
+
+<a href="<%= @url %>"><%= @url %></a>

data/app/views/cms/forgot_password_mailer/reset_password.text.plain.erb

@@ -0,0 +1,3 @@
+This email is in response to your request to reset your password. Please copy and paste the link into your browser and fill in the password fields to the new credentials you wish to use to authenticate yourself.
+
+<%= @url %>

data/app/views/cms/form_entries/_buttons.html.erb

@@ -0,0 +1,2 @@
+<%= link_to("#{@entry.form.name} form", form_path(@entry.form), class: "btn btn-small right ") %>
+<%= link_to("New Entry", new_form_entry_path(form_id: @entry.form), class: "btn btn-small btn-primary right") %>

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

@@ -0,0 +1,7 @@
+<%= simple_form_for(model, as: :form_entry, url: url) do |f| %>
+    <%= hidden_field_tag :form_id, model.form.id %>
+    <% model.form.fields.each do |field| %>
+        <%= f.input field.name, field.options(entry: model) %>
+    <% end %>
+    <%= f.button :submit, "Submit" %>
+<% end %>

data/app/views/cms/form_entries/_internal_form.html.erb

@@ -0,0 +1,9 @@
+<% content_for :buttons, 'save_buttons' %>
+<%= simple_form_for(model, as: :form_entry, url: url) do |f| %>
+    <%= render layout: 'form_with_buttons', locals: {f: f} do %>
+        <%= hidden_field_tag :form_id, model.form.id %>
+        <% model.form.fields.each do |field| %>
+            <%= f.input field.name, field.options(entry: model) %>
+        <% end %>
+    <% end %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% use_page_title "Edit Entry" %>
+<%= render partial: 'internal_form',
+           locals: {model: @entry,
+                    url: cms.form_entry_path(@entry)}
+%>

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

@@ -0,0 +1,3 @@
+<%= content_for :main do %>
+  <%= render file: 'cms/forms/render' %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% content_for :bulk_actions do %>
+    <%= render 'buttons' %>
+	<%= hidden_field_tag :form_id, @form.id %>
+<% end %>
+<%=  render file: 'cms/content_block/index' %>

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

@@ -0,0 +1,5 @@
+<% use_page_title "New Entry for #{@entry.form.name}" %>
+<%= render partial: 'internal_form',
+           locals: {model: @entry,
+                    url: form_entries_path(@entry)}
+%>

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

@@ -0,0 +1,13 @@
+<% use_page_title "View Entry" %>
+
+<%= render partial: 'buttons', layout: 'page_title' %>
+
+
+<%= render layout: 'main_with_sidebar' do %>
+    <dl>
+      <% @entry.form.fields.each do |field| %>
+          <dt><%= field.label %></dt>
+          <dd><%= @entry.data_columns[field.name] %></dd>
+      <% end %>
+    </dl>
+<% end %>

data/app/views/cms/form_entries/submit.html.erb

@@ -0,0 +1 @@
+<%= content_for :main , @form.confirmation_text.html_safe %>

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

@@ -0,0 +1,8 @@
+<%= f.input field.name,
+            label: field.label,
+            hint: field.instructions,
+            wrapper: :append do %>
+    <%= f.input_field field.name, field.options(disabled: true).merge({data: {id: field.id}}) %>
+    <%= link_to("Edit", "#", data: {edit_path: edit_path}, class: "btn edit_form_button") %>
+    <%= link_to("Delete", "#", data: {path: delete_path}, class: "btn delete_field_button") %>
+<% end %>

data/app/views/cms/form_fields/_select.html.erb

@@ -0,0 +1,3 @@
+<%= f.input :choices, hint: "Enter each choice on a separate line." %>
+<%= f.input :required, hint: "Required fields will show the first option a preselected." %>
+<%= f.input :instructions, as: :text %>

data/app/views/cms/form_fields/_text_area.html.erb

@@ -0,0 +1,3 @@
+<%= f.input :required %>
+<%= f.input :instructions, as: :text %>
+<%= f.input :default_value %>

data/app/views/cms/form_fields/_text_field.html.erb

@@ -0,0 +1,3 @@
+<%= f.input :required %>
+<%= f.input :instructions, as: :text %>
+<%= f.input :default_value %>

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

@@ -0,0 +1,26 @@
+<div class="modal-header">
+  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+  <h3>Edit Field</h3>
+</div>
+<div class="modal-body">
+  <%= simple_form_for(@field, html: {id: 'ajax_form_field'}) do |f| %>
+      <%= f.hidden_field :form_id %>
+      <%= f.hidden_field :field_type %>
+      <%= f.input :label, hint: @field.new_record? ? "" : "Will not change the database name (i.e. '#{@field.name}') for new or existing entries. ", autofocus: true %>
+      <%= render partial: @field.field_type, locals: {f: f, field: @field} %>
+      <%= f.button :submit, "Save", style: 'display: none' %>
+  <% end %>
+</div>
+<div class="modal-footer">
+  <a class="btn btn-primary" href="#" id="create_field" data-dismiss="modal" type="button">Save</a>
+  <a aria-hidden="true" class="btn" data-dismiss="modal" href="#" type="button">Never Mind</a>
+</div>
+
+<%#
+    I would prefer to do this on shown.bs.modal event but that doesn't seem to work.
+    Doing it here guarantees the #create_field exists before we add the click to it.
+  %>
+<script type="text/javascript">
+ $("#create_field").on('click', formBuilder.createField);
+ formBuilder.onEnterSubmitFormViaAjax();
+</script>

data/app/views/cms/form_fields/preview.html.erb

@@ -0,0 +1,16 @@
+<%= simple_form_for(@form) do |f| %>
+    <%= f.simple_fields_for :new_entry do |e| %>
+        <%
+           locals = {f: e,
+                     field: @field,
+                     edit_path: new_form_field_path(form_id: @form.id, field_type: @field.field_type)
+           }
+           if @field.persisted?
+             locals[:delete_path] = form_field_path(@field.id)
+           else
+             locals[:delete_path] = ""
+           end
+        %>
+        <%= render partial: 'cms/form_fields/form', locals: locals %>
+    <% end %>
+<% end %>

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

@@ -0,0 +1,67 @@
+<% if cleanup_before_abandoning %>
+    <span id="cleanup-before-abandoning" data-path="<%= form_path(@block) %>"></span>
+<% end %>
+
+<h3>Form Settings</h3>
+<%= f.input :name, as: :name %>
+<%= f.input :slug, as: :path %>
+<%= f.input :description %>
+<%= hidden_field_tag "field_ids", @block.field_ids %>
+<%= f.input :confirmation_behavior, label: "On Confirmation",
+            collection: [["Show Text", :show_text], ['Redirect to Website', :redirect]],
+            as: :radio_buttons %>
+<%= f.input :confirmation_text, label: false %>
+<%= f.input :confirmation_redirect, label: false, hint: "A complete URL (i.e. http://www.yoursite.com/registration) or relative path (/thanks-for-registering)." %>
+<%= f.input :notification_email, placeholder: 'email@example.com', label: "Notification Email", hint: "Notify this email address when an entry is created. (Leave blank for no notification)" %>
+
+<h3> Preview</h3>
+<div id="form-preview">
+  <% if @block.new_record? %>
+      <div id="no-field-instructions">
+        No fields yet! This <b>live preview</b> of your form will show you fields as you add them. Choose a field type
+        below.
+      </div>
+  <% end %>
+  <%= f.simple_fields_for :new_entry do |e| %>
+      <% @block.fields.each do |field| %>
+          <%= render partial: 'cms/form_fields/form',
+                     locals: {f: e, field: field, edit_path: edit_form_field_path(field.id), delete_path: form_field_path(field.id)} %>
+      <% end %>
+  <% end %>
+  <span id="placeHolder" data-new-path="<%= preview_form_field_path(@block) %>"></span>
+</div>
+
+<%= f.simple_fields_for :new_entry do |e| %>
+    <%= e.input :new_field,
+                label: "Add New Field",
+                prompt: "Select a field type:",
+                collection: [["Text Field", :text_field], ["Text Box", :text_area], ["Dropdown", :select]],
+                input_html: {class: 'add-new-field'}
+    %>
+<% end %>
+<%# Can't have a form inside a form, so this must go into the head. %>
+<%= content_for :html_head do %>
+    <div id="modal-edit-field" class="modal" tabindex="-1" role="dialog" aria-labelledby="model_label" aria-hidden="true">
+      <div class="modal-content"></div>
+    </div>
+
+    <div id="modal-confirm-delete-field" class="modal modal-content" tabindex="-1" role="dialog" aria-labelledby="model_label" aria-hidden="true">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <h3>Delete Field</h3>
+      </div>
+      <div class="modal-body">
+        <p>Are you sure you want to delete this field?</p>
+      </div>
+      <div class="modal-footer">
+        <a class="btn btn-primary" href="#" id="delete_field" data-dismiss="modal" type="button">Yes. Remove this field.</a>
+        <a aria-hidden="true" class="btn" data-dismiss="modal" href="#" type="button">Never Mind</a>
+      </div>
+    </div>
+<% end %>
+
+<% content_for :sidebar_actions do %>
+    <div class="btn-group">
+        <%= link_to "Entries", cms.entries_path(@block), class: "btn btn-small" %>
+    </div>
+<% end %>

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

@@ -0,0 +1,15 @@
+<% content_for :html_head do %>
+    <%= stylesheet_link_tag Rails.application.config.cms.form_builder_css %>
+<% end %>
+<h1><%= @content_block.name %></h1>
+<p>
+  <%= @content_block.description %>
+</p>
+<%
+   unless @entry
+     @entry = Cms::FormEntry.for(@content_block)
+   end
+%>
+<%= render partial: 'cms/form_entries/form', locals: {model: @entry, url: cms.submit_form_entries_path, form: @content_block} %>
+
+

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

@@ -0,0 +1,6 @@
+<% content_for :page_buttons do %>
+    <div class="btn-group">
+    <%= link_to("Entries", cms.entries_path(@block), class: "btn btn-small") %>
+    </div>
+<% end %>
+<%= render file: 'cms/content_block/show' %>

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

@@ -0,0 +1,38 @@
+<%= content_for :html_head do %>
+    <%# Hide permissions based on whether is a CMS User group or not.  %>
+    <%= javascript_tag do %>
+
+        jQuery(function($){
+            var element = $('#group_group_type_id');
+            var cms_access_group_ids = <%= Cms::GroupType.cms_access.to_a.map { |e| e.id.to_s }.to_json.html_safe %>
+            element.change(function() {
+                if ($.inArray(element[0].value, cms_access_group_ids) < 0) {
+                    $('#permissions').hide();
+                    $('#section-action').text('view');
+                } else {
+                    $('#permissions').show();
+                    $('#section-action').text('edit');
+                }
+            }).change();
+        });
+    <% end %>
+<% end %>
+
+<%= simple_form_for @group do |f| %>
+    <%=  page_title_with_buttons(f, 'save_buttons') %>
+    <%= render layout: 'main_with_sidebar' do %>
+    <%= f.input :name, label: "Group Name" %>
+    <% unless @group.guest? %>
+        <%= f.association :group_type,
+                    collection: Cms::GroupType.non_guest,
+                    label: 'Type of User',
+                    hint: 'What kind of user does this group represent?',
+                    include_blank: false
+        %>
+    <% end %>
+
+    <%= render :partial => 'permissions', locals: {f: f} %>
+    <%= render :partial => 'sections', locals: {f: f} %>
+    <% end %>
+    <%= bottom_buttons f,  'save_buttons' %>
+<% end %>

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

@@ -0,0 +1,14 @@
+<div id="permissions">
+    <%= f.association :permissions,
+                      collection: Cms::Permission.order(:name),
+                      as: :check_boxes,
+                      label: 'Global Permissions',
+                      label_method: lambda { |permission| "#{permission.full_name} (#{permission.description})"},
+                      :input_html => { :class => "check_uncheck" }
+                      # Note: Check/uncheck only works once, and was not broken by this refactoring.
+    %>
+  <div class="check_uncheck">
+    <%= check_uncheck_tag 'input.check_uncheck' %>
+  </div>
+</div>
+

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

@@ -0,0 +1,12 @@
+
+<%= f.association :sections,
+                  collection: Cms::Section.order(:path),
+                  as: :check_boxes,
+                  label: 'Section Permissions',
+                  label_method: lambda { |s| "#{s.name} (Path: #{s.path})"},
+                  hint: "What sections should group members be allowed to <span id='section-action'>#{@group.cms_access? ? 'edit' : 'view'}</span>?".html_safe,
+                  :input_html => { :class => "section_ids" }
+%>
+<div class="check_uncheck">
+<%= check_uncheck_tag 'input.section_ids' %>
+</div>

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

@@ -0,0 +1,2 @@
+<% use_page_title "Edit Group" %>
+<%= render :partial => 'form' %>

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

@@ -0,0 +1,36 @@
+<% use_page_title "Groups" %>
+<%= render layout: 'page_title' do %>
+    <%= link_to("Add Group", new_group_path, :id => "new_group_button", :class => "btn btn-primary btn-small right") %>
+<% end %>
+<%= render layout: 'main_content' do %>
+  <table class="data table table-rounded table-bordered table-hover table-striped">
+    <thead>
+      <tr>
+        <th><%= link_to "Name", groups_path(:order => determine_order(params[:order], "#{Cms::Group.table_name}.name")) %></th>
+        <th><%= link_to "Type", groups_path(:order => determine_order(params[:order], "#{Cms::GroupType.table_name}.name")) %></th>
+        <th>Permissions</th>
+      </tr>
+    </thead>
+    <% section_count = Cms::Section.count %>
+    <% @groups.each do |g| %>
+      <tr>
+        <td>
+            <%= link_to h(g.name), [:edit, g] %>
+        </td>
+        <td>
+            <%= h(g.group_type.name) %>
+        </td>
+        <td>
+          <% g.permissions.uniq.each do |p| %>
+            - <%= p.full_name %> <br />
+          <% end %>
+          - <%= g.cms_access? ? "Edit" : "View" %>
+          <%= g.sections.count >= section_count ? "All Sections" : "#{g.sections.count} of #{section_count} Sections" %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
+<% if @groups.total_pages > 1 %>
+  <%= render_pagination @groups, Cms::Group %>
+<% end %>

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

@@ -0,0 +1,2 @@
+<% use_page_title "Add a New Group" %>
+<%= render 'form' %>

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

@@ -0,0 +1,3 @@
+<%= f.input :name %>
+<%= f.input :content, as: :text_editor %>
+<%= f.cms_tag_list %>

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

@@ -0,0 +1 @@
+<%= show :content %>

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

@@ -0,0 +1,3 @@
+<%= f.input :name %>
+<%= f.input :file, label: "Image", hint: "Select a file to upload.", as: :file_picker %>
+<%= f.cms_tag_list %>

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

@@ -0,0 +1,4 @@
+<%= tag :img,
+        :src => attachment_path_for(@content_block.file),
+        :alt => h(@content_block.name),
+        :data => { :type => "image_block" } %>

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

@@ -0,0 +1,8 @@
+<%= page_title_with_buttons f %>
+<div class="padded row-fluid clearfix">
+  <%= f.input :name %>
+  <%= f.input :url %>
+  <%= f.input :new_window, label: "Open In New Window?" %>
+</div>
+<%= bottom_buttons f %>
+

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

@@ -0,0 +1,4 @@
+<% use_page_title "Edit Link" %>
+<%= simple_form_for(@link) do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f, title: 'Edit Link'} %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% use_page_title "Add a New Link" %>
+<%= simple_form_for(@link) do |f| %>
+    <%= hidden_field_tag :section_id, @link.section_id %>
+    <%= render :partial => 'form', :locals => {:f => f, title: 'Add a New Link'} %>
+<% end %>

data/app/views/cms/menus/_menu.html.erb

@@ -0,0 +1,9 @@
+<div id="<%= css_id %>" class="<%= css_class %>">
+<% unless items.empty?
+%>  <ul>
+<% items.each_with_index do |item, i|
+      %><%= render :partial => "/cms/menus/menu_item", :object => item, :locals => { :depth => 1, :position => i + 1, :item_count => items.length }
+      %><% end 
+%>  </ul>
+<% end
+%></div>

data/app/views/cms/menus/_menu_item.html.erb

@@ -0,0 +1,11 @@
+<% indent = (depth - 1) * 4
+%><%= " "*(indent + 4) %><li id="<%= menu_item[:id] %>" class="depth-<%= depth %><%= ' first' if position == 1 %><%= ' last' if position == item_count %><%= ' on' if menu_item[:selected] %><%= ' open' unless menu_item[:children].blank? %>">
+<%= " "*(indent + 6) %><a href="<%= menu_item[:url] %>"<%= ' target=#{menu_item[:target]}' if menu_item[:target] %>><%= menu_item[:name] %></a>
+<% unless menu_item[:children].blank?
+%><%= " "*(indent + 6)  %><ul>
+<% menu_item[:children].each_with_index do |item, i|
+%><%= render :partial => "/cms/menus/menu_item", :object => item, :locals => { :depth => depth + 1, :position => i + 1, :item_count => menu_item[:children].length }
+%><% end 
+%><%= " "*(indent + 6)  %></ul>
+<% end 
+%><%= " "*(indent + 4)  %></li>

data/app/views/cms/page_components/_content.html.erb

@@ -0,0 +1,18 @@
+<dl>
+  <dt><%= link_to "Add #{@default_type.display_name}", new_engine_aware_path((@default_type),
+            "#{@default_type.param_key}[connect_to_page_id]" => params[:connect_to_page_id],
+            "#{@default_type.param_key}[connect_to_container]" => params[:connect_to_container]
+          ),
+
+                 :class=>"btn btn-small btn-primary" %></dt>
+  <dd>Or choose another content types to add:</p>
+  <ul>
+    <% @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.param_key}[connect_to_container]" => params[:connect_to_container]
+          ), :target=> "_top" %></li>
+    <% end %>
+  </ul></dd>
+</dl>
+

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

@@ -0,0 +1,12 @@
+<div class="modal-header">
+  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+  <h3>Add Content</h3>
+</div>
+<div class="modal-body">
+  <%= render 'content' %>
+</div>
+<div class="modal-footer">
+  <%= link_to "Never Mind", "#", class: "btn btn-small", data: {dismiss: "modal", }, "aria-hidden" => "true" %>
+  <%= link_to "Reuse Content Instead?", cms.new_connector_path(:page_id => params[:connect_to_page_id], :container => params[:connect_to_container]) , class: "btn btn-small btn-primary", id: "insert_existing_content" %>
+</div>