From a574807e50553e41e2df97b661ddd3a37acd854c Mon Sep 17 00:00:00 2001
From: Alex Weiksnar <alex@zooniverse.org>
Date: Wed, 9 Dec 2015 15:02:34 -0600
Subject: [PATCH] Update active class on owned-card-list

---
 app/components/owned-card-list.cjsx | 12 +++++++++++-
 app/pages/collections.cjsx          |  1 +
 app/pages/projects.cjsx             |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/components/owned-card-list.cjsx b/app/components/owned-card-list.cjsx
index b82cc3d5cd..80e3f08ba6 100644
--- a/app/components/owned-card-list.cjsx
+++ b/app/components/owned-card-list.cjsx
@@ -32,6 +32,8 @@ module.exports = React.createClass
       'All'
 
   render: ->
+    {location} = @props
+
     <div className="secondary-page all-resources-page">
       <section className={"hero #{@props.heroClass}"}>
         <div className="hero-container">
@@ -65,7 +67,15 @@ module.exports = React.createClass
                 {if meta
                   <nav className="pagination">
                     {for page in [1..meta.page_count]
-                      <Link to={"#{@props.linkTo}?page=#{page}"} activeClassName="active" key={page} className="pill-button" style={border: "2px solid" if page is 1 and window.location.search is ""}>{page}</Link>}
+                      active = (page is +location.query.page) or (page is 1 and not location.search)
+                      <Link
+                        key={page}
+                        to={"#{@props.linkTo}?page=#{page}"}
+                        activeClassName="active"
+                        className="pill-button"
+                        style={border: "2px solid" if active}>
+                        {page}
+                      </Link>}
                   </nav>}
               </nav>
             </div>
diff --git a/app/pages/collections.cjsx b/app/pages/collections.cjsx
index 8e71a5cdab..74285393aa 100644
--- a/app/pages/collections.cjsx
+++ b/app/pages/collections.cjsx
@@ -61,6 +61,7 @@ List = React.createClass
 
   render: ->
     <OwnedCardList
+      {...@props}
       translationObjectName="collectionsPage"
       listPromise={@listCollections()}
       linkTo="collections"
diff --git a/app/pages/projects.cjsx b/app/pages/projects.cjsx
index e5d9aa3c21..0e7f3b6950 100644
--- a/app/pages/projects.cjsx
+++ b/app/pages/projects.cjsx
@@ -42,6 +42,7 @@ module.exports = React.createClass
 
   render: ->
     <OwnedCardList
+      {...@props}
       translationObjectName="projectsPage"
       listPromise={@listProjects()}
       linkTo="projects"