merge develop

Author: edbrett

app/assets/images/layer-icons/ptw-mongabay.png

@@ -31,8 +31,8 @@ def set_metadata
         description: 'Explore the status of forests worldwide by layering data to create custom maps of forest change, cover, and use.',
         keywords: 'GFW, map, forest map, visualization, data, forest data, geospatial, gis, geo, spatial, analysis, local data, global data, forest analysis, explore, layer, terrain, alerts, tree, cover, loss, search, country, deforestation'
       },
-      small_grants_fund: {
-        title: 'Small Grants Fund'
+      grants_and_fellowships: {
+        title: 'Grants & Fellowships'
       },
       dashboards: {
         title: 'Dashboards',

app/assets/images/layer-icons/ptw-mongabay.svg

@@ -0,0 +1,3 @@
+class GrantsAndFellowshipsController < ApplicationController
+  layout 'application_react'
+end

app/assets/images/layer-icons/ptw-palm-oil.png

@@ -75,27 +75,27 @@ export const routes = {
     ]
   },
   [SGF]: {
-    controller: 'small_grants_fund',
-    path: '/small-grants-fund/:tab?',
+    controller: 'grants_and_fellowships',
+    path: '/grants-and-fellowships/:tab?',
     component: 'sgf',
     sections: {
       projects: {
         label: 'Projects',
         submenu: true,
         component: 'projects',
-        path: '/small-grants-fund'
+        path: '/grants-and-fellowships'
       },
       about: {
         label: 'About',
         submenu: true,
         component: 'about',
-        path: '/small-grants-fund/about'
+        path: '/grants-and-fellowships/about'
       },
       apply: {
         label: 'Apply',
         submenu: true,
         component: 'apply',
-        path: '/small-grants-fund/apply'
+        path: '/grants-and-fellowships/apply'
       }
     }
   },