refinerycms 0.9.6.34 → 0.9.7

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

@@ -0,0 +1,68 @@
+it:
+  admin:
+    users:
+      update:
+        cannot_remove_user_plugin_from_current_user: "Non è possibile rimuovere il plugin 'Utenti' dal attualmente connesso in conto."
+      form:
+        blank_password_keeps_current: Lasciando password vuota mantiene la password corrente
+      index:
+        create_new_user: Crea nuovo utente
+        no_users_yet:  Non ci sono ancora gli utenti. Fare clic su "Crea nuovo Utente" per aggiungere il primo utente.
+      user:
+        confirm_delete_message: "Sei sicuro di voler eliminare '{{who}}'?"
+        confirm_delete_title: Rimuovi questo utente per sempre
+        edit_user: Modifica questo utente
+        email_user: E-mail a questo utente
+        preview: ({{who}}) creato {{created_at}}
+  sessions:
+    login_successful: Accesso effettuato con successo
+    login_failed: Spiacente, la tua password o nome utente non era corretto.
+    logged_out: Sei stato disconnesso.
+    new:
+      login: Login nome
+      log_in: Entra
+      cancel: Annullare
+      password: Password
+      remember_me: Ricordati di me
+      or: o
+      forgot_password: Ho dimenticato la password
+  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
+    new:
+      fill_form: Compila il form sottostante con i tuoi dati in modo che possiamo iniziare.
+      sign_up: Iscriviti
+    create:
+      welcome: Benvenuti a Refinery, {{who}}
+      signup_complete: Registrati completo!
+  user_mailer:
+    please_activate: Si prega di attivare il nuovo account
+    activated: Il tuo account è stato attivato!
+    activated_email: "{{who}}, il tuo account è stato attivato. È ora possibile iniziare ad aggiungere i plugin:"
+    account_created: Il tuo account è stato creato.
+    user_name: Nome utente {{name}}
+    password: Password {{password}}
+    visit_url: "Visita questo url per attivare l'account:"
+    link_to_reset_your_password: Link a reimpostare la password
+  authlogic:
+    error_messages:
+      login_blank: non può essere vuoto
+      login_not_found: non è valido
+      login_invalid: dovrebbero utilizzare solo lettere, numeri, spazi e .-_@ gratzie.
+      consecutive_failed_logins_limit_exceeded: Consecutivi non ha superato il limite di account di accesso, account è disattivato.
+      email_invalid: dovrebbe apparire come un indirizzo email.
+      password_blank: non può essere vuoto
+      password_invalid: non è valido
+      not_active: Il tuo account non è attivo
+      not_confirmed: Il tuo account non è confermata
+      not_approved: Il tuo account non è approvato
+      no_authentication_details: Il tuo account non è approvato.
+    models:
+      user_session: UserSession
+    attributes:
+      user_session:
+        login: accesso
+        email: email
+        password: password
+        remember_me: Ricordati di me
+        incorrect: "Siamo spiacenti, la {{login_field}} o la password non è corretto."

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

@@ -0,0 +1,68 @@
+nb:
+  admin:
+    users:
+      update:
+        cannot_remove_user_plugin_from_current_user: "Du kan ikke fjerne 'Bruker'-instikket fra kontoen du er logget inn som."
+      form:
+        blank_password_keeps_current: Blankt passord beholder ditt nåværende passord.
+      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.
+      user:
+        confirm_delete_message: "Er du sikker på at du ønsker å slette '{{who}}'?"
+        confirm_delete_title: Fjern denne brukeren for alltid
+        edit_user: Rediger denne brukeren
+        email_user: Send epost 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.
+    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
+  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
+    new:
+      fill_form: Fyll ut skjemaet under med detaljene dine så vi kan få deg startet.
+      sign_up: Registrer deg
+    create:
+      welcome: Velkommen til Refinery, {{who}}
+      signup_complete: Registrering utført!
+  user_mailer:
+    please_activate: Vennligst aktiver 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.
+    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
+  authlogic:
+    error_messages:
+      login_blank: kan ikke være blankt
+      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.
+      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
+    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."

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

