tkh_authentication 0.1.3 → 0.1.5

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 
 
+## 0.1.5
+
+* Modified the login info in sidebar partial
+* Added a login info for navbar partial
+
+
+## 0.1.4
+
+* Set up all missing translations
+* Improved and debugged user mailer
+
+
 ## 0.1.3
 
 * Added login module partial to embed in pages and set it up with bootstrap tabs

data/app/mailers/user_mailer.rb

@@ -1,10 +1,6 @@
 class UserMailer < ActionMailer::Base
   
-  if defined?(SETTINGS) && SETTINGS['site_admin_email'] 
-    default :from => SETTINGS['site_admin_email']
-  else
-    default :from => 'test@example.com'
-  end
+  default :from => Setting.first.try(:contact_email) ? Setting.first.try(:contact_email) : 'info@tenthousandhours.eu'
 
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
@@ -13,11 +9,7 @@ class UserMailer < ActionMailer::Base
   #
   def password_reset(user)  
     @user = user
-    if defined?(SETTINGS) && SETTINGS['site_name']
-      mail :to => user.email, :subject => t('authentication.password_reset_email_subject') + ' | ' + SETTINGS['site_name']
-    else
-      mail :to => user.email, :subject => t('authentication.password_reset_email_subject')
-    end
+    mail :to => user.email, :subject => t('authentication.password_reset_email_subject') + ' | ' + Setting.first.try(:site_name)
   end
 
 end

data/app/views/password_resets/new.html.erb

@@ -1,6 +1,6 @@
-<h1>Request a new Password</h1>
+<h1><%= t('authentication.password.request.a_new_one') %></h1>
 
-<p>Whether you forgot your password or you just want to change it, please give us your email address. We will send you an email with instructions on how to complete the two-click, 30 second process.</p>
+<p><%= t('authentication.password.request.explanation') %></p>
 
 <%= form_tag password_resets_path, :method => :post do %>
   <div class="field">

data/app/views/shared/_embedded_login_module.html.erb

@@ -1,6 +1,6 @@
 <ul class="nav nav-tabs" id="loginTab">
-	<li class="active"><a href="#login-tab" data-toggle="tab">login</a></li>
-	<li><a href="#signup-tab" data-toggle="tab">create account</a></li>
+	<li class="active"><a href="#login-tab" data-toggle="tab"><%= t('authentication.login_now') %></a></li>
+	<li><a href="#signup-tab" data-toggle="tab"><%= t('authentication.create_account') %></a></li>
 </ul>
  
 <div class="tab-content">

data/app/views/shared/_login_info.html.erb

@@ -1,7 +1,7 @@
 <p class="login-info">
 	<% if current_user %>
-	  <strong><%= current_user.email %></strong> <%= link_to "Log Out", logout_path, class: 'btn btn-mini' %>
+	  <strong><%= current_user.email %></strong> <%= link_to t('authentication.logout'), logout_path, class: 'btn btn-mini' %>
 	<% else %>
-	  <%= link_to "Log In", login_path, class: 'btn btn-mini' %> or <%= link_to "Sign Up", signup_path, class: 'btn btn-mini' %>
+	  <%= link_to t('authentication.login_now'), login_path, class: 'btn btn-mini' %> or <%= link_to "Sign Up", signup_path, class: 'btn btn-mini' %>
 	<% end %>
 </p>

data/app/views/shared/_login_info_for_navbar.html.erb

@@ -0,0 +1,6 @@
+<li class='dropdown'>
+	<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= current_user.email %> <b class="caret"></b></a>
+	<ul class="dropdown-menu">
+		<%= content_tag :li, link_to(t('logout'), logout_path) %>
+	</ul>
+</li>

data/app/views/shared/_login_info_for_sidebar.html.erb

@@ -1,9 +1,12 @@
 <% if current_user %>
-	<h3>You are logged in as</h3>
-	<p><%= current_user.name %>, <%= current_user.email %> | <%= link_to t('authentication.logout'), logout_path %>
-	</p>
+	<div class="btn-group">
+		<br />
+		<a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#"><%= current_user.email %>&nbsp;<span class="caret"></span></a>
+		<ul class="dropdown-menu">
+			<%= content_tag :li, link_to(t('logout'), logout_path) %>
+		</ul>
+	</div>
 <% else %>
