refinerycms 0.9.7.6 → 0.9.7.7

data/.gitignore

@@ -1,28 +1,63 @@
-public/system/*
-public/themes/*
-*.log
+# Rails
+.bundle
+db/*.sqlite3
+log/*.log
 tmp/**/*
-.DS_Store
+
+# Documentation
 doc/api
 doc/app
 doc/*
-config/database.yml
-config/amazon_s3.yml
-config/rackspace_cloudfiles.yml
-nbproject
+.yardoc
+.yardopts
+
+# Public Uploads
+public/system/*
+public/themes/*
+
+# Public Cache
+public/javascripts/cache
+public/stylesheets/cache
+
+# Vendor Cache
+vendor/cache
+
+# Acts as Indexed
 index/**/*
-db/*.sqlite3
+
+# Refinery Specific
 *.tmproj
 *.autobackupbyrefinery.*
 /refinerycms-*.gem
-public/javascripts/cache
-public/stylesheets/cache
-.yardoc/
-vendor/cache
-.bundle
+
+# Mac
+.DS_Store
+
+# NetBeans
+nbproject
+
+# Redcar
+.redcar
+tags
+
+# Rubinius
 *.rbc
+
+# Vim
 *.swp
 *.swo
+
+# RubyMine
+.idea
+
+# Backup
 *~
+
+# Capybara Bug
 capybara-*html
-.idea
+
+# Development Specific
+# REMOVE IF UPLOADING TO SERVER
+config/database.yml
+config/amazon_s3.yml
+config/rackspace_cloudfiles.yml

data/bin/refinerycms

@@ -141,7 +141,7 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
     puts "---------\n\n"
   end
 else
-  puts "\nPlease specify the path where you want to install Refinery. i.e. refinery /path/to/project [options]"
+  puts "\nPlease specify the path where you want to install Refinery. i.e. #{__FILE__.split(File::SEPARATOR).last} /path/to/project [options]"
   puts "\n"
   puts "Options:"
   puts "--force             Forces the directory to be overriden if the directory already exists"

data/changelog.md

@@ -1,66 +1,79 @@
+## 0.9.7.7 [20 July 2010]
+
+- Fixed an issue in the plugin generator that saw locales being created with singular_name not the interpreted version. [Philip Arndt](http://github.com/parndt) and [Joe Sak](http://github.com/joemsak)
+- Fixed an issue with non-MySQL databases. [Lee Irving](http://github.com/magpieuk)
+- Refactored versioning and .gitignore file so that both are easier to follow and use. [Steven Heidel](http://github.com/stevenheidel)
+- Added rake refinery:test_all command to run all tests Refinery has. [Steven Heidel](http://github.com/stevenheidel)
+- Fixed deprecation warnings with translate rake tasks. [Steven Heidel](http://github.com/stevenheidel)
+- Bugfixes, some IE compatibility. [Philip Arndt](http://github.com/parndt)
+- Fix syntax errors in existing resource dialog. [David Jones](http://github.com/djones)
+- Identified and fixed a positioning bug in dialogues [Joe Sak](http://github.com/joemsak) and [Philip Arndt](http://github.com/parndt)
+- Fixed issue that was causing Refinery to load in rake tasks twice if they lived under ``"#{Rails.root}/vendor/plugins"``. [David Jones](http://github.com/djones) and [Philip Arndt](http://github.com/parndt)
+- [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.6...0.9.7.7)
+
 ## 0.9.7.6 [15 July 2010]
 
-- Bugfixes, fixed some failing tests. [Philip Arndt]
-- More pt-BR translation keys translated [Kivanio Barbosa]
-- Locked gems using Gemfile.lock [David Jones]
-- Changed 'refinery' task to 'refinerycms' as that is our gem's name. [Steven Heidel]
-- Fixed bug where settings were still considered restricted if NULL. [Steven Heidel]
-- Ensures that bundler is available before creating an application from a gem. [Philip Arndt]
-- Application generator (from gem) and application upgrade bin task (from 0.9.6) is now Ruby 1.9.2 compatible. [Philip Arndt]
-- bin/refinery-upgrade-from-096-to-097 will no longer allow you to run it if Gemfile is present and thus signifying an upgraded app. [Philip Arndt]
-- Cleaned up syntax, changed CSS involving dialogues [Philip Arndt]
+- Bugfixes, fixed some failing tests. [Philip Arndt](http://github.com/parndt)
+- More pt-BR translation keys translated. [Kivanio Barbosa](http://github.com/kivanio)
+- Locked gems using ``Gemfile.lock``. [David Jones](http://github.com/djones)
+- Changed 'refinery' task to 'refinerycms' as that is our gem's name. [Steven Heidel](http://github.com/stevenheidel)
+- Fixed bug where settings were still considered restricted if NULL. [Steven Heidel](http://github.com/stevenheidel)
+- Ensures that bundler is available before creating an application from a gem. [Philip Arndt](http://github.com/parndt)
+- Application generator (from gem) and application upgrade bin task. (from 0.9.6) is now Ruby 1.9.2 compatible. [Philip Arndt](http://github.com/parndt)
+- bin/refinery-upgrade-from-096-to-097 will no longer allow you to run it if Gemfile is present and thus signifying an upgraded app. [Philip Arndt](http://github.com/parndt)
+- Cleaned up syntax, changed CSS involving dialogues. [Philip Arndt](http://github.com/parndt)
 - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.5...0.9.7.6)
 
 ## 0.9.7.5 [08 July 2010]
 
-- Wrote an upgrade task for migrating from 0.9.6.x releases of RefineryCMS. Just run refinery-update-096-to-097 inside your application's directory. [Philip Arndt]
-- Improved code used to include gem rake tasks and script/generate tasks into the Refinery application to fix issue with these tasks not being found. [Philip Arndt]
-- Fixed a broken migration that would mean pages were missing upon upgrading. [Jesper Hvirring Henriksen]
-- More pt-BR translation keys translated. [Kivanio Barbosa]
+- Wrote an upgrade task for migrating from 0.9.6.x releases of RefineryCMS. Just run refinery-update-096-to-097 inside your application's directory. [Philip Arndt](http://github.com/parndt)
+- Improved code used to include gem rake tasks and script/generate tasks into the Refinery application to fix issue with these tasks not being found. [Philip Arndt](http://github.com/parndt)
+- Fixed a broken migration that would mean pages were missing upon upgrading. [Jesper Hvirring Henriksen](http://github.com/hvirring)
+- More pt-BR translation keys translated. [Kivanio Barbosa](http://github.com/kivanio)
 - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.4...0.9.7.5)
 
 ## 0.9.7.4 [07 July 2010]
 
-- Fixed critical issue in the i18n routing pattern that was matching prefixes like /news/ as a locale incorrectly. [Philip Arndt]
+- Fixed critical issue in the i18n routing pattern that was matching prefixes like /news/ as a locale incorrectly. [Philip Arndt](http://github.com/parndt)
 - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.3...0.9.7.4)
 
 ## 0.9.7.3 [07 July 2010]
 
-- Falls back to default locale when a translation key can not be located in the current locale, only in production mode. [Philip Arndt]
-- Fixed issue creating a Refinery site using bin/refinery where directory paths contained spaces. [Philip Arndt]
-- Fixed issue when using script/generate refinery surrounding the migration incorrectly using the plugin's title. [Philip Arndt]
-- Added verbose=true option when running rake refinery:update that prints out everything it's doing. [Philip Arndt]
+- Falls back to default locale when a translation key can not be located in the current locale, only in production mode. [Philip Arndt](http://github.com/parndt)
+- Fixed issue creating a Refinery site using bin/refinery where directory paths contained spaces. [Philip Arndt](http://github.com/parndt)
+- Fixed issue when using script/generate refinery surrounding the migration incorrectly using the plugin's title. [Philip Arndt](http://github.com/parndt)
+- Added verbose=true option when running rake refinery:update that prints out everything it's doing. [Philip Arndt](http://github.com/parndt)
 - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.2...0.9.7.3)
 
 ## 0.9.7.2 [06 July 2010]
 
-- Bugfixes with users and roles. [Philip Arndt and Amanda Wagener]
-- Fixed the rake translate:lost_in_translation LOCALE=en and rake translate:lost_in_translation_all tasks so that they accurately reflect the missing i18n translation keys. [Philip Arndt]
-- Refactored routing of i18n to allow different default frontend and backend locales. [Philip Arndt]
-- Added better grammar support for some i18n. [Halan Pinheiro]
-- Improved output of rake refinery:update task and removed bin/refinery-update-core task. [Steven Heidel]
-- Set config.ru to run in production RAILS_ENV by default. [Philip Arndt]
+- Bugfixes with users and roles. [Philip Arndt](http://github.com/parndt) and [Amanda Wagener](http://github.com/awagener)
+- Fixed the rake translate:lost_in_translation LOCALE=en and rake translate:lost_in_translation_all tasks so that they accurately reflect the missing i18n translation keys. [Philip Arndt](http://github.com/parndt)
+- Refactored routing of i18n to allow different default frontend and backend locales. [Philip Arndt](http://github.com/parndt)
+- Added better grammar support for some i18n. [Halan Pinheiro](http://github.com/halan)
+- Improved output of rake refinery:update task and removed bin/refinery-update-core task. [Steven Heidel](http://github.com/stevenheidel)
+- Set config.ru to run in production RAILS_ENV by default. [Philip Arndt](http://github.com/parndt)
 - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7.1...0.9.7.2)
 
 ## 0.9.7.1 [03 July 2010]
 
-- Bugfixes in the gem installation method process. [Philip Arndt]
-- Made installing from gem faster. [Philip Arndt]
-- Provided example files for sqlite3, mysql and postgresql. [Philip Arndt]
-- Created option for specifying a database adapter (sqlite3, mysql or postgresql) when creating from Gem. [Philip Arndt]
-- Other bugfixes including UI consistency around signup. [Philip Arndt]
+- Bugfixes in the gem installation method process. [Philip Arndt](http://github.com/parndt)
+- Made installing from gem faster. [Philip Arndt](http://github.com/parndt)
+- Provided example files for sqlite3, mysql and postgresql. [Philip Arndt](http://github.com/parndt)
+- Created option for specifying a database adapter (sqlite3, mysql or postgresql) when creating from Gem. [Philip Arndt](http://github.com/parndt)
+- Other bugfixes including UI consistency around signup. [Philip Arndt](http://github.com/parndt)
 - [See full list](http://github.com/resolve/refinerycms/compare/0.9.7...0.9.7.1)
 
 ## 0.9.7 [02 July 2010]
 
-- Full backend internationalisation (i18n) support and frontend i18n routing. [Maarten Hoogendoorn and Philip Arndt and many others]
-- Marketable URLs, such as "/contact". [Joshua Davey and Joe Sak].
-- Switched to bundler and rack. [Alex Coles and Philip Arndt]
-- Added options to Refinery Settings :restricted, :scoping, :callback_proc_as_string. [Steven Heidel and Philip Arndt]
-- Added caching abilities to frontend and to RefinerySetting to drastically speed up the application under certain conditions. [Philip Arndt]
-- Added spam filtering to contact form. [David Jones]
-- Full Refinery UI redesign. [Resolve Digital]
-- User Role support. [Amanda Wagener and Philip Arndt]
+- Full backend internationalisation (i18n) support and frontend i18n routing. [Maarten Hoogendoorn](http://github.com/moretea) and [Philip Arndt](http://github.com/parndt) and many others
+- Marketable URLs, such as "/contact". [Joshua Davey](http://github.com/jgdavey) and [Joe Sak](http://github.com/joemsak).
+- Switched to bundler and rack. [Alex Coles](http://github.com/myabc) and [Philip Arndt](http://github.com/parndt)
+- Added options to Refinery Settings :restricted, :scoping, :callback_proc_as_string. [Steven Heidel](http://github.com/stevenheidel) and [Philip Arndt](http://github.com/parndt)
+- Added caching abilities to frontend and to RefinerySetting to drastically speed up the application under certain conditions. [Philip Arndt](http://github.com/parndt)
+- Added spam filtering to contact form. [David Jones](http://github.com/djones)
+- Full Refinery UI redesign. [Resolve Digital](http://github.com/resolve)
+- User Role support. [Amanda Wagener](http://github.com/awagener) and [Philip Arndt](http://github.com/parndt)
 - [See full list](http://github.com/resolve/refinerycms/compare/0.9.6.34...0.9.7)
 - [See blog post](http://refinerycms.com/blog/refinery-cms-0-9-7-released)
 

data/lib/refinery/tasks/refinery.rb

@@ -7,7 +7,11 @@ end
 
 # We also need to load in the rake tasks from gem plugins whether Refinery is a gem or not:
 if $refinery_gem_plugin_lib_paths.present?
-  extra_rake_tasks << $refinery_gem_plugin_lib_paths.collect {|path| Dir[File.join(%W(#{path} tasks ** *.rake))].sort}
+  paths = $refinery_gem_plugin_lib_paths.reject do |path|
+    path =~ /^#{Rails.root.join('vendor', 'plugins')}/
+  end
+  
+  extra_rake_tasks << paths.collect {|path| Dir[File.join(%W(#{path} tasks ** *.rake))].sort}
 end
 
 extra_rake_tasks << Dir[Rails.root.join("lib", "refinery", "tasks", "*.rake").to_s]

data/public/javascripts/jquery/jquery.corner.js

@@ -109,20 +109,10 @@
 
 	$.fn.corner = function(options) {
 		// in 1.3+ we can fix mistakes with the ready state
-		if ((elements = this).length == 0) {
-			if (!$.isReady && this.selector) {
-				var s = this.selector,
-				c = this.context;
-				$(function() {
-					$(s, c).corner(options);
-				});
-			}
-			return this;
-		}
-
+		var elements = this;
 		// help IE *yet again*.
 		if ($.browser.msie && $.browser.version < 9) {
-		  elements = elements.not('.button');
+		  elements = elements.not('input, .button');
 		  /*
 			(inputs = elements.find('input.button')).removeClass('button');
 			elements = elements.not('input');
@@ -135,6 +125,17 @@
 			*/
 		}
 
