tables galore

This commit is contained in:
Tyrel Souza 2014-11-07 15:56:49 -05:00
parent 1a64fe46e2
commit 22f913e389
4 changed files with 19 additions and 10 deletions

View File

@ -170,7 +170,7 @@ a {
background-color: $white; background-color: $white;
border-radius: 15; border-radius: 15;
padding: 15px; padding: 15px;
box-shadow: 2px 2px 3px #aaaaaa; box-shadow: 1px 1px 2px #aaaaaa;
.lead { .lead {
overflow: hidden; overflow: hidden;
@ -216,4 +216,14 @@ a {
.form-inline input { .form-inline input {
width: auto; width: auto;
}
.checkmark {
font-size:1.5em;
color: #419641;
}
.overdue {
font-weight:bold;
color:#f00;
} }

View File

@ -27,9 +27,9 @@ class Project < ActiveRecord::Base
def check_date_overdue_output completed, due def check_date_overdue_output completed, due
if completed if completed
"Completed".html_safe "<span class='checkmark'>&check;</span>".html_safe
elsif Date.today > due elsif Date.today > due
"Overdue" "<span class='overdue'>Overdue</span>".html_safe
else else
due due
end end

View File

@ -18,15 +18,14 @@
</h1> </h1>
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
<div class="well well-lg">
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<%= link_to 'New Project', new_project_path %> <a href="<%= url_for new_project_path %>" class="btn btn-info pull-right"><i class="glyphicon glyphicon-search"></i>New Project</a>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
<!-- /cont --> <!-- /cont -->

View File

@ -9,7 +9,7 @@
<% if @active_projects.count > 0 %> <% if @active_projects.count > 0 %>
<h3>Active (<%= @active_projects.count%>)</h3> <h3>Active (<%= @active_projects.count%>)</h3>
<table width="100%"> <table class="table">
<thead> <thead>
<tr> <tr>
<th width="30%">Project</th> <th width="30%">Project</th>
@ -35,7 +35,7 @@
<% if @upcoming_projects.count > 0 %> <% if @upcoming_projects.count > 0 %>
<h3>Upcoming (<%= @upcoming_projects.count%>)</h3> <h3>Upcoming (<%= @upcoming_projects.count%>)</h3>
<table width="100%"> <table class="table">
<thead> <thead>
<tr> <tr>
<th width="30%">Project</th> <th width="30%">Project</th>
@ -61,7 +61,7 @@
<% if @backlog_projects.count > 0 %> <% if @backlog_projects.count > 0 %>
<h3>Backlog (<%= @backlog_projects.count%>)</h3> <h3>Backlog (<%= @backlog_projects.count%>)</h3>
<table width="100%"> <table class="table">
<thead> <thead>
<tr> <tr>
<th width="30%">Project</th> <th width="30%">Project</th>
@ -87,7 +87,7 @@
<% if @completed_projects.count > 0 %> <% if @completed_projects.count > 0 %>
<h3>Completed (<%= @completed_projects.count%>)</h3> <h3>Completed (<%= @completed_projects.count%>)</h3>
<table width="100%"> <table class="table">
<thead> <thead>
<tr> <tr>
<th width="30%">Project</th> <th width="30%">Project</th>