refinerycms 0.9.7.1 → 0.9.7.2

data/Gemfile

@@ -21,7 +21,7 @@ gem 'acts_as_indexed', '= 0.6.2', :require => 'acts_as_indexed', :git => 'git://
 gem 'authlogic',       '= 2.1.5', :require => 'authlogic'
 gem 'friendly_id',     '= 3.0.6', :require => 'friendly_id'
 gem 'rails',           '= 2.3.8'
-gem 'rmagick',         '~> 2.13.1'
+gem 'rmagick',         '~> 2.12.2'
 gem 'truncate_html',   '= 0.3.2', :require => 'truncate_html'
 gem 'will_paginate',   '= 2.3.14', :require => 'will_paginate'
 
@@ -42,7 +42,7 @@ end
 
 #===REQUIRED FOR REFINERY GEM INSTALL===
 # Leave the gem below disabled (commented out) if you're not using the gem install method.
-#gem 'refinerycms',    '= 0.9.7.1'
+#gem 'refinerycms',    '= 0.9.7.2'
 #===END OF REFINERY GEM INSTALL REQUIREMENTS===
 
 # Bundle gems for certain environments:

data/bin/refinery

@@ -118,7 +118,7 @@ unless (app_path = ARGV.shift).nil? or app_path.length == 0
       puts `#{cmd}`
       
       puts "\n\nUpdating some core refinery files..\n"
-      puts (cmd="rake -f #{File.join(rails_root, 'Rakefile')} refinery:update")
+      puts (cmd="rake -f #{File.join(rails_root, 'Rakefile')} refinery:update from_installer=true")
       puts `#{cmd}`
     end
     
@@ -139,4 +139,4 @@ else
   puts "--force             Forces the directory to be overriden if the directory already exists"
   puts "--database=name     Preconfigure for selected database (options: mysql/postgresql/sqlite3 - default: sqlite3)."
   puts "\n"
-end
+end

data/changelog.md

@@ -1,3 +1,13 @@
+## 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]
+- [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]
@@ -5,6 +15,7 @@
 - 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]