@@ -0,0 +1,83 @@
+nl:
+  activerecord:
+    models:
+      session: session
+    attributes:
+      session:
+        login: gebruikersnaam
+        password: wachtwoord
+        remember_me: Onthoud mijn gegevens
+      user:
+        login: Gebruikersnaam
+        email: E-mail adres
+        password: Wachtwoord
+        password_confirmation: Bevestig wachtwoord
+  plugins:
+    refinery_users:
+      title: Gebruikers
+  admin:
+    users:
+      update:
+        cannot_remove_user_plugin_from_current_user: "U kunt de 'Gebruikers' plugin niet deactiveren voor uw huidige ingelogde account."
+      form:
+        blank_password_keeps_current: Als u dit veld leeg laat, blijft het oude wachtwoord behouden.
+      index:
+        create_new_user: Maak een nieuwe gebruiker
+        no_users_yet:  Er zijn nog geen gebruikers. Klik op "Maak een nieuwe gebruiker" om de eerste toe te voegen.
+      user:
+        confirm_delete_message: "Weet u zeker dat u de gebruiker '{{who}}' wilt verwijderen?"
+        confirm_delete_title: Verwijder deze gebruiker permanent.
+        edit_user: Bewerk deze gebruiker
+        email_user: Email deze gebruiker
+        preview: ({{who}}) is aangemaakt op {{created_at}}
+  sessions:
+    login_successful: Successvol ingelogd.
+    login_failed: Sorry, uw wachtwoord of gebruikersnaam was niet juist.
+    logged_out: U bent uitgelogd.
+    new:
+      login: Gebruikersnaam
+      password: Wachtwoord
+      log_in: Log in
+      or: of
+      cancel: Annuleren
+      remember_me: Onthoud mijn gegevens
+      forgot_password: Ik ben mijn wachtwoord vergeten
+  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
+    new:
+      fill_form: Vul het onderstaande formulier in, zodat u kan beginnen.
+      sign_up: Registreer
+    create:
+      welcome: Welkom bij Refinery, {{who}}
+      signup_complete: Registratie compleet!
+  user_mailer:
+    please_activate: A.u.b. uw gebruikersaccount activeren.
+    activated: Uw gebruikersaccount is geactiveerd!
+    activated_email: "{{who}}, uw gebruikersaccount is geactiveerd. U mag nu plugins toevoegen:"
+    account_created: Uw account is aangemaakt.
+    user_name: Gebruiker {{name}}
+    password: Wachtwoord {{password}}
+    visit_url: "Bezoek dit adres om uw gebruikersaacount te activeren:"
+  authlogic:
+    error_messages:
+      login_blank: mag niet leeg zijn
+      login_not_found: is niet geldig
+      login_invalid: moet gebruik alleen letters, cijfers, spaties en .- _ @ gelieve
+      consecutive_failed_logins_limit_exceeded: Opeenvolgende mislukte logins overschreden, account is uitgeschakeld
+      email_invalid: eruit moet zien als een e-mail adres.
+      password_blank: mag niet leeg zijn
+      password_invalid: is niet geldig
+      not_active: Uw account is niet actief
+      not_confirmed: Uw account is niet bevestigd
+      not_approved: Uw account is niet goedgekeurd
+      no_authentication_details: U heeft niet alle details voor authenticatie.
+    models:
+      user_session: UserSession
+    attributes:
+      user_session:
+        login: Gebruikersnaam
+        email: e-mail
+        password: Wachtwoord
+        remember_me: Onthoud mijn gegevens
+        incorrect: "Sorry, uw {{login_field}} of wachtwoord was niet juist."

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

@@ -0,0 +1,64 @@
+pt-BR:
+  plugins:
+    refinery_users:
+      title: Usuários
+  admin:
+    users:
+      update:
+        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
+      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.
+      user:
+        confirm_delete_message: "Tem certeza que você deseja remover '{{who}}'?"
+        confirm_delete_title: Remover este usuário para sempre
+        edit_user: Editar este usuário
+        email_user: Enviar e-mail para este usuário
+        preview: ({{who}}) criado em {{created_at}}
+  sessions:
+    login_successful: Logado com sucesso
+    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
+  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
+    new:
+      fill_form: Preencha o formulário abaixo com seus detalhes pra que você possa começar.
+      sign_up: Cadastrar
+    create:
+      welcome: Bem-vindo ao Refinery, {{who}}
+      signup_complete: Cadastro completo!
+  user_mailer:
+    please_activate: Por favor, ative sua nova conta
+    activated: Sua conta foi ativada!
+    activated_email: "{{who}}, sua conta foi ativada. Agora você pode começar a adicionar seus plugins:"
+    account_created: Sua conta foi criada.
+    user_name: Nome de usuário {{name}}
+    password: Senha {{password}}
+    visit_url: "Visite esta url para ativar sua conta:"
+    link_to_reset_your_password: Link para redefinir sua senha
+  activerecord:
+    errors:
+      models:
+        user:
+          attributes:
+            email:
+              error_messages:
+                email_invalid: deveria se parecer com um endereço de email.
+            login:
+              error_messages:
+                login_invalid: deveria usar apenas letras, números, espaços e .-_@, por favor.
+    models:
+      user: Usuário
+    attributes:
+      user:
+        password: Senha
+        password_confirmation: Confirmação da senha
+
+

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

