browsercms 3.4.2 → 3.5.0.rc1

data/app/models/cms/user_group_membership.rb

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

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

@@ -0,0 +1,14 @@
+<%
+    show_delete = true
+    show_delete = can_delete if defined?(can_delete)
+%>
+<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>
+  <% else %>
+    <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>
+</tr>

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

@@ -0,0 +1,17 @@
+<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"%>">
+      <tr>
+        <th>Preview</th>
+        <th>Type</th>
+        <th>Size</th>
+        <th></th>
+      <tr>
+    <% for attachment in block.multiple_attachments %>
+      <% unless attachment.new_record? %>
+        <%= render :partial => "cms/attachments/attachment", :locals => { :attachment => attachment, :can_delete => can_delete } %>
+      <% end %>
+    <% end %>
+  </table>
+</div>

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

@@ -0,0 +1,4 @@
+<table>
+  <%= render @attachment %>
+</table>
+<span id="asset-id"><%= attachment.id %></span>

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

@@ -26,8 +26,7 @@
         <th<%= attrs %>>
           <div class="dividers">
             <% if column[:order] %>
-              <%= link_to column[:label], cms_index_path_for(content_type, 
-                :order => determine_order(params[:order], column[:order])) %>
+              <%= link_to column[:label], cms_sortable_column_path(content_type, column[:order])%>
             <% else %>
               <%= column[:label] %>
             <% end %>
@@ -83,5 +82,5 @@
 <% if params[:search] && @blocks.size == 0 %>
   <div class="pagination">No results found for '<%= params[:search][:term] %>'</div>
 <% elsif @blocks.total_pages > 1 %>
-  <%= render_pagination @blocks, content_type.content_block_type, :order => params[:order], :search => params[:search] %>
+  <%= render_pagination @blocks, content_type, :order => params[:order], :search => params[:search] %>
 <% end %>

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

@@ -33,7 +33,7 @@
   <% if @block.respond_to?(:draft_version?) && !@block.draft_version? %>
     <div class="nv_pair">
       <div class="header">Version:</div> 
-      <div>v. <%= @block.version %> ( <%= link_to "Current", @block %> )</div>
+      <div>v. <%= @block.version %> ( <%= link_to "Current", block_path(@block) %> )</div>
     </div>
   <% end -%>
   <% if @block.class.renderable? %>

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

@@ -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.resource_name %>
+  <%= render_pagination @views, dynamic_view_type %>
 <% end %>
 

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

@@ -35,5 +35,5 @@
 <div class="br"></div>
 </div>
 <% if @messages.total_pages > 1 %>
-  <%= render_pagination @messages, :email_messages %>
+  <%= render_pagination @messages, Cms::EmailMessage %>
 <% end %>

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

@@ -1,31 +1,5 @@
-<% 
-   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 }
-  @block.attachment_file_path = @block.attachment.file_path if @block.attachment_file_path.blank? && !@block.new_record?
-%>
-<%= content_for :html_head do %>
-  <%= javascript_tag do %>
-    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()))
-        })
-      <% end %>      
-    });    
-  <% end %>
-<% end %>
-
 <%= f.cms_text_field :name %>
-<%= f.cms_file_field :attachment_file, :label => "File" %>
-<%= f.cms_drop_down :attachment_section_id, 
-  @sections.map{|s| [s.full_path, s.id]}, 
-  :label => "Section" %>
-<%= f.cms_text_field :attachment_file_path, :label => "Path" %>
+<%= f.cms_file_field :file, :label => "File", :instructions=>"Select a file to upload.", edit_path: true, edit_section: true %>
 <%= 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

@@ -1,5 +1,5 @@
 <div id="file_block_<%= @content_block.id %>" class="file_block">
-  <%= 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 %>
+  <%= 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.data_file_size.round_bytes %>
 </div>

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

@@ -0,0 +1,26 @@
+<% if asset_definitions.nil? %>
+    <p>This content type (<%= @block.class.name %>) does not have any define any attachments.<p>
+<% else %>
+    <br/>
+    <%= 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" %>
+
+    <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="<%= @block.id %>"/>
+        <input type="hidden" id="asset_attachable_class" value="<%= @block.class.name %>"/>
+        <iframe src="javascript:false" name="asset_add_uploader" id="asset_add_uploader"></iframe>
+      </div>
+    </div>
+<% end %>

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

