browsercms 4.0.0.alpha → 4.0.0.beta

data/app/helpers/cms/form_tag_helper.rb

@@ -8,14 +8,22 @@ module Cms
     # support.
     def content_block_form_for(object, *args, &block)
       options = args.extract_options!
-      simple_form_for(engine_aware_path(object), *(args << options.merge(builder: Cms::FormBuilder::ContentBlockFormBuilder)), &block)
+      simple_form_for(engine_aware_path(object), *(args << options.merge(builder: Cms::FormBuilder::ContentBlockFormBuilder, wrapper: 'browsercms')), &block)
     end
 
+    # Simple wrapper for Rails form_for that will use the CMS CustomFormBuilder.
+    # Can be used by portlets or other random public facing views to render content.
+    def cms_form_for(*args, &block)
+      options = args.extract_options!
+      options.merge!(:builder => Cms::FormBuilder::ContentBlockFormBuilder)
+      form_for(*(args + [options]), &block)
+    end
 
     def forecasting_a_new_section?(form_object)
       Cms::Section.with_path(form_object.object.class.path).first.nil?
     end
 
+
     def slug_source_if(boolean)
       if boolean
         {input_html: {class: 'slug-source'}}

data/app/helpers/cms/page_helper.rb

@@ -26,13 +26,9 @@ module Cms
     # Return the JS file to load the configured default WYSIWYG editor
     #
     # Ideally, this could be improved if sprockets allows for dynamically determining which js library to use.
-    # @return [Array] Names of the JS files need to load the editor.
+    # @return [String] Names of the JS file needed to load the editor.
     def cms_content_editor
-      if Cms.content_editor.is_a?(Array)
-        Cms.content_editor
-      else
-        "bcms/#{Cms.content_editor}" # Handles existing FCKEditor behavior
-      end
+      "bcms/#{Cms.content_editor}"
     end
 
     # Outputs the title for this page. Used by both internal CMS pages, as well as page templates. Call use_page_title to

data/app/helpers/cms/path_helper.rb

@@ -5,6 +5,15 @@ module Cms
   # From app, should be cms.xyz_path
   module PathHelper
 
+    # @return A link if content is addressable, name otherwise.
+    # Link_to_if would call content.path even if it doesn't respond to '
+    def link_to_addressable_content(name, content)
+      if content.respond_to? :path
+        link_to name, content.path
+      else
+        name
+      end
+    end
     # Returns the relative path to the given attachment.
     # Content editors will see exact specific version path, while other users will see the 'public' url for the path.
     def attachment_path_for(attachment)

data/app/helpers/cms/section_nodes_helper.rb

@@ -26,7 +26,7 @@ module Cms
 
     # When sitemap initially renders, we only want to show first level.
     def initial_visibility_class(section_node)
-      section_node.depth > 1 ? 'hide' : ''
+      section_node.depth >= 1 ? 'hide' : ''
     end
 
     # Returns a css class for determine sitemap depth.

data/app/inputs/name_input.rb

@@ -0,0 +1,42 @@
+# A text field that is used for the Name fields of content.
+#
+# @example <%= f.name as: :name %>
+#
+# Add the following behaviors above and beyond
+#   1. Will generate a slug if the class requires it. (Requires a as: :path field to work)
+#   2. If no label is specified, it shows a larger than normal input which spans the full row.
+#   3. Labels are turned off by default.
+class NameInput < SimpleForm::Inputs::TextInput
+
+  def initialize(*args)
+    super(*args)
+    options[:label] = false if options[:label].nil?
+    options[:placeholder] = "Name" if options[:placeholder].nil?
+  end
+
+  def input
+    add_slug_source_for_content_that_needs_it
+
+    unless options[:label]
+      input_html_options[:class] << 'input-block-level input-xxlarge'
+    end
+
+    @builder.text_field(attribute_name, input_html_options).html_safe
+  end
+
+  protected
+
+  def add_slug_source_for_content_that_needs_it
+    if should_autogenerate_slug?
+      input_html_options[:class] << 'slug-source'
+    end
+  end
+
+  def should_autogenerate_slug?
+    content_requires_slug_field? && (object.new_record? || (object.name.blank? && object.slug.blank?))
+  end
+
+  def content_requires_slug_field?
+    object.class.requires_slug?
+  end
+end

data/app/models/cms/attachment.rb

@@ -98,6 +98,7 @@ module Cms
                           :storage => rail_config(:storage),
                           :s3_credentials => rail_config(:s3_credentials),
                           :bucket => rail_config(:s3_bucket),
+                          :s3_host_name => rail_config(:s3_host_name),
                           :s3_host_alias => rail_config(:s3_host_alias)
 
       end

