browsercms 3.5.7 → 4.0.0.alpha

data/app/models/cms/user_group_membership.rb

@@ -1,9 +1,9 @@
 module Cms
   class UserGroupMembership < ActiveRecord::Base
 
-    include Cms::DefaultAccessible
+    extend Cms::DefaultAccessible
 
     belongs_to :group, :class_name => 'Cms::Group'
-    belongs_to :user, :class_name => 'Cms::User'
+    belongs_to :user, :class_name => 'Cms::PersistentUser'
   end
 end

data/app/portlets/deprecated_placeholder.rb

@@ -0,0 +1,12 @@
+# A portlet type that can be used to deprecate and remove old portlets.
+# During migrations, change existing portlet types with this and remove the old classes.
+#
+# This will not appear as a selectable portlet type, but can render itself
+class DeprecatedPlaceholder < Cms::Portlet
+
+  enable_template_editor false
+
+  def render
+
+  end
+end

data/app/portlets/dynamic_portlet.rb

@@ -1,5 +1,5 @@
 class DynamicPortlet < Cms::Portlet
-
+  description "Allows user to create custom logic via the user interface. Require ruby/erb to define the controller and view."
   def render
     eval(@portlet.code) unless @portlet.code.blank?
   end

data/app/portlets/email_page_portlet.rb

@@ -1,5 +1,7 @@
 class EmailPagePortlet < Cms::Portlet
 
+  description "Display a form that allows visitors to email the current page to a friend."
+
   def render
     pmap = flash[instance_name] || params
     @email_message = Cms::EmailMessage.new pmap[:email_message]
@@ -10,9 +12,10 @@ class EmailPagePortlet < Cms::Portlet
 
   #----- Handlers --------------------------------------------------------------
   def deliver
-    message = Cms::EmailMessage.new(params[:email_message])
+    message = Cms::EmailMessage.new(email_message_params())
     message.subject = self.subject
-    message.body = "#{params[:email_page_portlet_url]}\n\n#{message.body}"    
+    message.body = "#{params[:email_page_portlet_url]}\n\n#{message.body}"
+    message.sender = self.sender
     if message.save
       url_for_success
     else
@@ -21,5 +24,9 @@ class EmailPagePortlet < Cms::Portlet
       url_for_failure
     end
   end
-  
+
+  def email_message_params
+    params.require(:email_message).permit(Cms::EmailMessage.permitted_params)
+  end
+
 end

data/app/portlets/forgot_password_portlet.rb

@@ -1,34 +1,15 @@
+# Shows a 'Forgot Password' form.
+#
+# This portlet is not typically necessary in CMS 4.0 or later since there is a built
+# in /forgot-password route built in. In previous versions this portlet would have worked with a page that handled
+# the reset password functionality.
+#
 class ForgotPasswordPortlet < Cms::Portlet
-  require 'digest/sha1'  
 
-  enable_template_editor true
+  enable_template_editor false
+  description "Displays the forgot password form. (Consider using /forgot-password instead of this)"
 
+  # Just shows the core CMS forgot password form.
   def render
-    logger.warn "Handling Class #{request.class}"
-    logger.warn "Handling FORGOT as #{request.method}"
-    logger.warn "Am I a POST? #{request.post?}"
-    flash[:forgot_password] = {}
-
-    return unless request.post?
-    user = Cms::User.find_by_email(params[:email])
-
-    logger.warn "Send email "
-
-    unless user
-      flash[:forgot_password][:error] = "We were unable to verify your account. Please make sure your email address is accurate."
-      return
-    end
-    
-    user.reset_token = generate_reset_token
-    if user.save
-      flash[:forgot_password][:notice] = "Your password has been sent to #{params[:email]}"
-      Cms::ForgotPasswordMailer.deliver_reset_password(self.reset_password_url + '?token=' + user.reset_token, user.email)
-    end
   end