-	<h3>You are not logged in</h3>
-	<p><%= link_to t('authentication.login_now'), login_path %> or <%= link_to t('authentication.create_account'), signup_path %>
-  </p>
+	<p><br /><%= link_to t('authentication.login_now'), login_path, class: 'btn' %></p>
 <% end %>
+

data/app/views/users/index.html.erb

@@ -1,11 +1,11 @@
-<h1>Listing Users</h1>
+<h1><%= t('activerecord.models.users') %></h1>
 
 <table class='table table-striped'>
 	<thead>
   <tr>	
 			<th><%= t 'authentication.name' %></th>
 	    <th><%= t 'activerecord.attributes.user.email' %></th>
-			<th>Admin?</th>
+			<th><%= t('question_mark_inverted') %><%= t('activerecord.attributes.user.admin') %><%= t('question_mark') %></th>
 	  </tr>
 	</thead>
 	

data/lib/generators/tkh_authentication/create_or_update_locales/templates/de.yml

@@ -1,8 +1,13 @@
 de:
   
   activerecord:
+    models:
+      user: 'Benutzer'
+      users: 'Benutzer'
+      
     attributes:
       user:
+        admin: 'Administrator'
         first_name: "Vorname"
         last_name: "Nachname"
         email: "Email"
@@ -10,9 +15,9 @@ de:
         password_confirmation: 'Kennwort bestätigen'
 
   authentication:
-    admin_disabled_confirmation: 'du hast diesem Nutzer die Administrator-Rechte entzogen'
+    admin_disabled_confirmation: 'Du hast diesem Nutzer die Administrator-Rechte entzogen'
     admin_enabled_confirmation: 'Du hast diesem Nutzer Administrator-Rechte gegeben'
-    create_account: 'erstelle ein Nutzerkonto'
+    create_account: 'Nutzerkonto erstellen'
     disable_admin: 'löschen'
     enable_admin: 'erstellen'
     forgot_password: "Kennwort vergessen?"
@@ -22,17 +27,24 @@ de:
     logout_confirmation: "Du hast dich abgemeldet!"
     name: 'Name'
     not_registered: "Hast Du schon ein Nutzerkonto?"
+    password:
+      request:
+        a_new_one: 'Neues Kennwort anfordern'
+        explanation: "Hast du dein Kennwort vergessen oder willst dein Kennwort ändern, bitte gib uns deine Email-Adresse. an. Wir werden dir eine Email mit detaillierter Anleitung zusenden."
     password_reset_confirmation: "Dein Kennwort wurde erfolgreich zurückgesetzt!"
     password_reset_email_subject: "Kennwort zurücksetzen"
-    remember_me: "mich erinnern"
+    remember_me: "Benutzer merken"
     reset_instructions: "Um das Kennwort zurückzusetzen, klicke auf folgenden Link: %{reset_url}  \n\nIf hast Du das Zurücksetzen des Kennworts nicht angefordert, dann ignoriere bitte diese Email. Dein Kennwort bleibt unverändert."
     reset_password_email_sent_confirmation: "Wir haben Dir einen Link zum Zurücksetzen Deines Kennworts geschickt."
     reset_your_password: "Kennwort zurücksetzen"
     signup_confirmation: "Dein Nutzerkonto wurde erstellt und Du bist eingeloggt!"
+    status:
+      logged_in: 'Du bist angemeldet als'
+      not_logged_in: 'Du bist nicht angemeldet'
     update_password: "Aktualisiere Dein Kennwort"
     warning:
       email_or_password_invalid: "Email oder Kennwort ungültig"
-      login_needed: "Du must Dich einloggen um auf diese Seite zuzugreifen. Du wurdest zum Login umgeleitet."
+      login_needed: "Du musst dich einloggen um auf diese Seite zuzugreifen. Du wurdest zum Login umgeleitet."
       no_such_email: "Es gibt kein Nutzerkonto mit dieser Email-Adresse."
-      password_reset_expired: "Das Zurücksetzen des Kennworts ist abgelaufen. Dies war für 24 Stunden möglich"
-      restricted_access: "Diese Sektion ist nur für Administratoren zugänglich. Kontaktiere den Inhaber der Webseite, wenn Du Administrator-Rechte erhalten möchtest."
+      password_reset_expired: "Das Zurücksetzen des Kennworts ist abgelaufen. Dies war nur für 24 Stunden möglich"
+      restricted_access: "Diese Sektion ist nur für Administratoren zugänglich. Kontaktiere den Inhaber der Webseite, wenn du Administrator-Rechte erhalten möchtest."