data/app/models/cms/content_type.rb

@@ -108,6 +108,12 @@ module Cms
       klass.content_type
     end
 
+    # Returns a list of column names and values for this content type which are allowed be orderable.
+    def orderable_attributes
+      attribute_names = model_class.new.attribute_names
+      attribute_names -= ["id", "version", "lock_version", "created_by_id", "updated_by_id"]
+    end
+
     # @deprecated
     def save!
       ActiveSupport::Deprecation.warn "Cms::ContentType#save! should no longer be called. Content Types do not need to be registered in the database."

data/app/models/cms/dynamic_view.rb

@@ -29,7 +29,8 @@ module Cms
 
         validates_presence_of :name, :format, :handler, :path, :locale
         validates_uniqueness_of :name, :scope => [:format, :handler],
-                                :message => "Must have a unique combination of name, format and handler"
+                                :message => "Must have a unique combination of name, format and handler",
+                                conditions: -> { where(deleted: false) }
 
       end
     end

data/app/models/cms/page.rb

@@ -379,6 +379,12 @@ class Cms::Page < ActiveRecord::Base
     path == "/"
   end
 
+
+  # @return [Boolean] true if this page can be deleted or not.
+  def deletable?
+    !home?
+  end
+
   # This will return the "top level section" for this page, which is the section directly
   # below the root (a.k.a My Site) that this page is in.  If this page is in root,
   # then this will return root.

data/app/models/cms/persistent_user.rb

@@ -11,6 +11,7 @@ module Cms
            # Note that Chrome doesn't expire session cookies immediately so test this in other browsers.
            # http://stackoverflow.com/questions/16817229/issues-with-devise-rememberable
            :rememberable,
+           :recoverable,  # Needs to be here so forgot password link works.
            :authentication_keys => [:login]
 
 

data/app/models/cms/section_node.rb

@@ -78,6 +78,14 @@ class Cms::SectionNode < ActiveRecord::Base
   def link?
     node_type == 'Cms::Link'
   end
+  
+  def deletable?
+    return false if self.root?
+    if node.respond_to?(:deletable?)
+      return node.deletable?
+    end
+    true
+  end
 
   # @param [Section] section
   # @param [Integer] position

data/app/models/cms/user.rb

@@ -19,9 +19,18 @@ module Cms
       end
     end
 
+    # Generate a new random password for this user.
+    # @return [String] The newly generated and assigned password
+    def new_password
+      pwd = SecureRandom.hex(4)
+      change_password(pwd)
+      pwd
+    end
+
     # Change this User's password to a new value.
     def change_password(new_password)
       update(:password => new_password, :password_confirmation => new_password)
+      new_password
     end
 
     # By default, Users are coming from the the CMS database (cms_users). All Cms::User class have have the same source.

data/app/portlets/helpers/cms/list_portlet_helper.rb

@@ -0,0 +1,5 @@
+##
+# All methods from this helper will be available in the render.html.erb for ListPortlet
+module ListPortletHelper
+  
+end

data/app/portlets/list_portlet.rb

@@ -0,0 +1,40 @@
+class ListPortlet < Cms::Portlet
+
+  description "Find and display content blocks."
+  enable_template_editor false
+
+  def render
+    query = current_content_type.model_class
+    limit = self.limit
+    unless limit.blank?
+      query = query.limit(limit.to_i)
+    end
+    direction =  self.reverse_order.blank? || self.reverse_order == "0" ? 'asc' : 'desc'
+    unless self.order.blank?
+      query = query.order("#{self.order} #{direction}")
+    end
+    @content_blocks = query.all.to_a
+  end
+
+
+  # This is far less flexible than prepending additional view paths, but it suffices for now.
+  def view_as_full_path
+    if File.exists?(expected_view_path())
+      "portlets/list/#{self.name.parameterize('_')}/_#{self.view_as}"
+    else
+      "portlets/list/_#{self.view_as}"
+    end
+  end
+
+  def expected_view_path
+    File.join(Rails.root, 'app', 'views', 'portlets', 'list', self.name.parameterize('_'), "_#{self.view_as}.html.erb")
+  end
+
+  def view_as_path
+    "portlets/list/#{self.name.parameterize('_')}/_#{self.view_as}.html.erb"
+  end
+
+  def current_content_type
+    Cms::ContentType.named(self.content_type).first
+  end
+end

data/app/views/cms/application/_add_content_modal.html.erb

@@ -1,3 +1,3 @@
-<div id="modal-add-content" class="modal fade modal-content" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-
+<div id="modal-add-content" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-content"></div>
 </div>

