Added mobile number- issues with validations

Author: nshntarora

app/assets/stylesheets/custom.css.scss

@@ -1680,14 +1680,14 @@ input,button,select,textarea
 
 a
 {
-  color: #2780e3;
+  color: #ff6600;
   text-decoration: none;
 }
 
 a:hover,a:focus
 {
-  color: #165ba8;
-  text-decoration: underline;
+  color: #ff6600;
+  text-decoration: none;
 }
 
 a:focus
@@ -3598,7 +3598,7 @@ output
 .form-control
 {
   display: block;
-  width: 100%;
+  width: 60%;
   height: 43px;
   padding: 10px 18px;
   font-size: 15px;
@@ -4178,8 +4178,8 @@ textarea.form-group-lg .form-control,select[multiple].form-group-lg .form-contro
 .btn-default:hover,.btn-default:focus,.btn-default.focus,.btn-default:active,.btn-default.active,.open>.dropdown-toggle.btn-default
 {
   color: #ffffff;
-  background-color: #090909;
-  border-color: #040404;
+  background-color: #ff6600;
+  border-color: #ff6600;
 }
 
 .btn-default:active,.btn-default.active,.open>.dropdown-toggle.btn-default
@@ -6464,6 +6464,12 @@ a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active
   border-color: #4e9f15;
   color: #ffffff;
 }
+.alert-notice
+{
+  background-color: #3fb618;
+  border-color: #4e9f15;
+  color: #ffffff;
+}
 
 .alert-success hr
 {
@@ -6516,6 +6522,20 @@ a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active
   color: #ffffff;
 }
 
+.alert-error
+{
+  background-color: #FF0000;
+  border-color: #FF0000;
+  color: #ffffff;
+}
+
+.alert-alert
+{
+  background-color: #FF0000;
+  border-color: #FF0000;
+  color: #ffffff;
+}
+
 .alert-danger hr
 {
   border-top-color: #d60054;

app/models/user.rb

@@ -5,7 +5,9 @@ class User < ActiveRecord::Base
          :recoverable, :rememberable, :trackable, :validatable
 
   validates :user_name, uniqueness: true
-  
+  validates :mobile,
+                  length: {minimum: 10, maximum: 10},
+                  :numericality => {:only_integer => true}
   has_many :posts
   has_many :comments
 end

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

@@ -1,13 +1,15 @@
-<h2>Edit <%= resource_name.to_s.humanize %></h2>
+<center>
+<h2 style="padding: 1em;">Edit <%= resource_name.to_s.humanize %></h2>
 
 <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= f.error_notification :error_html => { :class => "error"} %>
 
   <div class="form-inputs">
     <%= f.input :first_name, required: true, autofocus: true %>
     <%= f.input :last_name, required: true, autofocus: true %>
-    <%= f.input :user_name, required: true, autofocus: true %>
+    <%= f.input :user_name, label: 'Username', required: true, autofocus: true %>
     <%= f.input :email, required: true, autofocus: true %>
+    <%= f.input :mobile, label: 'Mobile No.', required: true, autofocus: true %>
 
     <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
       <p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p>
@@ -28,3 +30,6 @@
 <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
 
 <%= link_to "Back", :back %>
+<br>
+<br>
+</center>

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

@@ -1,23 +1,18 @@
 <div class="formwrapper">
 <center>
-<h1>Sign up</h2>
+<h1 style="padding: 1em;">Sign up</h2>
 
 <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">
     <%= f.input :first_name, :placeholder => 'First Name', required: true, autofocus: true %>
-    <br>
     <%= f.input :last_name, :placeholder => 'Last Name', required: true, autofocus: true %>
-    <br>
     <%= f.input :user_name, :placeholder => 'Username', required: true, autofocus: true %>
-    <br>
     <%= f.input :email, :placeholder => 'Email', required: true, autofocus: true %>
-    <br>
+    <%= f.input :mobile, :placeholder => 'Mobile No.', required: true, autofocus: true %>
     <%= f.input :password, :placeholder => 'Password', required: true %>
-    <br>
     <%= f.input :password_confirmation, :placeholder => 'Confirm Password', required: true %>
-    <br>
   </div>
 
   <div class="form-actions">

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

@@ -1,22 +1,18 @@
 <div class="formwrapper">
 <center>
-<h1>Log in</h1>
+<h1 style="padding: 1em;">Log in</h1>
 
 <%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="form-inputs">
     <%= f.input :email, :placeholder => 'Email', required: false, autofocus: true %>
-    <br>
     <%= f.input :password, :placeholder => 'Password', required: false %>
-    <br>
     <%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
-    <br>
   </div>
 
   <div class="form-actions">
     <%= f.button :submit, "Log in" %>
   </div>
 <% end %>
-<br>
 <div class="bottom-links">
   <%= render "devise/shared/links" %>
 </div>

app/views/layouts/_messages.html.erb

@@ -1,5 +1,5 @@
 <% flash.each do |key, value| %>
-  <div class="alert alert-<%= key %> alert-dismissible alert-success">
+  <div class="alert alert-<%= key %> alert-dismissible">
     <a href="#" data-dismiss="alert" class="close">×</a>
       <ul>
         <li>

app/views/layouts/application.html.erb

@@ -15,6 +15,7 @@
       <ul class="nav navbar-nav">
         <% if user_signed_in? %>
           <li><%= link_to "Profile", current_user %></li>
+          <li><%= link_to "Edit Profile", edit_user_registration_path %></li>
           <li><%= link_to "Log Out", destroy_user_session_path, :method => :delete  %></li>
         <% else %>
           <li><%= link_to "Sign Up", new_user_registration_path %></li>

db/migrate/20150305132905_add_mobile_to_users.rb

@@ -0,0 +1,5 @@
+class AddMobileToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :mobile, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150126102943) do
+ActiveRecord::Schema.define(version: 20150305132905) do
 
   create_table "comments", force: true do |t|
     t.text     "comment"
@@ -48,6 +48,7 @@
     t.string   "first_name"
     t.string   "last_name"
     t.string   "user_name"
+    t.string   "mobile"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true

spring/444d93d38f410700fcda5806851415ec.pid

@@ -1 +1 @@
-12854
+19622