last minute push

Halalan-trial/app/views/admin/candidates/_form.html.erb

 
 <%= simple_form_for([:admin, @candidate]) do |f| %>
+  	<%= f.association :position, label: 'Position: '%>
 	<%= f.input :first_name, label: 'First Name: '%>
   	<%= f.input :last_name, label: 'Last Name: '%>
   	<%= f.input :slogan, label: 'Slogan: '%>
-  	<%= f.association :position, label: 'Position: '%>
   	<%= f.submit %>
 <% end %>

Halalan-trial/app/views/admin/candidates/index.html.erb

@@ -5,12 +5,13 @@
 	<div class="row">
 		<div class="col-md-12">
 			<left>
-				<h1>Candidates</h1>
-				<%=link_to "Add a candidate", new_admin_candidate_path%>
+				<h1>CANDIDATES</h1>
+				<%= button_to "Add a Candidate", new_admin_candidate_path, :method => "get" %>
 			</left>
 			<%@positions.each do |p|%>
 			<hr>
 			<h3><center><%=p.name%></center></h3>
+<<<<<<< HEAD
 
 				<table>
 				<table class="table table-hover">
@@ -18,6 +19,9 @@
 						<th witdth = "40%"><center>Name</center></th>
 						<th><center>Slogan</center></th>
 					</thead>
+=======
+				<table>
+>>>>>>> a1448dc5a8392d3e8fd508db23a835cd0eab52ce
 					<%p.candidates.each do |c|%>
 						<tr>
 							<td>

Halalan-trial/app/views/admin/candidates/new.html.erb

@@ -3,12 +3,12 @@
 
 <div class="container">
   	<div class="row">
-    	<div class="col-md-12">	
-			<h1>New Candidate</h1>
-
+		<h1>New Candidate</h1>
+    	<div class="col-md-3">	
+    		<br>			
 			<%= render partial: "form" %>
-
-			<%= link_to "Back to Candidates", admin_candidates_path %>
+			<br>
+			<%= link_to "< Back to Candidates", admin_candidates_path %>
 		</div>
 	</div>
 </div>

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

@@ -5,14 +5,14 @@
 	<div class="row">
 		<div class="col-md-12">
 			<left>
-				<h1>Positions</h1>
-				<%=link_to "Add New Position", new_admin_position_path%>
+				<h1>POSITIONS</h1>
+				<%=button_to "Create a Position", new_admin_position_path, :method => "get" %>
 			</left>
 			<%@positions.each do |p|%>
 			<hr>
-			<h3><center><%= link_to p.name, admin_position_path(p.id) %></center></h3>
+			<h3><left><%= link_to p.name, admin_position_path(p.id) %></left></h3>
 
 			<%end%>
 		</div> 
 	</div>
-</div>
+</div>
\ No newline at end of file

Halalan-trial/app/views/admin/positions/new.html.erb

@@ -3,12 +3,12 @@
 
 <div class="container">
   	<div class="row">
-    	<div class="col-md-12">	
-			<h1>New Position</h1>
-
+  	<h1>New Position</h1>
+    	<div class="col-md-3">			
+			<br>
 			<%= render partial: "form" %>
-
-			<%= link_to "Back to Candidates", admin_candidates_path %>
+			<br>
+			<%= link_to "< Back to Candidates", admin_candidates_path %>
 		</div>
 	</div>
 </div>

Halalan-trial/app/views/devise/registrations/new.html.erb

 <div class="container">
   <div class="row">
-    <div class="col-md-12"> 
+    <div class="col-md-3"> 
       <h2>Sign up</h2>
 
       <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), :html => { :role => 'form'}) do |f| %>

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

@@ -7,7 +7,7 @@
 %>
 
 <%= simple_form_for([:voting, @vote]) do |f| %>
-	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 label: 'Cast Vote' %>

Halalan-trial/app/views/voting/votes/index.html.erb

@@ -11,7 +11,7 @@
       <h4>Vote now for:</h4>
       <ul>
         <%@positions.each do |p|%>
-        <li><%=p.name%><br>
+        <br>
           <%voted_for = false%>
             <% p.candidates.each do |c|%>
               <%c.votes.each do |v|%>
@@ -26,7 +26,7 @@
               <%=link_to "Vote for a #{p.name}", "/voting/new/#{p.id}" %>
               <%else%>
               <%end%>
-        </li>
+        
         <%end%>
       </ul>
       <hr>

Halalan-trial/app/views/voting/votes/new.html.erb

@@ -3,12 +3,13 @@
 
 <div class="container">
   	<div class="row">
-    	<div class="col-md-12">	
+    	<div class="col-md-3">	
 			<h1>Vote</h1>
 
 			<%= render partial: "form" %>
 
-			<%= link_to "Back to Votes", voting_votes_path %>
+			<br>
+			<%= link_to "< Back to Votes", voting_votes_path %>
 		</div>
 	</div>
 </div>