Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine

Conflicts:
	app/views/devise/passwords/new.html.erb
	app/views/devise/sessions/new.html.erb

app/views/devise/passwords/new.html.erb

@@ -1,12 +1,22 @@
-<h2>Forgot your password?</h2>
 
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
-
-  <div><%= f.submit "Send me reset password instructions" %></div>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
+<h1 class="login-logo"><%= t(:ruling_site) %></h1>
+<div id="signin-header">
+	<h3><%= t(:forgot_password) %></h3>
+</div>
+<div id="container" class="sign-in">
+	<%= form_for :user, :url => user_password_path, :html => {:class => 'user_new form-horizontal'} do |f| %>
+		<%= devise_error_messages! %>
+		<div class="content">
+			<div class="main">
+				<div class="control-group clear">
+					<%= f.label :email %>
+					<%= f.email_field :email, :placeholder => t(:email), :style => "width: 330px;" %>
+					<span class="help-inline">Please correct the error</span>
+				</div>
+			</div>	
+		</div>
+		<div class="form-actions clear">
+			<%= content_tag :button, "Send me reset password instructions", :type => :submit, :class => 'btn btn-primary pull-right' %>
+		</div>
+	<% end %>
+</div>