Add twitter-bootstrap along with haml

Gemfile

@@ -13,6 +13,11 @@ gem 'omniauth-twitter'
 
 gem "paperclip", "~> 3.0"
 
+gem "twitter-bootstrap-rails"
+
+gem "haml"
+gem "html2haml"
+
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.0'
 

Gemfile.lock

@@ -51,8 +51,16 @@ GEM
     execjs (2.0.2)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
+    haml (4.0.3)
+      tilt
     hashie (2.0.5)
     hike (1.2.3)
+    hpricot (0.8.6)
+    html2haml (1.0.1)
+      erubis (~> 2.7.0)
+      haml (>= 4.0.0.rc.1)
+      hpricot (~> 0.8.6)
+      ruby_parser (~> 3.1.1)
     httpauth (0.2.0)
     i18n (0.6.5)
     jbuilder (1.5.1)
@@ -125,6 +133,8 @@ GEM
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
+    ruby_parser (3.1.3)
+      sexp_processor (~> 4.1)
     sass (3.2.11)
     sass-rails (4.0.0)
       railties (>= 4.0.0.beta, < 5.0)
@@ -133,6 +143,7 @@ GEM
     sdoc (0.3.20)
       json (>= 1.1.3)
       rdoc (~> 3.10)
+    sexp_processor (4.3.0)
     slop (3.4.6)
     sprockets (2.10.0)
       hike (~> 1.2)
@@ -152,6 +163,11 @@ GEM
       polyglot (>= 0.3.1)
     turbolinks (1.3.0)
       coffee-rails
+    twitter-bootstrap-rails (2.2.8)
+      actionpack (>= 3.1)
+      execjs
+      rails (>= 3.1)
+      railties (>= 3.1)
     tzinfo (0.3.37)
     uglifier (2.2.1)
       execjs (>= 0.3.0)
@@ -165,6 +181,8 @@ PLATFORMS
 DEPENDENCIES
   coffee-rails (~> 4.0.0)
   devise
+  haml
+  html2haml
   jbuilder (~> 1.2)
   jquery-rails
   mysql2
@@ -176,4 +194,5 @@ DEPENDENCIES
   sass-rails (~> 4.0.0)
   sdoc
   turbolinks
+  twitter-bootstrap-rails
   uglifier (>= 1.3.0)

app/assets/javascripts/application.js

@@ -12,5 +12,6 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require twitter/bootstrap
 //= require turbolinks
 //= require_tree .

app/assets/javascripts/bootstrap.js.coffee

@@ -0,0 +1,3 @@
+jQuery ->
+  $("a[rel~=popover], .has-popover").popover()
+  $("a[rel~=tooltip], .has-tooltip").tooltip()

app/assets/stylesheets/application.css

@@ -11,3 +11,30 @@
  *= require_self
  *= require_tree .
  */
+
+/* User sign in and sign forms. */
+.border-form-div {
+  max-width: 300px;
+  padding: 19px 29px 29px;
+  margin: 0 auto 20px;
+  background-color: #fff;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 5px;
+     -moz-border-radius: 5px;
+          border-radius: 5px;
+  -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
+     -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
+          box-shadow: 0 1px 2px rgba(0,0,0,.05);
+}
+.border-form-div .form-signin-heading,
+.border-form-div .checkbox {
+  margin-bottom: 10px;
+}
+.border-form-div input[type="text"],
+.border-form-div input[type="email"],
+.border-form-div input[type="password"] {
+  font-size: 16px;
+  height: auto;
+  margin-bottom: 15px;
+  padding: 7px 9px;
+}

app/assets/stylesheets/bootstrap_and_overrides.css

@@ -0,0 +1,7 @@
+/*
+  =require twitter-bootstrap-static/bootstrap
+
+  Use Font Awesome icons (default)
+  To use Glyphicons sprites instead of Font Awesome, replace with "require twitter-bootstrap-static/sprites"
+  =require twitter-bootstrap-static/fontawesome
+  */

app/views/devise/confirmations/new.html.haml