+- [See full list](http://github.com/resolve/refinerycms/compare/0.9.7...0.9.7.1)
 
 ## 0.9.7 [02 July 2010]
 
@@ -16,6 +27,8 @@
 - Added spam filtering to contact form. [djones]
 - Full Refinery UI redesign. [Resolve Digital]
 - User Role support. [Amanda Wagener and Philip Arndt]
+- [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)
 
 ## 0.9.6.34 [09 May 2010]
 

data/config.ru

@@ -1,5 +1,7 @@
+ENV["RAILS_ENV"] ||= "production"
 require File.expand_path("../config/application", __FILE__)
 
 use Rails::Rack::LogTailer
 use Rails::Rack::Static
+
 run ActionController::Dispatcher.new

data/db/migrate/20100522020225_rename_permissions_for_resources_plugin_to_files.rb

@@ -3,13 +3,13 @@ class RenamePermissionsForResourcesPluginToFiles < ActiveRecord::Migration
   def self.up
     UserPlugin.find_all_by_title("Resources").each do |up|
       up.update_attribute(:title, "Files")
-    end
+    end if UserPlugin.column_names.include?('title')
   end
 
   def self.down
     UserPlugin.find_by_title("Files").each do |up|
       up.update_attribute(:title, "Resources")
-    end
+    end if UserPlugin.column_names.include?('title')
   end
 
 end

data/lib/gemspec.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 require File.expand_path('../../vendor/plugins/refinery/lib/refinery.rb', __FILE__)
-files = %w( .gitignore .yardopts Gemfile Rakefile changelog.md readme.md license.md todo.md public/.htaccess config.ru )
+files = %w( .gitignore .yardopts Gemfile Rakefile *.md public/.htaccess config.ru ).map { |file| Dir[file] }.flatten
 %w(app bin config db features lib public script test themes vendor).sort.each do |dir|
   files += Dir.glob("#{dir}/**/*")
 end
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.homepage          = %q{http://refinerycms.com}
   s.authors           = %w(Resolve\\ Digital David\\ Jones Philip\\ Arndt)
   s.require_paths     = %w(lib)
-  s.executables       = %w(refinery refinery-update-core)
+  s.executables       = %w(refinery)
 
   s.files             = [
     '#{files.join("',\n    '")}'
@@ -29,7 +29,4 @@ Gem::Specification.new do |s|
 end
 EOF
 
-if File.exist?(file = "refinerycms.gemspec")
-  File.delete(file)
-end
-File.open(file, 'w') { |f| f.puts gemspec }
+File.open(File.expand_path("../../refinerycms.gemspec", __FILE__), 'w').puts(gemspec)

data/public/javascripts/refinery/admin.js

@@ -58,6 +58,14 @@ init_interface = function() {
   if (last_item_offset && ((last_item_offset.left + last_item.outerWidth() - $('#menu').offset().left + 5) < $('#page_container').outerWidth())) {
     $("#page_container:not('.login #page_container')").corner('5px tr');
   }
+
+  $('#current_locale li a').click(function(e) {
+    $('#current_locale li a span').each(function(span){
+      $(this).css('display', $(this).css('display') == 'none' ? '' : 'none');
+    });
+    $('#other_locales').animate({opacity: 'toggle', height: 'toggle'}, 250);
+    e.preventDefault();
+  });
 }
 
 init_delete_confirmations = function() {

data/public/stylesheets/refinery/refinery.css

@@ -252,7 +252,7 @@ body.login #page_container div.remember_me {
 }
 body.login #page_container div.forgot_password {
   float: right;
-  width: 200px;
+  width: 250px;
 }
 body.login label, body.login a {
   font-size: 14px;
@@ -972,7 +972,13 @@ ul#menu.reordering_menu li a {
   line-height: 18px;
   padding: 2px;
   font-size: 16px;
-  width: 200px;
+  width: 180px;
+}
+.pt-BR #search {
+  width: 187px;
+}
+.en #search {
+  width: 210px;
 }
 .search_form {
   position: relative;
@@ -1369,6 +1375,22 @@ input.button.close_dialog:active, a.button.close_dialog:active, #content a.butto
   line-height: 20px;
 }
 
+#actions ul#current_locale {
+  margin-top: 30px;
+}
+#current_locale li a {
+  position: relative;
+}
+#current_locale li a span {
+  position: absolute;
+  right: 9px;
+  border-bottom: 1px dotted #727272;
+}
+
+#other_locales li:first-child {
+  margin-top: 0px;
+}
+
 /* cornering */
 .button, #editor_switch a, #editor_switch span {
   border-radius: 6px;

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

@@ -59,13 +59,13 @@ class User < ActiveRecord::Base
   end
 
   def add_role(title)
-    unless self.has_role?(role = Role[title.to_s])
-      self.roles << role
-    end
+    raise ArgumentException, "Role should be the title of the role not a role object." if title.is_a?(Role)
+    self.roles << Role[title] unless self.has_role?(title)
   end
 
-  def has_role?(role)
-    self.roles.include?(role.is_a?(Role) ? role : Role[role.to_s])
+  def has_role?(title)
+    raise ArgumentException, "Role should be the title of the role not a role object." if title.is_a?(Role)
+    (role = Role.find_by_title(title.to_s.camelize)).present? and self.roles.collect{|r| r.id}.include?(role.id)
   end
 
 end

data/vendor/plugins/authentication/app/views/users/forgot.html.erb

@@ -1,18 +1,18 @@
-<% content_for :header, "Please enter the email address for your account." %>
+<% content_for :header, t('.enter_email_address') %>
 
 <% form_for :user do |f| -%>
   <%= f.error_messages %>
 
   <div class='field'>
     <%= f.text_field :email, :class => "larger widest",
