Skip to content

F
final_project
Commit d6825da1 authored by Wills Gomez's avatar Wills Gomez
Browse files
Options

last minute push fuck ups

parent b5e99c92
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 14 deletions
Halalan-trial/app/assets/stylesheets/ver1.css.scss
View file @ d6825da1
...@@ -23,3 +23,18 @@ td { ...@@ -23,3 +23,18 @@ td {
ul.nav navbar-nav navbar-right{ ul.nav navbar-nav navbar-right{
padding-top: 20px; padding-top: 20px;
} }
.banner{
width: 100%;
height: 300px;
display: block;
background-image: url(image-path('philippineflag2.jpg'));
}
.banner > .banner-image{
width: 100%;
height: 300px;
display: block;
background-image: url(image-path('philippineflag2.jpg'));
}
\ No newline at end of file
Halalan-trial/app/views/about/evilla.html.erb
View file @ d6825da1
...@@ -14,23 +14,24 @@ ...@@ -14,23 +14,24 @@
<div class="row"> <div class="row">
<p>&emsp;<b>What do you want to be when you grow up?</b> <p>&emsp;<b>What do you want to be when you grow up?</b>
<br> <br>
<i>&emsp;&emsp;Insert Answer Here</i> <i>&emsp;&emsp;Batman!</i>
<br> <br>
&emsp;<b>Happy ka ba kay Sir Happy?</b> &emsp;<b>Happy ka ba kay Sir Happy?</b>
<br> <br>
<i>&emsp;&emsp;Insert Answer Here</i> <i>&emsp;&emsp;happy!
</i>
<br> <br>
&emsp;<b>Kapag nagluto si Sir Happy, Happy Meal ba tawag dun?</b> &emsp;<b>Kapag nagluto si Sir Happy, Happy Meal ba tawag dun?</b>
<br> <br>
<i>&emsp;&emsp;Insert Answer Here</i> <i>&emsp;&emsp;Happy Meal ba tawag dun? Jolly meal siguro</i>
<br> <br>
&emsp;<b>Expected grade sa MIS21?</b> &emsp;<b>Expected grade sa MIS21?</b>
<br> <br>
<i>&emsp;&emsp;Insert Answer Here</i> <i>&emsp;&emsp;Ayoko na magexpect, mahirap na! </i>
<br> <br>
&emsp;<b>Ano ang favorite final fantasy mo? </b> &emsp;<b>Ano ang favorite final fantasy mo? </b>
<br> <br>
<i>&emsp;&emsp;Insert Answer Here)</i> <i>&emsp;&emsp;ff10</i>
<br> <br>
&emsp;<b>(For the purposes of being in this institution, the question was censored)</b> &emsp;<b>(For the purposes of being in this institution, the question was censored)</b>
<br> <br>
......
Halalan-trial/app/views/admin/candidates/index.html.erb
View file @ d6825da1
...@@ -11,15 +11,13 @@ ...@@ -11,15 +11,13 @@
<%@positions.each do |p|%> <%@positions.each do |p|%>
<hr> <hr>
<h3><center><%=p.name%></center></h3> <h3><center><%=p.name%></center></h3>
<<<<<<< HEAD
<table> <table>
=======
<table class="table table-hover"> <table class="table table-hover">
<thead> <thead>
<th witdth = "40%"><center>Name</center></th> <th witdth = "40%"><center>Name</center></th>
<th><center>Slogan</center></th> <th><center>Slogan</center></th>
</thead> </thead>
>>>>>>> 3a7c99764459a08d3b3963ee6e918b827b0e4445
<%p.candidates.each do |c|%> <%p.candidates.each do |c|%>
<tr> <tr>
<td> <td>
......
Halalan-trial/app/views/layouts/application.html.erb
View file @ d6825da1
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
<body> <body>
<%= render '/layouts/navbar' %> <%= render '/layouts/navbar' %>
<%= yield %> <%= yield %>
......
Halalan-trial/app/views/pages/index.html.erb
View file @ d6825da1
<% provide(:home, "active") %> <% provide(:home, "active") %>
<% provide(:title, "Home") %> <% provide(:title, "Home") %>
<div class="banner">
<img class="banner-image" src="images/philippineflag2.jpg">
</div>
<div class ="container"> <div class ="container">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
...@@ -13,10 +18,6 @@ ...@@ -13,10 +18,6 @@
<th width ="40%"><center>Name</center></th> <th width ="40%"><center>Name</center></th>
<th><center>Votes</center></th> <th><center>Votes</center></th>
</thead> </thead>
<%total = 0%>
<%p.candidates.each do |c|%>
<%total = total+c.votes.count%>
<%end%>
<%p.candidates.each do |c|%> <%p.candidates.each do |c|%>
<tr> <tr>
<td> <td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment