casein 4.0.0 → 5.0.0.0

data/app/mailers/casein/casein_notification.rb

@@ -4,35 +4,35 @@ module Casein
 	
   	self.prepend_view_path File.join(File.dirname(__FILE__), '..', 'views', 'casein')
 	
-  	def generate_new_password from, casein_user, host, pass
-  		@name = casein_user.name
+  	def generate_new_password from, casein_admin_user, host, pass
+  		@name = casein_admin_user.name
   		@host = host
-  		@login = casein_user.login
+  		@login = casein_admin_user.login
   		@pass = pass
   		@from_text = casein_config_website_name
   		
-  		mail(:to => casein_user.email, :from => from, :subject => "[#{casein_config_website_name}] New password")
+  		mail(:to => casein_admin_user.email, :from => from, :subject => "[#{casein_config_website_name}] New password")
   	end
   
-  	def new_user_information from, casein_user, host, pass
-      @name = casein_user.name
+  	def new_user_information from, casein_admin_user, host, pass
+      @name = casein_admin_user.name
   		@host = host
-  		@login = casein_user.login
+  		@login = casein_admin_user.login
   		@pass = pass
   		@from_text = casein_config_website_name
   		
-  		mail(:to => casein_user.email, :from => from, :subject => "[#{casein_config_website_name}] New user account")
+  		mail(:to => casein_admin_user.email, :from => from, :subject => "[#{casein_config_website_name}] New user account")
   	end
   	
-  	def password_reset_instructions from, casein_user, host
+  	def password_reset_instructions from, casein_admin_user, host
   	  ActionMailer::Base.default_url_options[:host] = host.gsub("http://", "")
-      @name = casein_user.name
+      @name = casein_admin_user.name
       @host = host
-      @login = casein_user.login
-      @reset_password_url = edit_casein_password_reset_url + "/?token=#{casein_user.perishable_token}"
+      @login = casein_admin_user.login
+      @reset_password_url = edit_casein_password_reset_url + "/?token=#{casein_admin_user.perishable_token}"
       @from_text = casein_config_website_name
 
-      mail(:to => casein_user.email, :from => from, :subject => "[#{casein_config_website_name}] Password reset instructions")
+      mail(:to => casein_admin_user.email, :from => from, :subject => "[#{casein_config_website_name}] Password reset instructions")
     end
 
   end

data/app/models/casein/{user.rb → admin_user.rb}

@@ -4,7 +4,7 @@ $CASEIN_USER_ACCESS_LEVEL_ADMIN = 0
 $CASEIN_USER_ACCESS_LEVEL_USER = 10
 
 module Casein
-  class User < ActiveRecord::Base
+  class AdminUser < ActiveRecord::Base
 
 	  def self.table_name
       self.to_s.gsub("::", "_").tableize
@@ -24,7 +24,7 @@ module Casein
     validates_presence_of :time_zone
 	  
   	def self.has_more_than_one_admin
-      Casein::User.where(:access_level => $CASEIN_USER_ACCESS_LEVEL_ADMIN).count > 1
+      Casein::AdminUser.where(:access_level => $CASEIN_USER_ACCESS_LEVEL_ADMIN).count > 1
     end
 	
   	def send_create_notification

data/app/models/casein/{user_session.rb → admin_user_session.rb}

@@ -1,5 +1,5 @@
 module Casein
-  class UserSession < ::Authlogic::Session::Base
+  class AdminUserSession < ::Authlogic::Session::Base
     include ActiveModel::Conversion 
     def persisted? 
       false 

data/app/views/casein/admin_user_sessions/new.html.erb