@@ -1,36 +1,28 @@
-<% if cms_options[:fancy] %>
-  <%= content_for :html_head do %>
-  <%= javascript_tag do %>
-    jQuery(function($) {
-      $('#mock_<%= object_name %>_<%= method %>')
-      .focus(function() {this.blur()})
-      .mousedown(function() {this.blur()})
-      $('#<%= object_name %>_<%= method %>').change(function() {
-        $('#mock_<%= object_name %>_<%= method %>')
-        .attr('value', $(this).attr('value')) 
-      })
-     })
-   <% end %>
-  <% end %>
+<%#
+  # Renders a single file field for a given attachment.
+  # method - The field name
+  #
+  # This loops over the attachments array for a given block in order to create a nested_hash. This allows multiple attachments to be created at once
+  # However, since content_types can have multiple attachments, we only want to render once for eatch attachment, regardless of how many times
+  # cms_file_field gets called.
+%>
+<%= f.fields_for :attachments do |a| %>
+    <% if a.object.attachment_name == method.to_s %>
+        <%= a.hidden_field :attachment_name, :value => method.to_s %>
+        <div class="fields file_fields">
+            <%= a.cms_label :data, cms_options[:label] %>
+            <div id="<%= object_name %>_<%= method %>_div" class="file_inputs">
+                <%= a.file_field :data, options.merge('data-purpose'=>"cms_file_field") %>
+            </div>
+            <%= a.cms_instructions cms_options[:instructions] %>
+        </div>
+        <% if options[:edit_section] %>
+            <%= render :partial=>'cms/file_blocks/section_selector' %>
+            <%= a.cms_drop_down :section_id, @sections.map {|s| [s.full_path, s.id]}, {:label => "Section"}, {'data-purpose'=>"section_selector"} %>
+        <% end %>
+        <% if options[:edit_path] %>
+            <% suggest_file_path =  model_object.new_record? ? "suggest_file_path" : "keep_existing_path" %>
+            <%= a.cms_text_field :data_file_path, :label => "Path", :class=>suggest_file_path  %>
+        <% end %>
+    <% end %>
 <% end %>
-
-<div class="fields file_fields">
-  <% if cms_options[:label] %>
-    <%= f.label method, cms_options[:label] %>
-  <% else %>
-    <%= f.label method %>
-  <% end %>
-  <div id="<%= object_name %>_<%= method %>_div" class="file_inputs">
-    <%= f.file_field method, {:class=>"#{'fancy_' if cms_options[:fancy]}file"}.merge(options) %>
-<% if cms_options[:fancy] %>  
-    <div class="fakefile">
-        <input type="text" name="temp" class="mock" id="mock_<%= object_name %>_<%= method %>" />
-        <%= image_tag("cms/browse.gif") %>
-    </div>
-<% end %>
-  </div>
-  <% if cms_options[:instructions] %>
-    <div class="instructions"><%=h cms_options[:instructions] %></div>
-    <br clear="all"/>  
-  <% end %>
-</div>

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

@@ -54,5 +54,5 @@
   <div class="br"></div>
 </div>
 <% if @groups.total_pages > 1 %>
-  <%= render_pagination @groups, :groups %>
+  <%= render_pagination @groups, Cms::Group %>
 <% end %>

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

@@ -1,29 +1,3 @@
-<% 
-   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 }
-  @block.attachment_file_path = @block.attachment.file_path if @block.attachment_file_path.blank? && !@block.new_record?
-%>
-<%= content_for :html_head do %>
-  <%= javascript_tag do %>
-    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 %>
-        $('#image_block_attachment_file, #image_block_attachment_section_id').change(function(){
-          $('#image_block_attachment_file_path').val(sectionIdPathMap[$('#image_block_attachment_section_id').val()]+'/'+$.cms.sanitizeFileName($('#image_block_attachment_file').val()))
-        });
-      <% end %>
-    });
-  <% end %>
-<% end %>
-
 <%= f.cms_text_field :name %>
