refinerycms 0.9.5.18 → 0.9.5.19

data/bin/refinery-update-core

@@ -6,51 +6,52 @@ unless RAILS_ROOT.nil? or RAILS_ROOT.length == 0
   # ensure asset directories exist.
   dirs = [%w(public stylesheets), %w(public javascripts), %w(db migrate), %w(lib tasks)]
   FileUtils::makedirs dirs.map {|dir| File.join(RAILS_ROOT, dir) }
-  
+
   # copy in the new assets.
   assets = [%w(public stylesheets refinery), %w(public javascripts refinery)]
 	assets.each do |asset|
 	  FileUtils::rm_rf File.join(RAILS_ROOT, asset), :secure => true # ensure the destination is clear.
 	  FileUtils::cp_r File.join(REFINERY_ROOT, asset), File.join(RAILS_ROOT, asset) # copy the new assets into the project.
   end
-  
+
   # copy in any new migrations.
   FileUtils::cp Dir[File.join(REFINERY_ROOT, %w(db migrate *.rb))], File.join(RAILS_ROOT, %w(db migrate))
-  
+
   # copy any rake tasks from plugins to the main lib directory so they can be run.
   FileUtils::cp Dir[File.join(REFINERY_ROOT, %w(** tasks *.rake))], File.join(RAILS_ROOT, %w(lib tasks))
-	
+
 	# read in the config files
 	app_config = File.open(File.join(RAILS_ROOT, %w(config environment.rb)), "r").read
 	environment_updated = false
-	
+
   # backup app's environment.rb
-  unless (app_refinery_gems_section = app_config.scan(/(#===REFINERY REQUIRED GEMS===)([^#]*)(#===REFINERY END OF REQUIRED GEMS===)/).join("")).length == 0
+  matcher = /(#===REFINERY REQUIRED GEMS===)(.+?)(#===REFINERY END OF REQUIRED GEMS===)/m
+  unless (app_refinery_gems_section = app_config.scan(matcher).join("")).length == 0
     # read in the config file in the gem
   	refinery_config = File.open(File.join(REFINERY_ROOT, %w(config environment.rb)), "r").read
   	FileUtils.cp File.join(RAILS_ROOT, %w(config environment.rb)), File.join(RAILS_ROOT, %w(config environment.autobackupbyrefinery.rb))
-  
+
     # write the new content into the file.
     File.open(File.join(RAILS_ROOT, %w(config environment.rb)), "w").puts(app_config.gsub!(
-  	  app_refinery_gems_section, 
-  	  refinery_config.scan(/(#===REFINERY REQUIRED GEMS===)([^#]*)(#===REFINERY END OF REQUIRED GEMS===)/).join("")
+  	  app_refinery_gems_section,
+  	  refinery_config.scan(matcher).join("")
   	))
-  	
+
   	environment_updated = true
 	end
-	
+
 	unless ARGV.include?("--from-refinery-installer")
 	  puts "---------"
 	  puts "Copied new Refinery core assets."
 	  if environment_updated
   	  puts "I've made a backup of your current config/environment.rb file as it has been updated with the latest Refinery RubyGem requirements."
   	  puts "The backup is located at config/environment.autobackupbyrefinery.rb incase you need it."
-    end  
+    end
 	  puts ""
 	  puts "=== ACTION REQUIRED ==="
 	  puts "Please run rake db:migrate to ensure your database is at the correct version."
 	  puts "Please also run rake gems:install to ensure you have the currently specified gems." if environment_updated
-	  
+
 	  puts ""
   end
 else

data/public/stylesheets/refinery/refinery.css

@@ -169,9 +169,9 @@ a:hover {
 }
 
 #page_container.login #page h1 {
-	margin: 0; 
-	padding: 5px; 
-	font-size: 20px; 
+	margin: 0;
+	padding: 5px;
+	font-size: 20px;
 	line-height:22px
 }
 
@@ -243,10 +243,10 @@ pre {
 }
 
 .clearfix:after {
-	content: "."; 
-	display: block; 
-	height: 0; 
-	clear: both; 
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
 	visibility: hidden;
 }
 
@@ -257,7 +257,7 @@ pre {
 #header {
 	background: url('/images/refinery/header_background.png') #50504B repeat-x bottom;
 	padding: 26px 15px 0 15px;
-	position: relative;	
+	position: relative;
 }
 
 #page_container.login #header {
@@ -268,7 +268,7 @@ pre {
 	display: block;
 	color: #C2C2B3;
 	float: left;
-	
+
 }
 
 #site_link:hover {
@@ -317,9 +317,9 @@ pre {
 
 #submenu {
 	clear: both;
-	padding-left: 10px; 
+	padding-left: 10px;
 	background: url('/images/refinery/nav-3-background.gif') #EFEE8 repeat-x bottom;
-}					
+}
 
 #submenu ul {
 	list-style: none;
@@ -498,7 +498,7 @@ label {
 	display: block;
 }
 
-textarea { 
+textarea {
 	padding: 5px;
 }
 
@@ -558,8 +558,8 @@ label.stripped {
 }
 
 #side_body_field {
-	float: left;	
-	width: 38%; 
+	float: left;
+	width: 38%;
 	margin-left: 18px;
 }
 
@@ -630,7 +630,8 @@ label.stripped {
 
 #recent_activity td.time_ago {
 	text-align: right;
-	width: 80px;
+	min-width: 80px;
+	max-width: 135px;
 }
 
 #recent_activity tr.on {
@@ -1071,7 +1072,7 @@ ul#image_grid li {
 	margin: 0px 13px 12px 0px;
 	padding: 0px;
 	width: 135px;
-	text-align: center; 
+	text-align: center;
 	height: 176px;
 }
 ul#image_grid li.row-end {

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

@@ -27,4 +27,7 @@ class SessionsController < ApplicationController
     redirect_back_or_default(new_session_url)
   end
 
+protected
+  def take_down_for_maintenance?;end
+
 end

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

@@ -74,6 +74,7 @@ class UsersController < ApplicationController
   end
 
 protected
+  def take_down_for_maintenance?;end
 
   def find_user
     @user = User.find(params[:id])

data/vendor/plugins/dashboard/app/helpers/admin/dashboard_helper.rb

@@ -1,19 +1,19 @@
 module Admin::DashboardHelper
-  
+
   def activity_message_for(record)
     unless (activity = Refinery::Plugins.active.find_activity_by_model(record.class)).nil? or activity.title.blank?
       title = eval "record.#{activity.title}"
-      link = link_to truncate(title, :length => 60), 
-        eval("#{activity.url_prefix}admin_#{record.class.name.underscore.downcase}_url(record)"), 
+      link = link_to truncate(title, :length => 45),
+        eval("#{activity.url_prefix}admin_#{record.class.name.underscore.downcase}_url(record)"),
         :title => "See '#{title}'"
-        
+
       # next work out which action occured and how long ago it happened
       action = record.updated_at.eql?(record.created_at) ? "created" : "updated"
-    
+
       message = "<td>#{refinery_icon_tag("#{eval("activity.#{action}_image")}")}</td>"
       message << "<td>#{link} #{record.class.name.titleize.downcase} was #{action}</td>"
       message << "<td class='time_ago'>#{time_ago_in_words(eval("record.#{action}_at")).gsub("about ", "")} ago</td>"
     end
   end
-  
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  version: 0.9.5.18
+  version: 0.9.5.19
 platform: ruby
 authors: 
 - Resolve Digital
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 +13:00
+date: 2009-12-01 00:00:00 +13:00
 default_executable: refinery
 dependencies: []