Merge branch 'master' of https://gitlab.discs.ateneo.edu/evilla_gomez_guian_principe/final_project

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

 <% provide(:candidate, "active") %>
 <% provide(:title, "#{@candidate.full_name}" ) %> 
 
+<style>
+	p{
+
+	    display:inline;
+	}
+	h1{
+	    display:inline
+	}
+</style>
+
 <div class="container">
   	<div class="row">
     	<div class="col-md-12">	
-			<h1>Name of the Candidate: <%= @candidate.full_name%></h1>
-				<%=link_to "Edit", edit_admin_candidate_path(@candidate.id)%>
     		<br>
+			<h1><font size="20"><%= @candidate.full_name%></font></h1>
+				<p>
+				<%=link_to "Edit", edit_admin_candidate_path(@candidate.id)%>
 				<%=link_to "Delete", admin_candidate_path(@candidate.id), method: :delete%>
-				<br>
-			<h3>Position: <%= @candidate.position.name %></h3>
+				</p>
+			<h2><%= @candidate.position.name %></h2>
 				<% 
 					m=0
 					f=0
@@ -29,7 +40,7 @@
 				%> 
 			<%end%>
 			<br>
-			<h3>Slogan: <%= @candidate.slogan%></h3>
+			<h3>" <%= @candidate.slogan%> "</h3>
 			<br>
 			<center>
 				<table class="table table-hover">
@@ -62,8 +73,6 @@
 				<%end%>
 			</ul>
 
-			<hr>
-			<%= link_to "Back to Candidates", admin_candidates_path %>
 		</div>
 	</div>
 </div>
\ No newline at end of file

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

 <% provide(:position, "active") %>
 <% provide(:title, "#{@position.name}" ) %> 
 
+<style>
+	p{
+		margin-bottom: 0;
+		padding-bottom: 0;
+	    display:inline;
+	}
+	h1{
+	    display:inline
+	}
+</style>
+
 <div class="container">
   	<div class="row">
     	<div class="col-md-12">	
-			<h1><%= @position.name%></h1>
-
+			<h1><font size="20"><%= @position.name%></font></h1>
+			<p>
 			<%=link_to "Edit", edit_admin_position_path(@position.id)%>
-			<br>
 			<%=link_to "Delete", admin_position_path(@position.id), method: :delete%>
-			<br>
+			</p>
+
 			<hr>
 			<h2>Candidates for <%=@position.name%></h2>
 
@@ -18,8 +29,9 @@
 				    <li><%=link_to c.full_name, admin_candidate_path(c.id)%></li>
 				<%end%>
 			</ul>
+			<br>
 
-			<%= link_to "Back to Positions", admin_positions_path %>
+			<%= link_to "< Back to Positions", admin_positions_path %>
 		</div>
 	</div>
 </div>
\ No newline at end of file

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

@@ -4,16 +4,6 @@
 <div class ="container">
 	<div class="row">
 		<div class="col-md-12">
-			<% if user_signed_in? %>
-		  		<% case current_user.role %>
-		  		<% when 'voter' %>
-		    		<h3>Welcome, <%= current_user.first_name%>! </h3>
-		  		<% when 'admin' %>
-		    		<h3>Welcome, Administrator</h3>
-		  	<% end %>
-			<% else %>
-		  		<h3>Welcome</h3>
-			<% end %>
 			<h1><center>Current Vote Tally</center></h1>
 			<hr>
 			<%@positions.each do |p|%>