Merge branch 'develop' of github.com:Vizzuality/growasia_calculator i…

…nto develop * 'develop' of github.com:Vizzuality/growasia_calculator: Updates user manual and titles
Vizzuality · Oct 31, 2016 · 5e69b22 · 5e69b22
2 parents 05fd41c + cb9b07c
commit 5e69b22
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/javascripts/templates/guidance/home-page.hbs b/app/assets/javascripts/templates/guidance/home-page.hbs
@@ -13,7 +13,7 @@
   <li>Nutrient management practices,</li>
   <li>Liming,</li>
   <li>Crop residue burning and decomposition,</li>
-  <li>Agrochemical use,</li>
+  <li>Pesticide and herbicide use,</li>
   <li>Agroforestry practices,</li>
   <li>Fossil fuel use,</li>
   <li>Rice irrigation (for paddy rice).</li>

diff --git a/app/serializers/analysis_serializer.rb b/app/serializers/analysis_serializer.rb
@@ -116,7 +116,7 @@ def analysis
     val = object.emissions_from_agrochemical_use
     emissions_by_source << {
       slug: "agrochemical",
-      name: "Agrochemical application",
+      name: "Pesticide and herbicide use",
       total: val.to_f,
       total_per_yield: (val/per_yield).to_f
     }

diff --git a/public/documents/Grow Asia Counter User Manual.pdf b/public/documents/Grow Asia Counter User Manual.pdf