-                     :placeholder => "Email Address" %>
+                     :placeholder => t('.email_address', :default => t('authlogic.attributes.user_session.email')) %>
   </div>
 
   <%= render :partial => "/shared/admin/form_actions",
              :locals => {
                :f => f,
                :continue_editing => false,
-               :submit_button_text => "Reset password",
+               :submit_button_text => t('.reset_password'),
                :cancel_url => login_url
              } -%>
 <% end -%>

data/vendor/plugins/authentication/app/views/users/reset.html.erb

@@ -1,4 +1,4 @@
-<% content_for :header, "Pick a new password for #{@user.email}" %>
+<% content_for :header, t('.pick_new_password_for', :email => @user.email) %>
 
 <% form_for :user do |f| -%>
   <%= f.error_messages %>
@@ -17,7 +17,7 @@
              :locals => {
                :f => f,
                :continue_editing => false,
-               :submit_button_text => "Reset password",
+               :submit_button_text => t('.reset_password'),
                :cancel_url => login_url
              } -%>
 <% end -%>

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

@@ -29,6 +29,8 @@ da:
       remember_me: Husk mig
       or: eller
       forgot_password: Jeg har glemt mit password
+      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"
     signup_disabled: Brugeroprettelse er deaktiveret
@@ -38,6 +40,16 @@ da:
     create:
       welcome: Velkommen til Refinery, {{who}}
       signup_complete: Du er nu oprettet.
+    forgot:
+      email_address: E-mail-adresse
+      enter_email_address: Indtast venligst den email-adresse til din konto.
+      reset_password: Reset adgangskode
+      blank_email: Du har ikke angivet en e-mail-adresse.
+      email_not_associated_with_account: "Undskyld, '{{email}}' er ikke forbundet med nogen regnskaber. <br/> Er du sikker på du har skrevet den rigtige email-adresse?"
+      email_reset_sent: En e-mail er blevet sendt til dig med et link til nulstille din adgangskode.
+    reset:
+      code_invalid: "Vi beklager, men denne nulstilling kode er udløbet eller ugyldig. Hvis du har spørgsmål kan du prøve at kopiere og indsætte webadressen fra din e-mail til din browser eller genstarte reset password proces."
+      successful: "Adgangskode reset succes for {{email}}"
   user_mailer:
     please_activate: Du skal aktivere din nye brugerkonto
     activated: Din konto er nu aktiveret.

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

@@ -26,6 +26,8 @@ de:
       remember_me: Anmeldung merken
       or: oder
       forgot_password: Ich habe mein Passwort vergessen
+      hello_please_sign_in: Hallo! Bitte melden Sie sich
+      sign_in: Anmelden
   users:
     forgot:
       blank_email: Sie haben nicht eine E-Mail-Adresse.

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

@@ -36,12 +36,17 @@ en:
       welcome: Welcome to Refinery, {{who}}
       signup_complete: Signup complete!
     forgot:
+      email_address: Email Address
+      enter_email_address: Please enter the email address for your account.
+      reset_password: Reset password
       blank_email: You did not enter an email address.
       email_not_associated_with_account: "Sorry, '{{email}}' isn't associated with any accounts.<br/>Are you sure you typed the correct email address?"
       email_reset_sent: An email has been sent to you with a link to reset your password.
     reset:
       code_invalid: "We&apos;re sorry, but this reset code has expired or is invalid. If you are having issues try copying and pasting the URL from your email into your browser or restarting the reset password process."
       successful: "Password reset successfully for {{email}}"
+      pick_new_password_for: "Pick a new password for {{email}}"
+      reset_password: Reset password
   user_mailer:
     please_activate: Please activate your new account
     activated: Your account has been activated!

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

@@ -16,9 +16,9 @@ es:
       user_session: Sesión de usuario
     attributes:
       user_session:
-        login: login
-        email: email
-        password: contraseña
+        login: Login
+        email: Email
+        password: Contraseña
         remember_me: Recordarme
         incorrect: "Lo sentimos, su {{login_field}} o la contraseña son correctos."
   plugins:
@@ -56,6 +56,8 @@ es:
       cancel_log_in: Cancelar
       or: o
       forgot_password: He olvidado mi contraseña