+		if (elements.length == 0) {
+			if (!$.isReady && this.selector) {
+				var s = this.selector,
+				c = this.context;
+				$(function() {
+					$(s, c).corner(options);
+				});
+			}
+			return this;
+		}
+
 		return elements.each(function(index) {
 			var $this = $(this);
 			// meta values override options
@@ -204,6 +205,7 @@
 
 			if (typeof this.style.zoom != undefined) this.style.zoom = 1;
 			// force 'hasLayout' in IE
+			// TODO: IE is losing its border in some cases though still rounding it, investigate.
 			if (!keep) this.style.border = 'none';
 			strip.style.borderColor = cc || gpc(this.parentNode);
 			var cssHeight = $(this).outerHeight();

data/public/javascripts/jquery/jquery.html5-placeholder-shim.js

@@ -9,10 +9,11 @@
 				var config = {
 					color: '#888',
 					cls: '',
-					lr_padding:4
+					lr_padding:4,
+					selector: 'input[placeholder], textarea[placeholder]'
 				};
 				$.extend(config,opts);
-				!this.browser_supported() && $('input[placeholder]')._placeholder_shim(config);
+				!this.browser_supported() && $(config.selector)._placeholder_shim(config);
 			}
 	}});
 
@@ -48,8 +49,7 @@
 						textAlign: 'left',
 						color: config.color,
 						cursor: 'text',
