Merge pull request #195 from xzzy/master

Ages changes on forms
dbca-wa · Jan 8, 2025 · f691a4e · f691a4e
2 parents b97c34d + ccfe128
commit f691a4e
Show file tree

Hide file tree

Showing 12 changed files with 158 additions and 33 deletions.
diff --git a/mooring/frontend/admissions/src/admissions.vue b/mooring/frontend/admissions/src/admissions.vue
@@ -120,7 +120,7 @@
                                                 <input id="noOfInfants" v-model="noOfInfants" class="form-control" name="noOfInfants" @blur="validateNoOfPeople()" type="number" palceholder="0"/>
                                             </div>
                                         </div>
-                                        <label class="label-small">(0 - 4)</label>
+                                        <label class="label-small">(under 4)</label>
                                     </div>
 
                                     <div class="row">

diff --git a/mooring/frontend/availability2/src/availability.vue b/mooring/frontend/availability2/src/availability.vue
@@ -198,7 +198,7 @@
                 <div class="dropdown-pane" id="guests-dropdown" data-dropdown data-auto-focus="true">
                     <div class="row">
                         <div class="small-6 columns">
-                            <label for="num_adults" class="text-right">Adults (ages 12+)</label>
+                            <label for="num_adults" class="text-right">Adults</label>
                         </div><div class="small-6 columns">
                             <input type="number" id="numAdults" name="num_adults" @change="checkGuests()" v-model="numAdults" min="0" max="16"/>
                         </div>
@@ -219,14 +219,14 @@
                     </div>
                     <div class="row">
                         <div class="small-6 columns">
-                            <label for="num_children" class="text-right">Children (ages 4-12)</label>
+                            <label for="num_children" class="text-right">Children (4-16)</label>
                         </div><div class="small-6 columns">
                             <input type="number" id="numChildren" name="num_children" @change="checkGuests()" v-model="numChildren" min="0" max="16"/>
                         </div>
                     </div>
                     <div class="row">
                         <div class="small-6 columns">
-                            <label for="num_infants" class="text-right">Infants (ages 0-4)</label>
+                            <label for="num_infants" class="text-right">Infants (under 4)</label>
                         </div><div class="small-6 columns">
                             <input type="number" id="numInfants" name="num_infants" @change="checkGuests()" v-model="numInfants" min="0" max="16"/>
                         </div>

diff --git a/mooring/frontend/exploreparks/src/parkfinder.vue b/mooring/frontend/exploreparks/src/parkfinder.vue
@@ -70,7 +70,7 @@
                         <div class="dropdown-pane" id="guests-dropdown" data-dropdown data-auto-focus="true">
                             <div class="row">
                                 <div class="small-6 columns">
-                                    <label for="num_adults" class="text-right">Adults (ages 12+)<label>
+                                    <label for="num_adults" class="text-right">Adults<label>
                                 </div>
                                 <div class="small-6 columns">
                                     <input type="number" id="numAdults" name="num_adults" v-model="numAdults" min="0" max="16"/></label>
@@ -93,15 +93,15 @@
                             </div>
                             <div class="row">
                                 <div class="small-6 columns">
-                                    <label for="num_children" class="text-right">Children (ages 4-12)<label>
+                                    <label for="num_children" class="text-right">Children (4-16)<label>
                                 </div>
                                 <div class="small-6 columns">
                                     <input type="number" id="numChildren" name="num_children" v-model="numChildren" min="0" max="16"/></label>
                                 </div>
                             </div>
                             <div class="row">
                                 <div class="small-6 columns">
-                                    <label for="num_children" class="text-right">Infants (ages 0-4)<label>
+                                    <label for="num_children" class="text-right">Infants (under 4)<label>
                                 </div>
                                 <div class="small-6 columns">
                                     <input type="number" id="numInfants" name="num_infants" v-model="numInfants" min="0" max="16"/></label>

diff --git a/mooring/static/admissions/js/app.js b/mooring/static/admissions/js/app.js
@@ -23087,7 +23087,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
     }
   })])]), _vm._v(" "), _c('label', {
     staticClass: "label-small"
-  }, [_vm._v("(0 - 4)")])]), _vm._v(" "), _c('div', {
+  }, [_vm._v("(under 4)")])]), _vm._v(" "), _c('div', {
     staticClass: "row"
   }, [_c('div', {
     staticClass: "small-12 medium-12 large-4 columns"

diff --git a/mooring/static/availability/fonts/fontawesome-webfont.eot b/mooring/static/availability/fonts/fontawesome-webfont.eot
diff --git a/mooring/static/availability/fonts/fontawesome-webfont.ttf b/mooring/static/availability/fonts/fontawesome-webfont.ttf
diff --git a/mooring/static/availability/img/fontawesome-webfont.svg b/mooring/static/availability/img/fontawesome-webfont.svg
diff --git a/mooring/static/availability/js/app.js b/mooring/static/availability/js/app.js
diff --git a/mooring/static/availability/js/manifest.js b/mooring/static/availability/js/manifest.js
diff --git a/mooring/static/availability/js/vendor.js b/mooring/static/availability/js/vendor.js
diff --git a/mooring/static/availability2/js/app.js b/mooring/static/availability2/js/app.js
diff --git a/mooring/static/exploreparks/js/map.js b/mooring/static/exploreparks/js/map.js