Skip to content

Commit 5359672

Browse files
committed
Merge branch 'with_status_counts'
2 parents 6124a56 + 3b92e1b commit 5359672

File tree

2 files changed

+37
-0
lines changed

2 files changed

+37
-0
lines changed

app/views/manage/events/proposals.html.erb

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,29 @@
33
<% run_when_jquery_is_ready "bind_all_proposal_controls();" %>
44
<% run_when_jquery_is_ready "bind_manage_proposals_checkboxes();" %>
55

6+
<% if proposal_statuses? %>
7+
<table cellspacing="0" id="proposal-status-counts">
8+
<tr>
9+
<th>Proposed</th>
10+
<th>Accepted</th>
11+
<th>Confirmed</th>
12+
<th>Accepted + Confirmed</th>
13+
<th>Declined</th>
14+
<th>Rejected</th>
15+
<th>Junk</th>
16+
</tr>
17+
<tr>
18+
<td><%= @event.proposals.proposed.count %></td>
19+
<td><%= @event.proposals.accepted.count %></td>
20+
<td><%= @event.proposals.confirmed.count %></td>
21+
<td><%= @event.proposals.accepted.count + @event.proposals.confirmed.count %></td>
22+
<td><%= @event.proposals.declined.count %></td>
23+
<td><%= @event.proposals.rejected.count %></td>
24+
<td><%= @event.proposals.junk.count %></td>
25+
</tr>
26+
</table>
27+
<% end %>
28+
629
<%= link_to "Send email to selected speakers...", "mailto:", :class => "send-email-link editable" %>
730

831
<%

themes/bridgepdx/stylesheets/custom.css

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,20 @@ ul.speakers .note li {
572572
width: 100%;
573573
}
574574

575+
table#proposal-status-counts {
576+
collapse: collapse;
577+
}
578+
579+
#proposal-status-counts th {
580+
background-color: #DEDEDE;
581+
}
582+
583+
#proposal-status-counts th,
584+
#proposal-status-counts td {
585+
text-align: center;
586+
border: 1px solid #DEDEDE;
587+
}
588+
575589
/* @end */
576590

577591
/* @end */

0 commit comments

Comments
 (0)