-						fontSize: $(this).css('font-size'),
-						lineHeight: $(this).css('height')
+						fontSize: $(this).css('font-size')
 					})
 					.css(calcPositionCss(this))
 					.attr('for', this.id)
@@ -77,5 +77,7 @@
 })(jQuery);
 
 $(document).ready(function() {
-  $.placeholder.shim();
+  if ($.placeholder) {
+    $.placeholder.shim();
+  }
 });

data/public/javascripts/refinery/admin.js

@@ -10,6 +10,9 @@ $(document).ready(function(){
 });
 
 init_interface = function() {
+  if (parent && parent.document.location.href != document.location.href) {
+    $('body#dialog_container.dialog').addClass('iframed');
+  }
   $('input:submit:not(.button)').addClass('button');
 
   $('.button, #editor_switch a').corner('6px');
@@ -32,22 +35,26 @@ init_interface = function() {
     /*overlay = $("<div class='wym_loading_overlay'>&nbsp;</div>")
               .css({'height': textarea.height(), 'width': textarea.width()});
     textarea.before(overlay);*/
-    if ((instance = WYMeditor.INSTANCES[$(textarea.next('.wym_box').find('iframe').attr('id').split('_')).last().get(0)]) != null) {
-      textarea.parent().next().find('input, textarea').keydown($.proxy(function(e) {
-        shiftHeld = e.shiftKey;
-        if (shiftHeld && e.keyCode == $.ui.keyCode.TAB) {
-          this._iframe.contentWindow.focus();
-          e.preventDefault();
-        }
-      }, instance)).keyup(function(e) {
-        shiftHeld = false;
-      });
-      textarea.parent().prev().find('input, textarea').keydown($.proxy(function(e) {
-        if (e.keyCode == $.ui.keyCode.TAB) {
-          this._iframe.contentWindow.focus();
-          e.preventDefault();
-        }
-      }, instance));
+    if ((instance = WYMeditor.INSTANCES[$((textarea.next('.wym_box').find('iframe').attr('id')||'').split('_')).last().get(0)]) != null) {
+      if ((next = textarea.parent().next()) != null && next.length > 0) {
+        next.find('input, textarea').keydown($.proxy(function(e) {
+          shiftHeld = e.shiftKey;
+          if (shiftHeld && e.keyCode == $.ui.keyCode.TAB) {
+            this._iframe.contentWindow.focus();
+            e.preventDefault();
+          }
+        }, instance)).keyup(function(e) {
+          shiftHeld = false;
+        });
+      }
+      if ((prev = textarea.parent().prev()) != null && prev.length > 0) {
+        prev.find('input, textarea').keydown($.proxy(function(e) {
+          if (e.keyCode == $.ui.keyCode.TAB) {
+            this._iframe.contentWindow.focus();
+            e.preventDefault();
+          }
+        }, instance));
+      }
     }
   });
 
@@ -94,15 +101,29 @@ init_flash_messages = function(){
 init_modal_dialogs = function(){
   $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor)
   {
-    $(anchor).click(function(e){
-      iframe = $("<iframe id='dialog_iframe' src='" + $(this).attr('href') + "&amp;app_dialog=true" + "'></iframe>").corner('8px');
+    $(anchor).data({
+      'dialog-width': parseInt($(anchor.href.match("width=([0-9]*)")).last().get(0), 928)||928
+      , 'dialog-height': parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0), 473)||473
+      , 'dialog-title': ($(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null)
+    }).attr('href', $(anchor).attr('href').replace(/(\&(amp\;)?)?dialog\=true/, '')
+                                          .replace(/(\&(amp\;)?)?width\=\d+/, '')
+                                          .replace(/(\&(amp\;)?)?height\=\d+/, '')
+                                          .replace(/(\?&(amp\;)?)/, '?')
+                                          .replace(/\?$/, ''))
+    .click(function(e){
+      $anchor = $(this);
+      iframe_src = (iframe_src = $anchor.attr('href'))
+                   + (iframe_src.indexOf('?') > -1 ? '&amp;' : '?')
+                   + 'app_dialog=true&amp;dialog=true';
+
+      iframe = $("<iframe id='dialog_iframe' src='" + iframe_src + "'></iframe>").corner('8px');
       iframe.dialog({
-        title: $(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null
+        title: $anchor.data('dialog-title')
         , modal: true
         , resizable: false
         , autoOpen: true
-        , width: (parseInt($(anchor.href.match("width=([0-9]*)")).last().get(0))||928)
-        , height: (parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0))||473)
+        , width: $anchor.data('dialog-width')
+        , height: $anchor.data('dialog-height')
         , open: onOpenDialog
         , close: onCloseDialog
       });
@@ -163,7 +184,7 @@ init_submit_continue = function(){
     $(this).attr('data-changes-made', true);
   });
 
-  if ((continue_editing = $('#continue_editing')).length > 0 && continue_editing.attr('rel') != 'no-prompt') {
+  if ((continue_editing_button = $('#continue_editing')).length > 0 && continue_editing_button.attr('rel') != 'no-prompt') {
     $('#editor_switch a').click(function(e) {
       if ($('form[data-changes-made]').length > 0) {
         if (!confirm("Any changes you've made will be lost. Are you sure you want to continue without saving?")) {
@@ -286,10 +307,10 @@ init_tooltips = function(args){
       })
     });
     if ($(element).attr('tooltip') == null) {
-      $(element).attr({'tooltip': $(element).attr('title'), 'title': ''});
+      $(element).attr('tooltip', $(element).attr('title'));
     }
     // wipe clean the title on any children too.
-    $(element).children('img').attr('title', '');
+    $(element).add($(element).children('img')).attr('title', null);
   });
 }
 
@@ -639,8 +660,8 @@ var image_dialog = {
         image_dialog.set_image(this);
     });
     //Select any currently selected, just uploaded...
-    if ((selected_image = $('#existing_image_area_content ul li.selected img')).length > 0) {
-      image_dialog.set_image(selected_image.first());
+    if ((selected_img = $('#existing_image_area_content ul li.selected img')).length > 0) {
+      image_dialog.set_image(selected_img.first());
     }
   }
 

data/public/stylesheets/refinery/{ie.css → ie-less-than-8.css}

@@ -14,7 +14,8 @@
   padding-left: 8px;
   padding-right: 8px;
 }
-body.login input.larger, body.login input.larger:focus {
+body.login .field input.larger, body.login .field input.larger:focus {
   background-image: none !important;
   padding: 0px;
+  line-height: 30px;
 }

data/public/stylesheets/refinery/ie-less-than-9.css

@@ -0,0 +1,26 @@
+/*
+#content .form-actions .form-actions-left a.button {
+  height: 19px;
+  line-height: 19px;
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+#site_bar #editor_switch a {
+  height: 26px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  line-height: 26px;
+}
+.search_form input.button {
+  padding-left: 8px;
+  padding-right: 8px;
+}
+*/
+body.login .field input.larger, body.login .field input.larger:focus {
+  line-height: 30px;
+}
+/*
+  background-image: none !important;
+  padding: 0px;
+}
+*/

data/public/stylesheets/refinery/refinery.css

@@ -1102,7 +1102,7 @@ a#toggle_advanced_options:hover {
   margin-top: 10px;
   height: 45px;
 }
-.dialog .dialog_area {
+.dialog form {
   margin-bottom: 45px;
 }
 .dialog .dialog_area > div > .field label:first-child, .dialog .dialog_area > div > label:first-child {
@@ -1131,7 +1131,7 @@ a#toggle_advanced_options:hover {
   position: relative;
 }
 #dialog_container #content .form-actions, .ui-dialog .form-actions, .dialog_container .form-actions {
-  position: fixed;
+  position: absolute;
   bottom: 0px;
   left: 0px;
   right: 0px;
@@ -1140,6 +1140,9 @@ a#toggle_advanced_options:hover {
   border-bottom: 0px;
   width: auto;
 }
+#dialog_container.dialog.iframed #content .form-actions {
+  position: fixed;
+}
 #existing_image_area {
   padding-top:6px;
 }

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

