refinerycms 0.9.6.19 → 0.9.6.21

data/public/javascripts/refinery/admin.js

@@ -13,7 +13,7 @@ $(document).ready(function(){
 
 init_delete_confirmations = function() {
   $('a.confirm-delete').click(function(e) {
-    if (confirm("Are you sure you want to " + (t=$(this).attr('title'))[0].toLowerCase() + t.substring(1) + "?")) {
+    if (confirm("Are you sure you want to " + (t=($(this).attr('title') || $(this).attr('tooltip')))[0].toLowerCase() + t.substring(1) + "?")) {
       $("<form method='POST' action='" + $(this).attr('href') + "'></form>")
         .append("<input type='hidden' name='_method' value='delete' />")
         .append("<input type='hidden' name='authenticity_token' value='" + $('#admin_authenticity_token').val() + "'/>")
@@ -137,12 +137,24 @@ init_submit_continue = function(){
 }
 
 init_tooltips = function(args){
-  if (typeof(Tooltip) != "undefined") {
-    $($(args != null ? args : 'a[title], #image_grid img[title]')).each(function(index, element)
-    {
-      new Tooltip(element, {mouseFollow:false, delay: 0, opacity: 1, appearDuration:0, hideDuration: 0, rounded: false});
+  $($(args != null ? args : 'a[title], span[title], #image_grid img[title], *[tooltip]')).each(function(index, element)
+  {
+    // create tooltip on hover and destroy it on hoveroff.
+    $(element).hover(function(e) {
+      tooltip = $("<div class='tooltip'></div>").html($(this).attr('tooltip')).appendTo($('#tooltip_container'));
+      tooltip.css({
+          'left': ((left = $(this).offset().left - (tooltip.outerWidth() / 2) + ($(this).outerWidth() / 2)) >= 0 ? left : 0)
+        , 'top': $(this).offset().top - tooltip.outerHeight() - 6
+      }).show();
+    }, function(e) {
+      $('.tooltip').remove();
     });
-  }
+    if ($(element).attr('tooltip') == null) {
+      $(element).attr({'tooltip': $(element).attr('title'), 'title': ''});
+    }
+    // wipe clean the title on any children too.
+    $(element).children('img').attr('title', '')
+  });
 }
 
 var link_dialog = {
@@ -325,6 +337,13 @@ var link_dialog = {
 
 var page_options = {
   init: function(enable_parts, new_part_url, del_part_url){
+    // set the page tabs up, but ensure that all tabs are shown so that when wymeditor loads it has a proper height.
+    // also disable page overflow so that scrollbars don't appear while the page is loading.
+    $(document.body).addClass('hide-overflow');
+    page_options.tabs = $('#page-tabs').tabs({tabTemplate: '<li><a href="#{href}">#{label}</a></li>'});
+    part_shown = $('#page-tabs .page_part.field').not('.ui-tabs-hide');
+    $('#page-tabs .page_part.field').removeClass('ui-tabs-hide');
+
     this.enable_parts = enable_parts;
     this.new_part_url = new_part_url;
     this.del_part_url = del_part_url;
@@ -333,7 +352,9 @@ var page_options = {
 
     // Hook into the loaded function. This will be called when WYMeditor has done its thing.
     WYMeditor.loaded = function(){
-      page_options.tabs = $('#page-tabs').tabs({tabTemplate: '<li><a href="#{href}">#{label}</a></li>'});
+      // hide the tabs that are supposed to be hidden and re-enable overflow.
+      $(document.body).removeClass('hide-overflow');
+      $('#page-tabs .page_part.field').not(part_shown).addClass('ui-tabs-hide');
     }
 
     if(this.enable_parts){
@@ -499,10 +520,10 @@ var image_dialog = {
           wym_src.value = relevant_src;
         }
         if ((wym_title = parent.document.getElementById('wym_title')) != null) {
-          wym_title.value = img.title;
+          wym_title.value = $(img).attr('title');
         }
         if ((wym_alt = parent.document.getElementById('wym_alt')) != null) {
-          wym_alt.value = img.alt;
+          wym_alt.value = $(img).attr('alt');
         }
       }
     }

data/public/javascripts/refinery/boot_wym.js

@@ -165,4 +165,8 @@ $(function()
   wymeditor_inputs = $('.wymeditor');
   wymeditor_inputs.hide();
   wymeditor_inputs.wymeditor(wymeditor_boot_options);
+  $('.wym_iframe iframe').each(function(index, wym) {
+    // adjust for border width.
+    $(wym).css({'height':$(wym).parent().height()-2, 'width':$(wym).parent().width()-2});
+  });
 });

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -1536,7 +1536,7 @@ WYMeditor.editor.prototype.listen = function() {
   for(var i=0; i < images.length; i++) {
     $(images[i]).bind("mousedown", this.mousedown);
   }
-    
+
   // ensure links can't be navigated to.
   $(this._doc).find('a[href]').click(function(e){e.preventDefault();});
 };
@@ -1576,8 +1576,7 @@ WYMeditor.editor.prototype.loadSkin = function() {
     //(we check the existing <link> elements)
 
     var found = false;
-    var rExp = new RegExp(this._options.skin
-         + '\/' + WYMeditor.SKINS_DEFAULT_CSS + '$');
+    var rExp = new RegExp(this._options.skin + '\/' + WYMeditor.SKINS_DEFAULT_CSS + '([\?].+?)?$');
 
     $('link').each( function() {
         if(this.href.match(rExp)) found = true;
@@ -4156,7 +4155,7 @@ WYMeditor.WymClassExplorer.prototype.initIframe = function(iframe) {
 
     //init designMode
     this._doc.designMode="on";
-    
+
     try{
       // (bermi's note) noticed when running unit tests on IE6
       // Is this really needed, it trigger an unexisting property on IE6

data/public/stylesheets/refinery/refinery.css

@@ -1241,4 +1241,15 @@ ul#plugins li {
     margin-top:8px;
     display:inline-block;
     width:auto;
+}
+
+/**** Tooltip Icons *****/
+.tooltip {
+  background: white;
+  border: 4px solid #606060;
+  padding: 6px;
+	word-wrap:break-word;
+}
+.tooltip * {
+  color: black;
 }

data/public/stylesheets/wymeditor/skins/refinery/skin.css

@@ -215,4 +215,6 @@
     background-image: url('/images/refinery/icons/star.png');
     background-repeat: no-repeat;
     background-position: 181px 2px;
-}
+}
+
+.wym_skin_refinery .wym_status.wym_section {display: none;}

data/public/stylesheets/wymeditor/skins/refinery/wymiframe.css

@@ -6,12 +6,12 @@
  *
  * For further information visit:
  *		http://www.wymeditor.org/
- * 
+ *
  * File Name:
  *		wymeditor.css
  *		Main editor css file.
  *		See the documentation for more info.
- * 
+ *
  * File Authors:
  *		Jean-Francois Hovinne (jf.hovinne a-t wymeditor dotorg)
  *		Daniel Reszka (d.reszka a-t wymeditor dotorg)
@@ -21,7 +21,7 @@
 
 /* basic */
 	body	{ background: #fff;}
- 
+
 /* make HTML blocs visible */
 	p,
 	h1,
@@ -36,7 +36,7 @@
 	blockquote,
 	pre			 { background: #FFFFFF no-repeat 2px 2px;
 					padding:8px 5px 5px;
-					margin:6px 0px; 
+					margin:6px 0px;
 					border: 1px dotted #cccccc;
 					}
 	td			{ background: #F0F4F8; }
@@ -53,7 +53,7 @@
 	p			 { min-height: 1em; } /*min-height is needed under Firefox, because empty parargraphs */
 	*+html p		{ min-height: auto; } /* but we have to remove it under IE7 because it triggers the 'haslayout' mode */
 	td			{ height: 1.6em; }
- 
+
 /* labels */
 	p		 { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-p.png'); }
 	h1		{ background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h1.png'); }

data/readme.md

@@ -27,20 +27,14 @@ Unlike other content managers, Refinery is truly aimed at the end user making it
 
 ## Requirements
 
-Refinery runs using a number of gems which (as of Refinery version 0.9.6.19) are outlined below:
+Refinery's gem requirements are:
 
-* [friendly_id ~> 2.2.2](http://rubygems.org/gems/friendly_id)
-* [will_paginate ~> 2.3.11](http://rubygems.org/gems/will_paginate)
 * [rails ~> 2.3.5](http://rubygems.org/gems/rails)
-* [aasm ~> 2.1.3](http://rubygems.org/gems/aasm)
-* [unicode ~> 0.1](http://rubygems.org/gems/unicode)
-* [hpricot ~> 0.8.1](http://rubygems.org/gems/hpricot)
-* [slim_scrooge ~> 1.0.5](http://rubygems.org/gems/slim_scrooge)
 
 ### Other dependancies
 
 * [RMagick](http://github.com/rmagick/rmagick) - [Install docs](http://rmagick.rubyforge.org/install-faq.html) or for
-Mac OS users [shell install script](http://github.com/maddox/magick-installer) will be easier.
+Mac OS 10.5 or 10.6 users [this shell install script](http://github.com/maddox/magick-installer) will be easier.
 
 ## Installing and Setting Up Refinery
 
@@ -71,6 +65,15 @@ After your database exists, you'll need to install the gems that Refinery depend
 
     rake gems:install
 
+As of version 0.9.6.21, the news engine was extracted into a separate gem. This is included by default in config/application.rb
+If you don't want this engine on your site, just remove the config.gem line for it in config/application.rb
+If you do want it, please run the following commands to get it up and running:
+
+    script/generate news
+    rake db:migrate
+
+Now, news should be up and running.
+
 ### 3. Starting up your site
 
     ruby script/server
@@ -131,7 +134,7 @@ This will pull in all of the updated files in the project and may result in some
 * Collect inquiries from a contact form
 * Manage your inquiries and be notified when new ones come in
 
-### [News](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/news/news.md)
+### [News](http://github.com/resolve/refinerycms-news)
 
 * Post news about your company and update your visitors
 
@@ -171,7 +174,7 @@ If you have installed Refinery using GIT (described above in step 1 of installin
 
 ### What about a portfolio?
 
-Check out the [portfolio plugin gem](http://github.com/resolve/refinery-portfolio)
+Check out the [portfolio plugin gem](http://github.com/resolve/refinerycms-portfolio)
 
 ## License
 

data/test/fixtures/users.yml

@@ -1,15 +1,15 @@
 quentin:
   login: quentin
   email: quentin@example.com
-  salt: 7e3041ebc2fc05a40c60028e2c4901a81035d3cd
+  password_salt: 7e3041ebc2fc05a40c60028e2c4901a81035d3cd
   crypted_password: 00742970dc9e6319f8019fd54864d3ea740f04b1 # test
   created_at: <%%= 5.days.ago.to_s :db %>
-  state: active
-  
+  persistence_token: <%%= Authlogic::Random.hex_token %>
+
 aaron:
   login: aaron
   email: aaron@example.com
-  salt: 7e3041ebc2fc05a40c60028e2c4901a81035d3cd
+  password_salt: 7e3041ebc2fc05a40c60028e2c4901a81035d3cd
   crypted_password: 00742970dc9e6319f8019fd54864d3ea740f04b1 # test
   created_at: <%%= 1.days.ago.to_s :db %>
-  state: pending
+  persistence_token: <%%= Authlogic::Random.hex_token %>

data/test/functional/dashboard_controller_test.rb

@@ -9,9 +9,6 @@ class DashboardControllerTest < ActionController::TestCase
 
   def setup
     @controller = Admin::DashboardController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
     login_as(:quentin)
   end
 
@@ -20,7 +17,6 @@ class DashboardControllerTest < ActionController::TestCase
     assert_response :success
 
     assert_not_nil assigns(:recent_activity)
-
   end
 
   def test_recent_activity_should_report_activity

data/test/functional/images_controller_test.rb

@@ -9,9 +9,6 @@ class ImagesControllerTest < ActionController::TestCase
 
   def setup
     @controller = Admin::ImagesController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
     login_as(:quentin)
   end
 

data/test/test_helper.rb

@@ -2,6 +2,7 @@ ENV["RAILS_ENV"] = "test"
 # this allows us to run rake test:refinery from an application using the Refinery gem.
 require (ENV["RAILS_ROOT"] ||= (File.expand_path(File.dirname(__FILE__)) + "/..")) + "/config/environment"
 require 'test_help'
+require 'authlogic/test_case'
 
 class ActiveSupport::TestCase
   # Transactional fixtures accelerate your tests by wrapping each test method
@@ -37,13 +38,16 @@ class ActiveSupport::TestCase
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
-
   def login_as(user)
-    @request.session[:user_id] = user ? users(user).id : nil
+    UserSession.create(users(user)) # logs a user in
   end
 
   def logout
-    @request.session[:user_id] = nil
+    UserSession.find.destroy
   end
 
 end
+
+class ActionController::TestCase
+  setup :activate_authlogic
+end

data/themes/hemingway/views/layouts/application.html.erb

@@ -20,18 +20,7 @@
     <div id="ancillary">
       <div class="inside">
         <div class="block first" style='margin: 0;'>
-          <h2>Recent Posts</h2>
-          <% if NewsItem.latest.empty? %>
-            <p>No news posts yet</p>
-          <% else %>
-            <ul>
-              <% NewsItem.latest.each do |item| %>
-                <li>
-                  <%= link_to item.title, news_item_url(item) %>
-                </li>
-              <% end %>
-            </ul>
-          <% end %>
+
         </div>
         <div class="block pages">
           <h2>

data/vendor/plugins/authentication/app/controllers/admin/users_controller.rb

@@ -1,6 +1,6 @@
 class Admin::UsersController < Admin::BaseController
 
-  crudify :user, :order => 'login', :title_attribute => 'login', :conditions => "state = 'active'"
+  crudify :user, :order => 'login', :title_attribute => 'login'
 
   # Protect these actions behind an admin login
   before_filter :find_user, :except => [:new, :create]
@@ -21,8 +21,6 @@ class Admin::UsersController < Admin::BaseController
 
     if @user.save
       @user.plugins = @selected_plugin_titles
-      @user.register!
-      @user.activate!
       flash[:notice] = "'#{@user.login}' was successfully created."
       redirect_to :action => 'index'
     else

data/vendor/plugins/authentication/app/controllers/sessions_controller.rb

@@ -1,30 +1,19 @@
 class SessionsController < ApplicationController
-
   layout 'admin'
   filter_parameter_logging 'password', 'password_confirmation'
 
   def create
-    self.current_user = User.authenticate(params[:session][:login], params[:session][:password])
-
-    if logged_in?
-      if params[:session][:remember_me] == "1"
-        current_user.remember_me unless current_user.remember_token?
-        cookies[:auth_token] = {:value => self.current_user.remember_token ,
-                                :expires => self.current_user.remember_token_expires_at}
-      end
-
+    @session = UserSession.new(params[:session])
+    if @session.save
       redirect_back_or_default(admin_root_url)
       flash[:notice] = "Logged in successfully"
     else
-      flash.now[:error] = "Sorry, your password or username was incorrect."
       render :action => 'new'
     end
   end
 
   def destroy
-    self.current_user.forget_me if logged_in?
-    cookies.delete :auth_token
-    reset_session
+    current_user_session.destroy if logged_in?
     flash[:notice] = "You have been logged out."
     redirect_back_or_default(new_session_url)
   end

data/vendor/plugins/authentication/app/controllers/users_controller.rb

@@ -3,11 +3,16 @@ class UsersController < ApplicationController
   # Protect these actions behind an admin login
   before_filter :find_user, :only => [:suspend, :unsuspend, :destroy, :purge]
 
+  # authlogic default
+  #before_filter :require_no_user, :only => [:new, :create]
+  #before_filter :require_user, :only => [:show, :edit, :update]
+
   filter_parameter_logging 'password', 'password_confirmation'
 
   layout 'admin'
 
   def new
+    @user = User.new
     render :text => "User signup is disabled", :layout => true unless can_create_public_user
   end
 
@@ -16,19 +21,19 @@ class UsersController < ApplicationController
       render :text => "User signup is disabled", :layout => true
     else
       begin
-        cookies.delete :auth_token
         # protects against session fixation attacks, wreaks havoc with
         # request forgery protection.
         # uncomment at your own risk
         # reset_session
-        @user = User.new(params[:user])
+        @user = User.create(params[:user])
         @selected_plugin_titles = params[:user][:plugins] || []
 
-        @user.register! if @user.valid?
+        @user.save if @user.valid?
+
         if @user.errors.empty?
           @user.plugins = @selected_plugin_titles
-          self.current_user = @user
-          current_user.activate!
+          @user.save
+          UserSession.create!(@user)
           current_user.update_attribute(:superuser, true) if User.count == 1 # this is the superuser if this user is the only user.
           redirect_back_or_default(admin_root_url)
           flash[:notice] = "Welcome to Refinery, #{current_user.login}."
@@ -44,49 +49,33 @@ class UsersController < ApplicationController
     end
   end
 
-  def activate
-    self.current_user = params[:activation_code].blank? ? false : User.find_by_activation_code(params[:activation_code])
-
-    if logged_in? && !current_user.active?
-      current_user.activate!
-      flash[:notice] = "Signup complete!"
-    end
-
-    redirect_back_or_default(root_url)
-  end
-
   def forgot
     if request.post?
       if (user = User.find_by_email(params[:user][:email])).present?
-        user.create_reset_code
-
-        begin
-          flash[:notice] = "An email has been sent to #{user.email} with a link to reset your password."
-          UserMailer.deliver_reset_notification(user, request)
-        rescue
-          logger.info "Error: email could not be sent for user password reset for user #{user.id} with email #{user.email}"
-        end
+        flash[:notice] = "An email has been sent to #{user.email} with a link to reset your password."
+        user.deliver_password_reset_instructions!(request)
+        redirect_back_or_default forgot_url
       else
         flash[:notice] = "Sorry, #{params[:user][:email]} isn't associated with any accounts. Are you sure you typed the correct email address?"
       end
-
-      redirect_back_or_default(forgot_url)
     end
   end
 
   def reset
-    @user = User.find_by_reset_code(params[:reset_code]) unless params[:reset_code].nil?
-
-    if request.post?
-      if @user.update_attributes(:password => params[:user][:password], :password_confirmation => params[:user][:password_confirmation])
-        self.current_user = @user
-        @user.delete_reset_code
-
-        flash[:notice] = "Password reset successfully for #{@user.email}"
-        redirect_back_or_default(admin_root_url)
-      else
-        render :action => :reset
+    if params[:reset_code] and @user = User.find_using_perishable_token(params[:reset_code])
+      if request.post?
+        UserSession.create(@user)
+        if @user.update_attributes(:password => params[:user][:password], :password_confirmation => params[:user][:password_confirmation])
+          flash[:notice] = "Password reset successfully for #{@user.email}"
+          redirect_back_or_default admin_root_url
+        end
       end
+    else
+      flash[:notice] = "We're sorry, but this reset code has expired or is invalid." +
+        "If you are having issues try copying and pasting the URL " +
+        "from your email into your browser or restarting the " +
+        "reset password process."
+      redirect_to forgot_url
     end
   end