From b10a2edc228a77015f9b1d673e82c9d601475b13 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Fri, 29 Nov 2013 18:49:47 +0800
Subject: [PATCH] redirects are ok now

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/confirmations_controller.rb
---
 app/controllers/basic_infos_controller.rb     |  6 +++---
 app/controllers/confirmations_controller.rb   |  1 -
 app/controllers/registrations_controller.rb   |  3 +++
 .../_user_for_listing.html.erb                |  2 +-
 .../_user_for_summary.html.erb                |  2 +-
 .../_user_for_thumbnail.html.erb              |  2 +-
 app/views/basic_infos/confirmation.html.erb   | 20 +++++++++++++++++++
 config/routes.rb                              |  1 +
 8 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 app/views/basic_infos/confirmation.html.erb

diff --git a/app/controllers/basic_infos_controller.rb b/app/controllers/basic_infos_controller.rb
index e9e04787..08397bf0 100644
--- a/app/controllers/basic_infos_controller.rb
+++ b/app/controllers/basic_infos_controller.rb
@@ -46,9 +46,9 @@ class BasicInfosController < ApplicationController
 		render :json => response.to_json
 	end
 
-
-
-
+	def confirmation
+		
+	end
 
 
 end
\ No newline at end of file
diff --git a/app/controllers/confirmations_controller.rb b/app/controllers/confirmations_controller.rb
index 6ec06db0..c601a3e0 100644
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@@ -1,7 +1,6 @@
 class ConfirmationsController < Devise::ConfirmationsController
 layout "devise"
 
-
 def show
     self.resource = resource_class.confirm_by_token(params[:confirmation_token])
 
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb
index 57aa5f7c..85c7f50a 100644
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -1,3 +1,6 @@
 class RegistrationsController < Devise::RegistrationsController
   layout "devise"
+  	def after_sign_up_path_for(resource)
+    	basic_infos_confirmation_path
+	end
 end
\ No newline at end of file
diff --git a/app/views/admin/users_new_interface/_user_for_listing.html.erb b/app/views/admin/users_new_interface/_user_for_listing.html.erb
index d77bf738..02445ff6 100644
--- a/app/views/admin/users_new_interface/_user_for_listing.html.erb
+++ b/app/views/admin/users_new_interface/_user_for_listing.html.erb
@@ -16,7 +16,7 @@
         <% end %>
       </td>
       <td>
-        <%= link_to (user_for_listing.name ? user_for_listing.name : user_for_listing.user_id),admin_users_new_interface_path(user_for_listing) %>
+        <%= link_to (user_for_listing.name && user_for_listing.name != user_for_listing.email ? user_for_listing.name : user_for_listing.user_id),admin_users_new_interface_path(user_for_listing) %>
         <div class="quick-edit">
           <ul class="nav nav-pills">
             <%= content_tag(:li, link_to(t(:edit),edit_admin_users_new_interface_path(user_for_listing))) if is_admin? %>
diff --git a/app/views/admin/users_new_interface/_user_for_summary.html.erb b/app/views/admin/users_new_interface/_user_for_summary.html.erb
index a1544fd6..07e40665 100644
--- a/app/views/admin/users_new_interface/_user_for_summary.html.erb
+++ b/app/views/admin/users_new_interface/_user_for_summary.html.erb
@@ -18,7 +18,7 @@
       <%= image_tag(user_for_summary.avatar) %>
     </div>
     <div class="member-info">
-      <h4 class="member-name"><%= link_to (user_for_summary.name ? user_for_summary.name : user_for_summary.user_id),admin_users_new_interface_path(user_for_summary)%></h4>
+      <h4 class="member-name"><%= link_to (user_for_summary.name && user_for_summary.name != user_for_summary.email  ? user_for_summary.name : user_for_summary.user_id),admin_users_new_interface_path(user_for_summary)%></h4>
       <div class="member-mail muted"><%= user_for_summary.email%></div>
       <hr>
       <ul class="member-roles">
diff --git a/app/views/admin/users_new_interface/_user_for_thumbnail.html.erb b/app/views/admin/users_new_interface/_user_for_thumbnail.html.erb
index 538c0348..53df2e01 100644
--- a/app/views/admin/users_new_interface/_user_for_thumbnail.html.erb
+++ b/app/views/admin/users_new_interface/_user_for_thumbnail.html.erb
@@ -18,5 +18,5 @@
       </div>
       <%= image_tag(user_for_thumbnail.avatar) %>
     </div>
-    <h4 class="member-name text-center"><%= link_to (user_for_thumbnail.name ? user_for_thumbnail.name : user_for_thumbnail.user_id),admin_users_new_interface_path(user_for_thumbnail)%></h4>
+    <h4 class="member-name text-center"><%= link_to (user_for_thumbnail.name && user_for_thumbnail.name != user_for_thumbnail.email ? user_for_thumbnail.name : user_for_thumbnail.user_id),admin_users_new_interface_path(user_for_thumbnail)%></h4>
   </li>
\ No newline at end of file
diff --git a/app/views/basic_infos/confirmation.html.erb b/app/views/basic_infos/confirmation.html.erb
new file mode 100644
index 00000000..ca80c859
--- /dev/null
+++ b/app/views/basic_infos/confirmation.html.erb
@@ -0,0 +1,20 @@
+<%= stylesheet_link_tag "sign_up" %>
+<section id="main-wrap">
+	<div class="sign-up have-other-sign-in facebook-form">
+
+		<% flash.each do |key, msg| %>
+			<%= content_tag :p, msg, :class => [key, "alert alert-error in fade"] %>
+		<% end %>
+
+		<div class="form">
+			<h3 class="login-logo">Thank you for registering.</h3>
+			<div class="form-block">
+				<div class="form-list clearfix option-block">
+					<div class="alert alert-success">We have sent you a confirmation email on your email id. Please confirm to proceed</div>
+					<a href="<%= root_path %>">Home</a>
+				</div>
+			</div>
+		</div>
+
+	</div>
+</section>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 05aabae7..6fcbf460 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -21,6 +21,7 @@ Orbit::Application.routes.draw do
   get 'basic_infos/form' => "basic_infos#form_page"
   get 'basic_infos/role_page' => "basic_infos#role_page"
   get 'basic_infos/check_availability' => "basic_infos#check_availability"
+  get 'basic_infos/confirmation' => "basic_infos#confirmation"
   post 'basic_infos/role_update' => "basic_infos#role_update"
   match 'basic_infos/basic_info_update' => "basic_infos#basic_info_update"
   # routes for admin