Merge branch 'master' into add-event-display-endpoint

Procfile

@@ -1,3 +1,3 @@
 web: bundle exec unicorn -c ./config/unicorn.rb
-worker: bundle exec sidekiq -r ./app.rb
+worker: bundle exec sidekiq -c 5 -r ./app.rb
 redis: redis-server ./config/redis.conf

app/assets/css/footer.scss

@@ -16,3 +16,9 @@ footer {
     display: inline-block;
   }
 }
+div.award {
+  background-color: white;
+  img{
+    width: 100%;
+  }
+}

app/assets/css/styles.css.erb

@@ -208,7 +208,7 @@ section h3 {
 #step1 .publisher .publisher-description {
   background-color: #8b969e;
   color: #fff;
-  border-radius: 15px;
+  border-radius: 10px;
   padding: 20px 15px;
   line-height: 1.2;
   position: absolute;
@@ -229,6 +229,10 @@ section h3 {
   opacity: 1;
 }
 
+#step1 .publisher.selected {
+  border: 5px solid #182A4A;
+}
+
 #step1 .publisher .city {
   text-transform: uppercase;
   border-bottom: 2px solid #BAC0C8;

app/assets/js/scripts.js

@@ -35,13 +35,18 @@ app.hookupSteps = function() {
       .removeClass('is-active');
 
     var $publisher = $(event.currentTarget);
-    $publisher
-      .addClass('selected')
-      .addClass('is-active');
+    $publisher.addClass('is-active');
+  });
+
+  $('.publisher:not(.soon)').on('mouseout', function(event) {
+    $('.publisher').removeClass('is-active');
   });
 
   $('.publisher:not(.soon) .publisher-btn').on('click', function(event) {
+    $('.publisher').removeClass('selected');
+
     var $publisher = $(this).parents('.publisher:not(.soon)');
+    $publisher.addClass('selected');
 
     app.setPublisher($publisher);
 

app/models/subscription.rb

@@ -65,7 +65,7 @@ def remindable?
     end
 
     def needs_activity_evaluation?
-      Time.now > 2.weeks.from_now(last_notification)
+      Time.now > 2.weeks.since(last_notification)
     end
 
     def deliveries_since_last_notification

app/views/layouts/footer.erb

@@ -20,3 +20,9 @@
     </div>
   </div>
 </footer>
+
+<div class="award">
+  <div class="col-xs-12 col-md-9">
+    <a href="http://awards.codeforamerica.org/2015/winner/Citygram/"><img src="<%= asset_path 'footer/cfa-award-logo-purple-2.png' %>"></a>
+  </div>
+</div>    

config/cities.geojson

@@ -96,6 +96,23 @@
           35.880079
         ]
       }
+    },
+        {
+      "id": "tulsa",
+      "type": "Feature",
+      "properties": {
+        "title": "Tulsa OK",
+        "background": "tulsa.jpg",
+        "zoom": 11
+      },
+      "geometry": {
+        "type": "Point",
+        "coordinates": [
+            -95.991433,
+            36.156718
+
+        ]
+      }
     },
     {
       "id": "austin",