Merge branch 'design_team' into ldap

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

@@ -5,8 +5,8 @@
 
 	<%= flash_messages %>
 <div id="container" class="sign-in">
-	  <% flash.each do |key, msg| %>
-    <%= content_tag :spen, msg, :class => [key, "notice label label-warning"] %>
+	<% flash.each do |key, msg| %>
+    <%= content_tag :span, msg, :class => [key, "notice label label-warning"] %>
   <% end%>
 	<%= form_for :user, :url => user_session_path, :html => {:class => 'user_new form-horizontal'} do |f| %>
 		<div class="content">
@@ -18,10 +18,10 @@
 					<span class="help-inline">Please correct the error</span>
 				</div>
 				<div class="control-group clear">
-					<%= link_to t(:forgot_password), new_user_password_path, :class => 'pull-right forgot' %>
 					<%= f.label :password %>
 					<%= f.password_field :password, :placeholder => t(:dots), :style => "width: 330px;" %>
 					<span class="help-inline">Please correct the error</span>
+					<%= link_to t(:forgot_password), new_user_password_path, :class => 'pull-right forgot hide' %>
 				</div>
 			</div>
 		</div>