kryptonite 0.0.9 → 0.0.10

data/PUBLIC_VERSION.yml

@@ -1,4 +1,4 @@
 major: 0
 minor: 0
-patch: 9
+patch: 10
 build: 

data/app/controllers/kryptonite/kryptonite_controller.rb

@@ -74,6 +74,12 @@ module Kryptonite
         redirect_to :controller => :kryptonite, :action => :index
       end
     end
+    
+    def needs_admin_or_user
+      unless @session_user.is_admin? || @session_user.is_user?
+        redirect_to :controller => :kryptonite, :action => :index
+      end
+    end
   
     def needs_admin_or_current_user
       unless @session_user.is_admin? || params[:id].to_i == @session_user.id

data/app/helpers/kryptonite/kryptonite_helper.rb

@@ -30,13 +30,15 @@ module Kryptonite
           return "Administrator"
         when $KRYPTONITE_USER_ACCESS_LEVEL_USER
   	      return "User"
+  	    when $KRYPTONITE_USER_ACCESS_LEVEL_FE_USER
+  	      return "Frontend User"
   	    else
   	      return "Unknown"
   	  end
   	end
 	
   	def kryptonite_get_access_level_array
-  	  [["Administrator", $KRYPTONITE_USER_ACCESS_LEVEL_ADMIN], ["User", $KRYPTONITE_USER_ACCESS_LEVEL_USER]]
+  	  [["Administrator", $KRYPTONITE_USER_ACCESS_LEVEL_ADMIN], ["User", $KRYPTONITE_USER_ACCESS_LEVEL_USER], ["Frontend User", $KRYPTONITE_USER_ACCESS_LEVEL_FE_USER]]
   	end
 	
   	def kryptonite_table_cell_link contents, link, options = {}

data/app/models/kryptonite/user.rb

@@ -2,6 +2,7 @@ include Kryptonite::ConfigHelper
 
 $KRYPTONITE_USER_ACCESS_LEVEL_ADMIN = 0
 $KRYPTONITE_USER_ACCESS_LEVEL_USER = 10
+$KRYPTONITE_USER_ACCESS_LEVEL_FE_USER = 20
 
 module Kryptonite
   class User < ActiveRecord::Base
@@ -52,6 +53,10 @@ module Kryptonite
   	def is_admin?
   	  access_level == $KRYPTONITE_USER_ACCESS_LEVEL_ADMIN
   	end
+  	
+  	def is_user?
+  	  access_level == $KRYPTONITE_USER_ACCESS_LEVEL_USER
+  	end
   
   end
 end

data/app/views/kryptonite/users/show.html.erb

@@ -1,4 +1,4 @@
-<h2>View user</h2>
+<h2><%=t :users_show %></h2>
 
 <%= form_for @kryptonite_user do |f| %>
 

data/config/locales/de.yml

@@ -1,5 +1,5 @@
 de:
-    welcome_title: "Hi, to the KS of %{website_name}"
+    welcome_title: "Hallo beim Kryptoapp System von %{website_name}"
     home_page_title: "Home"
     multiple_acctounts_notice: "Multiple accounts were found. Emails have been sent to %{email} with instructions on how to reset your passwords"
     email_sent_notice: "An email has been sent to %{email} with instructions on how to reset your password"
@@ -7,73 +7,74 @@ de:
     field_empty_warning: "A field has been left empty"
     password_updated_notice: "Password successfully updated"
     account_not_located_warning: "Your account could not be located. Try to copy and paste the URL directly from the email."
-    login_successful: "Login successful"
-    logout_successful: "Logout successful"
-    users_page_title: "Users"
-    users_add_new: "Add a new user"
+    login_successful: "Login erfolgreich"
+    logout_successful: "Logout erfolgreich"
+    users_page_title: "Benutzer"
+    users_add_new: "Neuer Benutzer"
     users_email_sent_with_details: "An email has been sent to %{username} with the new account details"
     users_problems_saving_warning: "There were problems when trying to create a new user"
-    users_show: "View User"
-    users_update: "Update User"
-    users_updated_notice: "%{username} has been updated"
+    users_show: "Benutzer anzeigen"
+    users_update: "Benutzer ändern"
+    users_updated_notice: "%{username} wurde erfolgreich geändert"
     users_problems_updating: "There were problems when trying to update this user"
-    users_update_password: "Update Password"
-    users_password_changed_notice: "Your password has been changed"
-    users_problems_changing_password: "There were problems when trying to change the password"
-    users_password_incorrect: "The current password is incorrect"
-    users_reset_password: "Reset Password"
-    users_password_reseted: "Your password has been reset"
+    users_update_password: "Passwort ändern"
+    users_password_changed_notice: "Ihr Passwort wurde geändert"
+    users_problems_changing_password: "Probleme beim ändern vom Passwort"
+    users_password_incorrect: "Das aktuelle Passwort ist falsch"
+    users_reset_password: "Passwort zurücksetzen"
+    users_password_reseted: "Ihr Passwort wurde zurückgesetzt"
     users_password_reseted_and_emailed: "Password has been reset and %{username} has been notified by email"
     users_problems_reseting_password: "There were problems when trying to reset this user's password"
