Merge pull request #2614 from Vizzuality/disposable/release-landing-a…

…nd-stories-links

Landing slider updates and stories link

app/assets/javascripts/stories/templates/story.handlebars

@@ -1,7 +1,7 @@
 <section class="header-stories">
   <div class="inner">
     <header>
-      <a class="back-btn desktop-show" href="/stayinformed/crowdsourced-stories">
+      <a class="back-btn desktop-show" href="/stories/crowdsourcedstories">
         <svg><use xlink:href="#shape-fast-forward-left"></use></svg>
         Back to crowdsourced stories
       </a>

app/assets/stylesheets/layouts/_landing.scss

@@ -344,9 +344,9 @@
   &.slide2 { background-image:url('http://gfw.blog.s3.amazonaws.com/Carousel/22109811392_813e7092fc_o.jpg');}
   &.slide3 { background-image:url('backgrounds/home-slider/bg_slide3.png');}
   &.slide4 { background-image:url('backgrounds/home-slider/bg_slide4.jpg');}
-  &.slide5 { background-image:url('http://gfw.blog.s3.amazonaws.com/Carousel/Carousel%20Slide_GLAD%20Alerts%20Brazil.jpg');}
+  &.slide5 { background-image:url('http://gfw.blog.s3.amazonaws.com/Carousel/GFW%20Water%20Carousel%20Slide%20Small.jpg');}
   &.slide6 { background-image:url('backgrounds/home-slider/bg_slide6.jpg');}
-  &.slide7 { background-image:url('http://gfw.blog.s3.amazonaws.com/Carousel/GFW%20Water%20Carousel%20Slide%20Small.jpg');}
+  &.slide7 { background-image:url('http://gfw.blog.s3.amazonaws.com/Carousel/Map%20Builder%20Carousel%20Slide%20Small.jpg');}
 
   aside {
     position: absolute;

app/views/landing/index.html.erb

@@ -37,28 +37,28 @@
   <ul class="main-slider-viewport">
     <!-- <span class="ribbon">Complete this short survey!</span> -->
     <li class="slide slide7">
-      <a href="http://bit.ly/2cdsdCX">
+      <a href="http://bit.ly/2dulYrN">
         <div class="inner">
           <aside>
-            <h2>GFW Water</h2>
-            <h3><span>New tool explores the connection</span> <span>between forests and water risk</span></h3>
+            <h2>Map Builder</h2>
+            <h3><span>Create custom interactive mapping</span> <span>applications with ArcGIS Online</span></h3>
             <div class="link"><span class="mobile-hide">more info</span><span class="mobile-show">+</span></div>
           </aside>
         </div>
       </a>
-      <p class="credits">Photo: Bernd Thaller</p>
+      <p class="credits">Photo: Jane Goodall Institute</p>
     </li>
     <li class="slide slide5">
-      <a href="http://bit.ly/2bQp3PX">
+      <a href="http://bit.ly/2dxJVjB">
         <div class="inner">
           <aside>
-            <h2>Weekly Alerts</h2>
-            <h3><span>High-resolution GLAD Alerts</span> <span>Now available for Brazil</span></h3>
+            <h2>GFW Water</h2>
+            <h3><span>New tool explores the connection</span> <span>between forests and water risk</span></h3>
             <div class="link"><span class="mobile-hide">more info</span><span class="mobile-show">+</span></div>
           </aside>
         </div>
       </a>
-      <p class="credits">Photo: NASA</p>
+      <p class="credits">Photo: Bernd Thaller</p>
     </li>
 	  <li class="slide slide1">
       <a href="/map?referral=carousel">

app/views/shared/_sources_map.html.erb

@@ -454,7 +454,7 @@
         <p>Alerts become confirmed when a second satellite pass has also identified the pixel as an alert. Most of the alerts that are not confirmed have not had another satellite pass, due to the 8-day revisit time or cloud cover.</p>
       </div>
     </li>
-    
+
     <li id='guyra' class='source-item last'>
       <div class='source_header'>
         <strong class='source_title'>Gran Chaco deforestation</strong>
@@ -1704,10 +1704,10 @@
           <dl class='sources_row even'>
             <dt>Cautions</dt>
             <dd>
-            
+
             <p>The accuracies of the species and type labels were not assessed. These fields represent the best guess of the analysts and should not be used for official purposes.</p>
             <p>Polygons labeled as clearings were bare or had very young vegetation as of 2013 or 2014, but contextual clues suggest that these areas will eventually become tree plantations.</p>
-            
+
             </dd>
           </dl>
           <dl class='sources_row even'>
@@ -6439,7 +6439,7 @@
       <p>List of supported file formats <strong>(only polygon data is supported, not point and line data)</strong>:</p>
       <ul class='bullets'>
         <li>Unzipped: .bna, .csv, .dxf, .gtx, .txt, json, .geojson, .rss, .georss, .xml, .gml, .gmt, . gpx, .itf, .kml, .kmz</li>
-        <li>Zipped: .shp, dbf, .shx, .gml, .xsd, .itf, .ili, .tab, .map, .id, .dat, .vrt</li>
+        <li>Zipped: .shp, dbf, .shx, .gml, .xsd, .itf, .ili, .tab, .map, .id, .dat, .vr (zipped shapefiles must include .shp, .shx, .dbf, and .prj files)</li>
       </ul>
     </div>
   </div>
@@ -6683,4 +6683,4 @@
       </div>
     </div>
   </div>
-</article>
+</article>

app/views/small_grants_fund/index.html.erb

@@ -137,7 +137,7 @@
             <ul class="slides js_slides">
               <li class="js_slide">
                 <div class="m-card _align-vertically-flex">
-                  <a href="http://blog.globalforestwatch.org/2016/04/announcing-the-2016-recipients-of-the-small-grants-fund/">
+                  <a href="http://blog.globalforestwatch.org/gfw-community/announcing-the-2016-recipients-of-the-small-grants-fund.html">
                     <h3 class="card-title">Announcing the 2016 Recipients</h3>
                   </a>
                 </div>

config/routes.rb

@@ -47,6 +47,9 @@
   get '/sources' => redirect("http://data.globalforestwatch.org/")
   get '/sources(/:section)' => redirect("http://data.globalforestwatch.org/")
 
+  # stories
+  get '/stayinformed/crowdsourced-stories' => redirect('/stories')
+
   # stayinformed
   get '/stayinformed' => redirect("/")
   get '/stayinformed(/:section)' => redirect("/")
@@ -55,9 +58,6 @@
   get '/getinvolved' => redirect("/developers-corner")
   get '/getinvolved(/:section)' => redirect("/developers-corner")
 
-  # stories
-  get '/stayinformed/crowdsourced-stories' => redirect('/stories')
-
   # static
   get '/data' => redirect("sources")
   get '/getinvolved/apply-to-the-small-grants-fund' => redirect('/small-grants-fund')