alchemy_cms 2.5.0.b9 → 2.5.0.rc3

data/config/initializers/devise.rb

@@ -0,0 +1,242 @@
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  # ==> Mailer Configuration
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
+  config.mailer_sender = Alchemy::Config.get(:mailer)['mail_from']
+
+  # Configure the class responsible to send e-mails.
+  config.mailer = "Alchemy::Notifications"
+
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  require 'devise/orm/active_record'
+
+  config.parent_controller = "Alchemy::BaseController"
+
+  # ==> Configuration for any authentication mechanism
+  # Configure which keys are used when authenticating a user. The default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating a user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
+  config.authentication_keys = [:login]
+
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [:login]
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  config.strip_whitespace_keys = [:login]
+
+  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
+  # config.params_authenticatable = true
+
+  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:token]` will
+  # enable it only for token authentication.
+  # config.http_authenticatable = false
+
+  # If http headers should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
+
+  # The realm used in Http Basic Authentication. "Application" by default.
+  # config.http_authentication_realm = "Application"
+
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # :http_auth and :token_auth by adding those symbols to the array below.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing :skip => :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
+  # using other encryptors, it sets how many times you want the password re-encrypted.
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments.
+  config.stretches = Rails.env.test? ? 1 : 10
+
+  # Setup a pepper to generate the encrypted password.
+  config.pepper = Rails.configuration.secret_token
+
+  # ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming his account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming his account,
+  # access will be blocked just in the third day. Default is 0.days, meaning
+  # the user cannot access the website without confirming his account.
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # A period that the user is allowed to confirm their account before their
+  # token becomes invalid. For example, if set to 3.days, the user can confirm
+  # their account within 3 days after the mail was sent, but on the fourth day
+  # their account can't be confirmed with the token any more.
+  # Default is nil, meaning there is no restriction on how long a user can take
+  # before confirming their account.
+  # config.confirm_within = 3.days
+
+  # If true, requires any email changes to be confirmed (exactly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed new email is stored in
+  # unconfirmed email column, and copied to email column on successful confirmation.
+  # config.reconfirmable = false
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [ :email ]
+
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # If true, extends the user's remember period when remembered via cookie.
+  # config.extend_remember_period = false
+
+  # Options to be passed to the created cookie. For instance, you can set
+  # :secure => true in order to force SSL only cookies.
+  # config.rememberable_options = {}
+
+  # ==> Configuration for :validatable
+  # Range for password length. Default is 8..128.
+  config.password_length = 6..128
+
+  # Email regex used to validate email formats. It simply asserts that
+  # an one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  # config.email_regexp = /\A[^@]+@[^@]+\z/
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  config.timeout_in = Rails.env.development? ? nil : Alchemy::Config.get(:auto_logout_time).minutes
+
+  # If true, expires auth token on session timeout.
+  # config.expire_auth_token_on_timeout = false
+
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [ :email ]
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [ :email ]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+  # REST_AUTH_SITE_KEY to pepper)
+  # config.encryptor = :authlogic_sha512
+
+  # ==> Configuration for :token_authenticatable
+  # Defines name of the authentication token params key
+  # config.token_authentication_key = :auth_token
+
+  # ==> Scopes configuration
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "users/sessions/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  # config.scoped_views = false
+
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+
+  # Set this configuration to false if you want /users/sign_out to sign out
+  # only the current scope. By default, Devise signs out all scopes.
+  # config.sign_out_all_scopes = true
+
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html, should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ["*/*", :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  # config.sign_out_via = :delete
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+
+  # ==> Warden configuration
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
+  #
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
+  # end
+
+  # ==> Mountable engine configurations
+  # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+  # is mountable, there are some extra configurations to be taken into account.
+  # The following options are available, assuming the engine is mounted as:
+  #
+  #     mount MyEngine, at: "/my_engine"
+  #
+  # The router that invoked `devise_for`, in the example above, would be:
+  # config.router_name = :my_engine
+  #
+  # When using omniauth, Devise cannot automatically set Omniauth path,
+  # so you need to do it manually. For the users scope, it would be:
+  # config.omniauth_path_prefix = "/my_engine/users/auth"
+end

data/config/locales/alchemy.de.yml

@@ -137,8 +137,8 @@ de:
         subject: 'Ihre Zugangsdaten zu meiner Seite'
         welcome: 'Willkommen auf meiner Seite'
         login_url_explanation: 'Zum Anmelden klicken Sie bitte auf folgenden Link'
-        username: 'Ihr Benutzername'
-        password: 'Ihr Passwort'
+        username: 'Ihr Benutzername lautet:'
+        password_notice: "(Aus Sicherheitsgründen stellen wir Ihr Passwort hier nicht da. Wenn Sie Ihr Passwort vergessen haben oder dies Ihr erster Login ist, gehen Sie bitte auf: %{url})"
         greeting: 'Einen schönen Tag noch'
 
     # == Translated language names for translation select
@@ -197,10 +197,13 @@ de:
     "Add global page": "Neue globale Seite"
     "Adobe Website": "Adobe Webseite"
     "Alchemy is open software and itself uses open software and free resources:": "Alchemy ist offene Software und benutzt selbst offene Software und freie Ressourcen:"
+    "Change password": "Passwort ändern"
     "Choose page": "Seite wählen"
     "Cleared trash": "Der Papierkorb wurde geleert"
     "Clear selection": "Auswahl aufheben"
+    "Forgot your password?": "Passwort vergessen?"
     "Clipboard": "Zwischenablage"
+    "Confirm new password": "Neues Passwort bestätigen"
     "Copy": "Kopie"
     "Could not load Adobe Flash® Plugin!": "Adobe Flash® Plugin konnte nicht geladen werden!"
     "Currently locked pages": "Momentan bearbeitete Seiten"
@@ -224,7 +227,6 @@ de:
     "Filter by tag": "Nach Tags filtern"
     "Flush page cache": "Seitencache löschen"
     "Flush picture cache": "Bildercache löschen"
-    "Have much fun with Alchemy!": "Viel Spaß mit Alchemy!"
     "Hide childpages": "Unterseiten ausblenden"
     "If you have any problems using the Flash uploader you can switch to": "Sollten Sie Probleme mit dem Flash® Uploader haben, wechseln Sie einfach zur %{link}"
     "Image missing": "Bild fehlt"
@@ -242,6 +244,7 @@ de:
     "New": "Neu"
     "New Element": "Element hinzufügen"
     "New page": "Neue Seite"
+    "New password": "Neues Passwort"
     "New Tag": "Neues Tag"
     "New Tag Created": "Neues Tag wurde erstellt"
     "No": "Nein"
@@ -257,6 +260,7 @@ de:
     "Page cache flushed": "Seitencache wurde geleert"
     "Pages order saved": "Seitensortierung wurde gespeichert"
     "Password": "Passwort"
+    "Password reset": "Passwort zurücksetzen"
     "Paste from clipboard": "Aus Zwischenablage"
     "Picture infos": "Bild Informationen"
     "Picture uploaded succesfully": "Bild %{name} wurde hochgeladen"
@@ -267,6 +271,8 @@ de:
     "Picture cache flushed": "Bildercache wurde geleert"
     "Please Signup": "Um Ihre Homepage bearbeiten zu können, müssen Sie als erstes einen Admin Benutzer einrichten."
     "Please choose": "Bitte wählen"
+    "Please enter a new password": "Bitte geben Sie Ihr neues Passwort ein."
+    "Please enter your email address": "Bitte geben Sie Ihre E-Mail-Adresse ein."
     "Please log in": "Bitte melden Sie sich an."
     "Please seperate the tags with commata": "* Die Tags bitte mit Kommata getrennt eingeben."
     use_alternative_uploader_instead: "Benutzen Sie bitte diesen alternativen Uploader."
@@ -281,6 +287,7 @@ de:
     "Select an content": "Wählen Sie einen Inhalt aus"
     "Select style": "Stilvorlage"
     "Send email with credentials": "Sende Benutzerdaten per Email"
+    "Send reset instructions": "Anweisungen senden"
     "Show Elements Window": "Elementeliste anzeigen"
     "Show Preview Window": "Seitenvorschau anzeigen"
     "Show childpages": "Unterseiten anzeigen"
@@ -300,12 +307,10 @@ de:
     "Tags": "Tags"
     "This page is locked by %{name}": "Diese Seite wird gerade von %{name} blockiert"
     "Title": "Titel"
-    "To manage your website open a browser and go to": "Um die Inhalte Ihrer Webseite zu bearbeiten klicken Sie bitte auf folgenden Link"
     "Trash": "Papierkorb"
     "User created": "%{name} wurde erstellt"
     "User deleted": "%{name} wurde gelöscht"
     "User updated": "%{name} wurde aktualisiert"
-    "Username": "Benutzername"
     "Validation failed": "Einige Pflichtfelder wurden nicht richtig ausgefüllt."
     "Version": "Version"
     "View File": "Datei anzeigen"
@@ -315,7 +320,7 @@ de:
     element_description_missing: "Warnung! Für dieses Element konnte die Vorlage nicht gefunden werden. Bitte überprüfen Sie die elements.yml Datei."
     "Welcome back, %{name}": "Willkommen zurück, %{name}!"
     "Welcome, %{name}": "Willkommen, %{name}!"
-    "Welcome to Alchemy": "Willkommen in Alchemy!"
+    "Welcome to Alchemy": "Willkommen in Alchemy"
     "Who else is online": "Wer ist noch online"
     "Yes": "Ja"
     "You are not authorized": "Sie sind dazu nicht authorisiert."
@@ -325,7 +330,6 @@ de:
     "You may upload any file": "Sie können jede Art von Datei hochladen."
     "Your last login was on %{time}": "Sie waren zuletzt angemeldet am %{time}."
     "Your Alchemy Login": "Ihre Alchemy Zugangsdaten"
-    "Your credentials are": "Ihre Zugangsdaten lauten"
     "Your last updated pages": "Ihre zuletzt bearbeiteten Seiten"
     "Your trash is empty": "Der Papierkorb ist leer"
     above: "darüber"
@@ -447,7 +451,6 @@ de:
       file: "Datei"
       internal: "Intern"
     link_title: "Linktitel"
-    logged_out: "Sie wurden abgemeldet."
     login: "anmelden"
     logout: "abmelden"
     mail_to: "Empfängeradresse"
@@ -841,10 +844,6 @@ de:
         one: Benutzer
         other: Benutzer
 
-      alchemy/user_session:
-        one: Anmeldung
-        other: Anmeldungen
-
       alchemy/site:
         one: Website
         other: Websites
@@ -930,7 +929,7 @@ de:
         gender: "Anrede"
         language: "Sprache"
         lastname: "Nachname"
-        last_login_at: "letzter Login am"
+        last_sign_in_at: "letzter Login am"
         login: "Benutzername"
         name: "Name"
         password: "Passwort"
@@ -947,29 +946,3 @@ de:
 
     errors:
       <<: *errors
-
-  # Translations for the authentication system used in alchemy.
-  authlogic:
-
-    error_messages:
-      login_blank: "^Es wurde kein Benutzername angeben."
-      login_not_found: "^Dieser Benutzername existiert nicht."
-      general_credentials_error: "Die Kombination aus Benutzername und Passwort ist nicht gültig."
-      consecutive_failed_logins_limit_exceeded: "Zu viele Fehlversuche! Dieser Account ist aus Sicherheitsgründen gesperrt worden. Bitte wenden Sie sich an den Administrator."
-      password_blank: "^Bitte ein Passwort angegeben."
-      password_invalid: "^Das Passwort ist nicht richtig."
-      not_active: "Dieser Account wurde noch nicht aktiviert."
-      not_confirmed: "Dieser Account wurde noch nicht bestätigt."
-      not_approved: "Dieser Account wurde noch nicht freigeschaltet."
-      no_authentication_details: 'Sie haben keinen Benutzernamen und/oder Passwort eingegeben.'
-
-    models:
-      alchemy/user_session: 'Sitzung'
-
-    attributes:
-      alchemy/user_session:
-        login: Benutzername
-        email: Email
-        password: Passwort
-        remember_me: "eingeloggt bleiben"
-

data/config/locales/alchemy.en.yml

@@ -123,8 +123,8 @@ en:
         subject: 'Your credentials for my site'
         welcome: 'Welcome to my site'
         login_url_explanation: 'To login just click this link'
-        username: 'Your username'
-        password: 'Your password'
+        username: 'Your username is'
+        password_notice: "(For security reasons we do not show your password here. If you forgot your password or this is your first login, please goto: %{url})"
         greeting: 'Have a nice day'
 
     # == Translated language names for translation select
@@ -287,7 +287,6 @@ en:
       file: "File"
       internal: "Internal"
     link_title: "Linktitle"
-    logged_out: "You´re logged out successfully."
     mail_to: "Recipient"
     male: "Male"
     medium_thumbnails: "Medium thumbnails"
@@ -408,6 +407,7 @@ en:
     username: "Username"
     want_to_create_new_language: "Do you want to create a new empty language tree?"
     want_to_make_copy_of_existing_language: "Do you want to copy an existing language tree?"
+    "Welcome to Alchemy": "Welcome to Alchemy"
     welcome_please_identify_notice: "Welcome! Please identify."
     width: "Width"
     "You are already logged in": "You are already logged in."
@@ -669,7 +669,7 @@ en:
         gender: "Gender"
         language: "Language"
         lastname: "Lastname"
-        last_login_at: "Last Login At"
+        last_sign_in_at: "Last Login At"
         login: "Username"
         name: "Name"
         password: "Password"
@@ -681,30 +681,3 @@ en:
 
     errors:
       <<: *errors
-
-  # Translations for the authentication system used in alchemy.
-  authlogic:
-    error_messages:
-      login_blank: 'can not be blank'
-      login_not_found: 'could not be found'
-      general_credentials_error: "User does not exist or invalid password!"
-      consecutive_failed_logins_limit_exceeded: 'Consecutive failed logins limit exceeded, account is disabled.'
-      email_invalid: 'should look like an email address.'
-      password_blank: 'can not be blank'
-      password_invalid: 'is not correct'
-      not_active: 'Your account is not active'
-      not_confirmed: 'Your account is not confirmed'
-      not_approved: 'Your account is not approved'
-      no_authentication_details: 'You did not provide any details for authentication'
-      login_not_valid: "is invalid. Please use letters, numbers, spaces and .-_@ only"
-      login_too_short: "is too short. Please use 3 characters ar least"
-
-    models:
-      alchemy/user_session: 'Session'
-    attributes:
-      alchemy/user_session:
-        login: Username
-        email: Email
-        password: Password
-        remember_me: 'remember me'
-