data/lib/generators/tkh_authentication/create_or_update_locales/templates/en.yml

@@ -1,8 +1,13 @@
 en:
   
-  activerecord: 
+  activerecord:
+    models:
+      user: 'user'
+      users: 'users'
+      
     attributes:
       user:
+        admin: 'admin' # admin is short for administrator. put full word if necessary
         first_name: "first name"
         last_name: "last name"
         email: "email"
@@ -22,6 +27,10 @@ en:
     logout_confirmation: "You have been logged out!"
     name: 'name'
     not_registered: "you don't have an account yet?"
+    password:
+      request:
+        a_new_one: 'Request a new Password'
+        explanation: "Whether you forgot your password or you just want to change it, please give us your email address. We will send you an email with instructions on how to complete the two-click, 30 second process."
     password_reset_confirmation: "Your password has been successfully reset!"
     password_reset_email_subject: "Password reset"
     remember_me: "stay logged in"
@@ -29,6 +38,9 @@ en:
     reset_password_email_sent_confirmation: "We have emailed you a link to reset your password."
     reset_your_password: "Reset Password"
     signup_confirmation: "Your account has been created and you have been logged in!"
+    status:
+      logged_in: 'You are logged in as'
+      not_logged_in: 'You are not logged in'
     update_password: "Update Password"
     warning:
       email_or_password_invalid: "Email or password is invalid"

data/lib/generators/tkh_authentication/create_or_update_locales/templates/es.yml

@@ -1,6 +1,10 @@
 es:
   
-  activerecord: 
+  activerecord:
+    models:
+      user: 'user'
+      users: 'users'
+      
     attributes:
       user:
         first_name: "nombre de pila"
@@ -22,6 +26,10 @@ es:
     logout_confirmation: 'Se ha cerrado la sesión'
     name: 'nombre'
     not_registered: 'no tienes una cuenta todavía'
+    password:
+      request:
+        a_new_one: 'Request a new Password'
+        explanation: "Whether you forgot your password or you just want to change it, please give us your email address. We will send you an email with instructions on how to complete the two-click, 30 second process."
     password_reset_confirmation: 'Tu contraseña se ha restablecido correctamente.'
     password_reset_email_subject: 'Restablecimiento de contraseña.'
     remember_me: "recordar en este equipo"
@@ -29,6 +37,9 @@ es:
     reset_password_email_sent_confirmation: 'Te hemos enviado un enlace para reestablecer tu contraseña.'
     reset_your_password: 'Restablece tu contraseña.'
     signup_confirmation:  'Hemos creado tu cuenta y ya estas conectado.'
+    status:
+      logged_in: 'You are logged in as'
+      not_logged_in: 'You are not logged in'
     update_password: 'Actualiza tu contraseña.'
     warning:
       email_or_password_invalid: 'Correo electrónico o contraseña no válidos'

data/lib/generators/tkh_authentication/create_or_update_locales/templates/fr.yml

@@ -1,8 +1,13 @@
 fr:
   
-  activerecord: 
+  activerecord:
+    models:
+      user: 'utilisateur'
+      users: 'les utilisateurs'
+      
     attributes:
       user:
+        admin: 'administrateur' # admin is short for administrator. put full word if necessary
         first_name: "prénom"
         last_name: "nom de famille"
         email: "courriel"
@@ -17,17 +22,24 @@ fr:
     enable_admin: 'donner le pouvoir'
     forgot_password: "avez vous oublié votre mot de passe ?"
     login_confirmation: "Merci de vous être identifié !"
-    login_now: "Identifiez-vous"
+    login_now: "identifiez-vous"
     logout: "déconnexion"
     logout_confirmation: "Merci pour votre visite."
     name: 'nom'
     not_registered: "vous n'avez pas encore de compte ?"
+    password:
+      request:
+        a_new_one: 'Demander un nouveau mot de passe'
+        explanation: "Que vous ayez oublié votre mot de passe, ou que vous vouliez juste en changer, veuillez entrer votre adresse courriel. Nous allons vous envoyer un courriel avec les instructions. Ça prendra deux clicks de souris et environ 30 segondes."
     password_reset_confirmation: "Votre mot de passe a été réinitialisé avec succès !"
     password_reset_email_subject: "Réinitialisation du mot de passe"
     remember_me: "gardez la session ouverte" # got this from amazon.fr
     reset_password_email_sent_confirmation: "Nous vous avons envoyé un lien pour réinitialiser votre mot de passe."
