Login layout

jamesperet 11 anni fa
parent
commit
299e2a3f50
3 ha cambiato i file con 28 aggiunte e 13 eliminazioni
  1. 1 0
      Gemfile
  2. 26 12
      app/views/devise/sessions/new.html.erb
  3. 1 1
      app/views/layouts/auth.html.erb

+ 1 - 0
Gemfile

@@ -36,6 +36,7 @@ gem "therubyracer"
36 36
 gem "less-rails" #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS
37 37
 gem "twitter-bootstrap-rails"
38 38
 gem 'flatstrap-rails'
39
+gem 'bootstrap-timepicker-rails'
39 40
 gem 'simple_form'
40 41
 gem 'friendly_id', '~> 5.0.0'
41 42
 gem 'devise'

+ 26 - 12
app/views/devise/sessions/new.html.erb

@@ -1,15 +1,29 @@
1
-<h2>Sign in</h2>
2
-
3 1
 <%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
4
-  <div class="form-inputs">
5
-    <%= f.input :email, required: false, autofocus: true %>
6
-    <%= f.input :password, required: false %>
7
-    <%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
8
-  </div>
2
+<div class="span4 offset4 well" style="">
3
+	<div class="login-panel panel panel-default">
4
+	     <div class="panel-heading">
5
+	         <h3 class="panel-title">Sign In</h3>
6
+	     </div>
7
+	     <div class="panel-body">
8
+	         <form role="form">
9
+	             <fieldset>
10
+	                     <%= f.input :email, required: true, autofocus: true, :input_html => {class: "input-block-level"} %>
11
+	                 <div class="form-group">
12
+	                     <%= f.input :password, required: true, :input_html => {class: "input-block-level"} %>
13
+	                 </div>
14
+	                 <%= f.input :remember_me, as: :boolean, inline_label: 'Remember me', label: false if devise_mapping.rememberable? %>
15
+	                 <!-- Change this to a button or input when using this as a form -->
16
+				  <div class="form-group">
17
+				  <%= f.button :submit, "Sign in" %><br>
18
+				  </div>
19
+				  <div class="form-group" style="margin-top: 10px;">
20
+				  <%= render "devise/shared/links" %>
21
+			  	  </div>
22
+	             </fieldset>
23
+	         </form>
24
+	     </div>
25
+	 </div>
26
+</div>
9 27
 
10
-  <div class="form-actions">
11
-    <%= f.button :submit, "Sign in" %>
12
-  </div>
13
-<% end %>
14 28
 
15
-<%= render "devise/shared/links" %>
29
+<% end %>

+ 1 - 1
app/views/layouts/auth.html.erb

@@ -56,7 +56,7 @@
56 56
 
57 57
     <div class="container top-container">
58 58
         <div class="row">
59
-          <div class="span4 col-md-offset-4">
59
+          <div class="span12">
60 60
             <%= bootstrap_flash %>
61 61
             <%= yield %>
62 62
           </div>