@@ -0,0 +1,78 @@
+sl:
+  plugins:
+    refinery_users:
+      title: Uporabniki
+  admin:
+    users:
+      update:
+        cannot_remove_user_plugin_from_current_user: "Ne morete odstraniti vstavka 'Uporabniki' iz trenutno prijavljenega računa."
+      form:
+        blank_password_keeps_current: V kolikor ne boste vnesli gesla bo ostalo obstoječe
+      index:
+        create_new_user: Dodaj Novega Uporabnika
+        no_users_yet:  Tretnutno ni nobenega uporabnika. Kliknite "Dodaj Novega Uporabnika" da boste dodali prvega uporabnika.
+      user:
+        confirm_delete_message: "Ali ste prepričani da želite odstraniti uporabnika '{{who}}'?"
+        confirm_delete_title: Odstrani uporabnika
+        edit_user: Uredi uporabnika
+        email_user: Pošlji email spročilo uporabniku
+        preview: ({{who}}) je bil ustvarjen {{created_at}}
+  sessions:
+    login_successful: Prijava je uspela
+    login_failed: Oprostite, vaše geslo ali uporabniško ime je bilo napačno.
+    logged_out: Uspešno ste se odjavili.
+    new:
+      login: Uporabniško ime
+      log_in: Prijavi se
+      cancel: Prekliči
+      password: Geslo
+      remember_me: Zapomni se me
+      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."
+    signup_disabled: Registracija uporabnikov je onemogočena
+    new:
+      fill_form: Izpolnite spodnji obrazec z vašimi podatki.
+      sign_up: Registriraj se
+    create:
+      welcome: Pzdravljeni v Refinery, {{who}}
+      signup_complete: Registracija je končana!
+    forgot:
+      blank_email: Niste vnesli email naslova.
+      email_not_associated_with_account: "Oprostite, '{{email}}' ni povezan z nobenim računom.<br/>Ali ste prepričani, a ste vnesli pravilen naslov?"
+      email_reset_sent: Poslali smo vam email sporočilo s povezavo za ponastavitev gesla.
+    reset:
+      code_invalid: "Se opravičujemo, vendar je ponastavitvena koda že potekla ali pa je neveljvna. V kolikor imate težave poizkusite kopirati in prilepiti URL naslov iz email sporočila v vaš brskalnik ali ponovite proces ponastavitve gesla."
+      successful: "Ponastavitev gesla za {{email}} je bila uspešna."
+  user_mailer:
+    please_activate: Prosimo aktivirajte vaš nov račun
+    activated: Vaš račun je bil aktiviran!
+    activated_email: "{{who}}, vaš račun je bil aktiviran. Zdaj lahko pričnete z dodajanjem vaših vstavkov:"
+    account_created: Vaš račun je bil ustvarjen.
+    user_name: Uporabniško ime {{name}}
+    password: Geslo {{password}}
+    visit_url: "Za aktivacijo računa obiščite ta url: "
+    link_to_reset_your_password: Povezava za ponastavitev vašega gesla
+  authlogic:
+    error_messages:
+      login_blank: ne sme biti prazno
+      login_not_found: ni pravilno
+      login_invalid: dovoljena je uporaba črk, števil, presledkov, in  .-_@.
+      consecutive_failed_logins_limit_exceeded: "Število zaporednih neuspelih prijav je preseženo, vaš račun je onemogočen."
+      email_invalid: mora biti email naslov.
+      password_blank: ne sme biti prazno
+      password_invalid: ni pravilno
+      not_active: Vaš račun ni aktiven
+      not_confirmed: Vaš račun ni potrjen
+      not_approved: Vaš račun ni odobren
+      no_authentication_details: Niste navedlih nobenih podrobnosti za avtentikacijo.
+    models:
+      user_session: SejaUporabnika
+    attributes:
+      user_session:
+        login: uporabniško ime
+        email: email
+        password: geslo
+        remember_me: zapomni se me
+        incorrect: "Oprostite, {{login_field}} ali geslo je bilo napačno."