-    reset_your_password: "Réinitialisez votre mot de passe."
+    reset_your_password: "Réinitialiser votre mot de passe"
     signup_confirmation: "Votre compte a été créé et vous êtes identifié !"
+    status:
+      logged_in: 'Votre identification :'
+      not_logged_in: "Vous n'êtes pas identifié"
     update_password: "Actualiser le mot de passe"
     warning:
       email_or_password_invalid: "La combinaison de l'addresse email et du mot de passe n'est pas correct"

data/lib/generators/tkh_authentication/create_or_update_locales/templates/it.yml

@@ -0,0 +1,50 @@
+it:
+  
+  activerecord:
+    models:
+      user: 'user'
+      users: 'users'
+      
+    attributes:
+      user:
+        first_name: "first name"
+        last_name: "last name"
+        email: "email"
+        password: 'password'
+        password_confirmation: 'password confirmation'
+
+  authentication:
+    admin_disabled_confirmation: 'you have stripped this user of the administrator privileges'
+    admin_enabled_confirmation: 'you have empowered this user to be an administrator'
+    create_account: 'create an account'
+    disable_admin: 'disable'
+    enable_admin: 'enable' 
+    forgot_password: "forgot your password?"
+    login_confirmation: "You have been logged in!"
+    login_now: "log in"
+    logout: "log out"
+    logout_confirmation: "You have been logged out!"
+    name: 'name'
+    not_registered: "you don't have an account yet?"
+    password:
+      request:
+        a_new_one: 'Request a new Password'
+        explanation: "Whether you forgot your password or you just want to change it, please give us your email address. We will send you an email with instructions on how to complete the two-click, 30 second process."
+    password_reset_confirmation: "Your password has been successfully reset!"
+    password_reset_email_subject: "Password reset"
+    remember_me: "stay logged in"
+    reset_instructions: "To reset your password, click or visit this link: %{reset_url}  \n\nIf you did not request your password to be reset, please ignore this email. Your password will stay as it is."
+    reset_password_email_sent_confirmation: "We have emailed you a link to reset your password."
+    reset_your_password: "Reset Password"
+    signup_confirmation: "Your account has been created and you have been logged in!"
+    status:
+      logged_in: 'You are logged in as'
+      not_logged_in: 'You are not logged in'
+    update_password: "Update Password"
+    warning:
+      email_or_password_invalid: "Email or password is invalid"
+      login_needed: "You must be logged in to access this page. You have been redirected to the login form."
+      no_such_email: "We do not have any accounts with the email you have provided."
+      password_reset_expired: "Password reset has expired. There was a 24 hours grace period"
+      restricted_access: "This section is reserved to the site's administrators. Contact the site owner if you would like access to be granted to you."
+    

data/lib/tkh_authentication/version.rb

@@ -1,3 +1,3 @@
 module TkhAuthentication
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_authentication
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -110,6 +110,7 @@ files:
 - app/views/sessions/new.html.erb
 - app/views/shared/_embedded_login_module.html.erb
 - app/views/shared/_login_info.html.erb
+- app/views/shared/_login_info_for_navbar.html.erb
 - app/views/shared/_login_info_for_sidebar.html.erb
 - app/views/user_mailer/password_reset.text.erb
 - app/views/users/_form.html.erb
@@ -121,6 +122,7 @@ files:
 - lib/generators/tkh_authentication/create_or_update_locales/templates/en.yml
 - lib/generators/tkh_authentication/create_or_update_locales/templates/es.yml
 - lib/generators/tkh_authentication/create_or_update_locales/templates/fr.yml
+- lib/generators/tkh_authentication/create_or_update_locales/templates/it.yml
 - lib/generators/tkh_authentication/create_or_update_migrations/create_or_update_migrations_generator.rb
 - lib/generators/tkh_authentication/create_or_update_migrations/templates/create_users.rb
 - lib/tasks/tkh_authentication_tasks.rake
@@ -176,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4266320656794431571
+      hash: -1539702950156840883
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -185,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4266320656794431571
+      hash: -1539702950156840883
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23