RubyGems - browsercms - Versions diffs - 3.0.6 → 3.1.0 - Mend

browsercms 3.0.6 → 3.1.0

Files changed (995) hide show

@@ -0,0 +1,31 @@
+##
+# Separated into its own file so it can be required in Application Templates and Generators easier.
+module Templates
+  ##
+  # Generates a basic empty template for a page.
+  #
+  def self.default_body
+    html = <<HTML
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    <title><%= page_title %></title>
+    <%= yield :html_head %>
+  </head>
+  <body style="margin: 0; padding: 0; text-align: center;">
+    <%= cms_toolbar %>
+    <div id="wrapper" style="width: 700px; margin: 0 auto; text-align: left; padding: 30px">
+      Breadcrumbs: <%= render_breadcrumbs %>
+      Main Menu: <%= render_menu %>
+      <h1><%= page_title %></h1>
+      <%= container :main %>
+    </div>
+  </body>
+</html>
+HTML
+    html
+  end
+end

data/app/models/user.rb CHANGED

@@ -17,8 +17,8 @@ class User < ActiveRecord::Base
   has_many :user_group_memberships
   has_many :groups, :through => :user_group_memberships
   has_many :tasks, :foreign_key => "assigned_to_id"
-  named_scope :active, :conditions => {:expires_at => nil }
+  named_scope :active, :conditions => ["expires_at IS NULL OR expires_at > ?", Time.now.utc]
   named_scope :able_to_edit_or_publish_content,
     :include => {:groups => :permissions},
     :conditions => ["permissions.name = ? OR permissions.name = ?", "edit_content", "publish_content"]
@@ -38,6 +38,12 @@ class User < ActiveRecord::Base
     !!@guest
   end
+  # Determines if this user should have access to the CMS administration tools. Can be overridden by specific users (like GuestUser)
+  # which may not need to check the database for that information.
+  def cms_access?
+    groups.cms_access.count > 0
+  end
   def disable
     if self.class.count(:conditions => ["expires_at is null and id != ?", id]) > 0
       self.expires_at = Time.now - 1.minutes
@@ -109,15 +115,27 @@ class User < ActiveRecord::Base
     end
   end
-  # Expects object to be an object or a section
-  # If it's a section, that will be used
-  # If it's not a section, it will call section on the object
-  # returns true if any of the sections of the groups the user is in matches the page's section.
+  # Determine if this user has permission to view the specific object. Permissions
+  #   are always tied to a specific section. This method can take different input parameters
+  #   and will attempt to determine the relevant section to check.
+  # Expects object to be of type:
+  #   1. Section - Will check the user's groups to see if any of those groups can view this section.
+  #   2. Path - Will look up the section based on the path, then check it.  (Note that section paths are not currently unique, so this will check the first one it finds).
+  #   3. Other - Assumes it has a section attribute and will call that and check the return value.
+  #
+  # Returns: true if the user can view this object, false otherwise.
+  # Raises: ActiveRecord::RecordNotFound if a path to a not existent section is passed in.
   def able_to_view?(object)
-    section = object.is_a?(Section) ? object : object.section
-    viewable_sections.include?(section) || groups.cms_access.count > 0
+    section = object
+    if object.is_a?(String)
+       section = Section.find_by_path(object)
+       raise ActiveRecord::RecordNotFound.new("Could not find section with path = '#{object}'") unless section
+    elsif !object.is_a?(Section)
+      section = object.section
+    end
+    viewable_sections.include?(section) || cms_access?
   end
   def able_to_modify?(object)
     case object
       when Section

data/app/portlets/forgot_password_portlet.rb ADDED

@@ -0,0 +1,29 @@
+class ForgotPasswordPortlet < Portlet
+  require 'digest/sha1'
+  enable_template_editor true
+  def render
+    flash[:forgot_password] = {}
+    return unless request.method == :post
+    user = User.find_by_email(params[: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]}"
+      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/reset_password_portlet.rb ADDED

@@ -0,0 +1,28 @@
+class ResetPasswordPortlet < Portlet
+  def render
+    flash[:reset_password] = {}
+    unless params[:token]
+      flash[:reset_password][:error] = "No password token given"
+      return
+    end
+    @user = User.find_by_reset_token(params[:token])
+    unless @user
+      flash[:reset_password][:notice] = "Invalid password token"
+      return
+    end
+    if request.method == :post
+      @user.password = params[:password]
+      @user.password_confirmation = params[:password_confirmation]
+      if @user.save
+        flash[:reset_password][:notice] = 'Password has been reset'
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 <% able_to? :publish_content do -%>
   <% if @block.respond_to?(:live?) && !@block.live? %>
     <%= link_to span_tag('Publish'), block_path(:publish),