-
-  private
-  def generate_reset_token
-    Digest::SHA1.hexdigest(Time.now.to_s.split(//).sort_by {rand}.join)
-  end
-
 end

data/app/portlets/login_portlet.rb

@@ -1,10 +1,13 @@
+# Shows a 'Login' form.
+#
+# This portlet should not typically necessary in CMS 4.0 or later since there is a built
+# in /login route built in.
 class LoginPortlet < Cms::Portlet
-  
+
+  enable_template_editor false
+  description "Display a login form (Consider using /login instead)."
+
   def render
-    @success_url = (flash[:success_url] || self.success_url)
-    @failure_url = self.failure_url
-    @login = flash[:login] || params[:login]
-    @remember_me = flash[:remember_me] || params[:remember_me]
   end
     
 end

data/app/portlets/tag_cloud_portlet.rb

@@ -1,5 +1,7 @@
 class TagCloudPortlet < Cms::Portlet
-  
+
+  description "Generates a Tag cloud by based the tags used on content blocks."
+
   def self.default_sizes
     (0..4).map{|n| "size-#{n}" }.join(" ")
   end

data/app/presenters/cms/user_presenter.rb

@@ -0,0 +1,24 @@
+module Cms
+
+  # Wrap User for JSON formatting.
+  class UserPresenter
+
+    attr_reader :resource
+
+    def initialize(user)
+      @resource = user
+    end
+
+    def as_json(options)
+      hash = resource.as_json(
+          :only => [:id, :email, :login, :first_name, :last_name],
+          :methods => [:full_name])
+      hash[:is_logged_in] = logged_in?
+      hash
+    end
+
+    def logged_in?
+      !@resource.guest?
+    end
+  end
+end

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

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

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

@@ -0,0 +1,7 @@
+<%= button_menu location do %>
+    <%= f.button :publish, location: location %>
+    <div class="btn-group right">
+      <%= cancel_button location %>
+      <%= f.button :save_draft, location: location %>
+    </div>
+<% end %>

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

@@ -0,0 +1,7 @@
+<%# Shows error message and any errors on the base model. Can be included in any CMS form view. %>
+<div class="row-fluid padded">
+  <%= form.error_notification %>
+  <span id="base-errors">
+  <%= form.error :base %>
+  </span>
+</div>

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

@@ -0,0 +1,10 @@
+<%= page_title_with_buttons(f, yield(:buttons)) %>
+<div class="padded row-fluid">
+  <div class="span8 main-content">
+    <%= yield  %>
+  </div>
+  <div class="span4">
+    <%= yield :sidebar %>
+  </div>
+</div>
+<%= bottom_buttons f, yield(:buttons) %>

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

@@ -0,0 +1,3 @@
+<div class="main-content padded row-fluid clearfix">
+  <%= yield %>
+</div>

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

@@ -0,0 +1,8 @@
+<div class="padded row-fluid">
+  <div class="span8 main-content">
+    <%= yield  %>
+  </div>
+  <div class="span4">
+    <%= yield :sidebar %>
+  </div>
+</div>

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

@@ -0,0 +1,16 @@
+<%# Mobile toggle will only appear if a Page template has a mobile counterpart.  %>
+<% if mobile_template_exists?(@page) %>
+    <%
+       mobile_state = session[:mobile_mode] == true ? "Mobile" : "Desktop"
+    %>
+    <div class="btn-group">
+      <button class="btn dropdown-toggle btn-small btn-info btn-solo" data-toggle="dropdown">
+        <%= mobile_state %>
+        <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu" role="menu">
+        <li><%= link_to "View as Mobile", "#{@page.path}?template=mobile", :target => "_top" %></li>
+        <li><%= link_to "View as Desktop", "#{@page.path}?template=full", :target => "_top" %></li>
+      </ul>
+    </div>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% span = 'span6' unless local_assigns.has_key? :span %>
+<div class="row-fluid padded">
+  <h1 class="<%= span %>"><%= page_title %></h1>
+  <%= yield %>
+</div>

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

@@ -0,0 +1,26 @@
+<p>
+  Displaying
+  <%= collection.offset + 1 %>
+  -
+  <%= collection.offset + collection.size %>
+  of
+  <%= collection.total_entries %>
+</p>
+<div>
+  <%= link_to "<< &nbsp;".html_safe, first_page_path, :id => "first_page_link" %>
+  <%= link_to "< &nbsp;".html_safe, previous_page_path, :id => "previous_page_link" %>
+    <% url = URI.parse(current_page_path) %>
+    <%= form_tag url.path, :method => :get, :class => "current_page", style: 'display:inline' do %>
+        <% url.query.to_s.split('&').each do |p|
+          ; k, v = p.split('=') %>
+            <%= hidden_field_tag(k, CGI::unescape(v.to_s), :id => "pagination_hidden_#{k}") unless k == "page" %>
+        <% end %>
+        <%= label_tag "current_page_number", "Page", style: 'display:inline' %>
+        <%= text_field_tag "page", collection.current_page, :id => "current_page_number", style: 'display:inline' %>
+        <p style="display: inline">of
+        <%= collection.total_pages %></p>
+    <% end %>
+  <%= link_to "&nbsp; >".html_safe, next_page_path, :id => "next_page_link" %>
+  <%= link_to "&nbsp; >>".html_safe, last_page_path, :id => "last_page_link" %>
+</div>
+

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

@@ -0,0 +1 @@
+<div class="row-fluid"><%= yield %></div>

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

@@ -0,0 +1,7 @@
+<%# Generic Save/Cancel used by a number of views. %>
+<%= button_menu location do %>
+    <%= f.button :save, location: location %>
+    <div class="btn-group right">
+      <%= cancel_button location %>
+    </div>
+<% end %>

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

@@ -0,0 +1,3 @@
+<div class="span4">
+    <%= yield %>
+</div>

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

@@ -0,0 +1,23 @@
+<% live = original.version == revision.version %>
+<% current = i == 0 %>
+<%= tag :tr, {:id => "revision_#{revision.version}"}, false %>
+<td>
+  <%= link_to "v.#{revision.version}", engine(original).polymorphic_path([:version, original], version: revision.version), target: '_blank' %>
+  <%= '(LIVE)' if live %>
+  <%= '(CURRENT)' if current %>
+</td>
+<td>
+  <%= revision.version_comment %>
+</td>
+<td>
+  <%= revision.created_at.strftime("%b %d, %Y %I:%M %p") if revision.created_at %>
+</td>
+<td>
+  <%= revision.updated_by.login if revision.updated_by %>
+</td>
+<td>
+  <% unless current %>
+      <%= link_to 'Revert to', engine(original).polymorphic_path([:revert, original], version: revision.version), class: 'btn btn-mini btn-danger', method: :put %>
+  <% end %>
+</td>
+</tr>

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

@@ -0,0 +1,22 @@
+<%= render :partial => 'cms/attachments/attachment_table', :locals => {:block => @block, :can_delete => true} %>
+<div class="fields">
+  <p>Upload a new attachment:</p>
+</div>
+
+<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" %>
+
+<div id="asset_add" class="fields file_fields" style="display:<%= asset_types.size > 1 ? "none" : "block" %>">
+  <label for="asset_add">Choose file</label>
+
+  <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/_no_attachments_defined.html.erb

@@ -0,0 +1 @@
+<p>Error: This content type (<%= object.class.name %>) is not configured to use attachments.<p>

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

@@ -1,12 +1,7 @@
-<% page_title @toolbar_title = "Page Cache Info" %>
-
-<%= content_for :html_head do %>
-  <%= stylesheet_link_tag("cms/form_layout") %>
+<% use_page_title "Page Cache" %>
+<%= render layout: 'page_title' do %>
+    <%= link_to "Clear", cache_path, class: 'btn btn-primary right http_delete', :rel=>'clear-cache' %>
 <% end %>
-
-<%= content_for :functions do %>
-  <%= link_to(span_tag("Clear Page Cache"), cache_path,
-    :class => "button http_delete") %>
+<%= render layout: 'main_content' do %>
+    <p>The CMS caches pages which are frequently accessed by guest users to increase throughput. If a page appears stale, you may manually clear this page cache.</p>
 <% end %>
-
-<p style="font-size: larger; margin: 10px; line-height: 20px;">The CMS System caches pages which are frequently accessed by guest users to increase throughput. If data appears stale, you may manually clear this page cache.</p>

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

@@ -1,36 +1,27 @@
 <% if Cms::CategoryType.count > 0 %>
-  <%= content_for :html_head do %>
-    <script type="text/javascript">
-      jQuery(function($){
-        var categoriesByType = <%= Cms::CategoryType.category_map.to_json %>
-        $("#cms_category_category_type_id").change(function(){
-          $("#cms_category_parent_id option").remove()
-          $.each(categoriesByType[$(this).val()], function(){        
-            $("#cms_category_parent_id").append($.createElement("option", this[0], {value: this[1]}))
-          })
-        })
-      })
-    </script>
-  <% end %>
 
-  <% @block.category_type ||= (Cms::Category.last(:include => :category_type) && Cms::Category.last.category_type) %>  
-  <%= f.cms_drop_down :category_type_id, Cms::CategoryType.all(:order => "name").map{|c| [c.name, c.id]}, :prompt => "Select a Type of Category", :label => "Type" %>
+  <% @block.category_type ||= (Cms::Category.includes(:category_type).last && Cms::Category.last.category_type) %>
+  <%= f.association :category_type,
+                    collection: Cms::CategoryType.order("name"),
+                    :prompt => "Select a Type of Category",
+                    :label => "Type" %>
 
-  <% categories = @block.category_type ? @block.category_type.category_list.map{|c| [c.path, c.id]} : [] %>
+  <% categories = @block.category_type ? @block.category_type.category_list : [] %>
   <% unless categories.empty? %>
-    <%= f.cms_drop_down :parent_id, categories, :include_blank => true %>
+    <%= f.association :parent, collection: categories, :include_blank => true %>
   <% end %>
-  
-  <%= f.cms_text_field :name %>
+
+  <%= f.input :name %>
 
 <% else %>
-  <% page_title "Please Create A Category Type" %>
+  <% use_page_title "Please Create A Category Type" %>
   <%= content_for :html_head do %>
     <script type="text/javascript">
-      jQuery(function($){
-        $('.buttons').remove()
-      })
+      $(function(){
+        $('.form-actions, .top-buttons').remove();
+      });
     </script>
   <% end %>
-  <p>Before you can create a category, you must <%= link_to "create a category type", new_category_type_path %>.  Each category must have a category type.  For example, if you plan to categorize your news releases, you might create a "News Release" category type.</p>
+  <p>Before you can create a category, you must create at least one category type for that category. For example, if you plan to categorize your news releases, you might create a "News Release" category type.</p>
+    <%= link_to "Add a New Category Type", new_category_type_path, class: 'btn btn-primary btn-small' %>
 <% end %>

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

@@ -1 +1 @@
-<%= f.cms_text_field :name %>
+<%= f.input :name %>

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

@@ -1,69 +1,38 @@
-<% @toolbar_title = @page_title = "Add Existing Content to '#{@page.page_title}' Page".html_safe %>
-
-<%= content_for :html_head do %>
-  <%= stylesheet_link_tag("cms/content_library") %>
-  <%= javascript_tag do %>
-    jQuery(function($){
-      var collectionName = '<%= @block_type.content_block_type %>'
-      $('table.data tbody tr').hover(function(){
-        $(this).addClass('hover');
-      }, function(){
-        $(this).removeClass('hover');
-      }).click(function(){
-        var match = this.id.match(/(.*)_(\d+)/);
-        var type = match[1];
-        var id = match[2];
-        $('table.data tbody tr').removeClass('selected');
-        $(this).addClass('selected');
-        $('#connectable_type').attr('value', type);
-        $('#connectable_id').attr('value', id);
-        $('#add_button').removeClass('disabled').click(function(){
-          $('#connect_form').submit();
-          return false;
-        });
-        $('#view_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id);
-      })
-    })
-  <% end %>
-<% end %>
-
-<%= content_for :functions do %>
-  <h1><%=h @toolbar_title %></h1>
-  <%= link_to span_tag("Add to Page"), "#", :id => "add_button", :class => "button disabled" %>
-  <%= link_to span_tag("View Content"), "#", :id => "view_button", :class => "button disabled" %>
-  <%= form_tag connectors_path, :id => 'connect_form' do %>
-    <%= hidden_field_tag :page_id, @page.to_param %>
-    <%= hidden_field_tag :container,  @container %>
-    <%= hidden_field_tag :connectable_type, '' %>
-    <%= hidden_field_tag :connectable_id, '' %>
-  <% end %>
-  <br clear="all" />
+<%
+   use_page_title"Reuse Content"
+%>
+<%= render layout: 'page_title' do %>
+    <%= link_to "Back to Page", page_path(@page), class: 'btn btn-small right' %>
 <% end %>
 
 <%= form_tag new_connector_path, :method => :get do %>
-  <%= hidden_field_tag :page_id, @page.to_param %>
-  <%= hidden_field_tag :container, @container %>
-  <div style="margin: 20px 2px;">
-    <label>
-      Choose Type of Content
-      <%= select_tag "block_type", options_for_select(Cms::ContentType.connectable.all.map{|ct| [ct.display_name, ct.content_block_type]}, @block_type.content_block_type), :onchange => 'this.form.submit()' %>
-    </label>
-  </div>
+    <%= hidden_field_tag :page_id, @page.to_param %>
+    <%= hidden_field_tag :container, @container %>
+    <div class="row-fluid padded">
+      <label for="block_type">
+        Choose Type of Content
+        <%= select_tag "block_type", options_for_select(Cms::ContentType.connectable.to_a.map { |ct| [ct.display_name, ct.content_block_type] }, @block_type.content_block_type), :onchange => 'this.form.submit()' %>
+      </label>
+    </div>
 <% end %>
 
-<table class="data">
-  <thead>
-    <tr>
-      <th class="name first"><div class="dividers">Name</div></th>
-      <th class="updated"><div class="dividers">Updated</div></th>
-      <th class="used last">Uses</th>
-    </tr>
-  </thead>
-  <% @blocks.each do |block| %>
-    <tr id="<%= @block_type.content_block_type.singularize %>_<%= block.id %>">
-      <td class="name"><%= block.name %></td>
-      <td class="updated"><%= block.updated_at.to_formatted_s(:date) %></td>
-      <td class="used"><%= link_to_usages(block) %></td>
-    </tr>
-  <% end %>
-</table>
+<%= render layout: 'main_content' do %>
+    <table class="table table-bordered">
+      <thead>
+      <tr>
+        <th>Add?</th>
+        <th>Name</th>
+        <th>Updated</th>
+        <th>Uses</th>
+      </tr>
+      </thead>
+      <% @blocks.each do |block| %>
+          <tr>
+            <td><%= link_to "Add", connectors_path(page_id: @page.to_param, container: @container, :connectable_type => @block_type.content_block_type, connectable_id: block.id), class: "btn btn-mini btn-primary", method: :post %></td>
+            <td><%= link_to block.name, engine_aware_path(block), target: '_blank' %></td>
+            <td><%= block.updated_at.to_formatted_s(:date) %></td>
+            <td><%= block.connected_pages.count %></td>
+          </tr>
+      <% end %>
+    </table>
+<% end %>