tweaks

Halalan/app/controllers/pages_controller.rb

 class PagesController < ApplicationController
 	def index
+		@users = User.all
 		@votes = Vote.all
 		@candidates = Candidate.all
 		@positions = Position.all

Halalan/app/views/admin/positions/index.html.erb

@@ -3,12 +3,11 @@
 <%=link_to "Add New Position", new_admin_position_path%>
 <hr>
 
-<% @positions.each do |c| %>
-	<h2><%= c.name %></h2>
-	<ul>
-		<% c.candidates.each do |p| %>
-			<li><%= link_to "#{p.first_name} #{p.last_name}" , admin_candidate_path(p.id) %></li>
-		<% end %>
-	</ul>
-
+<% @positions.each do |p| %>
+  	<h2><%= link_to p.name, admin_position_path(p.id) %></h2>
+		<ul>
+		  <% p.candidates.each do |c|%>
+		    <li><%=link_to c.full_name, admin_candidate_path(c.id)%></li>
+		  <% end %>
+	  	</ul>
 <% end %>
\ No newline at end of file

Halalan/app/views/pages/index.html.erb

@@ -35,7 +35,7 @@
 					<td></td>
 					<td><center><%=link_to c.full_name, admin_candidate_path(c.id)%></center></td>
 					<td><center><%=c.votes.count%></center></td>
-					<td><center><progress value="<%=c.votes.count%>" max="<%=total%>" >(<%=c.votes.count%>)</center></td>
+					<td><center><progress value="<%=c.votes.count%>" max="<%=@users.count%>" >(<%=c.votes.count%>)</center></td>
 				</tr>
 			<%end%>
 		</table>