Skip to content

F
finalproject
Commit 042519a4 authored by Troy Gabriel Ang Ko's avatar Troy Gabriel Ang Ko
Browse files
Options

design+some minor adjustments

parent a2c0aaa7
Show whitespace changes
Inline Side-by-side
Showing with 108 additions and 64 deletions
election_2016/app/assets/stylesheets/application.css
View file @ 042519a4
.indexcontainer{
background-image: url(flag.jpg);
background-size: 1400px 700px;
position: absolute;
}
a.button {
-webkit-appearance: button;
-moz-appearance: button;
appearance: button;
text-decoration: none;
color: initial;
}
.backgroundcontainer{
background-image: url(gradient.jpg);
}
.gradientcontainer{
background-image: url(gradient.jpg);
}
.memcontainer{ .memcontainer{
background-image: url(Presidentiables.jpg), url(Vice-Presidentiables.jpg), url(UNA_Senators.png), url(LP_Senators.jpg), url(Poe_Escudero_Senators.png); background-image: url(Presidentiables.jpg), url(Vice-Presidentiables.jpg), url(UNA_Senators.png), url(LP_Senators.jpg), url(Poe_Escudero_Senators.png);
/*background-position: left top, right top, left bottom, center bottom, right bottom;*/ /*background-position: left top, right top, left bottom, center bottom, right bottom;*/
......
election_2016/app/assets/stylesheets/bootstrap.css
View file @ 042519a4
...@@ -7,10 +7,11 @@ ...@@ -7,10 +7,11 @@
html { html {
font-family: sans-serif; font-family: Impact;
-webkit-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%; -ms-text-size-adjust: 100%;
} }
body { body {
margin: 0; margin: 0;
} }
......
election_2016/app/views/devise/confirmations/new.html.erb
View file @ 042519a4
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<%= f.full_error :confirmation_token %> <%= f.full_error :confirmation_token %>
<div class="form-inputs"> <div class="form-inputs">
<h5 style="font-family:arial; padding-top:70px; padding-left:500px;">
<%= f.input :email, required: true, autofocus: true %> <%= f.input :email, required: true, autofocus: true %>
</div> </div>
......
election_2016/app/views/devise/passwords/edit.html.erb
View file @ 042519a4
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<%= f.full_error :reset_password_token %> <%= f.full_error :reset_password_token %>
<div class="form-inputs"> <div class="form-inputs">
<%= f.input :password, label: "New password", required: true, autofocus: true, hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length) %> <%= f.input :password, label: "New password", required: true, autofocus: true, hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length) %>
<%= f.input :password_confirmation, label: "Confirm your new password", required: true %> <%= f.input :password_confirmation, label: "Confirm your new password", required: true %>
</div> </div>
......
election_2016/app/views/devise/passwords/new.html.erb
View file @ 042519a4
<link rel"stylesheet" type="text/css" href="application.css"> <link rel"stylesheet" type="text/css" href="application.css">
<body class ="gradientcontainer">
<h2>Forgot your password?</h2> <h1 style = "font-size:70px;color: #FFFFFF; font-family:impact; padding-top:150px; padding-left:400px;">Forgot your password?</h2>
<%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %> <%= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<h5 style="font-family:arial; padding-top:70px; padding-left:550px;">
<div class="form-inputs"> <div class="form-inputs">
<%= f.input :email, required: true, autofocus: true %> <%= f.input :email, required: true, autofocus: true %>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<%= f.button :submit, "Send me reset password instructions" %> <%= f.button :submit, "Send me reset password instructions" %>
</div> </div>
<% end %> <% end %>
<h5 style="font-family:arial;padding-left:660px;">
<%= render "devise/shared/links" %> <%= render "devise/shared/links" %>
election_2016/app/views/devise/registrations/new.html.erb
View file @ 042519a4
<link rel"stylesheet" type="text/css" href="application.css"> <link rel"stylesheet" type="text/css" href="/app/assets/stylesheets/application.css">
<body class = "backgroundcontainer">
<h2>Sign up</h2>
<h1 style= "font-size:150px;color:#FFFFFF;font-family: fantasy; padding-left:430px; padding-top:20px"> Sign up </h1>
<%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= f.error_notification %> <%= f.error_notification %>
<div class="form-inputs"> <div class="form-inputs">
<h5 style="font-family:arial; padding-top:70px; padding-left:500px;">
<%= f.input :first_name, required: true, autofocus: true %> <%= f.input :first_name, required: true, autofocus: true %>
<h5 style="font-family:arial; padding-left:500px;">
<%= f.input :last_name, required: true, autofocus: true %> <%= f.input :last_name, required: true, autofocus: true %>
<h5 style="font-family:arial; padding-left:500px;">
<%= f.input :birthday, required: true, autofocus: true, start_year: 1900, end_year: 1998 %> <%= f.input :birthday, required: true, autofocus: true, start_year: 1900, end_year: 1998 %>
<h5 style="font-family:arial; padding-left:500px;">
<%= f.input :gender, required: true, as: :select, :collection => ['Female', 'Male'], autofocus: true %> <%= f.input :gender, required: true, as: :select, :collection => ['Female', 'Male'], autofocus: true %>
<h5 style="font-family:arial; padding-left:500px;">
<%= f.input :email, required: true, autofocus: true %> <%= f.input :email, required: true, autofocus: true %>
<h5 style="font-family:arial; padding-left:500px;">
<%= f.input :password, required: true, hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length) %> <%= f.input :password, required: true, hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length) %>
<h5 style="font-family:arial; padding-left:500px;">
<%= f.input :password_confirmation, required: true %> <%= f.input :password_confirmation, required: true %>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<h5 style="font-family:arial; padding-left:650px;">
<%= f.button :submit, "Sign up" %> <%= f.button :submit, "Sign up" %>
</div> </div>
<% end %> <% end %>
<h5 style="font-family:arial; padding-left:660px;">
<%= render "devise/shared/links" %> <%= render "devise/shared/links" %>
election_2016/app/views/devise/sessions/new.html.erb
View file @ 042519a4
<link rel"stylesheet" type="text/css" href="application.css"> <link rel"stylesheet" type="text/css" href="application.css">
<body class ="gradientcontainer">
<h1 style= "font-size:100px;font-family:impact;color: #FFFFFF; padding-top:70px; padding-left:580px;">Log in</h2>
<h2>Log in</h2>
<%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> <%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<body class ="gradientcontainer">
<div class="form-inputs"> <div class="form-inputs">
<h5 style="font-family:arial; padding-top:70px; padding-left:300px;">
<%= f.input :email, required: false, autofocus: true %> <%= f.input :email, required: false, autofocus: true %>
<h5 style="font-family:arial; padding-left:300px;">
<%= f.input :password, required: false %> <%= f.input :password, required: false %>
<%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %> <%= f.input :remember_me, as: :boolean if devise_mapping.rememberable? %>
</div> </div>
<div class="form-actions"> <div class="form-actions">
<h5 style="font-family:arial; padding-top:50px; padding-left:650px;">
<%= f.button :submit, "Log in" %> <%= f.button :submit, "Log in" %>
</div> </div>
<% end %> <% end %>
<h5 style="font-family:arial; padding-left:650px;">
<%= render "devise/shared/links" %> <%= render "devise/shared/links" %>
election_2016/app/views/pages/about.html.erb
View file @ 042519a4
<link rel"stylesheet" type="text/css" href="application.css"> <link rel"stylesheet" type="text/css" href="application.css">
<body> <body class = "gradientcontainer">
<div class="box fade-in one"> <div class="box fade-in one">
<h1 style="margin-left:100px;margin-top:300px;font-family:Droid Sans">MIS 21 - B DataBAES</h1> <h1 style="font-size:70px;color:#FFFFFF;margin-left:100px;margin-top:100px;font-family:impact; padding-left:330px;">MIS 21 - B DataBAES</h1>
<h6 style="margin-left:100px"> <h3 style="margin-left:100px">
<li style="margin-top:10px">Troy Ang Ko</li> <ul style="margin-top:10px;padding-top: 50px; padding-left: 400px;">Troy Ang Ko | "The malakas sa chicks"</ul>
<p style="color:#66ccff;margin-top:10px; margin-left: 50px;">The malakas sa chicks</p>
<li style="margin-top:10px">Jarod Catolico</li>
<p style="color:#4dc3ff;margin-top:10px; margin-left: 50px;">The malakas sa chicken</p>
<li style="margin-top:10px">Norence Ilicito</li>
<p style="color:#33bbff;margin-top:10px; margin-left: 50px;">The sketchy CSS Master</p>
<li style="margin-top:10px">Jego Reyes</li>
<p style="color:#1ab2ff;margin-top:10px; margin-left: 50px;">The pogi pero malandi</p>
</h6>
<h3 style="margin-left:100px"><%= link_to "Back", ".."%></h3> <ul style="margin-top:10px; padding-top: 20px; padding-left: 380px;">Jarod Catolico | "The malakas sa chicken"</ul>
<ul style="margin-top:10px; padding-top: 20px; padding-left: 380px;">Norence Ilicito | "The sketchy CSS Master"</ul>
<ul style="margin-top:10px; padding-top: 20px; padding-left: 405px;">Jego Reyes | "The pogi pero malandi"</ul>
</h3>
<h3 style="margin-left:100px; padding-right:100px;padding-top:100px"><%= link_to "Back", ".."%></h3>
</div> </div>
......
election_2016/app/views/pages/index.html.erb
View file @ 042519a4
<link rel"stylesheet" type="text/css" href="application.css"> <link rel = "stylesheet" type="text/css" href="/app/assets/stylesheets/application.css">
<body> <body class = "gradientcontainer" >
<div class="box fade-in one"> <div class="box fade-in one">
<h1 style="margin-left:100px;margin-top:100px;font-family:Droid Sans">Election 2016</h1> <h1 style="margin-left:100px;margin-top:150px;font-family: Impact">Election 2016</h1>
<h3 style="color:#0080ff;margin-left:100px">
<%= link_to "MIS 21 - B DataBAES", "/about" %>
</h3>
<h3 style="color:#0080ff;margin-left:100px"> <h4 style="color:#0080ff;margin-left:100px">
<%= link_to "MIS 21 - B DataBAES", "/about" %>
</h3>
<h4 style="color:#0080ff;margin-left:100px">
<% if user_signed_in? %> <% if user_signed_in? %>
Hello <%= current_user.email %>! <br> Hello <%= current_user.email %>! <br>
<h4 style="margin-left:100px"><%= link_to "Profile", "/profiles"%>&nbsp;&nbsp;<%= link_to('Log Out', destroy_user_session_path, :method => :delete) %></h4> <h4 style="margin-left:100px"><%= link_to "Profile", "/profiles"%>&nbsp;&nbsp;<%= link_to('Log Out', destroy_user_session_path, :method => :delete) %></h4>
<% else %> <% else %>
<h5 style="color:#0080ff;margin-left:100px"> <h5 style="color:#0080ff;margin-left:100px; padding ">
You're not signed in. You're not signed in.
<%= link_to "Login", new_user_session_path %> <%= link_to "Login", new_user_session_path %>
<%= link_to "Register", new_user_registration_path %> <%= link_to "Register", new_user_registration_path %>
...@@ -26,9 +25,9 @@ ...@@ -26,9 +25,9 @@
</h5> </h5>
<% end %> <% end %>
</h4> </h4>
<table width="100%" style="margin:100px;"> <table width="100%" style="margin:100px;">
<tr> <tr>
<th>Candidate ID </th> <th>Candidate ID </th>
<th>First Name</th> <th>First Name</th>
...@@ -45,7 +44,7 @@ ...@@ -45,7 +44,7 @@
<td><%= candidate.votes.count %> </td> <td><%= candidate.votes.count %> </td>
</tr> </tr>
<% end %> <% end %>
</table> </table>
<%= link_to "See Total Vote Count", votes_path %> <%= link_to "See Total Vote Count", votes_path %>
......
election_2016/app/views/votes/index.html.erb
View file @ 042519a4
<link rel"stylesheet" type="text/css" href="application.css"> <link rel"stylesheet" type="text/css" href="/app/assets/stylesheets/application.css">
<body> <body class = "indexcontainer">
<div class="box fade-in one"> <div class="box fade-in one">
<h1 style="margin-left:100px;margin-top:100px;font-family:Droid Sans">Election 2016</h1>
<h3 style="color:#0080ff;margin-left:100px"> <h1 style="font-size:100px; color:#464646; margin-left:100px;margin-top:100px;font-family:impact; padding-left:350px ">Election 2016</h1>
<h3 style="color:#464646;margin-left:50px; position:absolute; padding-left:560px; font-family:impact;" >
<%= link_to "MIS 21 - B DataBAES", "/about" %> <%= link_to "MIS 21 - B DataBAES", "/about" %>
</h3> </h3>
<h4 style="color:#0080ff;margin-left:100px"> <h2 style="color:#464646;margin-left:100px; padding-top:50px;padding-left: 530px;font-family:impact;">
<% if user_signed_in? %> <% if user_signed_in? %>
<% if current_user.email == "norenceilicito@gmail.com" %> <% if current_user.email == "norenceilicito@gmail.com" %>
Hello <a href = "/vote_history"> <%= current_user.first_name %></a>! <br> Hello <a href = "/vote_history"> <%= current_user.first_name %></a>! <br>
<h4 style="margin-left:100px"> <h3 style="margin-left:100px">
<%= link_to "Vote", vote_path %>&nbsp;&nbsp; <%= link_to "Vote", vote_path %>&nbsp;&nbsp;
<%= link_to('Log Out', destroy_user_session_path, :method => :delete) %> &nbsp;&nbsp; <%= link_to('Log Out', destroy_user_session_path, :method => :delete) %> &nbsp;&nbsp;
<%= link_to "Admin", admin_candidates_path %> <%= link_to "Admin", admin_candidates_path %>
</h4> </h4>
<% else %> <% else %>
Hello <a href = "/vote_history"> <%= current_user.first_name %></a>! <br> Hello <a href = "/vote_history"> <%= current_user.first_name %></a>! <br>
<h4 style="margin-left:100px"> <h4 style="margin-left:100px; padding-left:530px; padding-top:20px">
<%= link_to "Vote", vote_path %>&nbsp;&nbsp; <%= link_to "Vote", vote_path %>&nbsp;&nbsp;
&nbsp;&nbsp; &nbsp;&nbsp;
<%= link_to('Log Out', destroy_user_session_path, :method => :delete) %></h4> <%= link_to('Log Out', destroy_user_session_path, :method => :delete) %></h4>
<% end %> <% end %>
<% else %> <% else %>
<h5 style="color:#0080ff;margin-left:100px"> <h4 style="color:#464646;margin-left:100px; padding-top:10px;padding-left:480px; font-family:impact;">
You're not signed in. You're not signed in.
<%= link_to "Login", new_user_session_path %> <%= link_to "Login", new_user_session_path %>
<%= link_to "Register", new_user_registration_path %> <%= link_to "Register", new_user_registration_path %>
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
</h4> </h4>
<table width="100%" style="margin:100px;"> <table width="100%" style="font-size: 15px;margin-left:330px; margin-top:80px ;font-family:fantasy;">
<tr> <tr>
<th>Position</th> <th>Position</th>
<th>First Name</th> <th>First Name</th>
......
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