browsercms 3.3.4 → 3.4.0.rc1

data/app/models/cms/user_group_membership.rb

@@ -0,0 +1,6 @@
+module Cms
+  class UserGroupMembership < ActiveRecord::Base
+    belongs_to :group, :class_name => 'Cms::Group'
+    belongs_to :user, :class_name => 'Cms::User'
+  end
+end

data/app/models/cms/view_context.rb

@@ -27,7 +27,7 @@ module Cms
       self.class.send(:include, helpers)
 
       # Make all Route helpers available in the view, i.e. cms_xyz_path and cms_xyz_url
-      self.class.send(:include, Rails.application.routes.url_helpers)
+      self.class.send(:include, Cms::Engine.routes.url_helpers)
 
       # See what values are getting copied into template
 #      Rails.logger.warn "Assigned these variables: #{attributes_to_assign}"

data/app/portlets/dynamic_portlet.rb

@@ -1,7 +1,7 @@
-class DynamicPortlet < Portlet
+class DynamicPortlet < Cms::Portlet
 
   def render
     eval(@portlet.code) unless @portlet.code.blank?
   end
 
-end
+end

data/app/portlets/email_page_portlet.rb

@@ -1,15 +1,16 @@
-class EmailPagePortlet < Portlet
-  
+class EmailPagePortlet < Cms::Portlet
+
   def render
     pmap = flash[instance_name] || params
-    @email_message = EmailMessage.new pmap[:email_message]
+    @email_message = Cms::EmailMessage.new pmap[:email_message]
     @email_message.errors.add_from_hash flash["#{instance_name}_errors"]
-    @email_page_portlet_url = pmap[:email_page_portlet_url] || request.request_uri
+    @email_page_portlet_url = pmap[:email_page_portlet_url] || request.url
   end
-  
+
+
   #----- Handlers --------------------------------------------------------------
   def deliver
-    message = EmailMessage.new(params[:email_message])
+    message = Cms::EmailMessage.new(params[:email_message])
     message.subject = self.subject
     message.body = "#{params[:email_page_portlet_url]}\n\n#{message.body}"    
     if message.save
@@ -21,4 +22,4 @@ class EmailPagePortlet < Portlet
     end
   end
   
-end
+end

data/app/portlets/forgot_password_portlet.rb

@@ -1,4 +1,4 @@
-class ForgotPasswordPortlet < Portlet
+class ForgotPasswordPortlet < Cms::Portlet
   require 'digest/sha1'  
 
   enable_template_editor true
@@ -10,9 +10,10 @@ class ForgotPasswordPortlet < Portlet
     flash[:forgot_password] = {}
 
     return unless request.post?
-    user = User.find_by_email(params[:email])
+    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
@@ -21,7 +22,7 @@ class ForgotPasswordPortlet < Portlet
     user.reset_token = generate_reset_token
     if user.save
       flash[:forgot_password][:notice] = "Your password has been sent to #{params[:email]}"
-      ForgotPasswordMailer.deliver_reset_password(self.reset_password_url + '?token=' + user.reset_token, user.email)
+      Cms::ForgotPasswordMailer.deliver_reset_password(self.reset_password_url + '?token=' + user.reset_token, user.email)
     end
   end
 

data/app/portlets/login_portlet.rb

@@ -1,4 +1,4 @@
-class LoginPortlet < Portlet
+class LoginPortlet < Cms::Portlet
   
   def render
     @success_url = (flash[:success_url] || self.success_url)
@@ -7,4 +7,4 @@ class LoginPortlet < Portlet
     @remember_me = flash[:remember_me] || params[:remember_me]
   end
     
-end
+end

data/app/portlets/reset_password_portlet.rb

@@ -1,4 +1,4 @@
-class ResetPasswordPortlet < Portlet
+class ResetPasswordPortlet < Cms::Portlet
 
   def render
     flash[:reset_password] = {}
@@ -8,7 +8,7 @@ class ResetPasswordPortlet < Portlet
       return
     end
 
-    @user = User.find_by_reset_token(params[:token])
+    @user = Cms::User.find_by_reset_token(params[:token])
 
     unless @user
       flash[:reset_password][:notice] = "Invalid password token"    

data/app/portlets/tag_cloud_portlet.rb

@@ -1,4 +1,4 @@
-class TagCloudPortlet < Portlet
+class TagCloudPortlet < Cms::Portlet
   
   def self.default_sizes
     (0..4).map{|n| "size-#{n}" }.join(" ")
@@ -7,7 +7,7 @@ class TagCloudPortlet < Portlet
   def render
     @sizes = self.sizes.blank? ? self.class.default_sizes : self.sizes
     @limit = self.limit.blank? ? 50 : self.limit
