refinerycms 0.9.7.7 → 0.9.7.8

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

@@ -36,11 +36,16 @@
 					$ol.css(calcPositionCss($(this)));
 					return true;
 				}
+				
+				var possible_line_height = {};
+				if( $(this).css('height') != 'auto') {
+				  possible_line_height = { lineHeight: $(this).css('height') };
+				}
 
 				var ol = $('<label />')
 					.text($(this).attr('placeholder'))
 					.addClass(config.cls)
-					.css({
+					.css($.extend({
 						position:'absolute',
 						display: 'inline',
 						float:'none',
@@ -50,7 +55,7 @@
 						color: config.color,
 						cursor: 'text',
 						fontSize: $(this).css('font-size')
-					})
+					}, possible_line_height))
 					.css(calcPositionCss(this))
 					.attr('for', this.id)
 					.data('target',$(this))

data/public/javascripts/refinery/admin.js

@@ -78,7 +78,13 @@ init_interface = function() {
 
 init_delete_confirmations = function() {
   $('a.confirm-delete').click(function(e) {
-    if (confirm("Are you sure you want to " + (t=($(this).attr('title') || $(this).attr('tooltip')))[0].toLowerCase() + t.substring(1) + "?"))
+    if ((confirmation = $(this).attr('data-confirm')) == null || confirmation.length == 0) {
+      if ((title = ($(this).attr('title') || $(this).attr('tooltip'))) == null || title.length == 0) {
+        title = "Remove this forever";
+      }
+      confirmation = "Are you sure you want to " + title[0].toLowerCase() + title.substring(1) + "?";
+    }
+    if (confirm(confirmation))
     {
       $("<form method='POST' action='" + $(this).attr('href') + "'></form>")
         .append("<input type='hidden' name='_method' value='delete' />")
@@ -99,8 +105,7 @@ init_flash_messages = function(){
 }
 
 init_modal_dialogs = function(){
-  $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor)
-  {
+  $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor) {
     $(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

data/readme.md

@@ -1,25 +1,19 @@
 # Refinery CMS
 
-__An open source Ruby on Rails content management system for small business.__
-
-## Demo Site
-
-* [Front end live demo ](http://demo.refinerycms.com)
-* [Back end live demo ](http://demo.refinerycms.com/admin)
-
-For more screenshots, example sites & high level information: [http://refinerycms.com](http://refinerycms.com)
+__An open source Ruby on Rails content management system.__ More information at [http://refinerycms.com](http://refinerycms.com)
 
 ![Refinery Dashboard](http://refinerycms.com/system/images/0000/0576/dashboard.png)
 
-## What it's good at?
+Wanna see Refinery for yourself? [Try the demo](http://demo.refinerycms.com/refinery)
+
+## What's it good at?
 
-__Refinery is great for small business sites where the client needs to be able to update their website themselves__ without being bombarded with anything too complicated.
+__Refinery is great for sites where the client needs to be able to update their website themselves__ without being bombarded with anything too complicated.
 
-Unlike other content managers, Refinery is truly aimed at the end user making it easy for them to pick up and make changes themselves.
+Unlike other content managers, Refinery is truly __aimed at the end user__ making it easy for them to pick up and make changes themselves.
 
 ### 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/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.
@@ -29,121 +23,35 @@ Unlike other content managers, Refinery is truly aimed at the end user making it
 
 Refinery's gem requirements are:
 
-* [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)
+* [acts_as_indexed = 0.6.3](http://github.com/parndt/acts_as_indexed)
+* [authlogic = 2.1.5](http://rubygems.org/gems/authlogic)
+* [friendly_id = 3.0.6](http://rubygems.org/gems/friendly_id)
+* [rails = 2.3.8](http://rubygems.org/gems/rails)
+* [rmagick ~> 2.12.0](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)
+* [will_paginate = 2.3.14](http://rubygems.org/gems/will_paginate)
 
-### Other dependencies
+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.
-
-## Installing and Setting Up Refinery
-
-### 1. Get the Refinery code
-
-#### Install the Gem
-
-    gem install refinerycms
-    refinery path/to/project
-
-#### 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
-
-### 2. Configuration
-
-Firstly, edit ``config/database.yml`` to reflect your database server details.
-
-Next you'll need to install bundler if you don't have it already:
-
-    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
-
-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.
-
-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:
-
-    http://github.com/resolve/refinerycms-news
+Mac OS 10.5+ users [this shell install script](http://github.com/maddox/magick-installer) will be easier.
 
-Now, news should be up and running.
+## How to
 
-### 3. Starting up your site
+* __[Install Refinery](http://tutorials.refinerycms.org/tutorials/how-to-install-refinery)__
+* [Update Refinery to the latest version](http://tutorials.refinerycms.org/tutorials/how-to-update-refinery-to-the-latest-version)
+* [Install Refinery on Heroku](http://tutorials.refinerycms.org/tutorials/how-to-install-refinery-on-heroku)
+* [Run the Refinery test suite](http://tutorials.refinerycms.org/tutorials/how-to-test-refinery)
 
-    ruby script/server
+## Help and Documentation
 
-Now visit [http://localhost:3000](http://localhost:3000) and your Refinery site should be running.
-
-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)
+* [Tutorial Site](http://tutorials.refinerycms.org)
+* [Google Group Discussion](http://group.refinerycms.org)
 * [IRC Channel](irc://irc.freenode.net/refinerycms)
+* [GitHub repository](http://github.com/resolve/refinerycms)
+* [Developer/API documentation](http://api.refinerycms.org)
 
-## Setting Up on Heroku or Using S3 for Storage
-
-If you're using [Heroku](http://heroku.com/) you will want to put
-
-    Refinery.s3_backend = true
-
-in your ``config/environments/production.rb`` file to make Refinery store files uploaded on Amazon S3.
-
-## Updating to the latest Refinery
-
-### When using the gem
-
-Simply run the command:
-
-    rake refinery:update
-
-and the up-to-date core files will be copied from the latest gem into your project.
-
-### When using GIT
-
-You can update by running these commands:
-
-    git remote add refinerycms git://github.com/resolve/refinerycms.git
-    git pull refinerycms master
-
-This will pull in all of the updated files in the project and may result in some merge conflicts which you will need to resolve.
-
-## What comes included with Refinery
+## Features
 
 ### [Pages](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/pages/readme.md)
 
@@ -155,6 +63,7 @@ This will pull in all of the updated files in the project and may result in some
 * 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
+* Supports storage on Amazon S3
 
 ### [Inquiries](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/inquiries/readme.md)
 
@@ -169,7 +78,7 @@ This will pull in all of the updated files in the project and may result in some
 
 ### [Dashboard](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/dashboard/readme.md)
 
-* Get an overview of what has been updated recently
+* Get an overview of what has been updated recently and see recent inquiries.
 
 ### [Authentication & Users](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/authentication/readme.md)
 
@@ -190,19 +99,13 @@ Extend Refinery easily by running the Refinery generator
 
 to get help on how to use that. Or read the full documentation on [writing plugins for Refinery](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/plugins.md)
 
-### Run the Tests
-
-If you have installed Refinery using GIT (described above in step 1 of installing Refinery) then you'll be able to run the tests. At your Rails root run:
-
-    rake test
-
 ### Popular Plugins
 
 * [Portfolio](http://github.com/resolve/refinerycms-portfolio) - manage groups of images like an image gallery.
 * [News](http://github.com/resolve/refinerycms-news) - post and manage news items.
 
-## License
+[Full plugin list here](http://wiki.github.com/resolve/refinerycms/plugins)
 
-Refinery is released under the MIT license and is copyright (c) 2005-2010 [Resolve Digital Ltd.](http://www.resolvedigital.co.nz)
+## License
 
-[Read the license](http://github.com/resolve/refinerycms/blob/master/license.md)
+Refinery is released under the [MIT license](http://github.com/resolve/refinerycms/blob/master/license.md) and is copyright (c) 2005-2010 [Resolve Digital Ltd.](http://www.resolvedigital.co.nz)

data/todo.md

@@ -7,25 +7,18 @@ What are some of the known things that need to be done?
 * Add unit test coverage for user, user plugin and user mailer
 * Add unit test coverage for inquiry mailer and inquiry setting
 * Add functional tests for the whole of Refinery.
+* Add Cucumber for the whole of Refinery. (MOST IMPORTANT)
+* Add RSpec for the whole of Refinery.
 
 # Rails 3.0 Support
 
 We've started an effort to move to Rails 3.0 - that just needs to be completed.
 
-# Improve the Generator
-
-We need to have support for build in Refinery field types like "image". So I could run
-
-  ./script/generate refinery staff name:string bio:text mugshot:image
-  
-And it will automatically create a form field that pops open the image picker on the staff form.
-
-There is now a partial to easily call an image picker.
+Join the IRC channel on freenode.net #refinerycms on August 7th to contribute!
 
 # I18n support
 
 * Check all the views for missing translations
-  - Write a small tool that extracts t('.whatever') and check which translation keys are missing, or which keys are not used at all.
 * Translate models and model attributes used in forms (Rails 2.3.8 supports translation form labels!)
 * Javascript messages etc:
-  - http://github.com/fnando/i18n-js
+  - http://github.com/fnando/i18n-js

data/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb

@@ -19,7 +19,7 @@ class Test::Unit::TestCase
   end
 end
 
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 
 # AR keeps printing annoying schema statements
 $stdout = StringIO.new

data/vendor/plugins/attachment_fu/test/database.yml

@@ -1,9 +1,9 @@
 sqlite:
   :adapter: sqlite
-  :dbfile: attachment_fu_plugin.sqlite.db
+  :database: attachment_fu_plugin.sqlite
 sqlite3:
   :adapter: sqlite3
-  :dbfile: attachment_fu_plugin.sqlite3.db
+  :database: attachment_fu_plugin.sqlite3
 postgresql:
   :adapter: postgresql
   :username: postgres

data/vendor/plugins/authentication/app/views/admin/users/_form.html.erb

@@ -10,12 +10,12 @@
   </div>
   <div class='field'>
     <%= f.label :password %>
-    <%= f.password_field :password %>
+    <%= f.password_field :password, :autocomplete => 'off' %>
     <%= "<br /><span class='preview'>#{t('.blank_password_keeps_current')}</span>" unless @user.new_record? %>
   </div>
   <div class='field'>
     <%= f.label :password_confirmation %>
-    <%= f.password_field :password_confirmation %>
+    <%= f.password_field :password_confirmation, :autocomplete => 'off' %>
   </div>
   <div class='field plugin_access'>
     <span class='label_with_help'>
@@ -42,7 +42,14 @@
       <% end %>
     </ul>
   </div>
-  <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false, :hide_delete => !current_user.can_delete?(@user)} %>
+  <%= render :partial => "/shared/admin/form_actions",
+             :locals => {
+               :f => f,
+               :continue_editing => false,
+               :hide_delete => !current_user.can_delete?(@user),
+               :delete_title => t('admin.users.user.confirm_delete_title'),
+               :delete_confirmation => t('admin.users.user.confirm_delete_message', :who => @user.login)
+             } %>
 <% end %>
 
 <% content_for :head do %>

data/vendor/plugins/authentication/app/views/admin/users/_user.html.erb

@@ -8,7 +8,8 @@
   <span class='actions'>
     <%= link_to refinery_icon_tag('delete.png'), admin_user_path(user),
                 :class => "cancel confirm-delete",
-                :title => t('.confirm_delete_title') if current_user.can_delete?(user) %>
+                :title => t('.confirm_delete_title'),
+                :'data-confirm' => t('.confirm_delete_message', :who => user.login) if current_user.can_delete?(user) %>
     <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_user_path(user),
                 :title => t('.edit_user')%>
     <%= mail_to user.email, refinery_icon_tag('email_go.png'),

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

@@ -1,80 +1,80 @@
 nb:
+  plugins:
+    refinery_users:
+      title: Brukere
   admin:
     users:
       update:
-        cannot_remove_user_plugin_from_current_user: "Du kan ikke fjerne 'Bruker'-instikket fra kontoen du er logget inn som."
+        cannot_remove_user_plugin_from_current_user: "Du kan ikke fjerne tillegget 'Brukere' når du er logget inn med denne brukeren"
       form:
-        blank_password_keeps_current: Blankt passord beholder ditt nåværende passord.
+        blank_password_keeps_current: La feltet forbli tomt om du ikke ønsker å endre passordet
+        enable_all: merk alle
       index:
-        create_new_user: Opprett En Ny Bruker
-        no_users_yet:  Det er ingen brukere enda. Trykk "Opprett En Ny Bruker" for å legge til din første bruker.
+        create_new_user: Lag ny bruker
+        no_users_yet: Det er ikke opprettet noen brukere enda. Trykk "Opprett ny bruker" for å legge til din første bruker.
       user:
         confirm_delete_message: "Er du sikker på at du ønsker å slette '{{who}}'?"
-        confirm_delete_title: Fjern denne brukeren for alltid
+        confirm_delete_title: Fjern denne brukeren permanent
         edit_user: Rediger denne brukeren
-        email_user: Send epost til denne brukeren
+        email_user: Send en e-post til denne brukeren
         preview: ({{who}}) opprettet {{created_at}}
   sessions:
-    login_successful: Innlogging vellykket
-    login_failed: Beklager, ditt brukernavn eller passord er feil.
-    logged_out: Du er nå logget ut.
+    login_successful: Du er logget inn
+    login_failed: "Beklager, passordet eller brukernavnet ditt er feil."
+    logged_out: Du har blitt logget ut.
     new:
-      login: Innloggingsnavn
-      log_in: Logg inn
-      cancel: Avbryt
-      password: Passord
-      remember_me: Husk meg
-      or: eller
-      forgot_password: Jeg har glømt passordet mitt
-      hello_please_sign_in: Hei! Vennligst logg inn
-      sign_in: Logg på
+      hello_please_sign_in: "Hei! Vennligst logg inn."
+      sign_in: Logg inn
+      forgot_password: Jeg glemte passordet mitt
   users:
-    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
+    setup_website_name: "Først, la oss gi siden et navn. <a href='{{link}}' name='{{title}}'>Gå hit</a> for å endre navnet på websiden din"
+    signup_disabled: Registrering av nye brukere er deaktivert
     new:
-      fill_form: Fyll ut skjemaet under med detaljene dine så vi kan få deg startet.
+      fill_form: Fyll ut detaljene dine nedenfor slik at vi kan komme i gang.
       sign_up: Registrer deg
     create:
       welcome: Velkommen til Refinery, {{who}}
-      signup_complete: Registrering utført!
+      signup_complete: Registrering komplett!
     forgot:
-      email_address: E-postadresse
-      enter_email_address: Vennligst skriv inn e-postadressen for kontoen din.
+      email_address: E-post Adresse
+      enter_email_address: Vennligst tast inn e-post adressen for din konto.
       reset_password: Tilbakestill passord
-      blank_email: Du har ikke angitt en e-postadresse.
-      email_not_associated_with_account: "Beklager, '{{email}}' er ikke knyttet til noen kontoer. <br/> Er du sikker på at du har skrevet inn riktig e-postadresse?"
-      email_reset_sent: En e-post har blitt sendt til deg med en kobling for å tilbakestille passordet.
+      blank_email: Du har ikke oppgitt noen e-post adresse.
+      email_not_associated_with_account: "Beklager, '{{email}}' er ikke tilknyttet noen konto.<br/>Er du sikker på at du tastet inn riktig e-post adresse?"
+      email_reset_sent: En e-post har blitt sendt til deg med en lenke for å tilbakestille passordet ditt.
     reset:
-      code_invalid: "Vi beklager, men denne tilbakestille koden er utløpt eller er ugyldig. Hvis du har problemer prøve å kopiere og lime inn URL fra e-posten din i nettleseren, eller starte tilbakestille passordet prosessen."
-      successful: "Passord Vellykket nullstilling for {{email}}"
+      code_invalid: "Beklager, men denne koden for å tilbakestille passordet har utløpt eller er ugyldig. Om du opplever problemer så kan du forsøker å kopiere og lime inn lenken fra e-posten du mottok, eller start prosessen med å tilbakestille passordet på nytt."
+      successful: "Passordet for {{email}} er nå tilbakestilt"
+      pick_new_password_for: "Velg et nytt passord for {{email}}"
+      reset_password: Tilbakestill passord
   user_mailer:
-    please_activate: Vennligst aktiver din nye konto
+    please_activate: Vennligst aktivert din nye konto
     activated: Din konto er nå aktivert!
-    activated_email: "{{who}}, din konto er aktivert. Du kan nå legge til dine innstikk:"
-    account_created: Din konto er opprettet.
+    activated_email: "{{who}}, din konto er nå aktivert. Du kan nå begynne å legge til tillegg:"
+    account_created: Din konto er nå opprettet.
     user_name: Brukernavn {{name}}
     password: Passord {{password}}
-    visit_url: "Gå til denne adressen for å aktivere kontoen din:"
-    link_to_reset_your_password: Lenke for å nullstille passordet ditt
+    visit_url: "Beskø denne lenken for å aktivere kontoen din:"
+    link_to_reset_your_password: Lenke for å tilbakestille passordet ditt
   authlogic:
     error_messages:
-      login_blank: kan ikke være blankt
+      login_blank: kan ikke være blank
       login_not_found: er ikke gyldig
-      login_invalid: kan bare innholde bokstaver, nummer, mellomrom og .-_@.
-      consecutive_failed_logins_limit_exceeded: Grensen for antall for misslykkete innloggingsforsøk nådd, kontoen er deaktivert.
-      email_invalid: skal se ut som en epost-adresse.
+      login_invalid: "burde kun inneholde bokstaver, tall, mellomrom og .-_@."
+      consecutive_failed_logins_limit_exceeded: "Du har overskredet det tillatte antall feilede innlogginger, din konto er deaktivert."
+      email_invalid: burde se ut som en e-post adresse.
       password_blank: kan ikke være blank
       password_invalid: er ikke gyldig
       not_active: Din konto er ikke aktivert
       not_confirmed: Din konto er ikke bekreftet
       not_approved: Din konto er ikke godkjent
-      no_authentication_details: Du har ikke skrevet inn noe innloggingsinformasjon
+      no_authentication_details: Du har ikke oppgitt noen innloggingsinformasjon.
     models:
       user_session: UserSession
     attributes:
       user_session:
-        login: brukernavn
-        email: epost
-        password: passord
-        remember_me: husk meg
-        incorrect: "beklager, ditt {{login_field}} eller passord er ikke korrekt."
+        login: Brukernavn
+        email: E-post
+        password: Passord
+        remember_me: Husk meg
+        incorrect: "Beklager, din {{login_field}} eller passord var ikke riktig."