Skip to content

Commit

Permalink
Marzipano tour added. resolves #28 , text not necessary, table and to…
Browse files Browse the repository at this point in the history
…ur should work
  • Loading branch information
JoshGore committed Oct 20, 2018
1 parent 96a381d commit 9d6945a
Show file tree
Hide file tree
Showing 1,049 changed files with 3,688 additions and 25 deletions.
71 changes: 57 additions & 14 deletions accommodation.html
Original file line number Diff line number Diff line change
Expand Up @@ -152,23 +152,66 @@ <h2>Drop in to Hiltaba Nature Reserve</h2>
-->
</header>
<div class="container">
<div class="row">
<div class="col">
<h1>How to Book Accommodation</h1>
<p1>
Please fill out our <a href="https://www.naturefoundation.org.au/getattachment/Visit-Nature/Visit-Hiltaba-Nature-Reserve/Hiltaba_BookingForm_-May-2018-interactive-(1).pdf" target="_blank">booking form</a>.
If you have any queries you can reach us at <a href="mailto:reservations@nfsa.org.au">reservations@nfsa.org.au</a>
<br>
<small><em>Please note there will be modest price increases for 2019; please contact the office for details.
Accommodation and tours are subject to operational requirements (researchers on site are given priority).</em></small>
</p1>
</div>
</div>
<div class="row">
<div class="col py-3">
<h1>How to Book Accommodation</h1> <p>
Please fill out our <a href="https://www.naturefoundation.org.au/getattachment/Visit-Nature/Visit-Hiltaba-Nature-Reserve/Hiltaba_BookingForm_-May-2018-interactive-(1).pdf" target="_blank">booking form</a>.
If you have any queries you can reach us at <a href="mailto:reservations@nfsa.org.au">reservations@nfsa.org.au</a>
<br>
<small><em>Please note there will be modest price increases for 2019; please contact the office for details.
Accommodation and tours are subject to operational requirements (researchers on site are given priority).</em></small>
</p>
<div class="table-responsive">
<table class="table table-striped bg-light">
<thead class="thead-dark">
<tr>
<th scope="col" class="text-white">2018 Accommodation Rates*</th>
</tr>
</thead>
<tbody>
<tr>
<td>Camping</td>
</tr>
<tr>
<td>$5 per person | under 5 free <br>
Showers $10 per vehicle (max. 5 people)</td>
</tr>
<tr>
<td>Jackaroo Cottage (shared facilities, sleeps 5)</td>
</tr>
<tr>
<td>Adults $30 | Child (under 15) $10 | Under 5 free<br>
Max. 2 people per room</td>
</tr>
<tr>
<td>Governess Cottage (shared facilities, sleeps 5) </td>
</tr>
<tr>
<td>Adults $30 | Child (under 15) $10 | Under 5 free<br>
Max. 2 people per room</td>
</tr>
<tr>
<td>Shearers’ Quarters (shared facilities, sleeps 17)</td>
</tr>
<tr>
<td>Adults $25 | Child (under 15) $10 | Under 5 free</td>
</tr>
</tbody>
</table>
</div>
<p>*Prices subject to annual change.
</div>
</div>
</div>
<div class="container-fluid ">
<div class="container-fluid">
<div class="row">
<div id="visit" class="col py-3" style="height: 100vh">
<div id="visit" class="col px-0 mx-0" style="margin-top: -65px">
<!--
<iframe width="100%" height="100%" src="shearers_quaters_pointcloud.html"></iframe>
-->
<div style="height: 100vh; padding-top: 65px;">
<iframe width="100%" height="100%" style="border: none" src="./marzipano/index.html"></iframe>
</div>
</div>
</div>
</div>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/js/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ map.on('mouseleave', 'mapillary', function () {
});

map.on('click', function(e) {
// add accomodation popups
// add accommodation popups
var features = map.queryRenderedFeatures(e.point, {
layers: ['hiltaba-accommodation', 'hiltaba-walks-drives', 'mapillary']
});
Expand All @@ -170,7 +170,7 @@ map.on('click', function(e) {
if (feature.layer.id == "hiltaba-walks-drives"){
var popup = new mapboxgl.Popup({ offset: [0, -15] })
.setLngLat(feature.geometry.coordinates)
.setHTML((feature.properties.image ? '<img src="' + feature.properties.image + '" style="width: 100%;">' : '') + '<div class="p-2">' + '<h6>' + feature.properties.name + '</h6>' + '<p>' + feature.properties.description + '<br>' + feature.properties.price + '</p></div>')
.setHTML((feature.properties.image ? '<img src="' + feature.properties.image + '" style="width: 100%;">' : '') + '<div class="p-2">' + '<h6>' + feature.properties.name + '</h6>' + '<p>' + feature.properties.description + '</div>')
.addTo(map);
}
else if (feature.layer.id == "hiltaba-accommodation"){
Expand Down
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ <h1>Hiltaba</h1>
<div class="w-100"></div>
<div class="col-12 order-2 order-md-1 col-md col-lg py-3">
<h1>Facilities</h1>
<p>There are two campsites situated on site at Pretty Point and near the Shearers Quarters. More accommodation is available at either the cottages near the homestead or a refurbished Shearers Quarters a kilometre down the road. Five nature walks have been constructed and two nature drives. These have been designed to allow people to observe the diverse range of ecosystems, flora and fauna and the amazing geological formations on the site whilst minimising environmental impact. Station managers are usually available to take visitors on a tour of the site.</p>
<p>There are two campsites at Hiltaba, one at Pretty Point and another near the Shearers Quarters. Indoor accommodation is available in cottages near the homestead or at refurbished Shearers Quarters a kilometre down the road. <a href="/accommodation">Bookings are essential</a>. Five walking trails and two nature drives form a network through the property. These have been designed to allow you to observe the flora, fauna and geology of Hiltaba's diverse range of ecosystems whilst minimising environmental impact. Station managers are usually available to take you on an informative tour of the site.</p>
</div>
<div class="col-12 order-1 order-md-2 col-md-4 col-lg py-3">
<img src="/assets/images/general/hiltaba_hills_2.jpg" style="width: 100%; height: 100%; object-fit: cover;"></img>
Expand Down Expand Up @@ -170,9 +170,9 @@ <h1>Facilities</h1>
<img src="./assets/images/legend/mapillaryPointSnip.png" height="100%" class="mr-2 float-left">
<p class="text-white"><small>Zoom in to walking trails for ground level images.</small></p>
</div>
<a href="#" class="text-white dropdown-toggle" data-toggle="collapse" data-target="#accomodation" aria-controls="accomodation" aria-expanded="false">Accomodation</a>
<div id="accomodation" class="collapse show">
<p class="text-white">Tap pictures to fly to accomodation locations and map icons to view details</p>
<a href="#" class="text-white dropdown-toggle" data-toggle="collapse" data-target="#accommodation" aria-controls="accommodation" aria-expanded="false">Accomodation</a>
<div id="accommodation" class="collapse show">
<p class="text-white">Tap pictures to fly to accommodation locations and map icons to view details</p>
<!-- Cottages -->
<!-- Jackaroo Cottage -->
<!-- Governess Cottage -->
Expand Down
Loading

0 comments on commit 9d6945a

Please sign in to comment.