@@ -18,50 +18,52 @@ class UsersController < ApplicationController
 
   # This method should only be used to create the first Refinery user.
   def create
-    begin
-      # protects against session fixation attacks, wreaks havoc with request forgery protection.
-      # uncomment at your own risk:
-      # reset_session
-      @user = User.new(params[:user])
-      @selected_plugin_titles = params[:user][:plugins] || []
-
-      @user.save if @user.valid?
-
-      if @user.errors.empty?
-        @user.add_role(:refinery)
-        @user.plugins = @selected_plugin_titles
-        @user.save
-        UserSession.create!(@user)
-        if Role[:refinery].users.count == 1
-          # this is the superuser if this user is the only user.
-          current_user.add_role(:superuser)
-          current_user.save
-
-          # set this user as the recipient of inquiry notifications
-          if (notification_recipients = InquirySetting.find_or_create_by_name("Notification Recipients")).present?
-            notification_recipients.update_attributes({
-              :value => current_user.email,
-              :destroyable => false
-            })
-          end
+    # protects against session fixation attacks, wreaks havoc with request forgery protection.
+    # uncomment at your own risk:
+    # reset_session
+    @user = User.new(params[:user])
+    @selected_plugin_titles = params[:user][:plugins] || []
+
+    @user.save if @user.valid?
+
+    if @user.errors.empty?
+      @user.add_role(:refinery)
+      @user.plugins = @selected_plugin_titles
+      @user.save
+      UserSession.create!(@user)
+      if Role[:refinery].users.count == 1
+        # this is the superuser if this user is the only user.
+        current_user.add_role(:superuser)
+        current_user.save
+
+        # set this user as the recipient of inquiry notifications
+        if (notification_recipients = InquirySetting.find_or_create_by_name("Notification Recipients")).present?
+          notification_recipients.update_attributes({
+            :value => current_user.email,
+            :destroyable => false
+          })
         end
