Changes for orbit bar, login

app/views/layouts/_orbit_bar.html.erb

@@ -1,9 +1,3 @@
-<% if controller.controller_name.eql?('pages') %>
-	<link href='/assets/bootstrap.css.erb' rel='stylesheet' type='text/css'/>
-	<link href='/assets/style.css.erb' rel='stylesheet' type='text/css'/>
-	<script type='text/javascript' src='/assets/bootstrap.js'></script>
-<% end %>
-
 <header id="orbit-bar" class="navbar">
 	<div class="navbar-inner">
 		<div class="container clear">
@@ -27,12 +21,40 @@
 				<% if user_signed_in? %>
 					<li><%= link_to t(:logout), destroy_user_session_path, :class => 'orbit-bar-logout' %></li>
 				<% else %>
-					<li>
-						<%= form_for "user", :url => user_session_path, :html => {:class => 'log'} do |f| %>
-						  <%= f.text_field :email, :class => 'input-small', :placeholder => t(:email) %>
-						  <%= f.password_field :password, :class => 'input-small', :placeholder => t(:password) %>
-							<%= content_tag :button, t(:login), :type => :submit, :class => 'btn' %>
-						<% end %>
+					<li class="dropdown bar-login">
+						<a class="brand dropdown-toggle orbit-bar-member" href="#"><%= t(:login) %></a>
+						<div class="dropdown-menu">
+							<ul class="log">
+								<li class="title"></li>
+								
+								<%= form_for :user, :url => user_session_path do |f| %>
+									<li>
+										<div class="input-prepend">
+											<span class="add-on"><i class="icon-user"></i></span>
+											<%= f.text_field :email, :class => 'span2', :placeholder => t(:email), :size => 16 %>
+										</div>
+									</li>
+									<li>
+										<div class="input-prepend">
+											<span class="add-on"><i class="icon-lock"></i></span>
+										  <%= f.password_field :password, :class => 'span2', :placeholder => t(:password), :size => 16 %>
+										</div>
+									</li>
+									<li class="clear">
+										<%= link_to t(:forgot_password), new_user_password_path, :class => 'forgot' %>
+									</li>
+									<li>
+										<%= content_tag :button, t(:login), :type => :submit, :class => 'btn btn-primary' %>
+										<label class="remember" for="user_remember_me">
+											<%= f.check_box :remember_me %>
+											<span style="display: inline-block;height: 10px;"><%= t(:remember_me) %></span>
+										</label>
+									</li>
+									<li class="divider"><span><%= t(:or_lower) %></span></li>
+									<li><%= link_to content_tag(:button, t(:register), :class => 'btn btn-danger'), new_user_registration_path, :style => "padding:0px;" %></li>
+								<% end %>
+							</ul>
+						</div>
 					</li>
 				<% end %>
 				<li>

app/views/layouts/devise.html.erb

@@ -0,0 +1,20 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+	<title><%= @title || APP_CONFIG['orbit'] %></title>
+	<!--[if lt IE 9]>
+		<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+	<![endif]-->
+	<%= stylesheet_link_tag "devise" %>
+	<%= javascript_include_tag "devise" %>
+	<%= csrf_meta_tag %>
+</head>
+<body>
+	<%= render 'layouts/orbit_bar' %>
+	<%= yield %>
+	<div id="sign-footer">
+      <p>Rulingcom</p>
+  </div>
+</body>
+</html>