refinerycms 0.9.6.34 → 0.9.7

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

@@ -5,88 +5,92 @@
  * and GPL (GPL-license.txt) licenses.
  *
  * For further information visit:
- *		http://www.wymeditor.org/
+ *    http://www.wymeditor.org/
  *
  * File Name:
- *		wymeditor.css
- *		Main editor css file.
- *		See the documentation for more info.
+ *    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)
+ *    Jean-Francois Hovinne (jf.hovinne a-t wymeditor dotorg)
+ *    Daniel Reszka (d.reszka a-t wymeditor dotorg)
 */
 
 /* VISUAL FEEDBACK */
 
 /* basic */
-	body	{ background: #fff;}
+  body  { background: #fff;}
 
 /* make HTML blocs visible */
-	p,
-	h1,
-	h2,
-	h3,
-	h4,
-	h5,
-	h6,
-	ul,
-	ol,
-	table,
-	blockquote,
-	pre			 { background: #FFFFFF no-repeat 2px 2px;
-					padding:8px 5px 5px;
-					margin:6px 0px;
-					border: 1px dotted #cccccc;
-					}
-	td			{ background: #F0F4F8; }
-	th			{ background: #ffffcc; }
-	ul,
-	ol			{ border-left:20px solid #B9C4D0; padding:0px 5px; }
-	caption		 { background: #E4E4B0; padding: 5px; font-weight: bold; }
-	table		 { font-size: 12px; width: 500px; }
-	td			{ width: 25%; }
-	blockquote	{ margin-left: 30px; }
-	pre			 { background-color:transparent; border: 1px solid white; }
+  p,
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6,
+  ul,
+  ol,
+  table,
+  blockquote,
+  pre       { background: transparent no-repeat 2px 2px;
+          padding:8px 5px 5px;
+          margin:6px 0px;
+          border: 1px dotted #cccccc;
+          }
+  td      { background: #F0F4F8; }
+  th      { background: #ffffcc; }
+  ul,
+  ol      { border-left:20px solid #B9C4D0; padding:0px 5px; }
+  caption     { background: #E4E4B0; padding: 5px; font-weight: bold; }
+  table     { font-size: 12px; width: 500px; }
+  td      { width: 25%; }
+  blockquote  { margin-left: 30px; }
+  pre       { background-color:transparent; border: 1px solid white; }
 
 /* Gecko min height fix */
-	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; }
+  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'); }
-	h2		{ background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h2.png'); }
-	h3		{ background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h3.png'); }
-	h4		{ background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h4.png'); }
-	h5		{ background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h5.png'); }
-	h6		{ background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h6.png'); }
-	blockquote{ background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-blockquote.png'); }
-	pre		 { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-pre.png'); }
+  p     { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-p.png'); }
+  h1    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h1.png'); }
+  h2    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h2.png'); }
+  h3    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h3.png'); }
+  h4    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h4.png'); }
+  h5    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h5.png'); }
+  h6    { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-h6.png'); }
+  blockquote{ background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-blockquote.png'); }
+  pre     { background-image: url('/images/wymeditor/skins/refinery/iframe/lbl-pre.png'); }
 
 /* specific HTML elements */
 	caption	 { text-align: left; }
 	img		 { margin-right: 5px;
-				border-style: solid;
-				border-color: gray;
-				border-width: 0; }
-	a img	 { border-width: 1px; border-color: blue; }
+				border: 1px solid transparent; }
+	a img	 { border: 1px dotted blue !important; }
 	acronym	 { border: 1px solid gray; }
-	span		{ background-color: #eef; }
 
 /* visual feedback for non-valid nesting of elements*/
-	h1 h1, h1 h2, h1 h3, h1 h4, h1 h5, h1 h6, h1 p, h1 pre, h1 address,
-	h2 h1, h2 h2, h2 h3, h2 h4, h2 h5, h2 h6, h2 p, h2 pre, h2 address,
-	h3 h1, h3 h2, h3 h3, h3 h4, h3 h5, h3 h6, h3 p, h3 pre, h3 address,
-	h4 h1, h4 h2, h4 h3, h4 h4, h4 h5, h4 h6, h4 p, h4 pre, h4 address,
-	h5 h1, h5 h2, h5 h3, h5 h4, h5 h5, h5 h6, h5 p, h5 pre, h5 address,
-	h6 h1, h6 h2, h6 h3, h6 h4, h6 h4, h6 h6, h6 p, h6 pre, h6 address,
-	p h1, p h2, p h3, p h4, p h5, p h6, p pre, p address,
-	pre h1, pre h2, pre h3, pre h4, pre h5, pre h6, pre p, pre pre, pre address,
-	address h1, address h2, address h3, address h4, address h5, address h6,
-	address p, address pre, address address
-	{ background-color: #ff9999 !important;
-	border: 1px solid red !important;
-	font-size: 12px !important;
-	font-weight: normal; }
+  h1 h1, h1 h2, h1 h3, h1 h4, h1 h5, h1 h6, h1 p, h1 pre, h1 address,
+  h2 h1, h2 h2, h2 h3, h2 h4, h2 h5, h2 h6, h2 p, h2 pre, h2 address,
+  h3 h1, h3 h2, h3 h3, h3 h4, h3 h5, h3 h6, h3 p, h3 pre, h3 address,
+  h4 h1, h4 h2, h4 h3, h4 h4, h4 h5, h4 h6, h4 p, h4 pre, h4 address,
+  h5 h1, h5 h2, h5 h3, h5 h4, h5 h5, h5 h6, h5 p, h5 pre, h5 address,
+  h6 h1, h6 h2, h6 h3, h6 h4, h6 h4, h6 h6, h6 p, h6 pre, h6 address,
+  p h1, p h2, p h3, p h4, p h5, p h6, p pre, p address,
+  pre h1, pre h2, pre h3, pre h4, pre h5, pre h6, pre p, pre pre, pre address,
+  address h1, address h2, address h3, address h4, address h5, address h6,
+  address p, address pre, address address
+  { background-color: #ff9999 !important;
+  border: 1px solid red !important;
+  font-size: 12px !important;
+  font-weight: normal; }
+
+/* indicate invalid text area fields */
+  body.fieldWithErrors { background-color: #ffecf0 !important; }
+
+  img.selected_by_wym {
+    border: 1px dashed #22a7f2;
+  }

data/readme.md

@@ -20,7 +20,7 @@ Unlike other content managers, Refinery is truly aimed at the end user making it
 ### For developers
 
 * Allows you to get a small business site completed __ridiculously quickly__
-* Easily __[Theme and customise](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/themes/themes.md)__ the look to suit the business
+* Easily __[Theme and customise](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/themes/readme.md)__ the look to suit the business
 * __[Extend with custom plugins](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/plugins.md)__ to do anything Refinery doesn't do out of the box
 * Sticks to __"the Rails way"__ as much as possible. We don't force you to learn new templating languages.
 * Uses [jQuery](http://jquery.com/) for fast and concise JavaScript
@@ -29,9 +29,15 @@ Unlike other content managers, Refinery is truly aimed at the end user making it
 
 Refinery's gem requirements are:
 
-* [rails ~> 2.3.5](http://rubygems.org/gems/rails)
+* [acts_as_indexed = 0.6.2](http://github.com/parndt/acts_as_indexed)
+* [authlogic ~> 2.1.4](http://rubygems.org/gems/authlogic)
+* [friendly_id ~> 3.0.4](http://rubygems.org/gems/friendly_id)
+* [rails ~> 2.3.6](http://rubygems.org/gems/rails)
+* [rmagick ~> 2.12.2](http://rubygems.org/gems/rmagick)
+* [truncate_html = 0.3.2](http://rubygems.org/gems/truncate_html)
+* [will_paginate ~> 2.3.12](http://rubygems.org/gems/will_paginate)
 
-### Other dependancies
+### Other dependencies
 
 * [RMagick](http://github.com/rmagick/rmagick) - [Install docs](http://rmagick.rubyforge.org/install-faq.html) or for
 Mac OS 10.5 or 10.6 users [this shell install script](http://github.com/maddox/magick-installer) will be easier.
@@ -47,8 +53,11 @@ Mac OS 10.5 or 10.6 users [this shell install script](http://github.com/maddox/m
 
 #### Or, clone Refinery's GIT repository
 
+The git repository is where all of the changes are made when any new code is written or existing code is updated. For this reason it is often better to use the gem or to checkout a particular tag (the latest is usually considered the most stable). So unless you want to use the latest code, checkout the latest tag by replacing 0.9.X.XX below with the appropriate version:
+
     git clone git://github.com/resolve/refinerycms.git mynewsite.com
     cd ./mynewsite.com
+    git checkout 0.9.X.XX
     git remote rm origin
     git remote add origin git@github.com:you/yournewsite.git
     mv ./config/database.yml.example ./config/database.yml
@@ -57,13 +66,32 @@ Mac OS 10.5 or 10.6 users [this shell install script](http://github.com/maddox/m
 
 Firstly, edit ``config/database.yml`` to reflect your database server details.
 
-Next create your database and fill it with Refinery's default data:
+Next you'll need to install bundler if you don't have it already:
 
-    rake db:setup
+    gem install bundler
+
+Now you will need to make sure that you specify the correct database driver and web server.
+The default choices are mysql and unicorn but to change them open up ``Gemfile`` which is in your application's root directory.
+You'll see a section like this:
+
+    # Specify the database driver as appropriate for your application (only one).
+    gem 'mysql', :require => 'mysql'
+    #gem 'sqlite3-ruby', :require => 'sqlite3'
+
+    # Specify your favourite web server (only one).
+    gem 'unicorn', :group => :development
+    #gem 'mongrel', :group => :development
 
-After your database exists, you'll need to install the gems that Refinery depends on. You can do this by running:
+To choose a different driver or web server just comment out the one we've pre-selected and uncomment or write the one you want instead.
 
-    rake gems:install
+After you have bundler and you've chosen your database driver and web server, you'll need to install the gems that Refinery depends on.
+You can do this by running:
+
+    bundle install
+
+Next create your database and fill it with Refinery's default data:
+
+    rake db:setup
 
 Note: The news engine that was previously in Refinery's core was extracted into a separate gem / plugin to be found here:
 
@@ -81,8 +109,10 @@ You will be prompted to setup your first user.
 
 ## Help and Developer Documentation
 
+* [Tutorial Site](http://resolve.github.com/refinerycms)
 * [Google Group Discussion](http://groups.google.com/group/refinery-cms)
 * [Developer/API documentation](http://api.refinerycms.org)
+* [GitHub repository](http://github.com/resolve/refinerycms)
 * [Developer video - 26 mins](http://refinerycms.com/pages/for-developers)
 * [IRC Channel](irc://irc.freenode.net/refinerycms)
 
@@ -100,7 +130,7 @@ in your ``config/environments/production.rb`` file to make Refinery store files
 
 Simply run the command:
 
-    refinery-update-core path/to/project/root/
+    rake refinery:update
 
 and the up-to-date core files will be copied from the latest gem into your project.
 
@@ -115,42 +145,43 @@ This will pull in all of the updated files in the project and may result in some
 
 ## What comes included with Refinery
 
-### [Pages](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/pages/pages.md)
+### [Pages](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/pages/readme.md)
 
 * Easily edit and manage pages with a [WYSIWYG visual editor](http://www.wymeditor.org/)
 * Manage you site's structure
 
-### [Images](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/images/images.md) & [Resources](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/resources/resources.md)
+### [Images](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/images/readme.md) & [Files](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/resources/readme.md)
 
 * Easily upload and insert images
 * Upload and link to resources such as PDF documents
 * Uses the popular [attachment_fu](http://github.com/technoweenie/attachment_fu) Rails plugin
 
-### [Inquiries](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/inquiries/inquiries.md)
+### [Inquiries](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/inquiries/readme.md)
 
 * Collect inquiries from a contact form
 * Manage your inquiries and be notified when new ones come in
+* Checks new inquiries for spam
 
 ### [News](http://github.com/resolve/refinerycms-news)
 
 * Post news about your company and update your visitors
 
-### [Settings](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery_settings/settings.md)
+### [Settings](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery_settings/readme.md)
 
 * Manage the behaviour of Refinery
 * Easily integrate with [Google Analytics](https://www.google.com/analytics/)
 
-### [Dashboard](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/dashboard/dashboard.md)
+### [Dashboard](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/dashboard/readme.md)
 
 * Get an overview of what has been updated recently
 
-### [Authentication & Users](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/authentication/authentication.md)
+### [Authentication & Users](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/authentication/readme.md)
 
 * Manage who can access Refinery
 * Control which plugins each user has access to
 * Uses the popular [authlogic](http://github.com/binarylogic/authlogic) authentication Rails plugin
 
-### [Themes](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/themes/themes.md)
+### [Themes](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/themes/readme.md)
 
 * Customise Refinery to look exactly how you want
 * The Rails Way: use regular Rails erb views, no templating languages here!
@@ -175,6 +206,6 @@ Check out the [portfolio plugin gem](http://github.com/resolve/refinerycms-portf
 
 ## License
 
-Refinery is released under the MIT license and is copyright (c) 2005-2009 [Resolve Digital Ltd.](http://www.resolvedigital.co.nz)
+Refinery is released under the MIT license and is copyright (c) 2005-2010 [Resolve Digital Ltd.](http://www.resolvedigital.co.nz)
 
-[Read the license](http://github.com/resolve/refinerycms/blob/master/license.md)
+[Read the license](http://github.com/resolve/refinerycms/blob/master/license.md)

data/script/about

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../config/boot')
 require 'commands/about'

data/script/autospec

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
+ENV['RSPEC'] = 'true'     # allows autotest to discover rspec
+ENV['AUTOTEST'] = 'true'  # allows autotest to run w/ color on linux
+system((RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV) ||
+  $stderr.puts("Unable to find autotest.  Please install ZenTest or fix your PATH")

data/script/console

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../config/boot')
 require 'commands/console'

data/script/cucumber

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+if vendored_cucumber_bin
+  load File.expand_path(vendored_cucumber_bin)
+else
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  require 'cucumber'
+  load Cucumber::BINARY
+end

data/script/dbconsole

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../config/boot')
 require 'commands/dbconsole'

data/script/destroy

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../config/boot')
 require 'commands/destroy'

data/script/generate

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../config/boot')
 require 'commands/generate'

data/script/performance/benchmarker

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../../config/boot')
 require 'commands/performance/benchmarker'

data/script/performance/profiler

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../../config/boot')
 require 'commands/performance/profiler'

data/script/performance/request

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../../config/boot')
 require 'commands/performance/request'

data/script/plugin

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../config/boot')
 require 'commands/plugin'

data/script/process/inspector

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../../config/boot')
 require 'commands/process/inspector'

data/script/process/reaper

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../../config/boot')
 require 'commands/process/reaper'

data/script/process/spawner

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../../config/boot')
 require 'commands/process/spawner'

data/script/runner

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path(File.dirname(__FILE__) + '/../config/boot')
 require 'commands/runner'

data/script/server

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 require 'commands/server'

data/script/spec

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+if ARGV.any? {|arg| %w[--drb -X --generate-options -G --help -h --version -v].include?(arg)}
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+else
+  gem 'test-unit', '1.2.3' if RUBY_VERSION.to_f >= 1.9
+  ENV["RAILS_ENV"] ||= 'test'
+  require File.expand_path(File.dirname(__FILE__) + "/../config/environment") unless defined?(RAILS_ROOT)
+end
+require 'spec/autorun'
+exit ::Spec::Runner::CommandLine.run

data/test/fixtures/images.yml

@@ -4,8 +4,7 @@ the_world:
   width: 614
   height: 340
   size: 17535
-  # TODO: image_type? What's that used for?
-  
+
 our_car:
   content_type: image/jpg
   filename: car-wallpapers19.jpg

data/test/fixtures/pages.yml

@@ -1,10 +1,10 @@
 # this page links to the inquiries plugin through a custom link_url
 contact_us:
-  title: Contact Us
+  title: Contact
   position: 4
   show_in_menu: true
-  link_url: /inquiries/new
-  menu_match: ^/inquiries.*$
+  link_url: /contact
+  menu_match: ^/(inquiries|contact).*$
   deletable: true
 
 # A child page that is hidden
@@ -12,7 +12,7 @@ thank_you:
   title: Thank You
   position: 5
   show_in_menu: false
-  menu_match: ^/inquiries/thank_you$
+  menu_match: ^/(inquiries|contact)/thank_you$
   deletable: true
   parent: contact_us