+      end
 
-        redirect_back_or_default(admin_root_url)
-        flash[:message] = "<h2>#{t('users.create.welcome', :who => current_user.login).gsub(/\.$/, '')}.</h2>".html_safe
+      flash[:message] = "<h2>#{t('users.create.welcome', :who => current_user.login).gsub(/\.$/, '')}.</h2>".html_safe
 
-        site_name_setting = RefinerySetting.find_or_create_by_name('site_name', :value => "Company Name")
-        if site_name_setting.value.to_s =~ /^(|Company\ Name)$/ or Role[:refinery].users.count == 1
-          flash[:message] << "<p>#{t('users.setup_website_name', :link => edit_admin_refinery_setting_url(site_name_setting))}</p>".html_safe
-        end
-      else
-        render :action => 'new'
+      site_name_setting = RefinerySetting.find_or_create_by_name('site_name', :value => "Company Name")
+      if site_name_setting.value.to_s =~ /^(|Company\ Name)$/ or Role[:refinery].users.count == 1
+        flash[:message] << "<p>#{t('users.setup_website_name',
+                                   :link => edit_admin_refinery_setting_url(site_name_setting, :dialog => true),
+                                   :title => t('admin.refinery_settings.refinery_setting.edit'))}</p>".html_safe
       end
+
+      redirect_back_or_default(admin_root_url)
+    else
+      render :action => 'new'
     end
   end
 
   def forgot
     if request.post?
-      if (params[:user].present? and params[:user][:email].present? and user = User.find_by_email(params[:user][:email])).present?
+      if (params[:user].present? and params[:user][:email].present? and
+          user = User.find_by_email(params[:user][:email])).present?
         user.deliver_password_reset_instructions!(request)
         flash[:notice] = t('users.forgot.email_reset_sent')
         redirect_back_or_default new_session_url
@@ -70,7 +72,8 @@ class UsersController < ApplicationController
         if (email = params[:user][:email]).blank?
           flash.now[:error] = t('users.forgot.blank_email')
         else
-          flash.now[:error] = t('users.forgot.email_not_associated_with_account', :email => params[:user][:email])
+          flash.now[:error] = t('users.forgot.email_not_associated_with_account',
+                                :email => params[:user][:email])
         end
       end
     end

data/vendor/plugins/authentication/app/models/user_mailer.rb

@@ -2,7 +2,7 @@ class UserMailer < ActionMailer::Base
 
   def reset_notification(user, request)
     setup_email(user)
-    subject         I18n.translate('.link_to_reset_your_password')
+    subject         I18n.translate('user_mailer.link_to_reset_your_password')
     @body[:url]  =  reset_users_url(:host => request.host_with_port,
                                     :reset_code => user.perishable_token)
   end

data/vendor/plugins/authentication/config/locales/da.yml

@@ -32,7 +32,7 @@ da:
       hello_please_sign_in: Hej! Du skal logge ind
       sign_in: log ind
   users:
-    setup_website_name: "Lad os først give websitet et navn. <a href='{{link}}'>Her</a> kan du rette navnet"
+    setup_website_name: "Lad os først give websitet et navn. <a href='{{link}}' name='{{title}}'>Her</a> kan du rette navnet"
     signup_disabled: Brugeroprettelse er deaktiveret
     new:
       fill_form: Indtast dine oplysninger, så vi kan få dig i gang med Refinery.

data/vendor/plugins/authentication/config/locales/de.yml

