From 41437e3d8a0c68f00978fc73f8d8938b694c16f6 Mon Sep 17 00:00:00 2001
From: Marifel Barbasa <mrbarbasa@gmail.com>
Date: Tue, 6 Nov 2018 08:40:21 -1000
Subject: [PATCH 1/2] Add the okina to Hawaii

---
 client/src/components/Home/PlantDirectory.vue               | 2 +-
 client/src/components/Home/Stepper.vue                      | 4 ++--
 client/src/components/PlantIdentification/CapturedImage.vue | 2 +-
 client/src/layouts/Layout.vue                               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/components/Home/PlantDirectory.vue b/client/src/components/Home/PlantDirectory.vue
index 9c60a63..73c8300 100644
--- a/client/src/components/Home/PlantDirectory.vue
+++ b/client/src/components/Home/PlantDirectory.vue
@@ -1,6 +1,6 @@
 <template>
   <q-card>
-    <q-card-title>Browse the flora of Hawaii</q-card-title>
+    <q-card-title>Browse the flora of Hawaiʻi</q-card-title>
     <q-card-separator />
     <q-card-main>
       <q-table
diff --git a/client/src/components/Home/Stepper.vue b/client/src/components/Home/Stepper.vue
index 950742c..c964707 100644
--- a/client/src/components/Home/Stepper.vue
+++ b/client/src/components/Home/Stepper.vue
@@ -20,7 +20,7 @@
           >
             <div>
               To begin helping us identify plant species
-              in Hawaii, begin by allowing this application
+              in Hawaiʻi, begin by allowing this application
               access to your phone. If you choose to allow
               access and upload an image to this app,
               data about the image will be collected and stored,
@@ -38,7 +38,7 @@
               In addition, we request that you allow us to view your
               location to locate where the plant is located. When you
               take the picture, your GPS location will be recorded to
-              help the State of Hawaii protect and track native plants and
+              help the State of Hawaiʻi protect and track native plants and
               possibly eradicate invasive plants.
             </div>
           </q-timeline-entry>
diff --git a/client/src/components/PlantIdentification/CapturedImage.vue b/client/src/components/PlantIdentification/CapturedImage.vue
index 8ff29e8..f6dbbf1 100644
--- a/client/src/components/PlantIdentification/CapturedImage.vue
+++ b/client/src/components/PlantIdentification/CapturedImage.vue
@@ -77,7 +77,7 @@
         />
 
         <p class="text">
-          Mahalo for helping to identify the flora of Hawaii.
+          Mahalo for helping to identify the flora of Hawaiʻi.
         </p>
 
         <q-btn
diff --git a/client/src/layouts/Layout.vue b/client/src/layouts/Layout.vue
index 36c4c64..a8d065e 100644
--- a/client/src/layouts/Layout.vue
+++ b/client/src/layouts/Layout.vue
@@ -12,7 +12,7 @@
         <q-toolbar-title>
           <router-link to="/" class="title">ohia.ai</router-link>
           <div slot="subtitle">
-            Helping to identify native and invasive plants in Hawaii
+            Helping to identify native and invasive plants in Hawaiʻi
           </div>
         </q-toolbar-title>
       </q-toolbar>

From cb65b5e21c090bccece8421e2f444921840e0c04 Mon Sep 17 00:00:00 2001
From: Marifel Barbasa <mrbarbasa@gmail.com>
Date: Tue, 6 Nov 2018 09:04:56 -1000
Subject: [PATCH 2/2] Make copy changes to Help page to include uploading an
 existing photo

---
 client/src/components/Home/Stepper.vue | 29 +++++++++++++-------------
 client/src/layouts/Layout.vue          |  5 ++++-
 client/src/pages/PlantDetails.vue      |  2 +-
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/client/src/components/Home/Stepper.vue b/client/src/components/Home/Stepper.vue
index c964707..40375b6 100644
--- a/client/src/components/Home/Stepper.vue
+++ b/client/src/components/Home/Stepper.vue
@@ -13,14 +13,14 @@
           color="primary"
         >
           <q-timeline-entry
-            title="Allow us to use your camera."
+            title="Allow us to use your camera and photos."
             side="right"
             subtitle="Step 1"
             icon="camera"
           >
             <div>
               To begin helping us identify plant species
-              in Hawaiʻi, begin by allowing this application
+              in Hawaiʻi, when prompted, allow this application
               access to your phone. If you choose to allow
               access and upload an image to this app,
               data about the image will be collected and stored,
@@ -35,23 +35,22 @@
             icon="place"
           >
             <div>
-              In addition, we request that you allow us to view your
-              location to locate where the plant is located. When you
-              take the picture, your GPS location will be recorded to
-              help the State of Hawaiʻi protect and track native plants and
-              possibly eradicate invasive plants.
+              In addition, we request that you allow us to store your
+              location. When you take the image or upload an existing photo,
+              your GPS location will be recorded to help the State of Hawaiʻi
+              protect and track native plants and possibly eradicate invasive plants.
             </div>
           </q-timeline-entry>
 
           <q-timeline-entry
-            title="Snap the image."
+            title="Snap the image or upload an existing photo."
             side="right"
             subtitle="Step 3"
             icon="camera_alt"
           >
             <div>
               While taking the image of the plant, keep in mind:
-              take photos that are close, in focus and well lit.
+              take photos that are close, in focus, and well-lit.
               If possible, frame only one plant species in your photo.
             </div>
           </q-timeline-entry>
@@ -63,11 +62,13 @@
             icon="sort_by_alpha"
           >
             <div>
-              After taking the image, you will be taken to a classification
-              page and presented with our top three guesses of what species
-              that plant you took a picture is. If you know for sure what it
-              is, please select one of our selected guesses or enter the actual
-              genus of the plant. If you are not sure, select "I don't know".
+              After taking the image or uploading an existing photo,
+              you will be taken to a classification page and
+              presented with our top three guesses of what species
+              that plant is. If you know for sure what it
+              is, please select one of our three guesses or enter the actual
+              common, scientific, or Hawaiian name of the plant.
+              If you are not sure, select "I don't know".
             </div>
           </q-timeline-entry>
         </q-timeline>
diff --git a/client/src/layouts/Layout.vue b/client/src/layouts/Layout.vue
index a8d065e..5f1ad40 100644
--- a/client/src/layouts/Layout.vue
+++ b/client/src/layouts/Layout.vue
@@ -9,7 +9,7 @@
         <router-link to="/" class="title">
           <img src="statics/ohia.ai_logo.svg" class="logo" />
         </router-link>
-        <q-toolbar-title>
+        <q-toolbar-title class="title-block">
           <router-link to="/" class="title">ohia.ai</router-link>
           <div slot="subtitle">
             Helping to identify native and invasive plants in Hawaiʻi
@@ -72,6 +72,9 @@ export default {
   width: 36px;
   height: 36px;
 }
+.title-block {
+  padding-left: 8px;
+}
 .title {
   text-decoration: none;
   color: white;
diff --git a/client/src/pages/PlantDetails.vue b/client/src/pages/PlantDetails.vue
index 69de0e2..1f1921f 100644
--- a/client/src/pages/PlantDetails.vue
+++ b/client/src/pages/PlantDetails.vue
@@ -15,7 +15,7 @@
         @click="goToPreviousPage"
       >
         <q-icon name="keyboard_arrow_left" />
-        Previous Page
+        Plants
       </q-btn>
     </template>
     <br />