Merge pull request #65 from HACC2018/cleanup/review-app-copy

Review application copy
HACC2018 · Nov 7, 2018 · 181f32c · 181f32c
2 parents 12eb8e3 + cb65b5e
commit 181f32c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 19 deletions.
diff --git 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
@@ -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 Hawaii, 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 Hawaii 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/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
@@ -9,10 +9,10 @@
         <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 Hawaii
+            Helping to identify native and invasive plants in Hawaiʻi
           </div>
         </q-toolbar-title>
       </q-toolbar>
@@ -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
@@ -15,7 +15,7 @@
         @click="goToPreviousPage"
       >
         <q-icon name="keyboard_arrow_left" />
-        Previous Page
+        Plants
       </q-btn>
     </template>
     <br />
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@