data/vendor/plugins/authentication/config/routes.rb

@@ -1,15 +1,14 @@
 ActionController::Routing::Routes.draw do |map|
 
-  map.resources :users
   map.resource :session
+  map.reset_users '/users/reset/:reset_code', :controller => 'users', :action => 'reset'
+  map.resources :users, :only => [:new, :create], :collection => {:forgot => :get, :reset => :get}
 
-  map.namespace(:admin) do |admin|
-    admin.resources :users
+  map.namespace(:admin, :path_prefix => 'refinery') do |admin|
+    admin.resources :users, :collection => {:update_positions => :post}
   end
 
   map.login  '/login', :controller => 'sessions', :action => 'new'
   map.logout '/logout', :controller => 'sessions', :action => 'destroy'
-  map.forgot '/forgot', :controller => 'users', :action => 'forgot'
-  map.reset 'reset/:reset_code', :controller => 'users', :action => 'reset'
 
 end

data/vendor/plugins/authentication/lib/authenticated_system.rb

@@ -118,8 +118,12 @@ module AuthenticatedSystem
       session[:return_to] = nil
     end
 
+    def refinery_user?
+      logged_in? && current_user.roles.include?(Role.find_or_create_by_title('Refinery'))
+    end
+
     def self.included(base)
-      base.send :helper_method, :current_user, :current_user_session, :logged_in? if base.respond_to? :helper_method
+      base.send :helper_method, :current_user, :current_user_session, :logged_in?, :refinery_user? if base.respond_to? :helper_method
     end
 
 end

data/vendor/plugins/authentication/rails/init.rb

@@ -1,8 +1,9 @@
 Refinery::Plugin.register do |plugin|
   plugin.title = "Users"
+  plugin.name = "refinery_users"
   plugin.description = "Manage users"
   plugin.version = 1.0
-  plugin.menu_match = /admin\/users$/
+  plugin.menu_match = /(refinery|admin)\/users$/
   plugin.activity = {
     :class => User,
     :url_prefix => "edit_",
@@ -10,6 +11,9 @@ Refinery::Plugin.register do |plugin|
     :created_image => "user_add.png",
     :updated_image => "user_edit.png"
   }
+  # this tells refinery where this plugin is located on the filesystem and helps with urls.
+  plugin.directory = directory
+  plugin.url = {:controller => "/refinery/users"}
 end
 
 module ::Refinery

data/vendor/plugins/authentication/test/unit/user_mailer_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 require 'user_mailer'
 
 class UserMailerTest < Test::Unit::TestCase

data/vendor/plugins/dashboard/app/controllers/admin/dashboard_controller.rb

@@ -6,23 +6,33 @@ class Admin::DashboardController < Admin::BaseController
     Refinery::Plugins.active.each do |plugin|
       begin
         plugin.activity.each do |activity|
-          include_associations = []
-          include_associations.push(:slugs) if activity.class.methods.include? "find_one_with_friendly" # wee performance gain if slugs are used.
-
           @recent_activity += activity.class.find(:all,
             :conditions => activity.conditions,
             :order => activity.order,
-            :limit => activity.limit,
-            :include => include_associations
+            :limit => activity.limit
           )
         end
       rescue
-        logger.info "#{$!.class.name} raised while getting recent activity for dashboard."
+        logger.warn "#{$!.class.name} raised while getting recent activity for dashboard."
+        logger.warn $!.message
         logger.warn $!.backtrace.collect { |b| " > #{b}" }.join("\n")
       end
     end
 
-    @recent_activity = @recent_activity.compact.uniq.sort{|x,y| y.updated_at <=> x.updated_at}[0..(RefinerySetting.find_or_set(:activity_show_limit, 15)-1)]
+    @recent_activity = @recent_activity.compact.sort { |x,y|
+      y.updated_at <=> x.updated_at
+    }.first(activity_show_limit=RefinerySetting.find_or_set(:activity_show_limit, 7))
+
+    @recent_inquiries = Inquiry.latest(activity_show_limit)
+  end
+
+  def disable_upgrade_message
+    RefinerySetting.find(:first, :conditions => {
+        :name => 'show_internet_explorer_upgrade_message',
+        :scoping => 'refinery'
+      }
+    ).update_attribute(:value, false)
+    render :nothing => true
   end
 
 end