-    @cloud = Tag.cloud(:sizes => @sizes.size, :limit => @limit)
+    @cloud = Cms::Tag.cloud(:sizes => @sizes.size, :limit => @limit)
   end
     
-end
+end

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

@@ -1,6 +1,6 @@
 <%= able_to? :publish_content do -%>
   <% if @block.respond_to?(:live?) && !@block.live? %>
-    <%= link_to span_tag('Publish'), block_path(:publish), 
+    <%= link_to span_tag('Publish'), block_path(@block,:publish),
       :class => "http_put button left#{' disabled' unless (current_user.able_to_publish?(@block) && @block.publishable?)}", 
       :id => "publish_button" %>
   <% else %>
@@ -10,20 +10,20 @@
   <% end %>
 <% end -%>
 
-<%= link_to span_tag('View Content'), block_path, 
+<%= link_to span_tag('View Content'), block_path(@block),
   :class => "button middle#{ ' off' if action_name == 'show'}", 
   :id => "view_button" %>
   
-<%= link_to span_tag('Edit Content'), block_path(:edit), 
+<%= link_to span_tag('Edit Content'), block_path(@block,:edit),
   :class => "button right#{ ' off' if action_name == 'edit'}#{' disabled' unless current_user.able_to_edit?(@block)}", 
   :id => "edit_button" %>
   
-<%= link_to span_tag("Add New Content"), new_block_path, 
+<%= link_to span_tag("Add New Content"), new_block_path(@block),
   :class => "button#{ ' off' if action_name == 'new'}", 
   :id => "add_button" %>
 
 <% if @block.class.versioned? %>
-  <%= link_to span_tag('List Versions'), block_path(:versions),
+  <%= link_to span_tag('List Versions'), block_path(@block,:versions),
     :class => "button#{ ' off' if action_name == 'revisions'}", 
     :id => "list_versions" %>
 <% else %>
@@ -32,5 +32,5 @@
     :id => "list_versions" %>
 <% end %>
 
-<%= delete_button :path=>block_path, :title=>"Are you sure you want to delete '#{@block.name}'?", :enabled=>current_user.able_to_publish?(@block) %>
+<%= delete_button :path=>block_path(@block), :title=>"Are you sure you want to delete '#{@block.name}'?", :enabled=>current_user.able_to_publish?(@block) %>
 

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

@@ -9,7 +9,7 @@
 <% if @block.respond_to?(:deleted) && @block.deleted %>
   <div class="header">This <%= @block.class.name %> has been deleted.</div>
 <% else %>
-<%= form_for(@block, :url => block_path, :html => {:multipart => true}) do |f| %>
+<%= form_for(@block, :url => block_path(@block), :html => {:multipart => true}) do |f| %>
   <%= f.cms_error_messages %>
   <%= render :partial => 'cms/shared/exception', :object => @exception if @exception %>  
   <% if @other_version %>
@@ -21,9 +21,7 @@
     <%= render :partial => "cms/shared/version_conflict_diff", :locals => {:other_version => @other_version, :your_version => @block} %>
   <% end %>
     <div class="buttons">
-      <% if current_user.able_to?(:publish_content) && @block.publishable? %>
-        <%= lt_button_wrapper(%Q{<button type="submit" name="#{@block.content_block_type}[publish_on_save]" value="true" class="submit" tabindex="#{next_tabindex}"><span>Save And Publish</span></button>}) %>
-      <% end %>
+      <%= save_and_publish_button(@block, content_type) %>
       <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
     </div>
 <% end %>

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

@@ -1,57 +1,17 @@
 <%= content_for(:html_head) do %>
