e

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

@@ -4,11 +4,6 @@
 	<%=link_to "Delete", admin_candidate_path(@candidate.id), method: :delete%>
 	<br>
 <h3>Position: <%= @candidate.position.name %></h3>
-	<%
-		m=0
-		f=0
-		o=0
-	%>
 	<% 
 		m=0
 		f=0
@@ -52,7 +47,7 @@
 <ul>
 	<li>
 		<% @candidate.votes.each do |v|%>
-		<%="#{v.user.full_name}"%>
+		<%= "#{v.user.full_name}"%>
 		<p>
 			Comments: <%=v.comment%>
 		</p>

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

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

Halalan/app/views/voting/votes/_form.html.erb

@@ -10,5 +10,5 @@
 	I cast my vote for 
   	<%= f.association :candidate, collection: Candidate.where(position_id:@pos), label_method: :full_name, value_method: :id %>
   	<%= f.input :comment, label: 'Comment:'%>
-  	<%= f.submit %>
+  	<%= f.submit label: 'Cast Vote' %>
 <% end %>