kryptonite 0.0.1 → 0.0.2

data/PUBLIC_VERSION.yml

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

data/README.rdoc

@@ -1,6 +1,7 @@
 =Kryptonite. A really simple CMS
 
-Comming
+Coming
+
 
 ==Installation
 
@@ -32,6 +33,10 @@ Comming
     :authentication => :login
   }
 
+- Put the autoload paths in your application.rb
+
+	config.autoload_paths += %W(#{config.root}/lib)
+
 — Install Kryptonite configuration files into your project. This should not be run more than once without backing up or merging the generated files, as your customisations will be overwritten:
 
   rails g kryptonite:install

data/Rakefile

@@ -34,6 +34,8 @@ begin
     gem.homepage = "http://github.com/onefriendaday/Kryptonite"
     gem.add_dependency("will_paginate", ["3.0.0"])
     gem.add_dependency("authlogic", ["3.0.3"])
+    gem.add_dependency("best_in_place", ["1.0.6"])
+    gem.add_dependency("paperclip", ["3.0.1"])
   end
 rescue
   puts "Jeweler or one of its dependencies is not installed."

data/app/controllers/kryptonite/kryptonite_controller.rb

@@ -16,6 +16,8 @@ module Kryptonite
     helper_method :current_user_session, :current_user
     before_filter :authorise
     before_filter :set_time_zone
+    before_filter :get_uploaded_file
+    after_filter :destroy_uploaded_file
     
     ActionView::Base.field_error_proc = proc { |input, instance| "<span class='formError'>#{input}</span>".html_safe }
 
@@ -24,11 +26,35 @@ module Kryptonite
     end
 
   	def blank
-  		@kryptonite_page_title = "Welcome"
+  		@kryptonite_page_title = t(:home_page_title)
   	end
 
   private
   
+    def get_uploaded_file
+      if params.has_key?(:qqfile)
+        if params[:browser]=="opera"
+          @tempname = params[:qqfile].original_filename
+          file_content = File.open("#{Rails.root.to_s}/tmp/#{@tempname}", "wb") do |f| 
+            f.write(params[:qqfile].read)
+          end
+        else
+          @tempname = request.env['HTTP_X_FILE_NAME']
+          file_content = File.open("#{Rails.root.to_s}/tmp/#{@tempname}", "wb") do |f| 
+            f.write(request.env['rack.input'].read)
+          end
+        end
+        @file = File.new("#{Rails.root.to_s}/tmp/#{@tempname}")
+        #filename = "#{Rails.root.to_s}/tmp/#{tempname}"
+      end
+    end
+    
+    def destroy_uploaded_file
+      if params.has_key?(:qqfile)
+        File.unlink("#{Rails.root.to_s}/tmp/#{@tempname}")
+      end
+    end
+  
     def authorise    
       unless current_user
         session[:return_to] = request.fullpath

data/app/controllers/kryptonite/password_resets_controller.rb

@@ -17,12 +17,12 @@ module Kryptonite
         end
 
         if users.length > 1
-          flash[:notice] = "Multiple accounts were found. Emails have been sent to " + params[:recover_email] + " with instructions on how to reset your passwords"
+          flash[:notice] = t(:multiple_acctounts_notice, :email=>params[:recover_email])
         else
-          flash[:notice] = "An email has been sent to " + params[:recover_email] + " with instructions on how to reset your password"
+          flash[:notice] = t(:email_sent_notice, :email=>params[:recover_email])
         end
       else
-        flash[:warning] = "There is no user with that email"
+        flash[:warning] = t(:no_user_warning)
       end
 
       redirect_to new_kryptonite_user_session_url
@@ -35,14 +35,14 @@ module Kryptonite
     def update
       
       if params[:kryptonite_user][:password].empty? || params[:kryptonite_user][:password_confirmation].empty?
-        flash.now[:warning] = "A field has been left empty"
+        flash.now[:warning] = t(:field_empty_warning)
       else
       
         @reset_user.password = params[:kryptonite_user][:password]
         @reset_user.password_confirmation = params[:kryptonite_user][:password_confirmation]
       
         if @reset_user.save
-          flash[:notice] = "Password successfully updated"
+          flash[:notice] = t(:password_updated_notice)
           redirect_to new_kryptonite_user_session_url
           return
         end
@@ -58,7 +58,7 @@ module Kryptonite
       @reset_user = Kryptonite::User.find_using_perishable_token params[:token]
       
       unless @reset_user
-        flash[:warning] = "Your account could not be located. Try to copy and paste the URL directly from the email."
+        flash[:warning] = t(:account_not_located_warning)
         redirect_to new_kryptonite_user_session_url
       end
     end

data/app/controllers/kryptonite/user_sessions_controller.rb

@@ -15,7 +15,7 @@ module Kryptonite
     def create
       @user_session = Kryptonite::UserSession.new params[:kryptonite_user_session]
       if @user_session.save
-        flash[:notice] = "Login successful"
+        flash[:notice] = t(:login_successful)
         redirect_back_or_default :controller => :kryptonite, :action => :index
       else
         render :action => :new
@@ -24,7 +24,7 @@ module Kryptonite
   
     def destroy
       current_user_session.destroy
-      flash[:notice] = "Logout successful"
+      flash[:notice] = t(:logout_successful)
       redirect_back_or_default new_kryptonite_user_session_url
     end
 

data/app/controllers/kryptonite/users_controller.rb

@@ -7,12 +7,12 @@ module Kryptonite
     before_filter :needs_admin_or_current_user, :only => [:show, :destroy, :update, :update_password]
  
     def index
-      @kryptonite_page_title = "Users"
+      @kryptonite_page_title = t("users_page_title")
     	@users = Kryptonite::User.paginate :order => "login", :page => params[:page]
     end
  
     def new
-      @kryptonite_page_title = "Add a new user"
+      @kryptonite_page_title = t("users_add_new")
     	@kryptonite_user = Kryptonite::User.new
     	@kryptonite_user.time_zone = Rails.configuration.time_zone
     end
@@ -21,27 +21,27 @@ module Kryptonite
       @kryptonite_user = Kryptonite::User.new params[:kryptonite_user]
     
       if @kryptonite_user.save
-        flash[:notice] = "An email has been sent to " + @kryptonite_user.name + " with the new account details"
+        flash[:notice] = t("users_email_sent_with_details", :username=>@kryptonite_user.name)
         redirect_to kryptonite_users_path
       else
-        flash.now[:warning] = "There were problems when trying to create a new user"
+        flash.now[:warning] = t("users_problems_saving_warning")
         render :action => :new
       end
     end
   
     def show
     	@kryptonite_user = Kryptonite::User.find params[:id]
-    	@kryptonite_page_title = @kryptonite_user.name + " | View User"
+    	@kryptonite_page_title = @kryptonite_user.name + " | " + t("users_show")
     end
  
     def update
       @kryptonite_user = Kryptonite::User.find params[:id]
-      @kryptonite_page_title = @kryptonite_user.name + " | Update User"
+      @kryptonite_page_title = @kryptonite_user.name + " | " + t("users_update")
 
       if @kryptonite_user.update_attributes params[:kryptonite_user]
-        flash[:notice] = @kryptonite_user.name + " has been updated"
+        flash[:notice] = t("users_updated_notice", :username=>@kryptonite_user.name)
       else
-        flash.now[:warning] = "There were problems when trying to update this user"
+        flash.now[:warning] = t("users_problems_updating")
         render :action => :show
         return
       end
@@ -55,16 +55,16 @@ module Kryptonite
  
     def update_password
       @kryptonite_user = Kryptonite::User.find params[:id]
-      @kryptonite_page_title = @kryptonite_user.name + " | Update Password"
+      @kryptonite_page_title = @kryptonite_user.name + " | " + t("users_update_password")
        
       if @kryptonite_user.valid_password? params[:form_current_password]
         if @kryptonite_user.update_attributes params[:kryptonite_user]
-          flash.now[:notice] = "Your password has been changed"
+          flash.now[:notice] = t("users_password_changed_notice")
         else
-          flash.now[:warning] = "There were problems when trying to change the password"
+          flash.now[:warning] = t("users_problems_changing_password")
         end
       else
-        flash.now[:warning] = "The current password is incorrect"
+        flash.now[:warning] = t("users_password_incorrect")
       end
       
       render :action => :show
@@ -72,19 +72,19 @@ module Kryptonite
  
     def reset_password
       @kryptonite_user = Kryptonite::User.find params[:id]
-      @kryptonite_page_title = @kryptonite_user.name + " | Reset Password"
+      @kryptonite_page_title = @kryptonite_user.name + " | " + t("users_reset_password")
        
       @kryptonite_user.notify_of_new_password = true unless @kryptonite_user.id == @session_user.id
       
       if @kryptonite_user.update_attributes params[:kryptonite_user]
         if @kryptonite_user.id == @session_user.id
-          flash.now[:notice] = "Your password has been reset"
+          flash.now[:notice] = t("users_password_reseted")
         else    
-          flash.now[:notice] = "Password has been reset and " + @kryptonite_user.name + " has been notified by email"
+          flash.now[:notice] = t("users_password_reseted_and_emailed", :username=>@kryptonite_user.name)
         end
         
       else
-        flash.now[:warning] = "There were problems when trying to reset this user's password"
+        flash.now[:warning] = t("users_problems_reseting_password")
       end
       render :action => :show
     end
@@ -93,7 +93,7 @@ module Kryptonite
       user = Kryptonite::User.find params[:id]
       if user.is_admin? == false || Kryptonite::User.has_more_than_one_admin
         user.destroy
-        flash[:notice] = user.name + " has been deleted"
+        flash[:notice] = t("users_deleted", :username=>user.name)
       end
       redirect_to kryptonite_users_path
     end

data/app/mailers/kryptonite/kryptonite_notification.rb

@@ -11,7 +11,7 @@ module Kryptonite
   		@pass = pass
   		@from_text = kryptonite_config_website_name
   		
-  		mail(:to => kryptonite_user.email, :from => from, :subject => "[#{kryptonite_config_website_name}] New password")
+  		mail(:to => kryptonite_user.email, :from => from, :subject => t("new_password_subject", :website_name=>kryptonite_config_website_name))
   	end
   
   	def new_user_information from, kryptonite_user, host, pass
@@ -21,7 +21,7 @@ module Kryptonite
   		@pass = pass
   		@from_text = kryptonite_config_website_name
   		
-  		mail(:to => kryptonite_user.email, :from => from, :subject => "[#{kryptonite_config_website_name}] New user account")
+  		mail(:to => kryptonite_user.email, :from => from, :subject => t("new_account_subject", :website_name=>kryptonite_config_website_name))
   	end
   	
   	def password_reset_instructions from, kryptonite_user, host
@@ -32,7 +32,7 @@ module Kryptonite
       @reset_password_url = edit_kryptonite_password_reset_url + "/?token=#{kryptonite_user.perishable_token}"
       @from_text = kryptonite_config_website_name
 
-      mail(:to => kryptonite_user.email, :from => from, :subject => "[#{kryptonite_config_website_name}] Password reset instructions")
+      mail(:to => kryptonite_user.email, :from => from, :subject => t("password_reset_subject", :website_name=>kryptonite_config_website_name))
     end
 
   end

data/app/models/kryptonite/user.rb

@@ -13,6 +13,8 @@ module Kryptonite
     acts_as_authentic { |c| c.validate_email_field = false }
 	 
     attr_accessor :notify_of_new_password
+    
+    attr_accessible :login, :name, :email, :time_zone, :access_level, :password, :password_confirmation
 	 
     after_create :send_create_notification
     after_update :send_update_notification

data/app/views/kryptonite/kryptonite/blank.html.erb

@@ -1 +1 @@
-<h2>Welcome to the <%= kryptonite_config_website_name %> administration system</h2>
+<h2><%=t "welcome_title", :website_name=>kryptonite_config_website_name %></h2>

data/app/views/kryptonite/kryptonite_notification/generate_new_password.erb

@@ -1,12 +1,12 @@
-Dear <%= @name %>,<br />
+<%=t "greeting", :name=>@name %><br />
 <br />
-Your password has been reset by an administrator for your account at:<br />
+<%=t "password_reset_by_admin" %>:<br />
 <br />
 <%= @host %>/kryptonite<br />
 <br />
-Login: <%= @login %><br />
-New password: <%= @pass %><br />
+<%=t "login" %>: <%= @login %><br />
+<%=t "new_password" %>: <%= @pass %><br />
 <br />
-From<br />
+<%=t "from" %><br />
 <br />
 <%= @from_text %>

data/app/views/kryptonite/kryptonite_notification/new_user_information.erb

@@ -1,12 +1,12 @@
-Dear <%= @name %>,<br />
+<%=t "greeting", :name=>@name %><br />
 <br />
-A new user account has been created for you at:<br />
+<%=t "new_account_created" %>:<br />
 <br />
 <%= @host %>/kryptonite<br />
 <br />
-Login: <%= @login %><br />
-Password: <%= @pass %><br />
+<%=t "login" %>: <%= @login %><br />
+<%=t "new_password" %>: <%= @pass %><br />
 <br />
-From<br />
+<%=t "from" %><br />
 <br />
 <%= @from_text %>

data/app/views/kryptonite/kryptonite_notification/password_reset_instructions.erb

@@ -1,11 +1,10 @@
-Dear <%= @name %>,<br />
+<%=t "greeting", :name=>@name %><br />
+<br />
+<%=t "reset_instructions", :login=>@login %>
 <br />
-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:<br />
 <br />
 <%= @reset_password_url %><br />
 <br />
-From<br />
+<%=t "from" %><br />
 <br />
 <%= @from_text %>

data/app/views/kryptonite/password_resets/edit.html.erb

@@ -27,21 +27,21 @@
 
 	<div class="text">
 		<p>
-			<%= f.label :password, "Password:" %>
+			<%= f.label :password, "#{t(:password)}:" %>
 		  <%= f.password_field :password, :class => "kryptoniteTextField" %>
 		</p>
 	</div>
 
 	<div class="text">
 		<p>
-			<%= f.label :password_confirmation, "Confirm password:" %>
+			<%= f.label :password_confirmation, "#{t(:confirm_password)}:" %>
 		  <%= f.password_field :password_confirmation, :class => "kryptoniteTextField" %>
 		</p>
 	</div>
 	
 	<div class="submit_remember">
 		<p>
-			<%= f.submit "Reset password", :class => "kryptoniteSubmit" %>
+			<%= f.submit t(:reset_password), :class => "kryptoniteSubmit" %>
 		</p>
 	</div>
 

data/app/views/kryptonite/user_sessions/new.html.erb

@@ -25,24 +25,24 @@
 
 	<div class="text" style="margin-bottom:10px;">
 		<p>
-			<%= f.label :login, "Login:" %>
+			<%= f.label :login, "#{t(:login)}:" %>
 		  <%= f.text_field :login, :class => "kryptoniteTextField" %>
 		</p>
 	</div>
 
 	<div class="text">
 		<p>
-			<%= f.label :password, "Password:" %>
+			<%= f.label :password, "#{t(:password)}:" %>
 		  <%= f.password_field :password, :class => "kryptoniteTextField" %>
 		</p>
 	</div>
 	
 	<div class="submit_remember">
 		<p>
-			<%= f.check_box :remember_me %> Remember me
+			<%= f.check_box :remember_me %> <%=t :remember_me %>
 			<br /><br />
-			<%= f.submit "Log in", :class => "kryptoniteSubmit" %>
-			<input type="button" value="Forgotten password?" class="kryptoniteSubmitBlue" onclick="toggleDiv('recover');" />
+			<%= f.submit t(:do_login), :class => "kryptoniteSubmit" %>
+			<input type="button" value="<%= t(:forgotten_password) %>" class="kryptoniteSubmitBlue" onclick="toggleDiv('recover');" />
 		</p>
 	</div>
 
@@ -53,13 +53,13 @@
 	
 		<div class="text">
 			<p>
-				<%= label_tag :recover_email, "Email:" %>
+				<%= label_tag :recover_email, "#{t(:email)}:" %>
 				<%= text_field_tag :recover_email, params[:recover_email], :class => "kryptoniteTextField" %>
 			</p>
 		</div>
 		<div class="submit_remember">
 			<p>
-				<%= submit_tag "Reset", :class => "kryptoniteSubmit" %>
+				<%= submit_tag t(:do_reset), :class => "kryptoniteSubmit" %>
 			</p>
 		</div>
 	</div>

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

@@ -1,10 +1,10 @@
-<h2>Users</h2>
+<h2><%=t :users %></h2>
 
 <table cellpadding="0" cellspacing="0" id="itemList" class="itemList">
 	<tr>
-		<th>Login</th>
-		<th>Name</th>
-		<th>Status</th>
+		<th><%=t :login %></th>
+		<th><%=t :name %></th>
+		<th><%=t :status %></th>
 		<th>&nbsp;</th>
 	</tr>
 	
@@ -15,10 +15,10 @@
 			<td><%= kryptonite_table_cell_link kryptonite_get_access_level_text(user.access_level), kryptonite_user_path(user) %></td>
 			<td class="delete">
 				<% if user.is_admin? == false || Kryptonite::User.has_more_than_one_admin %>
-					<% confirm_message = "Are you sure you want to delete #{user.name}?" %>
+					<% confirm_message = t(:delete_user_confirm, :user=>user.name) %>
 			
 					<% if user.id == @session_user.id %>
-						<% confirm_message += "\n\nWARNING: This is your user account. You will be logged out if you proceed." %>
+						<% confirm_message += t(:warning_delete_admin) %>
 					<% end %>
 				
 					<%= link_to(kryptonite_show_row_icon("delete"), kryptonite_user_path(user), :method => :delete, :confirm => confirm_message) %>
@@ -31,5 +31,5 @@
 <%= will_paginate @users %>
 
 <%= content_for :sidebar do %>
-  <li><%= link_to "#{kryptonite_show_icon('add')}Add a new user".html_safe, new_kryptonite_user_path %></li>
+  <li><%= link_to "#{kryptonite_show_icon('add')}#{t(:add_new_user)}".html_safe, new_kryptonite_user_path %></li>
 <% end %>