-<%= javascript_include_tag "cms/content_library" %>
-  <%= javascript_tag do %>
-    jQuery(function($){
-      var collectionName = '<%= content_type.model_class.name.underscore.pluralize %>'
-      
-      $('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]
-        var editable = !$(this).hasClass("non-editable")
-        var publishable = !$(this).hasClass("non-publishable")
-        $('table.data tbody tr').removeClass('selected')
-        $(this).addClass('selected')
-        $('#functions .button').addClass('disabled').attr('href','#')
-        $('#add_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/new')
-        $('#view_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id)
-        if (editable) $('#edit_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id+'/edit')
-        <% if content_type.model_class.versioned? %>
-          $('#revisions_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id+'/versions')
-        <% else %>
-          $('#revisions_button').addClass('disabled')
-            .attr('title', '<%= content_type.display_name.pluralize.titleize %> are not versioned')          
-        <% end %>
-        var cannot_be_deleted_message = $(this).find('.cannot_be_deleted_message')
-        if(cannot_be_deleted_message.length > 0) {
-          $('#delete_button').addClass('disabled')
-            .attr('title', $.trim(cannot_be_deleted_message.text()))
-        } else {
-          if (publishable) {
-            $('#delete_button').removeClass('disabled')
-              .attr('href', '/cms/'+collectionName+'/'+id)  
-              .attr('title', 'Are You Sure You Want To Delete This Record?')
-          }
-        }        
-        <%= able_to? :publish_content do -%>
-          if($(this).hasClass('draft') && publishable) {
-            $('#publish_button').removeClass('disabled').attr('href', '/cms/'+collectionName+'/'+id+'/publish?_redirect_to='+location.href)        
-          }
-        <% end %>  
-      })   
-    })
-  <% end %>
-<%= stylesheet_link_tag "cms/content_library" %>
+    <%= javascript_include_tag "cms/content_library" %>
+    <%= stylesheet_link_tag "cms/content_library" %>
 <% end %>
 <% page_title "Content Library / List #{content_type.display_name_plural}" %>
 <% @toolbar_title = "List #{content_type.display_name_plural}" %>
 <%= render :partial => 'cms/blocks/toolbar' %>
 <div class="roundedcorners">
-<table id="blocks" class="data">
+<table id="blocks" class="data cms-content-table"
+       data-content_type="<%= content_type.content_block_type %>"
+       data-versioned="<%= content_type.model_class.versioned? %>"
+       data-can_publish="<%= current_user.able_to?(:publish_content) %>"
+       data-plural_title="<%= content_type.display_name_plural %>"
+>
   <thead>
     <tr>
       <% content_type.columns_for_index.each_with_index do |column, i| %>
@@ -66,7 +26,8 @@
         <th<%= attrs %>>
           <div class="dividers">
             <% if column[:order] %>
-              <%= link_to column[:label], params.merge(:order => determine_order(params[:order], column[:order])) %>
+              <%= link_to column[:label], cms_index_path_for(content_type, 
+                :order => determine_order(params[:order], column[:order])) %>
             <% else %>
               <%= column[:label] %>
             <% end %>
@@ -88,12 +49,11 @@
        col_ct += 1 if content_type.model_class.publishable? %>
     <% @blocks.each do |b| %>
       <% block = b.class.versioned? ? b.as_of_draft_version : b %>
-
-    <%= block_row_tag(block) %>
-    <td class="first"></td>
+    <%= content_block_tr_tag(block) %>
+	<td class="first"></td>
         <% content_type.columns_for_index.each_with_index do |column, i| %>
           <td class="<%= column[:label].gsub(' ', '').underscore %>">
-            <div<%= ' class="dividers"' if (i + 3 < col_ct) %>>
+            <div<%= ' class="dividers"'.html_safe if (i + 3 < col_ct) %>>
             <%= block.send(column[:method]) %>
             <% if i.zero? && block.respond_to?(:cannot_be_deleted_message) && block.cannot_be_deleted_message %>
               <div class="cannot_be_deleted_message" style="display: none">
@@ -107,7 +67,7 @@
         <% if content_type.model_class.connectable? %><td class="used"><div class="dividers"><%= block.connected_pages.size %></div></td><% end %>
         <% if content_type.model_class.publishable? %><td class="block_status"><%= status_icon(block.status) %> <div><%= block.status %></div></td><% end %>
 	<td class="last"></td>
-      </tr>
+    </tr>
     <% end %>
     <tr>
       <td colspan="<%= col_ct %>" class="buffer"></td>

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

@@ -12,9 +12,7 @@
   <%= render :partial => block_form, :locals => {:f => f} %>
   <% unless @hide_buttons %>
     <div class="buttons">
-      <% if current_user.able_to?(:publish_content) && @block.publishable? %>
-        <%= lt_button_wrapper(%Q{<button type="submit" name="#{@block.content_block_type}[publish_on_save]" value="true" class="submit" tabindex="#{next_tabindex}"><span>Save And Publish</span></button>}) %>
-      <% end %>
+      <%= save_and_publish_button(@block, content_type) %>
       <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
     </div>
   <% 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", [:cms, @block] %> )</div>
+      <div>v. <%= @block.version %> ( <%= link_to "Current", @block %> )</div>
     </div>
   <% end -%>
   <% if @block.class.renderable? %>

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

@@ -4,7 +4,7 @@
 <%= stylesheet_link_tag("cms/content_library") %>
   <%= javascript_tag do %>
     jQuery(function($){
-      var collectionName = '<%= @block.class.name.underscore.pluralize %>'
+      var collectionName = '<%= content_type.content_block_type %>'
       
       $('table.data tbody tr').hover(function(){
         $(this).addClass('hover')
@@ -54,7 +54,7 @@
     </thead>
     <tbody>
       <% @block.versions.all(:order => "version desc").each_with_index do |r, i| %>
-        <tr id="<%= @block.class.name.underscore %>_<%= r.version %>">
+        <tr id="<%= content_type.content_block_type.singularize %>_<%= r.version %>">
           <td class="first"></td>
           <td>
             <div class="dividers">

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

@@ -5,7 +5,7 @@
 <% end %>
 
 <%= content_for :functions do %>
-  <%= link_to(span_tag("Clear Page Cache"), cms_cache_path, 
+  <%= link_to(span_tag("Clear Page Cache"), cache_path,
     :class => "button http_delete") %>
 <% end %>
 

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

@@ -1,20 +1,20 @@
-<% if CategoryType.count > 0 %>
+<% if Cms::CategoryType.count > 0 %>
   <%= content_for :html_head do %>
     <script type="text/javascript">
       jQuery(function($){
-        var categoriesByType = <%= CategoryType.category_map.to_json %>
-        $("#category_category_type_id").change(function(){
-          $("#category_parent_id option").remove()
+        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(){        
-            $("#category_parent_id").append($.createElement("option", this[0], {value: this[1]}))
+            $("#cms_category_parent_id").append($.createElement("option", this[0], {value: this[1]}))
           })
         })
       })
     </script>
   <% end %>
 
-  <% @block.category_type ||= (Category.last(:include => :category_type) && Category.last.category_type) %>  
-  <%= f.cms_drop_down :category_type_id, CategoryType.all(:order => "name").map{|c| [c.name, c.id]}, :prompt => "Select a Type of Category", :label => "Type" %>
+  <% @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" %>
 
   <% categories = @block.category_type ? @block.category_type.category_list.map{|c| [c.path, c.id]} : [] %>
   <% unless categories.empty? %>
@@ -32,5 +32,5 @@
       })
     </script>
   <% end %>
-  <p>Before you can create a category, you must <%= link_to "create a category type", new_cms_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 <%= 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>
 <% end %>

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

@@ -31,7 +31,7 @@
   <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 cms_connectors_path, :id => 'connect_form' do %>
+  <%= 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, '' %>
@@ -40,13 +40,13 @@
   <br clear="all" />
 <% end %>
 
-<%= form_tag new_cms_connector_path, :method => :get do %>
+<%= 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(ContentType.connectable.all.map{|ct| [ct.display_name, ct.content_block_type]}, @block_type.content_block_type), :onchange => 'this.form.submit()' %>
+      <%= 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>
 <% end %>
@@ -60,7 +60,7 @@
     </tr>
   </thead>
   <% @blocks.each do |block| %>
-    <tr id="<%= block.class.name.underscore %>_<%= block.id %>">
+    <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>

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

@@ -2,11 +2,11 @@
 <%= content_for :functions, "<h1>#{ @page_title }</h1>" %>
 <%= content_for :html_head, stylesheet_link_tag('cms/content_types') %>
 <ul id="content_types">
-  <% ContentType.connectable.all.each_with_index do |type, i| %>
+  <% Cms::ContentType.connectable.all.each_with_index do |type, i| %>
     <li>
       <%= link_to h(type.display_name), cms_new_path_for(type, 
-        "#{type.name.underscore}[connect_to_page_id]" => params[:connect_to_page_id], 
-        "#{type.name.underscore}[connect_to_container]" => params[:connect_to_container]
+        "#{type.model_class_form_name}[connect_to_page_id]" => params[:connect_to_page_id], 
+        "#{type.model_class_form_name}[connect_to_container]" => params[:connect_to_container]
       ) %>
       <% if i == 1 %><div style="margin: 10px 0">&nbsp;</div><% end %>
     </li>

data/app/views/cms/dashboard/_page_drafts.html.erb

@@ -1,7 +1,7 @@
 <div class="dashboard_unit" id="page_drafts">
   <h2 class="left">Page Drafts</h2>
 
-  <%= form_tag publish_cms_pages_path, :method => :put do %>
+  <%= form_tag cms.publish_pages_path, :method => :put do %>
     <div class="roundedcorners" style="position: relative">
       <table class="data">
         <thead>

data/app/views/cms/dashboard/_tasks.html.erb

@@ -1,7 +1,7 @@
 <div class="dashboard_unit" id="tasks">
   <h2 class="left">Tasks</h2>
 
-  <%= form_tag complete_cms_tasks_path, :method => :put do %>
+  <%= form_tag cms.complete_tasks_path, :method => :put do %>
     <div class="roundedcorners" style="position: relative">
       <table class="data">
         <thead>