@@ -36,7 +36,7 @@ de:
     reset:
       code_invalid: "Es tut uns leid, aber diese Reset-Code ist abgelaufen oder ungültig. Wenn Sie Probleme versuchen Kopieren und Einfügen der URL aus Ihrem E-Mail in Ihrem Browser oder ein Neustart des Passwort-Reset-Prozess."
       successful: "Passwort zurücksetzen erfolgreich {{email}}"
-    setup_website_name: "Lassen Sie uns der Website als Erstes einen Namen geben. <a href='{{link}}'>Hier</a> können Sie den Namen Ihrer Website bearbeiten."
+    setup_website_name: "Lassen Sie uns der Website als Erstes einen Namen geben. <a href='{{link}}' name='{{title}}'>Hier</a> können Sie den Namen Ihrer Website bearbeiten."
     signup_disabled: Benutzerregistrierung ist deaktiviert
     new:
       fill_form: "Füllen Sie das Formular unten mit Ihren Angaben aus, damit wir loslegen können."

data/vendor/plugins/authentication/config/locales/en.yml

@@ -27,7 +27,7 @@ en:
       sign_in: Sign in
       forgot_password: I forgot my password
   users:
-    setup_website_name: "First let's give the site a name. <a href='{{link}}'>Go here</a> to edit your website's name"
+    setup_website_name: "First let's give the site a name. <a href='{{link}}' name='{{title}}'>Go here</a> to edit your website's name"
     signup_disabled: User signup is disabled
     new:
       fill_form: Fill out your details below so that we can get you started.

data/vendor/plugins/authentication/config/locales/es.yml

@@ -59,7 +59,7 @@ es:
       hello_please_sign_in: Hola! Por favor, iniciar sesión
       sign_in: Iniciar sesión
   users:
-    setup_website_name: "Lo primero es proporcionar un nombre para el sitio web.<br/><a href='{{link}}'>Pulse aquí</a> editar el nombre del sitio web"
+    setup_website_name: "Lo primero es proporcionar un nombre para el sitio web.<br/><a href='{{link}}' name='{{title}}'>Pulse aquí</a> editar el nombre del sitio web"
     signup_disabled: El registro de usuario ha sido deshabilitado.
     new:
       fill_form: Rellene el siguiente formulario con su información de usuario para comenzar.

data/vendor/plugins/authentication/config/locales/fr.yml

@@ -33,7 +33,7 @@ fr:
       hello_please_sign_in: Bonjour! S'il vous plaît signer po
       sign_in: Identifiez-vous
   users:
-    setup_website_name: "Pour commencer, donnez un nom au site. <a href='{{link}}'>Allez ici</a> pour modifier le nom de votre site."
+    setup_website_name: "Pour commencer, donnez un nom au site. <a href='{{link}}' name='{{title}}'>Allez ici</a> pour modifier le nom de votre site."
     signup_disabled:  "L'inscription d'utilisateur est désactivé"
     new:
       fill_form: Remplissez le formulaire ci-dessous avec vos information afin que nous puissions vous aider à démarrer.

data/vendor/plugins/authentication/config/locales/it.yml

@@ -29,7 +29,7 @@ it:
       sign_in: Entra
       hello_please_sign_in: "Ciao! Accedi per favore."
   users:
-    setup_website_name: "Prima di tutto dare al sito un nome. <a href='{{link}}'>Vai qui</a> per modificare il nome del tuo sito web"
+    setup_website_name: "Prima di tutto dare al sito un nome. <a href='{{link}}' name='{{title}}'>Vai qui</a> per modificare il nome del tuo sito web"
     signup_disabled: Iscriviti utente è disattivato
     new:
       fill_form: Compila il form sottostante con i tuoi dati in modo che possiamo iniziare.

data/vendor/plugins/authentication/config/locales/nb.yml

@@ -29,7 +29,7 @@ nb:
       hello_please_sign_in: Hei! Vennligst logg inn
       sign_in: Logg på
   users:
-    setup_website_name: "Først la oss gi siden et navn. <a href='{{link}}'>Gå her</a> for å redigere siden din sitt navn"
+    setup_website_name: "Først la oss gi siden et navn. <a href='{{link}}' name='{{title}}'>Gå her</a> for å redigere siden din sitt navn"
     signup_disabled: Brukerpåmelding er deaktivert
     new:
       fill_form: Fyll ut skjemaet under med detaljene dine så vi kan få deg startet.

data/vendor/plugins/authentication/config/locales/nl.yml

@@ -45,7 +45,7 @@ nl:
       hello_please_sign_in: Hallo! Gelieve in te loggen
       sign_in: Log in
   users:
-    setup_website_name: "Laten we eerst de website een naam geven. <a href='{{link}}'>Klik hier</a> om de naam van de website te bewerken"
+    setup_website_name: "Laten we eerst de website een naam geven. <a href='{{link}}' name='{{title}}'>Klik hier</a> om de naam van de website te bewerken"
     signup_disabled: Het registreren van gebruikers is uitgeschakeld
     new:
       fill_form: Vul het onderstaande formulier in, zodat u kan beginnen.

data/vendor/plugins/authentication/config/locales/pt-BR.yml

@@ -27,7 +27,7 @@ pt-BR:
       sign_in: Entrar
       forgot_password: Esqueci minha senha
   users:
-    setup_website_name: "Primeiro vamos dar um nome ao site. <a href='{{link}}'>Clique aqui</a> para editar o nome do seu site"
+    setup_website_name: "Primeiro vamos dar um nome ao site. <a href='{{link}}' name='{{title}}'>Clique aqui</a> para editar o nome do seu site"
     signup_disabled: Cadastro de usuários está desabilitado
     new:
       fill_form: Preencha o formulário abaixo com seus detalhes pra que você possa começar.

data/vendor/plugins/authentication/config/locales/sl.yml

@@ -31,7 +31,7 @@ sl:
       or: ali
       forgot_password: Pozabil sem geslo
   users:
