From 5b1abb9bb2aa3513ffe9836676f656d5d46cb5b8 Mon Sep 17 00:00:00 2001 From: Mark Ryall Date: Fri, 12 Oct 2012 13:23:23 +1000 Subject: [PATCH] added filtering by pending --- app/assets/javascripts/application.js.coffee | 5 +++-- app/views/teams/_pending_membership.html.slim | 2 +- app/views/teams/show.html.slim | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index cd70efe..91fe4a3 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -61,10 +61,11 @@ $ -> toggle_hidden = (show, selector) -> if show - $(selector).show() + $(selector).removeClass("hidden") else - $(selector).hide() + $(selector).addClass("hidden") $('#show-past').change -> toggle_hidden(this.checked, '.past') $('#show-current').change -> toggle_hidden(this.checked, '.current') $('#show-future').change -> toggle_hidden(this.checked, '.future') + $('#show-pending').change -> toggle_hidden(this.checked, '.pending') diff --git a/app/views/teams/_pending_membership.html.slim b/app/views/teams/_pending_membership.html.slim index c021b3a..e42a9ca 100644 --- a/app/views/teams/_pending_membership.html.slim +++ b/app/views/teams/_pending_membership.html.slim @@ -1,4 +1,4 @@ -div.hero-unit +div.hero-unit.pending.hidden div.row.person div.span4 img src="/assets/silhouette.png" width=300 diff --git a/app/views/teams/show.html.slim b/app/views/teams/show.html.slim index 5830740..e9fb88d 100644 --- a/app/views/teams/show.html.slim +++ b/app/views/teams/show.html.slim @@ -14,7 +14,9 @@ form.form-inline label.span1.checkbox input type="checkbox" id="show-current" checked="true" current label.span1.checkbox - input type="checkbox" future + input type="checkbox" id="show-future" future + label.span1.checkbox + input type="checkbox" id="show-pending" pending input.span2.search-query id="show-future" type="text" placeholder="search" div id="add_new" style="display:none;"