data/app/views/cms/application/_exception.html.erb

@@ -1,6 +1,6 @@
 <div class="errorExplanation" id="errorExplanation">
   <h2>An Error Occurred</h2>
   <ul>
-    <li><%=h "#{exception.class.name}: #{exception.message}" %></li>
+    <li><%=h "#{@exception.class.name}: #{@exception.message}" %></li>
   </ul>
 </div>

data/app/views/cms/attachments/_attachment.html.erb

@@ -1,14 +1,16 @@
 <%
-    show_delete = true
-    show_delete = can_delete if defined?(can_delete)
+   show_delete = true
+   show_delete = can_delete if defined?(can_delete)
 %>
-<tr id="<%= dom_id(attachment)%>">
+<tr id="<%= dom_id(attachment) %>">
   <% if attachment.is_image? %>
-    <td><%= link_to image_tag(attachment_path_for(attachment), :size => '60x60', :data=>{:purpose=>'attachment'}), attachment_path_for(attachment) %></td>
+      <td><%= link_to(image_tag(attachment_path_for(attachment), :size => '60x60', :data => {:purpose => 'attachment'}), attachment_path_for(attachment), target: "_blank") %></td>
   <% else %>
-    <td><%= image_tag "cms/icons/file_types/#{attachment.icon}.png" %>
+      <td><%= image_tag "cms/icons/file_types/#{attachment.icon}.png" %>
   <% end %>
   <td><%= attachment.attachment_name.singularize.capitalize %></td>
   <td><%= number_to_human_size(attachment.size) %></td>
-  <td><%= link_to_function "Delete", "$.cms.AttachmentManager.destroy(#{attachment.id})" if show_delete %></td>
+  <td><%= link_to("Delete", '#',
+                  data: {purpose: 'delete-attachment', id: attachment.id},
+                  class: 'btn btn-mini btn-danger') if show_delete %></td>
 </tr>

data/app/views/cms/attachments/_attachment_manager.html.erb

@@ -1,22 +1,39 @@
 <%= render :partial => 'cms/attachments/attachment_table', :locals => {:block => @block, :can_delete => true} %>
-<div class="fields">
-  <p>Upload a new attachment:</p>
-</div>
+<%= link_to 'Upload a New Attachment', "#", class: 'btn btn-primary', data: {toggle: "modal", target: "#upload-attachment"} %>
 
-<div class="fields select_fields">
-  <%= label_tag "Attachment Type" %>
-  <%= select_tag :asset_types, options_for_select(asset_types) %>
-</div>
-<%= f.hidden_field :attachment_id_list, :id => "attachment_manager_ids_list" %>
-<%= f.hidden_field :attachments_changed, :id => "attachments_manager_changed" %>
+<% content_for :before_main_content do
+  # Must be outside main form, since we can't have a form within a form.
+%>
+    <div class="modal fade" id="upload-attachment">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h4 class="modal-title">Upload a New Attachment</h4>
+          </div>
+          <div class="modal-body">
+            <%= simple_form_for Cms::Attachment.new do |af| %>
+                <%= af.input :attachable_type, collection: asset_types, label: 'Type', include_blank: false %>
+                <%= hidden_field_tag :attachment_id_list, "", :id => "attachment_manager_ids_list" %>
+                <%= hidden_field_tag :attachments_changed, "", :id => "attachments_manager_changed" %>
 
-<div id="asset_add" class="fields file_fields" style="display:<%= asset_types.size > 1 ? "none" : "block" %>">
-  <label for="asset_add">Choose file</label>
+                <%= af.input :data, label: 'File', input_html: {id: 'asset_add_file', onchange: "$.cms.AttachmentManager.upload(this)"} %>
+                <input type="hidden" id="asset_attachable_id" name="asset[attachable_id]" value="<%= object.id %>"/>
+                <input type="hidden" id="asset_attachable_class" value="<%= object.class.name %>"/>
+
+                <div id="asset_add" class="fields file_fields" style="display:<%= asset_types.size > 1 ? "none" : "block" %>">
+
+                  <div id="asset_add_div">
+                    <iframe src="javascript:false" name="asset_add_uploader" id="asset_add_uploader"></iframe>
+                  </div>
+                </div>
+            <% end %>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-small" data-dismiss="modal">Never Mind</button>
+          </div>
+        </div>
+      </div>
+    </div>
+<% end %>
 