-    setup_website_name: "Najprej morate poimenovati stran. <a href='{{link}}'>Pojdite sem</a> kjer lahko uredite naslov vaše strani."
+    setup_website_name: "Najprej morate poimenovati stran. <a href='{{link}}' name='{{title}}'>Pojdite sem</a> kjer lahko uredite naslov vaše strani."
     signup_disabled: Registracija uporabnikov je onemogočena
     new:
       fill_form: Izpolnite spodnji obrazec z vašimi podatki.

data/vendor/plugins/dashboard/app/views/admin/dashboard/index.html.erb

@@ -6,31 +6,42 @@
   <div id='actions'>
     <h2><%= t('.quick_tasks').titleize %></h2>
     <ul>
-      <%# I8N: How to translate tab names? %>
       <% if Refinery::Plugins.active.names.include?("refinery_pages") %>
         <li>
-          <%= link_to t('.add_a_new_page'), new_admin_page_url(:only_path => true),
+          <%= link_to t('.add_a_new_page'),
+                      new_admin_page_url(:only_path => true),
                       :class => "add_icon" %>
         </li>
         <li>
-          <%= link_to t('.update_a_page'), admin_pages_url(:only_path => true),
+          <%= link_to t('.update_a_page'),
+                      admin_pages_url(:only_path => true),
                       :class => "edit_icon" %>
         </li>
       <% end %>
       <% if Refinery::Plugins.active.names.include?("refinery_resources") %>
         <li>
-          <%= link_to t('.upload_a_file'), new_admin_resource_url(:dialog => true, :width => 600, :height => 300, :only_path => true),
+          <%= link_to t('.upload_a_file'),
+                      new_admin_resource_url(:dialog => true,
+                                             :width => 600,
+                                             :height => 300,
+                                             :only_path => true),
                       :class => "add_icon" %>
         </li>
       <% end %>
       <% if Refinery::Plugins.active.names.include?("refinery_images") %>
         <li>
-          <%= link_to t('.upload_a_image'), new_admin_image_url(:dialog => true, :width => 600, :height => 300, :only_path => true),
+          <%= link_to t('.upload_a_image'),
+                      new_admin_image_url(:dialog => true,
+                                          :width => 600,
+                                          :height => 300,
+                                          :only_path => true),
                       :class => "add_icon" %>
         </li>
       <% end %>
       <li>
-        <%= link_to t('.see_home_page'), root_url, :class => "go_icon", :target => "_blank" %>
+        <%= link_to t('.see_home_page'), root_url,
+                    :class => "go_icon",
+                    :target => "_blank" %>
       </li>
     </ul>
 
@@ -47,7 +58,7 @@
         <% Refinery::I18n.locales.reject{|key, value| key.to_sym == ::I18n.locale}.sort_by{|key, value| value}.each do |locale_key, locale_title| %>
           <li>
             <%= link_to locale_title,
-                        params.dup.tap { |p| p[:set_locale] = locale_key },  # Use the current params, just change the locale
+                        params.dup.tap { |p| p[:set_locale] = locale_key },
                         :style => "background-image: url('/images/refinery/icons/flags/#{locale_key}.png');" %>
           </li>
         <% end %>

data/vendor/plugins/refinery/app/views/admin/_head.html.erb

@@ -41,6 +41,10 @@
                              'refinery/admin',
                              :cache => (js_caching ? "cache/admin" : false) %>
 
-  <%= "<!--[if lt IE 8]>#{stylesheet_link_tag 'refinery/ie'}<![endif]-->".html_safe if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
+  <% if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
+    <%= "<!--[if lt IE 8]>#{stylesheet_link_tag 'refinery/ie-less-than-8'}<![endif]-->".html_safe  %>
+    <%= "<!--[if IE 8]>#{stylesheet_link_tag 'refinery/ie-less-than-9'}<![endif]-->".html_safe  %>
+  <% end %>
+
   <%= yield :head %>
 </head>

data/vendor/plugins/refinery/lib/generators/refinery/templates/config/locales/en.yml

@@ -7,7 +7,7 @@ en:
         reorder_done: Done Reordering <%= $title_name.pluralize %>
         sorry_no_results: Sorry! There are no results found.
         no_items_yet: There are no <%= plural_name %> yet. Click "Create a new <%= $title_name %>" to add your first <%= $title_name.downcase %>.
-      singular_name:
+      <%= singular_name %>:
         view_live: View this <%= $title_name.downcase %> live <br/><em>(opens in a new window)</em>
         edit: Edit this <%= $title_name.downcase %>
         delete: Remove this <%= $title_name.downcase %> forever

data/vendor/plugins/refinery/lib/generators/refinery/templates/config/locales/nl.yml

@@ -7,7 +7,7 @@ nl:
         reorder_done: Klaar met het wijzingen van de volgorde van de <%= $title_name.pluralize %>
         sorry_no_results: Helaas! Er zijn geen resultaten gevonden.
         no_items_yet: Er zijn nog geen <%= plural_name %>. Druk op 'Maak een nieuwe <%= $title_name %>' om de eerste aan te maken.
-      singular_name:
+      <%= singular_name %>:
         view_live: Bekijk deze <%= $title_name.downcase %> op de website <br/><em>(opent een nieuw venster)</em>
         edit: Bewerk deze <%= $title_name.downcase %>
         delete: Verwijder deze <%= $title_name.downcase %> voor eeuwig

data/vendor/plugins/refinery/lib/refinery.rb

@@ -24,8 +24,17 @@ module Refinery
   end
 
   class Version
+    class << self
+      attr_reader :major, :minor, :tiny, :build
+    end
+
+    @major = 0
+    @minor = 9
+    @tiny  = 7
+    @build = 7
+
     def self.to_s
-      %q{0.9.7.6}
+      [@major, @minor, @tiny, @build].compact.join('.')
     end
   end
 