-      :class => "http_put button left#{' disabled' unless current_user.able_to_publish?(@block)}",
+      :class => "http_put button left#{' disabled' unless (current_user.able_to_publish?(@block) && @block.publishable?)}",
       :id => "publish_button" %>
   <% else %>
     <%= link_to span_tag('Publish'), "#",

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

@@ -5,6 +5,10 @@
 <% page_title "Content Library / Edit #{content_type.display_name}" %>
 <% @toolbar_title = "Edit #{content_type.display_name} '#{@block.name}'" %>
 <% content_for :functions,  render(:partial => 'cms/blocks/toolbar') %>
+<% 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| %>
   <%= f.error_messages %>
   <%= render :partial => 'cms/shared/exception', :object => @exception if @exception %>
@@ -23,3 +27,4 @@
       <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
     </div>
 <% end %>
+<% end %>

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

@@ -13,6 +13,9 @@
 <%= content_for :functions,  render(:partial => 'cms/blocks/toolbar') %>
 <div id="block_content">
+  <% if @block.respond_to?(:deleted) && @block.deleted %>
+  <div class="header">This <%= @block.class.name %> has been deleted.</div>
+  <% end %>
   <% if @block.class.publishable? %>
     <% block_published_status = (@block.live? ? 'published' : 'draft') %>
     <div class="status">

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

@@ -24,8 +24,9 @@
   <%= link_to(span_tag("&nbsp;Edit&nbsp;"), '#', :id => 'edit_button', :class => "button disabled") %>
   <%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), "#",
     :id => "delete_button",
-    :class => "button disabled http_delete",
-    :onclick => "return confirm('Are you sure you want to delete this #{dynamic_view_type.name.underscore.titleize}?')" %>
+    :title => "Are you sure you want to delete this #{dynamic_view_type.name.underscore.titleize}?",
+    :class => "button disabled http_delete confirm_with_title"
+    %>
 <% end %>
 <div class="roundedcorners">

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

@@ -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 ADDED

@@ -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_builder/_cms_check_box.html.erb ADDED

@@ -0,0 +1,7 @@
+<div class="checkbox_group fields no_check_all">
+  <div class="checkbox_fields">
+    <%= f.label method, cms_options[:label] %>
+    <%= f.check_box method, options %>
+  </div>
+  <%= f.cms_instructions cms_options[:instructions] %>
+</div>

data/app/views/cms/form_builder/_cms_drop_down.html.erb CHANGED

@@ -1,10 +1,3 @@
-<% content_for :html_head do %>
-  <% javascript_tag do %>
-    jQuery(function($) {
-      $('#<%= object_name %>_<%= method %>').selectbox({width: '455px'});
-    })
-  <% end %>
-<% end %>
 <div class="fields select_fields">
   <% if cms_options[:label] %>
     <%= f.label method, cms_options[:label] %>

data/app/views/cms/form_builder/_cms_fancy_drop_down.html.erb ADDED

@@ -0,0 +1,9 @@
+<% cms_options[:width] = "455px" unless cms_options[:width]%>
+<% content_for :html_head do %>
+  <% javascript_tag do %>
+    jQuery(function($) {
+      $('select.<%= object_name %>_<%= method %>').selectbox({width: '<%= cms_options[:width]%>'});
+    })
+  <% end -%>
+<% end -%>
+<%= f.select method, choices, options, html_options %>

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

@@ -1,14 +1,16 @@
-<% content_for :html_head do %>
+<% 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()})
+      .focus(function() {this.blur()})
+      .mousedown(function() {this.blur()})
       $('#<%= object_name %>_<%= method %>').change(function() {
-          $('#mock_<%= object_name %>_<%= method %>')
-            .attr('value', $(this).attr('value'))
+        $('#mock_<%= object_name %>_<%= method %>')
+        .attr('value', $(this).attr('value'))
       })
-    })
+     })
+   <% end %>
   <% end %>
 <% end %>
@@ -19,11 +21,13 @@
     <%= f.label method %>
   <% end %>
   <div id="<%= object_name %>_<%= method %>_div" class="file_inputs">
-    <%= f.file_field method, {:size => 1, :class=>"file"}.merge(options) %>
+    <%= 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>

data/app/views/cms/form_builder/_cms_instructions.html.erb ADDED

@@ -0,0 +1,4 @@
+<% if :instructions %>
+    <div class="instructions"><%= h instructions %></div>
+    <br clear="all"/>
+<% end %>

data/app/views/cms/form_builder/_cms_template_editor.html.erb ADDED