-    users_deleted: "%{username} has been deleted"
-    new_password_subject: "[%{website_name}] New password"
-    new_account_subject: "[%{website_name}] New user account"
-    password_reset_subject: "[%{website_name}] Password reset instructions"
-    greeting: "Dear %{name},"
-    password_reset_by_admin: "Your password has been reset by an administrator for your account at"
+    users_deleted: "%{username} wurde gelöscht"
+    new_password_subject: "[%{website_name}] Neues Passwort"
+    new_account_subject: "[%{website_name}] Neuer Benutzer"
+    password_reset_subject: "[%{website_name}] Passwort zurücksetzten"
+    greeting: "Hallo %{name},"
+    password_reset_by_admin: "Ihr Passwort wurde vom Administrator zurückgesetzt"
     login: "Login"
-    new_password: "New password"
-    from: "From"
-    new_account_created: "A new user account has been created for you at"
+    new_password: "Neues Passwort"
+    from: "Von"
+    new_account_created: "Neuer Benutzer wurde angelegt"
     reset_instructions: "A request to reset the password for login '%{login}' has been made.<br />If you did not make this request, simply ignore this email.<br />Otherwise, click the link below to proceed:"
-    password: "Password"
-    confirm_password: "Confirm password"
-    reset_password: "Reset password"
-    remember_me: "Remember me"
-    do_login: "Log in"
-    forgotten_password: "Forgotten password?"
+    password: "Passwort"
+    confirm_password: "Passwort wiederholen"
+    reset_password: "Passwort zurücksetzen"
+    remember_me: "Angemeldet bleiben"
+    do_login: "Login"
+    forgotten_password: "Passwort vergessen?"
     email: "Email"
-    do_reset: "Reset"
+    do_reset: "Zurücksetzen"
     name: "Name"
     status: "Status"
-    delete_user_confirm: "Are you sure you want to delete %{user}?"
-    warning_delete_admin: "\n\nWARNING: This is your user account. You will be logged out if you proceed."
-    add_new_user: "Add a new user"
-    users: "Users"
-    add_new_user: "Add a new user"
-    back_to_list: "Back to list"
-    cancel: "Cancel"
-    save_changes: "Save changes"
-    reset_password_title: "Reset password (admin action - use carefully)"
-    change_password: "Change password"
-    current_password: "Current password"
-    change: "Change"
-    hello_user: "Hello %{user}"
-    profile: "Profile"
+    delete_user_confirm: "Sind Sie sicher, %{user} zu löschen?"
+    warning_delete_admin: "\n\nWARNUNG: Das ist Ihr Benutzerkonto. Sie werden ausgeloggt wenn Sie fortfahren."
+    add_new_user: "Neuen Benutzer hinzufügen"
+    users: "Benutzer"
+    add_new_user: "Neuen Benutzer hinzufügen"
+    back_to_list: "Zurück zur Liste"
+    cancel: "Abbrechen"
+    save_changes: "Änderungen speichern"
+    reset_password_title: "Passwort zurücksetzen"
+    change_password: "Passwort ändern"
+    current_password: "Aktuelles Passwort"
+    change: "Ändern"
+    hello_user: "Hallo %{user}"
+    profile: "Profil"
     logout: "Logout"
-    scaffold_view: "View %{model}"
-    scaffold_add_new: "Add a new %{model}"
-    scaffold_created: "%{model} created"
-    scaffold_problems_creating: "There were problems when trying to create a new %{model}"
-    scaffold_update: "Update %{model}"
-    scaffold_updated: "%{model} has been updated"
-    scaffold_problems_updating: "There were problems when trying to update this %{model}"
-    scaffold_deleted: "%{model} has been deleted"
-    scaffold_destroy_confirmation: "Are you sure you want to delete this %{model}?"
-    scaffold_add_new: "Add a new %{model}"
-    scaffold_cancel: "Cancel"
-    scaffold_back_to_list: "Back to list"
-    scaffold_save_changes: "Save Changes"
+    scaffold:
+        view: "%{model} Detail"
+        add_new: "%{model} anlegen"
+    scaffold_created: "%{model} erstellt"
+    scaffold_problems_creating: "Probleme beim speichern von %{model}"
+    scaffold_update: "%{model} ändern"
+    scaffold_updated: "%{model} wurde geändert"
+    scaffold_problems_updating: "Probleme beim speichern von %{model}"
+    scaffold_deleted: "%{model} wurde gelöscht"
+    scaffold_destroy_confirmation: "Sind Sie sicher dass Sie %{model} löschen möchten?"
+    scaffold_add_new: "%{model} anlegen"
+    scaffold_cancel: "Abbrechen"
+    scaffold_back_to_list: "Zur Listenansicht"
+    scaffold_save_changes: "Änderungen speichern"
         
         
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kryptonite
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000Z
+date: 2012-08-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kryptonite
-  requirement: &70102335168800 !ruby/object:Gem::Requirement
+  requirement: &70205343569480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70102335168800
+  version_requirements: *70205343569480
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70102335168040 !ruby/object:Gem::Requirement
+  requirement: &70205343568980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70102335168040
+  version_requirements: *70205343568980
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70102335167380 !ruby/object:Gem::Requirement
+  requirement: &70205343568480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -44,10 +44,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70102335167380
+  version_requirements: *70205343568480
 - !ruby/object:Gem::Dependency
   name: best_in_place
-  requirement: &70102335166720 !ruby/object:Gem::Requirement
+  requirement: &70205343556440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70102335166720
+  version_requirements: *70205343556440
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70102335166120 !ruby/object:Gem::Requirement
+  requirement: &70205343555940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -66,7 +66,7 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70102335166120
+  version_requirements: *70205343555940
 description: Kryptonite is an open-source CMS for Ruby on Rails, originally developed
   by Spoiled Milk. Extended by Alexander Feiglstorfer.
 email: delooks@gmail.com