@@ -0,0 +1,56 @@
+<%= form_for @admin_user_session, :url => casein_admin_user_session_path do |f| %>
+	<% if @admin_user_session.errors.any? %>
+		<div id="error_messages" class="alert alert-danger">
+			<% @admin_user_session.errors.keys.each do |key| %>
+				<%= (key.to_s.humanize + " ") unless key == :base %>
+				<%=  @admin_user_session.errors[key].first %>
+			<% end %>
+		</div>
+	<% end %>
+
+	<% if flash[:warning] %>
+      <div id="error" class="alert alert-danger">
+        <%= flash[:warning] %>
+      </div>
+    <% end %>
+    <% if flash[:notice] %>
+      <div id="notice" class="alert alert-success">
+        <%= flash[:notice] %>
+      </div>
+    <% end %>
+	
+	<div class="form-group">
+		<%= f.text_field :login, :placeholder => "Username", :class => "form-control input-large" %>
+	</div>
+	<div class="form-group">
+		<%= f.password_field :password, :placeholder => "Password", :class => "form-control input-large" %>
+	</div>
+
+	<div class="form-group">
+		<div class="checkbox-inline">
+		  <label>
+		    <%= f.check_box :remember_me %> Remember me
+		  </label>
+		</div>
+	</div>
+
+	<div class="form-group">
+		<%= f.submit "Sign in", :class => "btn btn-success btn-large btn-block" %>
+	</div>
+
+	<div class="form-group">
+		<input type="button" value="Forgotten password?" class="btn btn-link" onclick="toggleDiv('recover');" />
+	</div>
+	
+<% end %>
+
+<%= form_tag casein_password_reset_url do %>
+	<div id="recover" style="display:none;">
+		<div class="form-group">
+			<%= text_field_tag :recover_email, params[:recover_email], :placeholder => "Your email address", :class => "form-control input-large" %>
+		</div>
+		<div class="form-group">
+			<%= submit_tag "Reset password", :class => "btn btn-primary btn-large btn-block" %>
+		</div>
+	</div>
+<% end %>

data/app/views/casein/admin_users/index.html.erb

@@ -0,0 +1,39 @@
+<h2>Users<%= casein_pagination_details @users %></h2>
+
+<table class="table table-striped table-hover table-condensed">
+	<thead>
+		<tr>
+			<th><%= casein_sort_link 'Username', :login %></th>
+			<th><%= casein_sort_link 'Name', :name %></th>
+			<th><%= casein_sort_link 'Role', :access_level %></th>
+			<th>&nbsp;</th>
+		</tr>
+	</thead>
+
+	<% @users.each do |user| %>	
+		<tr>
+			<td><%= casein_table_cell_link user.login, casein_admin_user_path(user) %></td>
+			<td><%= casein_table_cell_link user.name, casein_admin_user_path(user) %></td>
+			<td><%= casein_table_cell_link casein_get_access_level_text(user.access_level), casein_admin_user_path(user) %></td>
+			<td class="delete">
+				<% if user.is_admin? == false || Casein::AdminUser.has_more_than_one_admin %>
+					<% confirm_message = "Are you sure you want to delete #{user.name}?" %>
+			
+					<% if user.id == @session_user.id %>
+						<% confirm_message += "\n\nWARNING: This is your user account. You will be signed out if you proceed." %>
+					<% end %>
+				
+					<%= link_to(casein_show_row_icon("trash"), casein_admin_user_path(user), :method => :delete, :data => { :confirm => confirm_message }) %>
+				<% end %>
+			</td>
+		</tr>
+	<% end %>
+</table>
+
+<div class="text-center">
+	<%= will_paginate @users %>
+</div>
+
+<%= content_for :sidebar do %>
+  <li><%= link_to "#{casein_show_icon('plus-sign')}Add a new user".html_safe, new_casein_admin_user_path %></li>
+<% end %>

data/app/views/casein/admin_users/new.html.erb

@@ -0,0 +1,57 @@
+<h2>Add a new user</h2>
+
+<%= form_for @casein_admin_user do |form| %>
+
+	<div class="row">
+  		<div class="col-lg-6">
+			<%= casein_text_field form, @casein_admin_user, :login, {:size => 30, :casein_label => "Username"} %>
+		</div>
+		<div class="col-lg-6">
+			<%= casein_text_field form, @casein_admin_user, :name %>
+		</div>
+	</div>
+
+	<div class="row">
+  		<div class="col-lg-6">
+			<%= casein_text_field form, @casein_admin_user, :email %>
+		</div>
+		<div class="col-lg-6">
+			<%= casein_time_zone_select form, @casein_admin_user, :time_zone, ActiveSupport::TimeZone.us_zones %>
+		</div>
+	</div>
+
+
+	<div class="row">
+  		<div class="col-lg-6">
+			<%= casein_select form, @casein_admin_user, :access_level, casein_get_access_level_array, {:casein_label => "Role"} %>
+		</div>
+		<div class="col-lg-6">
+		</div>
+	</div>
+
+	<div class="row">
+  		<div class="col-lg-6">
+			<%= casein_password_field form, @casein_admin_user, :password, {:casein_label => "Password"} %>
+		</div>
+		<div class="col-lg-6">
+			<%= casein_password_field form, @casein_admin_user, :password_confirmation, {:casein_label => "Repeat password"} %>
+		</div>
+		<div class="col-lg-12 password-checkbox">
+			<div class="checkbox">
+	      		<label>
+	      			<%= check_box_tag :generate_random_password, "1", false, {:id => 'generate-random-password-checkbox'} %> Generate random password
+	      		</label>
+	    	</div>
+	    </div>
+	</div>
+
+	<p class="submits">
+		<%= link_to 'Cancel', casein_admin_users_path, :class => 'btn btn-mini btn-danger' %>
+		<%= form.submit "Add new user", :class => "btn btn-mini btn-primary" %>
+	</p>
+
+<% end %>
+
+<%= content_for :sidebar do %>
+  <li><%= link_to "#{casein_show_icon('th-list')}Back to list".html_safe, casein_admin_users_path %></li>
+<% end %>