@@ -0,0 +1,9 @@
+%h2 Resend confirmation instructions
+= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f|
+  = devise_error_messages!
+  %div
+    = f.label :email
+    %br/
+    = f.email_field :email, :autofocus => true
+  %div= f.submit "Resend confirmation instructions"
+= render "devise/shared/links"

app/views/devise/mailer/confirmation_instructions.html.haml

@@ -0,0 +1,4 @@
+%p
+  Welcome #{@email}!
+%p You can confirm your account email through the link below:
+%p= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token)

app/views/devise/mailer/reset_password_instructions.html.haml

@@ -0,0 +1,6 @@
+%p
+  Hello #{@resource.email}!
+%p Someone has requested a link to change your password. You can do this through the link below.
+%p= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token)
+%p If you didn't request this, please ignore this email.
+%p Your password won't change until you access the link above and create a new one.

app/views/devise/mailer/unlock_instructions.html.haml

@@ -0,0 +1,5 @@
+%p
+  Hello #{@resource.email}!
+%p Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+%p Click the link below to unlock your account:
+%p= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token)

app/views/devise/passwords/edit.html.haml

@@ -0,0 +1,14 @@
+%h2 Change your password
+= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
+  = devise_error_messages!
+  = f.hidden_field :reset_password_token
+  %div
+    = f.label :password, "New password"
+    %br/
+    = f.password_field :password, :autofocus => true
+  %div
+    = f.label :password_confirmation, "Confirm new password"
+    %br/
+    = f.password_field :password_confirmation
+  %div= f.submit "Change my password"
+= render "devise/shared/links"

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

@@ -0,0 +1,9 @@
+%h2 Forgot your password?
+= 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, :autofocus => true
+  %div= f.submit "Send me reset password instructions"
+= render "devise/shared/links"

app/views/devise/registrations/edit.html.haml

@@ -0,0 +1,35 @@
+%div.border-form-div
+  %h3
+    Edit #{resource_name.to_s.humanize}
+  = form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
+    = devise_error_messages!
+    %div
+      = f.text_field :login, :autofocus => true, :placeholder => 'Login', maxlength: 50, required: true
+    %div
+      = f.text_field :first_name, placeholder: 'First name', maxlength: 50, required: true
+    %div
+      = f.text_field :last_name, placeholder: 'Last name', maxlength: 50, required: true
+    %div
+      = f.email_field :email, placeholder: 'Email'
+      - if devise_mapping.confirmable? && resource.pending_reconfirmation?
+        %div
+        Currently waiting confirmation for: #{resource.unconfirmed_email}
+    %div
+      = f.label 'Avatar'
+      = f.file_field :avatar
+    %div
+      %br/
+      %i (leave blank if you don't want to change it)
+      %br/
+      = f.password_field :password, :autocomplete => "off", placeholder: 'New password'
+    %div
+      = f.password_field :password_confirmation, placeholder: 'Password confirmation'
+    %div
+      %i (we need your current password to confirm your changes)
+      %br/
+      = f.password_field :current_password, placeholder: 'Current password'
+    %div= f.submit "Update", class:  'btn btn-primary'
+    %br/
+    %p
+      Unhappy? #{button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete}
+    = link_to "Back", :back

app/views/devise/registrations/new.html.haml

@@ -0,0 +1,23 @@
+%div.border-form-div
+  %h3
+    Create #{resource_name.to_s.humanize}
+  = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
+    = devise_error_messages!
+    %div
+      = f.text_field :login, :autofocus => true, :placeholder => 'Login', maxlength: 50, required: true
+    %div
+      = f.text_field :first_name, placeholder: 'First name', maxlength: 50, required: true
+    %div
+      = f.text_field :last_name, placeholder: 'Last name', maxlength: 50, required: true
+    %div
+      = f.email_field :email, placeholder: 'Email'
+    %div
+      = f.label 'Avatar'
+      = f.file_field :avatar
+    %br
+    %div
+      = f.password_field :password, placeholder: 'Password'
+    %div
+      = f.password_field :password_confirmation, placeholder: 'Password confirmation'
+    %div= f.submit "Sign up", class: 'btn btn-primary'
+  = render "devise/shared/links"