+      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"
     signup_disabled: El registro de usuario ha sido deshabilitado.
@@ -69,6 +71,16 @@ es:
     create:
       welcome: Bienvenido a Refinery, {{who}}
       signup_complete: "¡Registro correcto!"
+    forgot:
+      email_address: Correo electrónico
+      enter_email_address: Por favor, introduzca la dirección de correo electrónico para su cuenta.
+      reset_password: Perdí mi contraseña
+      blank_email: Usted no ha ingresado una dirección de correo electrónico.
+      email_not_associated_with_account: "Lo sentimos, '{{email}}' no está asociado a ninguna cuenta. <br/>¿Está seguro que escribió la dirección de correo electrónico correcta?"
+      email_reset_sent: Un correo electrónico ha sido enviado con un enlace para restablecer su contraseña.
+    reset:
+      code_invalid: "Lo sentimos, pero el código restablecer vencida o no es válida. Si tiene problemas intente copiar y pegar la dirección de su correo electrónico en el navegador o reiniciando el proceso de restablecimiento de contraseña."
+      successful: "De restablecimiento de contraseña con éxito por {{email}}"
   user_mailer:
     please_activate: Por favor, active la nueva cuenta.
     activated: "!Su cuenta ha sido activada!"

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

@@ -30,6 +30,8 @@ fr:
       remember_me: Rester connecté
       or: ou
       forgot_password: "J'ai oublié mon mot de passe"
+      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."
     signup_disabled:  "L'inscription d'utilisateur est désactivé"

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

@@ -26,6 +26,8 @@ it:
       remember_me: Ricordati di me
       or: o
       forgot_password: Ho dimenticato la password
+      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"
     signup_disabled: Iscriviti utente è disattivato
@@ -35,6 +37,16 @@ it:
     create:
       welcome: Benvenuti a Refinery, {{who}}
       signup_complete: Registrati completo!
+    forgot:
+      email_address: Indirizzo e-mail
+      enter_email_address: Inserisci l'indirizzo di posta elettronica per l'account.
+      reset_password: Reimpostazione della password
+      blank_email: Non hai inserito un indirizzo email.
+      email_not_associated_with_account: "Mi dispiace, '{{email}}' non è associato ad alcun account. <br/>Sei sicuro di avere digitato l'indirizzo email corretto?"
+      email_reset_sent: Una e-mail è stata inviata a voi con un link per reimpostare la password.
+    reset:
+      code_invalid: "Siamo spiacenti, ma questo codice reset è scaduto o non è valido. Se si hanno problemi provare a copiare e incollare l&apos;URL dal vostro e-mail nel vostro browser o riavviando la procedura di reimpostazione password."
+      successful: "Il ripristino della password con successo per {{email}}"
   user_mailer:
     please_activate: Si prega di attivare il nuovo account
     activated: Il tuo account è stato attivato!

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

@@ -26,6 +26,8 @@ nb:
       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å
   users:
     setup_website_name: "Først la oss gi siden et navn. <a href='{{link}}'>Gå her</a> for å redigere siden din sitt navn"
     signup_disabled: Brukerpåmelding er deaktivert
@@ -35,6 +37,16 @@ nb:
     create:
       welcome: Velkommen til Refinery, {{who}}
       signup_complete: Registrering utført!
+    forgot:
+      email_address: E-postadresse
+      enter_email_address: Vennligst skriv inn e-postadressen for kontoen din.
+      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.
+    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}}"
   user_mailer:
     please_activate: Vennligst aktiver din nye konto
     activated: Din konto er nå aktivert!

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

@@ -42,6 +42,8 @@ nl:
       cancel: Annuleren
       remember_me: Onthoud mijn gegevens
       forgot_password: Ik ben mijn wachtwoord vergeten
+      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"
     signup_disabled: Het registreren van gebruikers is uitgeschakeld
@@ -51,6 +53,16 @@ nl:
     create:
       welcome: Welkom bij Refinery, {{who}}
       signup_complete: Registratie compleet!
