we5-browsercms 3.0.2 → 3.0.5

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

@@ -8,7 +8,7 @@
         <% able_to?(:administrate) do %><li><%= link_to image_tag("/images/cms/nav_admin#{'_on' if tab == :administration}.gif", :id => 'nav_admin_img'), cms_administration_path, :target => "_top" %></li><% end %>
       </ul>
       <ul id="userlinks">
-	<li id="user_info"><%= image_tag "cms/icons/user.png" %><span><%= current_user.full_name %></span></li>
+	<li id="user_info"><a href="<%= current_user.able_to?(:administrate) ? edit_cms_user_path(current_user) : cms_user_path(current_user) %>" target="_top"><%= image_tag "cms/icons/user.png" %> <%= current_user.full_name %></a></li>
       	<li><%= link_to "Logout", cms_logout_path, :class => "http_delete", :target => "_top" %></li>
       </ul>
       <% flash_class, flash_message = flash.to_a.first %>

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

@@ -50,30 +50,30 @@
   <%= link_to "<span>Publish</span>", 
     @page.live? ? '#' : publish_cms_page_path(@page), 
     :id => "publish_button",
-    :class => "http_put button#{' disabled' if !current_user.able_to?(:publish_content) || @page.version != @page.draft.version || @page.live?} left",
+    :class => "http_put button#{' disabled' if !current_user.able_to?(:publish_content) || !current_user.able_to_edit?(@page) || @page.version != @page.draft.version || @page.live?} left",
     :target => "_top" %>
     
   <%= link_to "<span>Assign</span>", 
     new_cms_page_task_path(@page), 
     :id => "assign_button",
-    :class => "button#{ ' disabled' if @page.assigned_to == current_user} middle",
+    :class => "button#{ ' disabled' if @page.assigned_to == current_user || !current_user.able_to_edit?(@page) } middle",
     :target => "_top" %>
     
   <%= link_to "<span>Complete Task</span>", 
     @page.current_task ? complete_cms_task_path(@page.current_task) : '#', 
     :id => "complete_task_button",
-    :class => "http_put button#{ ' disabled' unless @page.assigned_to == current_user} right", 
+    :class => "http_put button#{ ' disabled' if @page.assigned_to != current_user || !current_user.able_to_edit?(@page) } right", 
     :target => "_top" %>
 
   <%= link_to "<span>Edit Properties</span>", 
     [:edit, :cms, @page], 
     :id => "edit_properties_button",
-    :class => "spacer button", 
+    :class => "spacer button#{ ' disabled' unless current_user.able_to_edit?(@page) }", 
     :target => "_top" %>
   
   <%= link_to "<span>List Versions</span>", 
     versions_cms_page_path(@page), 
-    :class => "spacer button",
+    :class => "spacer button#{ ' disabled' unless current_user.able_to_edit?(@page) }",
     :target => "_top" %>
     
   <% able_to? :publish_content do %>
@@ -83,7 +83,7 @@
         :id => "delete_button",
         :title => "Are you sure you want to delete '#{@page.name}'?", 
         :target => "_top", 
-        :class => "spacer button confirm_with_title http_delete" %>
+        :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>",
         revert_to_cms_page_path(@page, @page.version), 
@@ -98,7 +98,7 @@
         <div class="visual_editor_label">Visual Editor:</div>
         <div class="visual_editor_value_container">
           <% if @mode == "edit" %>
-	    <div><span id="visual_editor_state">ON</span></div>
+	    <div><span id="visual_editor_state"<%= ' title="You don\'t have permission to edit this page"' unless current_user.able_to_edit?(@page) %>>ON<%= '*' unless current_user.able_to_edit?(@page) %></span></div>
           <% else %>
 	    <div><span id="visual_editor_state">OFF</span></div>
           <% end %>

data/app/views/layouts/cms/administration.html.erb

@@ -7,18 +7,29 @@
   <div id="wrapper">
     <%= render_cms_toolbar(:administration) %>
     <div id="main">
-    <div class="top_cap_menu"></div>
-      <div id="menu">
-        <%= render :partial => 'cms/shared/admin_sidebar' %>                      
-      </div>
-      <div id="contentwrap">
+    
+    <% if current_user.able_to?(:administrate) %>
+      <div class="top_cap_menu"></div>
+        <div id="menu">
+          <%= render :partial => 'cms/shared/admin_sidebar' %>                      
+        </div>
+        <div id="contentwrap">
+    <% else %>
+      <div class="top_cap"></div>
+      <div id="contentwrapbig">
+    <% end %>
+    
 	<div id="functions">
 	  <h1><%= @toolbar_title %></h1>
 	  <%= yield :functions %>
 
 	</div>
 	<br clear="all" />