data/vendor/plugins/refinery/lib/tasks/refinery.rake

@@ -1,5 +1,8 @@
 namespace :refinery do
-
+  
+  desc "Run all refinery tests, including test-unit, rspec, and cucumber"
+  task :test_all => [:test, :spec, :cucumber]
+  
   desc "Override files for use in an application"
   task :override => :environment do
     require 'fileutils'

data/vendor/plugins/refinery_settings/app/controllers/admin/refinery_settings_controller.rb

@@ -1,6 +1,10 @@
 class Admin::RefinerySettingsController < Admin::BaseController
 
-  crudify :refinery_setting, :title_attribute => :title, :order => "name ASC", :searchable => false
+  crudify :refinery_setting,
+          :title_attribute => :title,
+          :order => "name ASC",
+          :searchable => false,
+          :redirect_to_url => :redirect_to_where?
 
   before_filter :sanitise_params, :only => [:create, :update]
   after_filter :fire_setting_callback, :only => [:update]
@@ -12,18 +16,26 @@ class Admin::RefinerySettingsController < Admin::BaseController
   end
 
   def find_all_refinery_settings
-    @refinery_settings = RefinerySetting.find :all,
-                                              :order => "name ASC",
-                                              :conditions => current_user.has_role?(:superuser) ? nil : ["restricted IS NOT ?", true]
+    @refinery_settings = RefinerySetting.find(:all,
+    {
+      :order => "name ASC",
+      :conditions => (["restricted <> ?", true] unless current_user.has_role?(:superuser))
+    })
   end
 
   def paginate_all_refinery_settings
-    @refinery_settings = RefinerySetting.paginate :page => params[:page],
-                                                  :order => "name ASC",
-                                                  :conditions => current_user.has_role?(:superuser) ? nil : ["restricted IS NOT ?", true]
+    @refinery_settings = RefinerySetting.paginate({
+      :page => params[:page],
+      :order => "name ASC",
+      :conditions => (["restricted <> ?", true] unless current_user.has_role?(:superuser))
+    })
   end
 
 private
+  def redirect_to_where?
+    (from_dialog? && session[:return_to].present?) ? session[:return_to] : admin_refinery_settings_url
+  end
+
   # this fires before an update or create to remove any attempts to pass sensitive arguments.
   def sanitise_params
     params.delete(:callback_proc_as_string)

data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_form.html.erb

@@ -3,7 +3,7 @@
   <div class='field'>
   <% if action_name =~ /(new)|(create)/ %>
     <%= f.label :name %>
-    <%= f.text_field :name, :class => "larger", :size => from_dialog? ? 50 : 67 %>
+    <%= f.text_field :name, :class => "larger widest" %>
   <% else %>
     <label for='refinery_setting_value'>Name</label>
     <label class='stripped' for='refinery_setting_value'>

data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/index.html.erb

@@ -1,7 +1,7 @@
 <div id='actions'>
   <ul>
     <li>
-      <%= link_to t('.new'), new_admin_refinery_setting_url(:dialog => true, :width => 725, :height => 425), :class => "add_icon" %>
+      <%= link_to t('.new'), new_admin_refinery_setting_url(:dialog => true, :width => 725, :height => 475), :class => "add_icon" %>
     </li>
   </ul>
 </div>

data/vendor/plugins/resources/app/views/admin/resources/_existing_resource.html.erb

@@ -20,12 +20,10 @@
   <%= render :partial => "/shared/admin/form_actions",
              :locals => {
                :f => nil,
-               :cancel_text => ,
                :cancel_url => admin_resources_url,
                :submit_button_text => t('.submit_insert'),
-               :hide_cancel => false,
+               :hide_cancel => true,
                :hide_delete => true,
-               :cancel_title => '',
                :paginate => {
                  :collection => @resources,
                  :url => {:controller => "admin/resources", :action => "insert", :dialog => from_dialog? }

data/vendor/plugins/resources/app/views/admin/resources/insert.html.erb

@@ -20,7 +20,7 @@
   </div>
 
   <div id='dialog_main'>
-    <% if any_resources or user_can_modify_images %>
+    <% if any_resources or user_can_modify_resources %>
       <%= render :partial => 'existing_resource' if any_resources %>
 
       <% if user_can_modify_resources %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 9
   - 7
-  - 6
-  version: 0.9.7.6
+  - 7
+  version: 0.9.7.7
 platform: ruby
 authors: 
 - Resolve Digital
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +12:00
+date: 2010-07-20 00:00:00 +12:00
 default_executable: 
 dependencies: []
 
@@ -535,7 +535,8 @@ files:
 - public/stylesheets/refinery/application.css
 - public/stylesheets/refinery/formatting.css
 - public/stylesheets/refinery/home.css
-- public/stylesheets/refinery/ie.css
+- public/stylesheets/refinery/ie-less-than-8.css
+- public/stylesheets/refinery/ie-less-than-9.css
 - public/stylesheets/refinery/refinery.css
 - public/stylesheets/refinery/site_bar.css
 - public/stylesheets/refinery/theme.css
@@ -1052,6 +1053,7 @@ files:
 - vendor/plugins/themes/rails/init.rb
 - vendor/plugins/themes/readme.md
 - vendor/plugins/translate/init.rb
+- vendor/plugins/translate/lib/tasks/translate.rake
 - vendor/plugins/translate/lib/translate/file.rb
 - vendor/plugins/translate/lib/translate/keys.rb
 - vendor/plugins/translate/lib/translate/log.rb
@@ -1061,7 +1063,6 @@ files:
 - vendor/plugins/translate/Rakefile
 - vendor/plugins/translate/README
 - vendor/plugins/translate/REFINERY_README
-- vendor/plugins/translate/tasks/translate.rake
 has_rdoc: true
 homepage: http://refinerycms.com
 licenses: []