+    forgot:
+      email_address: E-mailadres
+      enter_email_address: Vul het e-mailadres voor uw account.
+      reset_password: Verander wachtwoord
+      blank_email: Je hebt geen e-mail adres.
+      email_not_associated_with_account: "Sorry, '{{email}}' is niet geassocieerd met alle rekeningen. <br/>Weet u zeker dat u typte het juiste e-mailadres?"
+      email_reset_sent: Een e-mail is naar u verzonden met een link om je wachtwoord te resetten.
+    reset:
+      code_invalid: "Het spijt ons, maar dit reset code is verlopen of ongeldig. Als u problemen hebt proberen te kopiëren en plakken van de URL van uw e-mail in uw browser of het herstarten van de reset wachtwoord proces."
+      successful: "Wachtwoord resetten succes voor {{email}}"
   user_mailer:
     please_activate: A.u.b. uw gebruikersaccount activeren.
     activated: Uw gebruikersaccount is geactiveerd!

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

@@ -8,6 +8,7 @@ pt-BR:
         cannot_remove_user_plugin_from_current_user: "Você não pode remover o plugin 'Usuários' a partir da conta atualmente logada."
       form:
         blank_password_keeps_current: Deixar a senha em branco mantém a senha atual
+        enable_all: 'habilitar todos'
       index:
         create_new_user: Criar Novo Usuário
         no_users_yet: Ainda não existem usuários. Clique em "Criar Novo Usuário" para adicionar seu primeiro usuário.
@@ -22,9 +23,9 @@ pt-BR:
     login_failed: Desculpe, sua senha ou nome de usuário estavam incorretos.
     logged_out: Você foi deslogado.
     new:
-      log_in: Entrar
-      cancel: Cancelar
-      or: ou
+      hello_please_sign_in: "Olá! Faça o login"
+      sign_in: Cadastre-se em
+      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"
     signup_disabled: Cadastro de usuários está desabilitado
@@ -34,6 +35,15 @@ pt-BR:
     create:
       welcome: Bem-vindo ao Refinery, {{who}}
       signup_complete: Cadastro completo!
+    forgot:
+      enter_email_address: "Por favor, indique o endereço de email para sua conta."
+      reset_password: Esqueci minha senha
+      blank_email: Você não introduzir um endereço de e-mail.
+      email_not_associated_with_account: "Desculpe, '{{email}}' não está associado com todas as contas. <br/>Tem certeza que você digitou o endereço de email está correto?"
+      email_reset_sent: Um email foi enviado para você com um link para redefinir sua senha.
+    reset:
+      code_invalid: "Lamentamos, mas este código reset expirou ou é inválido. Se você está tendo problemas tente copiar e colar a URL do seu e-mail em seu navegador ou reiniciando o processo de redefinição de senha."
+      successful: "Redefinição de senha com sucesso para {{email}}"
   user_mailer:
     please_activate: Por favor, ative sua nova conta
     activated: Sua conta foi ativada!
@@ -60,5 +70,26 @@ pt-BR:
       user:
         password: Senha
         password_confirmation: Confirmação da senha
-
-
+        plugin_access: Acesso aos plugins
+  authlogic:
+    error_messages:
+      login_blank: não pode estar em branco
+      login_not_found: não é válido
+      login_invalid: deve usar somente letras, números, espaços e .- _ @ por favor
+      consecutive_failed_logins_limit_exceeded: "Consecutiva logins falhos limite excedido, a conta está desabilitada."
+      email_invalid: Deverá ser parecido com um endereço de e-mail
+      password_blank: não pode estar em branco
+      password_invalid: não é válido
+      not_active: Sua conta não está activa
+      not_confirmed: Sua conta não está confirmado
+      not_approved: Sua conta não está aprovada
+      no_authentication_details: Você não forneceu todos os detalhes para autenticação.
+    models:
+      user_session: UserSession
+    attributes:
+      user_session:
+        login: Login
+        email: Email
+        password: Senha
+        remember_me: Lembre-me
+        incorrect: "Desculpe, seu {{login_field}} ou senha estava errada."