-  <div id="asset_add_div">
-    <input type="file" name="attachment[data]" id="asset_add_file" onchange="$.cms.AttachmentManager.upload(this)"/>
-    <input type="hidden" id="asset_attachable_id" name="asset[attachable_id]" value="<%= object.id %>"/>
-    <input type="hidden" id="asset_attachable_class" value="<%= object.class.name %>"/>
-    <iframe src="javascript:false" name="asset_add_uploader" id="asset_add_uploader"></iframe>
-  </div>
-</div>

data/app/views/cms/attachments/_attachment_table.html.erb

@@ -1,17 +1,22 @@
 <div class="fields" id="assets_table">
-  <label><span id="asset-name"><%= block.class.name %></span> Attachments</label>
-  <br /><br />
-    <table style="display:<%= block.multiple_attachments.empty? ? "none" : "block"%>">
+  <table class="table table-bordered assets">
+    <thead>
       <tr>
         <th>Preview</th>
         <th>Type</th>
         <th>Size</th>
-        <th></th>
+        <th>Actions</th>
       <tr>
+    </thead>
+    <tbody>
+    <% if @block.multiple_attachments.empty? %>
+        <tr class='empty-row'><td colspan="4"   >There are no attachments yet.</td></tr>
+    <% end %>
     <% for attachment in block.multiple_attachments %>
-      <% unless attachment.new_record? %>
-        <%= render :partial => "cms/attachments/attachment", :locals => { :attachment => attachment, :can_delete => can_delete } %>
-      <% end %>
+        <% unless attachment.new_record? %>
+            <%= render :partial => "cms/attachments/attachment", :locals => {:attachment => attachment, :can_delete => can_delete} %>
+        <% end %>
     <% end %>
+    </tbody>
   </table>
 </div>

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

@@ -1 +1 @@
-<%= page_content_iframe(edit_content_path(current_page)) %>
+<%= page_content_iframe(@edit_page_path) %>

data/app/views/cms/content_block/_sidebar.html.erb

@@ -12,7 +12,7 @@
           <ul class="unstyled">
             <h4 class="gray">Changes will affect:</h4>
             <% @block.connected_pages.each do |page| %>
-                <li><%= link_to page.name, page_path(page), target: "_blank" %></li>
+                <li><%= link_to page.name, cms.page_path(page), target: "_blank" %></li>
             <% end %>
           </ul>
       <% end %>
@@ -33,3 +33,4 @@
     <%= link_to "Delete", engine_aware_path(@block), class: "btn btn-small btn-danger confirm_with_title http_delete", title: "Are you sure you want to delete this content?" %>
   </div>
 </div>
+<%= yield :sidebar_after if content_for(:sidebar_after)%>

data/app/views/cms/content_types/_order_field.html.erb

@@ -0,0 +1,5 @@
+<%= f.input :order,
+            collection: collection,
+            label_method: :humanize,
+            include_blank: false,
+            wrapper_html: {'data-role' => "order-fields", class: 'load'} %>

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

@@ -0,0 +1,3 @@
+<%= simple_form_for ListPortlet.new(order: "name") do |f| %>
+    <%= render partial: 'cms/content_types/order_field', locals: { f: f, collection: @attributes} %>
+<% end %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <h3>Form Settings</h3>
-<%= f.input :name, as: :cms_text_field %>
+<%= f.input :name, as: :name %>
 <%= f.input :slug, as: :path %>
 <%= f.input :description %>
 <%= hidden_field_tag "field_ids", @block.field_ids %>
@@ -41,7 +41,8 @@
 <% 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 modal-content" tabindex="-1" role="dialog" aria-labelledby="model_label" aria-hidden="true">
+    <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">

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

@@ -5,7 +5,7 @@
   <%= f.hidden_field :lock_version %>
 <% end %>
 
-<%= f.input :name, label: false, placeholder: 'Page Name', input_html: {class: 'input-block-level input-xxlarge'} %>
+<%= f.input :name, placeholder: 'Page Name', as: :name %>
 <%= f.input :path, placeholder: 'Page Path' %>
 <%= f.input :template_file_name, collection: Cms::PageTemplate.options, label: "Template", as: :select, include_blank: false %>
 

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

@@ -0,0 +1,16 @@
+<%# Overrides devise/passwords/new to add CMS specific styles. %>
+<%= render 'cms/application/page_title' %>
+
+<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+    <%= render layout: 'cms/application/main_with_sidebar' do %>
+        <%= f.error_notification %>
+        <%= f.input :email, :required => true, :autofocus => true %>
+
+        <%= render "devise/shared/links" %>
+    <% end %>
+    <%= render layout: 'cms/application/row' do %>
+        <%= button_menu :bottom do %>
+            <%= f.button :submit, "Send me reset password instructions", class: 'right btn-primary' %>
+        <% end %>
+    <% end %>
+<% end %>