data/app/views/casein/admin_users/show.html.erb

@@ -0,0 +1,104 @@
+<h2>View user</h2>
+
+<%= form_for @casein_admin_user do |f| %>
+
+	<div class="row">
+  		<div class="col-lg-6">
+			<%= casein_text_field f, f.object, :login, {:size => 30, :casein_label => "Username"} %>
+		</div>
+		<div class="col-lg-6">
+			<%= casein_text_field f, f.object, :name %>
+		</div>
+	</div>
+
+	<div class="row">
+  		<div class="col-lg-6">
+			<%= casein_text_field f, f.object, :email %>
+		</div>
+		<div class="col-lg-6">
+			<%= casein_time_zone_select f, f.object, :time_zone, ActiveSupport::TimeZone.us_zones %>
+		</div>
+	</div>
+
+	<% if @session_user.is_admin? && (@casein_admin_user.is_admin? == false || Casein::AdminUser.has_more_than_one_admin) %>
+		<div class="row">
+  			<div class="col-lg-6">
+				<%= casein_select f, f.object, :access_level, casein_get_access_level_array, {:casein_label => "Role"} %>
+			</div>
+			<div class="col-lg-6">
+			</div>
+		</div>
+	<% end %>
+
+	<p class="submits">
+	  	<%= link_to 'Cancel', casein_admin_users_path, :class => 'btn btn-mini btn-danger' %>
+		<%= f.submit "Save changes", :class => "btn btn-mini btn-primary" %>
+	</p>
+<% end %>
+
+<% if @session_user.is_admin? %>
+
+	<h2>Reset password <small>(admin action &mdash; use carefully)</small></h2>
+
+	<%= form_for @casein_admin_user, :url => reset_password_casein_admin_user_path(@casein_admin_user) do |f| %>
+
+		<div class="row">
+  			<div class="col-lg-6">
+				<%= casein_password_field f, f.object, :password, {:casein_label => "New password"} %>
+			</div>
+			<div class="col-lg-6">
+				<%= casein_password_field f, f.object, :password_confirmation, {:casein_label => "Repeat new password"} %>
+			</div>
+			<div class="col-lg-12 password-checkbox">
+				<div class="checkbox">
+		      		<label>
+		      			<%= check_box_tag :generate_random_password, "1", false, {:id => 'generate-random-password-checkbox'} %> Generate random password
+		      		</label>
+		    	</div>
+		    </div>
+		</div>
+		
+		<p class="submits">
+			<%= f.submit "Reset", :class => "btn btn-mini btn-warning" %>
+		</p>
+		
+	<% end %>
+	
+<% elsif @session_user.id == @casein_admin_user.id %>
+
+	<h2>Change password</h2>
+
+	<%= form_for @casein_admin_user, :url => update_password_casein_admin_user_path(@casein_admin_user) do |f| %>
+
+		<div class="row">
+  			<div class="col-lg-6">
+  				<div class="form-group">
+					<%= label_tag :form_current_password, "Current password" %>
+					<%= password_field_tag :form_current_password, "", {:class => 'form-control'} %>
+				</div>
+			</div>
+			<div class="col-lg-6">
+			</div>
+		</div>
+
+		<div class="row">
+  			<div class="col-lg-6">
+				<%= casein_password_field f, f.object, :password, {:casein_label => "New password"} %>
+			</div>
+			<div class="col-lg-6">
+				<%= casein_password_field f, f.object, :password_confirmation, {:casein_label => "Repeat new password"} %>
+			</div>
+		</div>
+		
+		<p class="submits">
+			<%= f.submit "Change", :class => "btn btn-mini btn-primary" %>
+		</p>
+
+	<% end %>
+<% end %>
+
+<%= content_for :sidebar do %>
+	<% if @session_user.is_admin? %>
+  		<li><%= link_to "#{casein_show_icon('th-list')}Back to list".html_safe, casein_admin_users_path %></li>
+	<% end %>
+<% end %>

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