-	<div class="top_cap_content"></div>
+	
+	<% able_to?(:administrate) do %>
+	  <div class="top_cap_content"></div>
+	<% end %>
+	
       <div id="content">
 	<div class="pad">
           <%= yield %>
@@ -26,7 +37,13 @@
       </div>
     </div>
     <br clear="all" />
-    <div class="bottom_cap_content"></div>
+    
+    <% if current_user.able_to?(:administrate) %>
+      <div class="bottom_cap_content"></div>
+    <% else %>
+      <div class="bottom_cap"></div>
+    <% end %>
+    
     <%= render :partial => 'layouts/cms/footer' %>
   </div>
 </div>

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

@@ -0,0 +1,5 @@
+<%= f.cms_text_field :name %>
+<%= f.cms_text_field :reset_password_url, :instructions => 'page in which the user will reset his or her password.  No get parameters allowed.' %>
+
+<%= 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/forgot_password/render.html.erb

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

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

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

data/{we5-browsercms.gemspec → browsercms.gemspec}

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{we5-browsercms}
-  s.version = "3.0.2"
+  s.version = "3.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BrowserMedia"]
-  s.date = %q{2009-10-14}
+  s.date = %q{2009-11-17}
   s.email = %q{github@browsermedia.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -74,6 +74,7 @@ Gem::Specification.new do |s|
      "app/models/email_message.rb",
      "app/models/email_message_mailer.rb",
      "app/models/file_block.rb",
+     "app/models/forgot_password_mailer.rb",
      "app/models/group.rb",
      "app/models/group_permission.rb",
      "app/models/group_section.rb",
@@ -103,7 +104,9 @@ Gem::Specification.new do |s|
      "app/models/user_group_membership.rb",
      "app/portlets/dynamic_portlet.rb",
      "app/portlets/email_page_portlet.rb",
+     "app/portlets/forgot_password_portlet.rb",
      "app/portlets/login_portlet.rb",
+     "app/portlets/reset_password_portlet.rb",
      "app/portlets/tag_cloud_portlet.rb",
      "app/views/cms/blocks/_hidden_fields.html.erb",
      "app/views/cms/blocks/_toolbar.html.erb",
@@ -133,6 +136,8 @@ Gem::Specification.new do |s|
      "app/views/cms/email_messages/show.html.erb",
      "app/views/cms/file_blocks/_form.html.erb",
      "app/views/cms/file_blocks/render.html.erb",
+     "app/views/cms/forgot_password_mailer/reset_password.text.html.erb",
+     "app/views/cms/forgot_password_mailer/reset_password.text.plain.erb",
      "app/views/cms/form_builder/_cms_date_picker.html.erb",
      "app/views/cms/form_builder/_cms_datetime_select.html.erb",
      "app/views/cms/form_builder/_cms_drop_down.html.erb",
@@ -155,6 +160,8 @@ Gem::Specification.new do |s|
      "app/views/cms/links/destroy.js.rjs",
      "app/views/cms/links/edit.html.erb",
      "app/views/cms/links/new.html.erb",
+     "app/views/cms/menus/_menu.html.erb",
+     "app/views/cms/menus/_menu_item.html.erb",
      "app/views/cms/page_routes/_form.html.erb",
      "app/views/cms/page_routes/edit.html.erb",
      "app/views/cms/page_routes/index.html.erb",
@@ -191,6 +198,7 @@ Gem::Specification.new do |s|
      "app/views/cms/shared/_pagination.html.erb",
      "app/views/cms/shared/_version_conflict_diff.html.erb",
      "app/views/cms/shared/_version_conflict_error.html.erb",
+     "app/views/cms/shared/access_denied.html.erb",
      "app/views/cms/shared/error.html.erb",
      "app/views/cms/tags/_form.html.erb",
      "app/views/cms/tags/render.html.erb",
@@ -205,6 +213,7 @@ Gem::Specification.new do |s|
      "app/views/cms/users/edit.html.erb",
      "app/views/cms/users/index.html.erb",
      "app/views/cms/users/new.html.erb",
+     "app/views/cms/users/show.html.erb",
      "app/views/layouts/_cms_toolbar.html.erb",
      "app/views/layouts/_page_toolbar.html.erb",
      "app/views/layouts/application.html.erb",
@@ -221,11 +230,16 @@ Gem::Specification.new do |s|
      "app/views/portlets/dynamic/_form.html.erb",
      "app/views/portlets/email_page/_form.html.erb",
      "app/views/portlets/email_page/render.html.erb",
+     "app/views/portlets/forgot_password/_form.html.erb",
+     "app/views/portlets/forgot_password/render.html.erb",
      "app/views/portlets/login/_form.html.erb",
      "app/views/portlets/login/render.html.erb",
      "app/views/portlets/portlets/_form.html.erb",
+     "app/views/portlets/reset_password/_form.html.erb",
+     "app/views/portlets/reset_password/render.html.erb",
      "app/views/portlets/tag_cloud/_form.html.erb",
      "app/views/portlets/tag_cloud/render.html.erb",
+     "browsercms.gemspec",
      "db/demo/data.rb",
      "db/demo/page_partials/_footer.html.erb",
      "db/demo/page_partials/_header.html.erb",
@@ -233,6 +247,7 @@ Gem::Specification.new do |s|
      "db/demo/page_templates/sub_page.html.erb",
      "db/migrate/20080815014337_browsercms_3_0_0.rb",
      "db/migrate/20081114172307_load_seed_data.rb",
+     "db/migrate/20091109175123_browsercms_3_0_5.rb",
      "doc/app/classes/AbstractFileBlock.html",
      "doc/app/classes/ActiveRecord.html",
      "doc/app/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html",
@@ -1167,6 +1182,7 @@ Gem::Specification.new do |s|
      "public/images/cms/usercontrols_bg.png",
      "public/images/cms/usercontrols_bg_cap.png",
      "public/javascripts/cms/application.js",
+     "public/javascripts/cms/content_library.js",
      "public/javascripts/cms/editor.js",
      "public/javascripts/cms/sitemap.js",
      "public/javascripts/jquery-ui.js",
@@ -1225,8 +1241,7 @@ Gem::Specification.new do |s|
      "rails_generators/portlet/templates/unit_test.erb",
      "templates/blank.rb",
      "templates/demo.rb",
-     "templates/module.rb",
-     "we5-browsercms.gemspec"
+     "templates/module.rb"
   ]
   s.homepage = %q{http://www.browsercms.org}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -1235,69 +1250,71 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{BrowserCMS is a general purpose, open source Web Content Management System (CMS), written in Ruby on Rails.}
   s.test_files = [
-    "test/custom_assertions.rb",
-     "test/factories.rb",
-     "test/functional/cms/cache_controller_test.rb",
-     "test/functional/cms/categories_controller_test.rb",
-     "test/functional/cms/connectors_controller_test.rb",
-     "test/functional/cms/content_controller_test.rb",
+    "test/functional/cms/file_blocks_controller_test.rb",
+     "test/functional/cms/toolbar_controller_test.rb",
+     "test/functional/cms/sessions_controller_test.rb",
      "test/functional/cms/content_types_controller_test.rb",
      "test/functional/cms/dashboard_controller_test.rb",
-     "test/functional/cms/dynamic_views_controller_test.rb",
-     "test/functional/cms/file_blocks_controller_test.rb",
-     "test/functional/cms/groups_controller_test.rb",
-     "test/functional/cms/home_controller_test.rb",
+     "test/functional/cms/cache_controller_test.rb",
      "test/functional/cms/html_blocks_controller_test.rb",
-     "test/functional/cms/image_blocks_controller_test.rb",
+     "test/functional/cms/users_controller_test.rb",
+     "test/functional/cms/content_controller_test.rb",
      "test/functional/cms/links_controller_test.rb",
+     "test/functional/cms/dynamic_views_controller_test.rb",
+     "test/functional/cms/categories_controller_test.rb",
+     "test/functional/cms/content_block_controller_test.rb",
      "test/functional/cms/pages_controller_test.rb",
-     "test/functional/cms/portlets_controller_test.rb",
+     "test/functional/cms/connectors_controller_test.rb",
+     "test/functional/cms/home_controller_test.rb",
      "test/functional/cms/section_nodes_controller_test.rb",
+     "test/functional/cms/groups_controller_test.rb",
      "test/functional/cms/sections_controller_test.rb",
-     "test/functional/cms/sessions_controller_test.rb",
-     "test/functional/cms/toolbar_controller_test.rb",
-     "test/functional/cms/users_controller_test.rb",
-     "test/integration/login_test.rb",
-     "test/test_helper.rb",
+     "test/functional/cms/portlets_controller_test.rb",
+     "test/functional/cms/image_blocks_controller_test.rb",
+     "test/factories.rb",
+     "test/custom_assertions.rb",
      "test/test_logging.rb",
-     "test/unit/behaviors/attaching_test.rb",
-     "test/unit/behaviors/dynamic_attributes_test.rb",
-     "test/unit/behaviors/publishable_test.rb",
-     "test/unit/behaviors/searching_test.rb",
-     "test/unit/behaviors/taggable_test.rb",
-     "test/unit/extensions/active_record/base_test.rb",
-     "test/unit/extensions/hash_test.rb",
-     "test/unit/extensions/integer_test.rb",
-     "test/unit/helpers/application_helper_test.rb",
-     "test/unit/helpers/form_builder_test.rb",
-     "test/unit/helpers/menu_helper_test.rb",
+     "test/test_helper.rb",
      "test/unit/helpers/page_helper_test.rb",
+     "test/unit/helpers/application_helper_test.rb",
      "test/unit/helpers/path_helper_test.rb",
-     "test/unit/lib/content_block_test.rb",
-     "test/unit/lib/generators_test.rb",
-     "test/unit/lib/routes_test.rb",
-     "test/unit/models/attachment_test.rb",
-     "test/unit/models/category_test.rb",
-     "test/unit/models/category_type_test.rb",
-     "test/unit/models/connector_test.rb",
-     "test/unit/models/content_type_test.rb",
+     "test/unit/helpers/menu_helper_test.rb",
+     "test/unit/helpers/form_builder_test.rb",
+     "test/unit/schema_statements_test.rb",
+     "test/unit/models/user_test.rb",
+     "test/unit/models/link_test.rb",
      "test/unit/models/email_page_portlet_test.rb",
-     "test/unit/models/file_block_test.rb",
      "test/unit/models/group_test.rb",
+     "test/unit/models/site_test.rb",
+     "test/unit/models/sections_test.rb",
+     "test/unit/models/section_node_test.rb",
+     "test/unit/models/content_type_test.rb",
      "test/unit/models/html_block_test.rb",
-     "test/unit/models/link_test.rb",
-     "test/unit/models/page_partial_test.rb",
-     "test/unit/models/page_route_test.rb",
-     "test/unit/models/page_template_test.rb",
-     "test/unit/models/page_test.rb",
-     "test/unit/models/permission_test.rb",
      "test/unit/models/portlet_test.rb",
-     "test/unit/models/section_node_test.rb",
-     "test/unit/models/sections_test.rb",
-     "test/unit/models/site_test.rb",
+     "test/unit/models/connector_test.rb",
      "test/unit/models/task_test.rb",
-     "test/unit/models/user_test.rb",
-     "test/unit/schema_statements_test.rb"
+     "test/unit/models/page_test.rb",
+     "test/unit/models/category_test.rb",
+     "test/unit/models/page_route_test.rb",
+     "test/unit/models/page_partial_test.rb",
+     "test/unit/models/attachment_test.rb",
+     "test/unit/models/file_block_test.rb",
+     "test/unit/models/permission_test.rb",
+     "test/unit/models/page_template_test.rb",
+     "test/unit/models/category_type_test.rb",
+     "test/unit/behaviors/publishable_test.rb",
+     "test/unit/behaviors/searching_test.rb",
+     "test/unit/behaviors/dynamic_attributes_test.rb",
+     "test/unit/behaviors/taggable_test.rb",
+     "test/unit/behaviors/attaching_test.rb",
+     "test/unit/extensions/hash_test.rb",
+     "test/unit/extensions/active_record/base_test.rb",
+     "test/unit/extensions/integer_test.rb",
+     "test/unit/lib/routes_test.rb",
+     "test/unit/lib/generators_test.rb",
+     "test/unit/lib/content_block_test.rb",
+     "test/integration/cms/password_management_test.rb",
+     "test/integration/login_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -1310,3 +1327,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/db/migrate/20091109175123_browsercms_3_0_5.rb

@@ -0,0 +1,9 @@
+class Browsercms305 < ActiveRecord::Migration
+  def self.up
+    add_column :users, :reset_token, :string
+  end
+
+  def self.down
+    remove_column :users, :reset_token
+  end
+end

data/lib/acts_as_list.rb

@@ -61,7 +61,7 @@ module ActsAsList
 
         #{scope_condition_method}
 
-        before_destroy :remove_from_list
+        before_destroy :remove_from_list_without_saving
         before_create  :add_to_list_bottom
       EOV
     end
@@ -118,13 +118,17 @@ module ActsAsList
     end
 
     # Removes the item from the list.
-    def remove_from_list
+    def remove_from_list(save = true)
       if in_list?
         decrement_positions_on_lower_items
-        update_attribute position_column, nil
+        update_attribute(position_column, nil) if save
       end
     end
 
+    def remove_from_list_without_saving
+      self.remove_from_list(false)
+    end
+
     # Increase the position of this item without adjusting the rest of the list.
     def increment_position
       return unless in_list?
@@ -249,4 +253,4 @@ module ActsAsList
         self.update_attribute(position_column, position)
       end
   end
-end
+end