fixed nav styles, deleted inline styles

app/models/candidate.rb

 class Candidate < ActiveRecord::Base
 
 	        validates :first_name, presence: true
+	        validates :nickname, presence: true
+
 	        validates :last_name, presence: true
  
 
@@ -20,4 +22,7 @@ class Candidate < ActiveRecord::Base
 	    		self.image_link
 	    	end
 	    end
+	    def votesCount
+	    	self.votes.count
+	    end
 end
\ No newline at end of file

app/views/admin/candidates/_form.html.erb

@@ -4,6 +4,7 @@
   <%= f.association :position, label_method: :name, value_method: :id %>
   <%= f.input :first_name%>
   <%= f.input :last_name %>
+  <%= f.input :nickname %>
 
   <div class="" id="box"></div>
   <%= f.input :image_link, input_html:{id:"field"}%>

app/views/admin/candidates/edit.html.erb

-<h1>Admin Edit Post</h1>
+<h1>Edit Candidate Details </h1>
 
 <%= render partial: "form" %>
 

app/views/admin/candidates/show.html.erb

@@ -4,10 +4,11 @@
 	<div style="display:inline-block">
 	<h1 style="margin-bottom:3px;"><%= @candidate.full_name%> 
 
+
 	<%=link_to "Edit", edit_admin_candidate_path(@candidate.id), {:style=>"font-size:18px; text-decoration:none; color:rgba(0,0,0,0.5)"}%>
 
 	<%=link_to "OBOSEN", admin_candidate_path(@candidate.id), {:style=>"font-size:18px; text-decoration:none; color:rgba(200,0,0,0.5)", method: :delete}%></h1>
-	<h3 style="margin-top:3px; color:#004e7e; margin: 0"><%= @candidate.position.name %></h3>
+	<%=link_to @candidate.position.name, admin_position_path(@candidate.position.id), {:style=> "font-size:35px;margin-top:3px; color:#004e7e; margin: 0"} %>
 	</div>
 </div>
 <p>
@@ -45,7 +46,11 @@ o=0
 <%end%>
 <div class="row">
 
-<div class="six columns"style="font-size:30px; margin:30px auto; text-align:center"><br>&ldquo; <%= @candidate.slogan%> &rdquo;</div>
+<div class="six columns"style="font-size:30px; margin:30px auto; text-align:center"><br>&ldquo; <%= @candidate.slogan%> &rdquo;
+<br>
+<div style="text-align:right;">- <%= @candidate.nickname%> </div>
+</div>
+
 <table class="five columns">
 		<tr><td>Male Votes</td><td><%= m%></td></tr>
 		<tr><td>Female Votes</td><td><%= f%></td></tr>

app/views/pages/index.html.erb

@@ -9,7 +9,7 @@
 	<%p.candidates.each do |c|%>
 	<%total = total+c.votes.count%>
 	<%end%>
-	<%p.candidates.each do |c|%>
+	<%p.candidates.order('first_name').each do |c|%>
 
 		<tr><td><img class="candidate-image" style="background: url(<%=c.image%>); background-size:cover; background-position: 50% 50%; height:64px; width:64px; " width="64px"  height="64px;"></td><td style="min-width: 250px;"><%=link_to c.full_name, admin_candidate_path(c.id), {:style =>"font-size:15	px;"}%></td><td style="min-width: 300px;"><%=c.slogan%></td><td><%=c.votes.count%></td>
 		<td>	<progress value="<%=c.votes.count%>" max="<%=total%>" ></td>

app/views/pages/profile.html.erb

 <h4>Howdy <%=current_user.first_name%></h4>
+<table>
+<tr><td>Email:</td><td><%=current_user.email%></td></tr>
+<tr><td>Gender:</td><td><%=current_user.gender%></td></tr>
+<tr><td>Birthday:</td><td><%=current_user.birthday%></td></tr>
+</table>
+
 You Voted for<br>
 
+
 <ul>
+
 <%current_user.votes.each do |v|%>
 <li><%="#{v.candidate.position.name}: #{v.candidate.full_name}"%>