-<%= f.cms_file_field :attachment_file, :label => "File" %>
-<%= f.cms_drop_down :attachment_section_id, 
-  @sections.map{|s| [s.full_path, s.id]}, 
-  :label => "Section" %>
-<%= f.cms_text_field :attachment_file_path, :label => "Path" %>
+<%= f.cms_file_field :file, :label => "File", :instructions=>"Select a file to upload.", edit_path: true, edit_section: true %>
 <%= f.cms_tag_list %>

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

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

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

@@ -51,3 +51,6 @@
 <div class="bl"></div>
 <div class="br"></div>
 </div>
+<% if @page_routes.total_pages > 1 %>
+  <%= render_pagination @page_routes, Cms::PageRoute %>
+<% end %>

data/app/views/cms/shared/error.xml.erb

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<error>
+  <message><%=h exception.message %></message>
+  <stacktrace>
+  <title>Stacktrace</title>
+  <body><pre><%=h exception.backtrace.join("<br />") %></pre></body>
+  </stacktrace>
+</error>

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

@@ -49,5 +49,5 @@
   </div>
 </div>
 <% if @taggings.total_pages > 1 %>
-  <%= render_pagination @taggings, :tag, {:id => @content_block} %>
+  <%= render_pagination @taggings, Cms::Tag, {:id => @content_block} %>
 <% end %>

data/app/views/cms/toolbar/_mobile_toggle.html.erb

@@ -0,0 +1,33 @@
+<% if mobile_template_exists?(@page) %>
+<style>
+    #mobile_toggle {
+        float: left;
+        text-transform: uppercase;
+        padding-left: 110px;
+        margin-top: 12px;
+        margin-right: 0px;
+        color: black;
+        font-weight: bold;
+        width: 200px;
+    }
+
+    #mobile_toggle div {
+        float: left;
+    }
+</style>
+<%
+   mobile_state = session[:mobile_mode] == true ? "ON" : "OFF"
+   button_text = session[:mobile_mode] == true ? "TURN OFF" : "TURN ON"
+   new_template = session[:mobile_mode] == true ? "full" : "mobile"
+%>
+
+<div id="mobile_toggle">
+  <div class="visual_editor_label">View As Mobile?:</div>
+  <div class="visual_editor_value_container">
+    <div><span id="visual_editor_state"><%= mobile_state %></span></div>
+  </div>
+  <div class="visual_editor_toggle_container">
+    <div class="sm_button"><%= link_to "<span id='visual_editor_action'>#{button_text}</span>".html_safe, "#{@page.path}?template=#{new_template}", :target => "_top", :class => "sm_button" %></div>
+  </div>
+</div>
+<% end %>

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

@@ -57,6 +57,6 @@
 <% if @users.size == 0 && params[:key_word]%>
   <div class="pagination">No results found for '<%= params[:key_word] %>'</div>
 <% elsif @users.total_pages > 1 %>
-  <%= render_pagination @users, :users %>
+  <%= render_pagination @users, Cms::User %>
 <% end %>
 

data/app/views/layouts/_page_toolbar.html.erb

@@ -86,13 +86,14 @@
         :class => "spacer button confirm_with_title http_delete#{ ' disabled' unless current_user.able_to_publish?(@page) }" %>
     <% else %>
       <%= link_to "<span>Revert to this Version</span>".html_safe,
-        cms.revert_to_page_path(@page, @page.version),
+        cms.revert_page_path(@page, @page.version),
         :id => "revert_button",
         :class => "button http_put", 
         :target => "_top" %>
     <% end %>
   <% end %>
 
+  <%= render :partial => "cms/toolbar/mobile_toggle" %>
   <div id="visual_editor_toggle">
     <% if @page.version == @page.draft.version %>
         <div class="visual_editor_label">Visual Editor:</div>

data/bin/bcms

@@ -8,6 +8,7 @@ require 'active_support/core_ext/string/inflections'
 require 'cms/version'
 require 'cms/commands/actions'
 require 'cms/upgrades/v3_4_0'
+require 'cms/upgrades/v3_5_0'
 # This seems to be required only due to a bug in Thor documented here:
 #   https://rails.lighthouseapp.com/projects/8994/tickets/4692-error-when-creating-app-from-template-undefined-method-wrap-for-arrayclass
 # If this bug is fixed the following line can probably be removed.