@@ -1 +1,12 @@
-<h2>Welcome to the <%= casein_config_website_name %> administration system</h2>
+<br />
+<br />
+ <div class="container">
+	<div class="jumbotron" style="text-align: center;">
+		<h1>Welcome to Casein</h1>
+		<br />
+		<p>You&rsquo;re ready to begin scaffolding and customizing!</p>
+		<p><small style="font-size: 0.7em;">To remove this screen, set <code>casein_config_dashboard_url</code></small></p>
+		<br />
+		<p><a href="https://github.com/russellquinn/casein/blob/master/README.rdoc" class="btn btn-primary btn-large">View README on GitHub</a></p>
+	</div>
+  </div>

data/app/views/casein/casein_notification/generate_new_password.erb

@@ -4,7 +4,7 @@ Your password has been reset by an administrator for your account at:<br />
 <br />
 <%= @host %>/casein<br />
 <br />
-Login: <%= @login %><br />
+Username: <%= @login %><br />
 New password: <%= @pass %><br />
 <br />
 From<br />

data/app/views/casein/casein_notification/new_user_information.erb

@@ -4,7 +4,7 @@ A new user account has been created for you at:<br />
 <br />
 <%= @host %>/casein<br />
 <br />
-Login: <%= @login %><br />
+Username: <%= @login %><br />
 Password: <%= @pass %><br />
 <br />
 From<br />

data/app/views/casein/casein_notification/password_reset_instructions.erb

@@ -1,6 +1,6 @@
 Dear <%= @name %>,<br />
 <br />
-A request to reset the password for login '<%= @login %>' has been made.<br />  
+A request to reset the password for username '<%= @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 />

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

@@ -1,48 +1,36 @@
 <%= form_for @reset_user, :url => casein_password_reset_path do |f| %>
 
 	<% if @reset_user.errors.any? %>
-		<div class="error">
-			<p>
-				<% @reset_user.errors.keys.each do |key| %>
-					<%= (key.to_s.humanize + " ") unless key == :base %>
-					<%=  @reset_user.errors[key].first %>
-				<% end %>
-			</p>
+		<div id="error_messages" class="alert alert-danger">
+			<% @reset_user.errors.keys.each do |key| %>
+				<%= (key.to_s.humanize + " ") unless key == :base %>
+				<%=  @reset_user.errors[key].first %>
+			<% end %>
 		</div>
 	<% end %>
 
 	<% if flash[:warning] %>
-		<div class="error">
-			<p><%= flash[:warning] %></p>
-		</div>
-	<% end %>
-
-	<% if flash[:notice] %>
-		<div class="notice">
-			<p><%= flash[:notice] %></p>
-		</div>
-	<% end %>
+      <div id="error" class="alert alert-danger">
+        <%= flash[:warning] %>
+      </div>
+    <% end %>
+    <% if flash[:notice] %>
+      <div id="notice" class="alert alert-success">
+        <%= flash[:notice] %>
+      </div>
+    <% end %>
 
 	<%= hidden_field_tag :token, params[:token] %>
 
-	<div class="text">
-		<p>
-			<%= f.label :password, "Password:" %>
-		  <%= f.password_field :password, :class => "caseinTextField" %>
-		</p>
+	<div class="form-group">
+		<%= f.password_field :password, :autocomplete => :off, :placeholder => "New password", :class => "form-control input-large" %>
 	</div>
-
-	<div class="text">
-		<p>
-			<%= f.label :password_confirmation, "Confirm password:" %>
-		  <%= f.password_field :password_confirmation, :class => "caseinTextField" %>
-		</p>
+	<div class="form-group">
+		<%= f.password_field :password_confirmation, :autocomplete => :off, :placeholder => "Confirm password", :class => "form-control input-large" %>
 	</div>
-	
-	<div class="submit_remember">
-		<p>
-			<%= f.submit "Reset password", :class => "caseinSubmit" %>
-		</p>
+
+	<div class="form-group">
+		<%= f.submit "Change password", :class => "btn btn-success btn-large btn-block" %>
 	</div>
 
 <% end %>