fixes for header and SEO titles

wri · May 14, 2018 · 4527860 · 4527860
1 parent a1ec62e
commit 4527860
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb
@@ -5,7 +5,7 @@ class DashboardsController < ApplicationController
 
   def index
     @title = @location && @location["name"] || @location
-    @desc = "Data about forest change, tenure, forest related employment and land use in #{@location}"
+    @desc = "Data about forest change, tenure, forest related employment and land use in #{@title}"
     # if params[:widget]
     #   widgets_config = JSON.parse(File.read(Rails.root.join('app', 'javascript', 'components', 'widget', 'widget-config.json')))
     #   widget_data = widgets_config[params[:widget]]
@@ -16,8 +16,8 @@ def index
   end
 
   def embed
-    @title = @location["name"]
-    @desc = "Data about forest change, tenure, forest related employment and land use in #{@location}"
+    @title = @location && @location["name"] || @location
+    @desc = "Data about forest change, tenure, forest related employment and land use in #{@title}"
     render layout: 'application_react_embed'
   end
 

diff --git a/app/javascript/components/widgets/widgets/land-cover/tree-cover/actions.js b/app/javascript/components/widgets/widgets/land-cover/tree-cover/actions.js
@@ -20,7 +20,7 @@ export const getData = ({ params, dispatch, setWidgetData, widget }) => {
       if (params.indicator !== 'gadm28') {
         dispatch(setWidgetData({ data, widget }));
       } else {
-        getExtent({ ...params, indicator: 'plantations' }).then(
+        getExtent({ ...params, forestType: 'plantations' }).then(
           plantationsResponse => {
             const plantationsData =
               plantationsResponse.data && plantationsResponse.data.data;

diff --git a/app/javascript/pages/dashboards/header/header-actions.js b/app/javascript/pages/dashboards/header/header-actions.js
@@ -20,7 +20,7 @@ export const getHeaderData = createThunkAction(
         .all([
           getExtent(params),
           getLoss(params),
-          getLoss({ ...params, indicator: 'plantations' })
+          getLoss({ ...params, forestType: 'plantations' })
         ])
         .then(
           axios.spread((totalExtent, totalLoss, plantationsLoss) => {

diff --git a/app/javascript/pages/dashboards/header/header-styles.scss b/app/javascript/pages/dashboards/header/header-styles.scss
@@ -61,6 +61,7 @@
     font-size: rem(18px);
     font-weight: 400;
     margin-top: rem(10px);
+    margin-bottom: rem(20px);
     min-height: rem(90px);
 
     b {