@@ -24,6 +25,7 @@ class Cms::Install < Thor
   include Rails::Generators::Actions
   include Cms::Commands::Actions
   include Cms::Upgrades::V3_4_0
+  include Cms::Upgrades::V3_5_0
 
   def self.common_options
     method_option :database, :aliases => "-d", :desc => "Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite3/frontbase/ibm_db) [Default: sqlite3]"
@@ -70,19 +72,22 @@ class Cms::Install < Thor
 
   desc "upgrade", "Upgrades a BrowserCMS project to v#{Cms::VERSION}"
   method_option :skip_rails, :aliases => "--skip-rails", :desc => "Skip running `rake rails:update`.", :default => false, :type => :boolean
+  method_option :skip_bundle, :aliases => "--skip-bundle", :desc => "Don't run `bundle update` during the process'", :default => false, :type => :boolean
+
   def upgrade
     update_browsercms_gem_version
     comment_out_rails_in_gemfile
-    run_bundle_install
+    run_bundle_update
     install_migrations
     rake "rails:update" unless options[:skip_rails]
     generate_rails_3_4_0_migration
+    upgrade_to_3_5_0
     install_cms_seed_data
 
     instructions = <<TEXT
-Upgrade is nearly complete. Review https://github.com/browsermedia/browsercms/wiki/Upgrading-to-3.4.x-from-3.3.x before proceeding.
+Upgrade is nearly complete. Review https://github.com/browsermedia/browsercms/wiki/Upgrading-a-BrowserCMS-project before proceeding.
 Next Steps:
-1. Revert/undo the changes (see the 3.4.x Upgrade guide for details)
+1. Review the changes made by the script, revert any files that need it.
 2. Run `rake db:migrate`
 TEXT
     puts instructions
@@ -171,34 +176,25 @@ Cms.table_prefix = "cms_"
     puts "    then type 'rails server' and open your browser to 'http://localhost:3000'."
   end
 
-  def configure_default_cache_directory
-    insert_into_file "config/environments/production.rb", :after => "Application.configure do\n" do
-      <<-CODE
-  config.action_controller.page_cache_directory = File.join(Rails.root,'public','cache')
-      CODE
-    end
-  end
-
   def enable_asset_precompiling
     gsub_file "config/environments/production.rb", /config\.assets\.compile = false/, 'config.assets.compile = true'
   end
 
   def configure_mail_server
-    insert_into_file "config/environments/production.rb", :after => "config.active_support.deprecation = :notify" do
-      %q{
-
-  # Configure your mail server's address below
-  config.action_mailer.smtp_settings = {:address => 'mail.yourmailserver.com', :domain => "#{SITE_DOMAIN}"}}
+    [
+        "# Configure your mail server's address below",
+        "config.action_mailer.smtp_settings = {:address => 'mail.yourmailserver.com', :domain => config.cms.site_domain}}\n"
+    ].reverse.each do |line|
+      environment line, :env => "production"
     end
   end
 
-  def add_sitedomain_constant_to_environment_files
-    %w{development test production}.each do |env|
-      prepend_to_file "config/environments/#{env}.rb" do
-        <<-CODE
-SITE_DOMAIN="localhost:3000"
-        CODE
-      end
+  def add_sitedomain_to_production
+    [
+        %!# Uncomment and set this to match your production URL. Used for emailing links to the CMS. (default: localhost:3000)!,
+        %!# config.cms.site_domain = "www.example.com"\n!
+    ].reverse.each do |line| # Reverse ensures comment appears first
+      environment line, :env => "production"
     end
   end
 
@@ -208,12 +204,11 @@ SITE_DOMAIN="localhost:3000"
     inside rails_app do
       install_cms_seed_data
       add_route_to_end("mount_browsercms")
-      add_sitedomain_constant_to_environment_files
-      configure_default_cache_directory
-      configure_mail_server
       create_browsercms_initializer
       enable_asset_precompiling
     end
+    configure_mail_server
+    add_sitedomain_to_production
   end
 
   def generate_demo_project