@@ -0,0 +1,8 @@
+<div class="fields text_editor_fields">
+  <%= f.label method, cms_options[:label] %>
+  <%= f.drop_down "#{method}_handler", ActionView::Template.template_handler_extensions, :default_value => dropdown_options[:default_handler], :width=>"96px" %>
+  <div class="template_editor">
+    <%= f.text_area method, options %>
+  </div>
+  <%= f.cms_instructions cms_options[:instructions] %>
+</div>

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

@@ -3,7 +3,7 @@
     jQuery(function($){
       var cms_access_group_ids = <%= GroupType.cms_access.all.map{|e| e.id.to_s}.to_json %>
       $('#group_group_type_id').change(function() {
-        if ($.inArray($('#group_group_type_id')[0].value, cms_access_group_ids)) {
+        if ($.inArray($('#group_group_type_id')[0].value, cms_access_group_ids) < 0) {
           $('#permissions').hide()
           $('#section-action').text('view')
         } else {

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

@@ -24,8 +24,8 @@
   <%= link_to(span_tag("&nbsp;Edit&nbsp;"), '#', :id => 'edit_button', :class => "button disabled") %>
   <%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), "#",
     :id => "delete_button",
-    :class => "button disabled http_delete",
-    :onclick => "return confirm('Are you sure you want to delete this Page Route?')" %>
+    :class => "button http_delete confirm_with_title disabled",
+    :title => "Are you sure you want to delete this Page Route?" %>
   <%= link_to(span_tag("View"), "#", :id => 'view_button', :class => "button") %>
   <%= link_to(span_tag("View Rails Routes"), cms_routes_path, :class => "button") %>
 <% end %>

data/app/views/cms/page_routes/show.html.erb CHANGED

@@ -5,8 +5,8 @@
   <%= link_to(span_tag("&nbsp;Edit&nbsp;"), edit_cms_page_route_path(@page_route), :id => 'edit_button', :class => "button") %>
   <%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), [:cms, @page_route],
     :id => "delete_button",
-    :class => "button http_delete",
-    :onclick => "return confirm('Are you sure you want to delete this Page Route?')" %>
+    :class => "button http_delete confirm_with_title",
+    :title => "Are you sure you want to delete this Page Route?" %>
   <%= link_to(span_tag("List All"), cms_page_routes_path, :class => "button") %>
   <%= link_to(span_tag("View Rails Routes"), cms_routes_path, :class => "button") %>
 <% end %>

data/app/views/cms/redirects/index.html.erb CHANGED

@@ -21,7 +21,7 @@
 <% content_for :functions do %>
 <%= link_to(span_tag("&nbsp;Add&nbsp;"), new_cms_redirect_path, :class => "button") %>
 <%= link_to(span_tag("&nbsp;Edit&nbsp;"), '#', :id => 'edit_button', :class => "button disabled") %>
-<%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), "#", :id => "delete_button", :class => "button disabled http_delete", :onclick => "return confirm('Are you sure you want to delete this redirect?')" %>
+<%= link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete"), "#", :id => "delete_button", :class => "button disabled http_delete confirm_with_title", :title => "Are you sure you want to delete this redirect?" %>
 <% end %>
 <div class="roundedcorners">
 <table class="data">

data/app/views/layouts/cms/_footer.erb CHANGED

@@ -1,4 +1,4 @@
 <div id="footer">
   <p>&copy; 1998-<%= Time.now.year %> <a href="#">BrowserMedia</a>. All Rights Reserved</p>
-  <p>Browser CMS v<%= Cms.version %> b<%= Cms.build_number %> Rails <%= RAILS_GEM_VERSION %> Env <%= Rails.env %></p>
+  <p>Browser CMS v<%= Cms.version %> Rails <%= RAILS_GEM_VERSION %> Env <%= Rails.env %></p>
 </div>

data/app/views/layouts/cms/_head.html.erb CHANGED

@@ -7,7 +7,7 @@
   <%= javascript_include_tag 'jquery', 'jquery-ui', 'jquery.dimensions' %>
   <%= javascript_include_tag 'jquery.cookie.js', 'jquery.selectbox-0.5.js' %>
   <%= javascript_include_tag 'jquery.taglist', '/cms/tags' %>
-  <%= javascript_include_tag '/fckeditor/fckeditor', 'cms/editor' %>
+  <%= javascript_include_tag Cms.wysiwig_js %>
   <%= javascript_include_tag 'cms/application' %>
   <script type="text/javascript">
     jQuery(function($){

data/app/views/layouts/cms/content_library.html.erb CHANGED

@@ -52,15 +52,15 @@
                 <%= yield :sidebar %>
                 <h3>Content Types</h3>
                 <ul>
-                  <% ContentTypeGroup.all(:order => "content_type_groups.id").each do |g| %>
-                    <li<%= ' class="open"' if (g == content_type.content_type_group) %>>
-                      <% if g.content_types.blank? %>
-                        <%= link_to h(g.name), "#" %>
+                  <% ContentTypeGroup.all(:order => "content_type_groups.id").each do |group| %>
+                    <li<%= ' class="open"' if (group == content_type.content_type_group) %>>
+                      <% if group.content_types.blank? %>
+                        <%= link_to h(group.name), "#" %>
                       <% else %>
-                        <%= link_to h(g.name), cms_index_path_for(g.content_types.first) %>
+                        <%= link_to h(group.name), cms_index_path_for(group.content_types.first) %>
                         <ul>
-                          <% g.content_types(:order => 'priority, name').each do |t| %>
-                            <li<%= ' class="on"' if content_type.is_child_of?(t) %>><%= link_to h(t.display_name), cms_index_path_for(t) %></li>
+                          <% group.content_types.find(:all, :order => 'priority, name').each do |type| %>
+                            <li<%= ' class="on"' if content_type.is_child_of?(type) %>><%= link_to h(type.display_name), cms_index_path_for(type) %></li>
                           <% end -%>
                         </ul>
                       <% end -%>

data/app/views/layouts/cms/thickbox.html.erb CHANGED

@@ -5,7 +5,7 @@
   <title><%= @page_title %></title>
   <%= stylesheet_link_tag 'cms/date_picker', 'cms/thickbox' %>
   <%= javascript_include_tag 'jquery', 'jquery-ui', 'jquery.cookie.js', 'jquery.selectbox-0.5.js', 'jquery.thickbox.js' %>
-  <%= javascript_include_tag '/fckeditor/fckeditor', 'cms/editor' %>
+  <%= javascript_include_tag Cms.wysiwig_js %>
   <%= javascript_include_tag 'cms/application' %>
   <script type="text/javascript">
     jQuery(function($){
@@ -21,4 +21,4 @@
     <div align="right"><a href="#" onclick="self.parent.tb_remove();">X</a></div>
     <%= yield %>
   </body>
-</html>
+</html>

data/app/views/portlets/forgot_password/_form.html.erb ADDED

@@ -0,0 +1,6 @@
+<%= f.cms_text_field :name %>
+<%= f.cms_text_field :reset_password_url, :instructions => 'URL to page where user will reset his or her password.  No get parameters allowed.' %>
+<%= f.cms_template_editor :template %>

data/app/views/portlets/forgot_password/render.html.erb ADDED

@@ -0,0 +1,14 @@
+<% if flash_scope = flash[:forgot_password] -%>
+  <% if flash_scope[:error] -%>
+    <span class="forgot-password-error"><%= flash_scope[:error] %></span>
+  <% end -%>
+  <% if flash_scope[:notice] -%>
+    <span class="forgot-password-notice"><%= flash_scope[:notice] %></span>
+  <% end -%>
+<% end -%>
+<% form_tag do %>
+  <label for="email">Your account email address:</label>
+  <%= text_field_tag "email" %><br>
+  <%= submit_tag "Request reset password token"%>
+<% end %>

data/app/views/portlets/reset_password/_form.html.erb ADDED

@@ -0,0 +1,3 @@
+<%= f.cms_text_field :name %>
+<%= f.cms_drop_down :handler, ActionView::Template.template_handler_extensions, :default => "erb" %>
+<%= f.cms_text_area :template, :default_value => @block.class.default_template %>

data/app/views/portlets/reset_password/render.html.erb ADDED

@@ -0,0 +1,24 @@
+<%= error_message_on :user, :password %>
+<% if flash_scope = flash[:reset_password] -%>
+  <% if flash_scope[:error] -%>
+    <span class="reset-password-error"><%= flash_scope[:error] %></span>
+  <% end -%>
+  <% if flash_scope[:notice] -%>
+    <span class="reset-password-notice"><%= flash_scope[:notice] %></span>
+  <% end -%>
+<% end -%>
+<% form_tag do %>
+  <% if params[:token] -%>
+  <%= hidden_field_tag "token", params[:token] %>
+  <% end -%>
+  <label for="password">New Password:</label>
+  <%= password_field_tag "password" %><br>
+  <label for="password_confirmation">Confirm New Password:</label>
+  <%= password_field_tag "password_confirmation" %><br>
+  <%= submit_tag "Reset Password" %>
+<% end %>