diff --git a/.DS_Store b/.DS_Store index 9e7e3c4..a329acc 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/travelleaflet/index.html b/travelleaflet/index.html index 5ebbae1..743edb7 100644 --- a/travelleaflet/index.html +++ b/travelleaflet/index.html @@ -26,65 +26,6 @@
- + \ No newline at end of file diff --git a/unit_10/.DS_Store b/unit_10/.DS_Store index 28c4b34..bfa6ce5 100644 Binary files a/unit_10/.DS_Store and b/unit_10/.DS_Store differ diff --git a/unit_10/Leaflet.Sleep-master/LICENSE b/unit_10/Leaflet.Sleep-master/LICENSE new file mode 100755 index 0000000..58863cf --- /dev/null +++ b/unit_10/Leaflet.Sleep-master/LICENSE @@ -0,0 +1,24 @@ +Copyright (c) 2015 Daniel Montague + + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + + diff --git a/unit_10/Leaflet.Sleep-master/Leaflet.Sleep.js b/unit_10/Leaflet.Sleep-master/Leaflet.Sleep.js new file mode 100755 index 0000000..5178fd7 --- /dev/null +++ b/unit_10/Leaflet.Sleep-master/Leaflet.Sleep.js @@ -0,0 +1,235 @@ +/* + * Leaflet.Sleep + */ + +/* + * Default Button (touch devices only) + */ + +L.Control.SleepMapControl = L.Control.extend({ + + initialize: function(opts){ + L.setOptions(this,opts); + }, + + options: { + position: 'topright', + prompt: 'disable map', + styles: { + 'backgroundColor': 'white', + 'padding': '5px', + 'border': '2px solid gray' + } + }, + + buildContainer: function(){ + var self = this; + var container = L.DomUtil.create('p', 'sleep-button'); + var boundEvent = this._nonBoundEvent.bind(this); + container.appendChild( document.createTextNode( this.options.prompt )); + L.DomEvent.addListener(container, 'click', boundEvent); + L.DomEvent.addListener(container, 'touchstart', boundEvent); + + Object.keys(this.options.styles).map(function(key) { + container.style[key] = self.options.styles[key]; + }); + + return (this._container = container); + }, + + onAdd: function () { + return this._container || this.buildContainer(); + }, + + _nonBoundEvent: function(e) { + L.DomEvent.stop(e); + if (this._map) this._map.sleep._sleepMap(); + return false; + } + +}); + +L.Control.sleepMapControl = function(){ + return new L.Control.SleepMapControl(); +}; + + +/* + * The Sleep Handler + */ + +L.Map.mergeOptions({ + sleep: true, + sleepTime: 750, + wakeTime: 750, + wakeMessageTouch: 'Touch to Wake', + sleepNote: true, + hoverToWake: true, + sleepOpacity:.7, + sleepButton: L.Control.sleepMapControl +}); + +L.Map.Sleep = L.Handler.extend({ + + addHooks: function () { + var self = this; + this.sleepNote = L.DomUtil.create('p', 'sleep-note', this._map._container); + this._enterTimeout = null; + this._exitTimeout = null; + + /* + * If the device has only a touchscreen we will never get + * a mouseout event, so we add an extra button to put the map + * back to sleep manually. + * + * a custom control/button can be provided by the user + * with the map's `sleepButton` option + */ + this._sleepButton = this._map.options.sleepButton(); + + if (this._map.tap) { + this._map.addControl(this._sleepButton); + } + + var mapStyle = this._map._container.style; + mapStyle.WebkitTransition += 'opacity .5s'; + mapStyle.MozTransition += 'opacity .5s'; + + this._setSleepNoteStyle(); + this._sleepMap(); + }, + + removeHooks: function () { + if (!this._map.scrollWheelZoom.enabled()){ + this._map.scrollWheelZoom.enable(); + } + L.DomUtil.setOpacity( this._map._container, 1); + L.DomUtil.setOpacity( this.sleepNote, 0); + this._removeSleepingListeners(); + this._removeAwakeListeners(); + }, + + _setSleepNoteStyle: function() { + var noteString = ''; + var style = this.sleepNote.style; + + if(this._map.tap) { + noteString = this._map.options.wakeMessageTouch; + } else if (this._map.options.wakeMessage) { + noteString = this._map.options.wakeMessage; + } else if (this._map.options.hoverToWake) { + noteString = 'click or hover to wake'; + } else { + noteString = 'click to wake'; + } + + if( this._map.options.sleepNote ){ + this.sleepNote.appendChild(document.createTextNode( noteString )); + style.pointerEvents = 'none'; + style.maxWidth = '150px'; + style.transitionDuration = '.2s'; + style.zIndex = 5000; + style.opacity = '.6'; + style.margin = 'auto'; + style.textAlign = 'center'; + style.borderRadius = '4px'; + style.top = '50%'; + style.position = 'relative'; + style.padding = '5px'; + style.border = 'solid 2px black'; + style.background = 'white'; + + if(this._map.options.sleepNoteStyle) { + var noteStyleOverrides = this._map.options.sleepNoteStyle; + Object.keys(noteStyleOverrides).map(function(key) { + style[key] = noteStyleOverrides[key]; + }); + } + } + }, + + _wakeMap: function (e) { + this._stopWaiting(); + this._map.scrollWheelZoom.enable(); + if (this._map.tap) { + this._map.touchZoom.enable(); + this._map.dragging.enable(); + this._map.tap.enable(); + this._map.addControl(this._sleepButton); + } + L.DomUtil.setOpacity( this._map._container, 1); + this.sleepNote.style.opacity = 0; + this._addAwakeListeners(); + }, + + _sleepMap: function () { + this._stopWaiting(); + this._map.scrollWheelZoom.disable(); + + if (this._map.tap) { + this._map.touchZoom.disable(); + this._map.dragging.disable(); + this._map.tap.disable(); + this._map.removeControl(this._sleepButton); + } + + L.DomUtil.setOpacity( this._map._container, this._map.options.sleepOpacity); + this.sleepNote.style.opacity = .4; + this._addSleepingListeners(); + }, + + _wakePending: function () { + this._map.once('mousedown', this._wakeMap, this); + if (this._map.options.hoverToWake){ + var self = this; + this._map.once('mouseout', this._sleepMap, this); + self._enterTimeout = setTimeout(function(){ + self._map.off('mouseout', self._sleepMap, self); + self._wakeMap(); + } , self._map.options.wakeTime); + } + }, + + _sleepPending: function () { + var self = this; + self._map.once('mouseover', self._wakeMap, self); + self._exitTimeout = setTimeout(function(){ + self._map.off('mouseover', self._wakeMap, self); + self._sleepMap(); + } , self._map.options.sleepTime); + }, + + _addSleepingListeners: function(){ + this._map.once('mouseover', this._wakePending, this); + this._map.tap && + this._map.once('click', this._wakeMap, this); + }, + + _addAwakeListeners: function(){ + this._map.once('mouseout', this._sleepPending, this); + }, + + _removeSleepingListeners: function(){ + this._map.options.hoverToWake && + this._map.off('mouseover', this._wakePending, this); + this._map.off('mousedown', this._wakeMap, this); + this._map.tap && + this._map.off('click', this._wakeMap, this); + }, + + _removeAwakeListeners: function(){ + this._map.off('mouseout', this._sleepPending, this); + }, + + _stopWaiting: function () { + this._removeSleepingListeners(); + this._removeAwakeListeners(); + var self = this; + if(this._enterTimeout) clearTimeout(self._enterTimeout); + if(this._exitTimeout) clearTimeout(self._exitTimeout); + this._enterTimeout = null; + this._exitTimeout = null; + } +}); + +L.Map.addInitHook('addHandler', 'sleep', L.Map.Sleep); diff --git a/unit_10/Leaflet.Sleep-master/README.md b/unit_10/Leaflet.Sleep-master/README.md new file mode 100755 index 0000000..e812e67 --- /dev/null +++ b/unit_10/Leaflet.Sleep-master/README.md @@ -0,0 +1,57 @@ +# Leaflet.Sleep + +Leaflet's stock maps are event-greedy and interfere with scrolling. + +`Leaflet.Sleep` is an interaction manager, helping your +map do what you want when you want. + +### [demo](http://cliffcloud.github.io/Leaflet.Sleep) + +## Use + +Available on [npm](#npm), [bower](#bower), and straight from the single +[source](https://github.com/CliffCloud/Leaflet.Sleep/blob/master/Leaflet.Sleep.js) +file + +`Leaflet.Sleep` is enabled by default, and can be disabled with the map's `sleep` +option. + +### npm + +[`npm install leaflet-sleep`](https://www.npmjs.com/package/leaflet-sleep) + +### bower + +`bower install leaflet-sleep` + +## Config + +These are the new options available for `L.map` and their defaults. + + { + // false if you want an unruly map + sleep: true, + + // time(ms) until map sleeps on mouseout + sleepTime: 750, + + // time(ms) until map wakes on mouseover + wakeTime: 750, + + // should the user receive wake instrurctions? + sleepNote: true, + + // should hovering wake the map? (non-touch devices only) + hoverToWake: true, + + // a message to inform users about waking the map + wakeMessage: 'Click or Hover to Wake', + + // a constructor for a control button + sleepButton: L.Control.sleepMapControl, + + // opacity for the sleeping map + sleepOpacity: .7 + } + +## MIT Licensed diff --git a/unit_10/Leaflet.Sleep-master/bower.json b/unit_10/Leaflet.Sleep-master/bower.json new file mode 100755 index 0000000..01cf12e --- /dev/null +++ b/unit_10/Leaflet.Sleep-master/bower.json @@ -0,0 +1,23 @@ +{ + "name": "leaflet-sleep", + "description": "Leaflet plugin preventing unwanted scroll capturing", + "main": "Leaflet.Sleep.js", + "authors": [ + "rocks.in.the.cloud+leafletsleep@gmail.com", + "Fabian Köster " + ], + "license": "MIT", + "keywords": [ + "leaflet", + "ui" + ], + "homepage": "https://github.com/CliffCloud/Leaflet.Sleep", + "ignore": [ + "**/.*", + "index.html", + "node_modules", + "bower_components", + "test", + "tests" + ] +} diff --git a/unit_10/Leaflet.Sleep-master/index.html b/unit_10/Leaflet.Sleep-master/index.html new file mode 100755 index 0000000..5621559 --- /dev/null +++ b/unit_10/Leaflet.Sleep-master/index.html @@ -0,0 +1,133 @@ + + + + + + Leaflet.Sleep + + + + + + + + + + +
+ + + + + + +

+ Leaflet.Sleep + remove scroll-sucking maps on content intensive pages +

+

I know what's gonna happen, take me to the end.

+
+
+
+
+

Bushwick ethical trust fund disrupt, butcher gastropub master cleanse locavore biodiesel mustache before they sold out craft beer keffiyeh swag hella. Salvia High Life crucifix, quinoa actually pop-up post-ironic tousled artisan lo-fi craft beer. Tofu vegan try-hard Truffaut, photo booth normcore slow-carb seitan before they sold out salvia fingerstache single-origin coffee kale chips. Bicycle rights sriracha bespoke McSweeney's try-hard Pinterest. Occupy keffiyeh Godard Marfa fixie tofu. Sustainable chambray Carles shabby chic four loko, vegan tattooed lomo Kickstarter Tonx mixtape sartorial. Viral wolf Pitchfork single-origin coffee salvia, fixie bitters chambray biodiesel Intelligentsia wayfarers.

+

Retro 3 wolf moon fanny pack, squid tote bag flannel Echo Park church-key banh mi. Messenger bag yr mlkshk, four loko Wes Anderson Shoreditch locavore. Biodiesel sustainable farm-to-table, Godard bitters skateboard Intelligentsia. Retro Carles dreamcatcher Tonx butcher. Banksy wayfarers aesthetic, stumptown street art synth bicycle rights gentrify roof party. Plaid kitsch chillwave direct trade. Cliche sustainable 90's leggings drinking vinegar, direct trade Bushwick disrupt flannel fanny pack synth Thundercats messenger bag.

+

Thundercats Tonx mlkshk fap fashion axe farm-to-table slow-carb. Cliche paleo meggings tousled Godard, Pinterest brunch banjo photo booth sustainable YOLO church-key fanny pack. Polaroid irony asymmetrical Pitchfork, umami biodiesel locavore lomo. Literally sriracha disrupt Brooklyn roof party, shabby chic tote bag post-ironic Cosby sweater pop-up gentrify paleo art party try-hard trust fund. Semiotics McSweeney's you probably haven't heard of them flexitarian tofu. Trust fund banjo meggings, semiotics YOLO chambray master cleanse. Banksy chambray flannel, messenger bag mixtape keffiyeh raw denim kale chips Williamsburg.

+

Pitchfork ethical disrupt 3 wolf moon jean shorts, squid seitan mustache Truffaut bespoke tattooed gentrify small batch fanny pack. American Apparel selvage Blue Bottle, food truck hoodie bicycle rights mumblecore lomo McSweeney's leggings irony keytar flexitarian swag Cosby sweater. DIY Bushwick hoodie, before they sold out farm-to-table Intelligentsia plaid 3 wolf moon put a bird on it retro Austin bicycle rights. Selfies synth selvage photo booth jean shorts, Portland slow-carb banjo Williamsburg Intelligentsia bitters. Brooklyn wayfarers meh, fanny pack bitters narwhal kitsch viral Kickstarter Intelligentsia Pitchfork cornhole chambray chillwave Marfa. Tousled Truffaut cliche, jean shorts YOLO fixie stumptown direct trade. Tousled synth lomo, wolf kogi flannel XOXO pork belly.

+
+
+
+

Frig. the map's scroll-sucking clutches stymied my skimming

+

Bushwick ethical trust fund disrupt, butcher gastropub master cleanse locavore biodiesel mustache before they sold out craft beer keffiyeh swag hella. Salvia High Life crucifix, quinoa actually pop-up post-ironic tousled artisan lo-fi craft beer. Tofu vegan try-hard Truffaut, photo booth normcore slow-carb seitan before they sold out salvia fingerstache single-origin coffee kale chips. Bicycle rights sriracha bespoke McSweeney's try-hard Pinterest. Occupy keffiyeh Godard Marfa fixie tofu. Sustainable chambray Carles shabby chic four loko, vegan tattooed lomo Kickstarter Tonx mixtape sartorial. Viral wolf Pitchfork single-origin coffee salvia, fixie bitters chambray biodiesel Intelligentsia wayfarers.

+

Retro 3 wolf moon fanny pack, squid tote bag flannel Echo Park church-key banh mi. Messenger bag yr mlkshk, four loko Wes Anderson Shoreditch locavore. Biodiesel sustainable farm-to-table, Godard bitters skateboard Intelligentsia. Retro Carles dreamcatcher Tonx butcher. Banksy wayfarers aesthetic, stumptown street art synth bicycle rights gentrify roof party. Plaid kitsch chillwave direct trade. Cliche sustainable 90's leggings drinking vinegar, direct trade Bushwick disrupt flannel fanny pack synth Thundercats messenger bag.

+

Thundercats Tonx mlkshk fap fashion axe farm-to-table slow-carb. Cliche paleo meggings tousled Godard, Pinterest brunch banjo photo booth sustainable YOLO church-key fanny pack. Polaroid irony asymmetrical Pitchfork, umami biodiesel locavore lomo. Literally sriracha disrupt Brooklyn roof party, shabby chic tote bag post-ironic Cosby sweater pop-up gentrify paleo art party try-hard trust fund. Semiotics McSweeney's you probably haven't heard of them flexitarian tofu. Trust fund banjo meggings, semiotics YOLO chambray master cleanse. Banksy chambray flannel, messenger bag mixtape keffiyeh raw denim kale chips Williamsburg.

+

Pitchfork ethical disrupt 3 wolf moon jean shorts, squid seitan mustache Truffaut bespoke tattooed gentrify small batch fanny pack. American Apparel selvage Blue Bottle, food truck hoodie bicycle rights mumblecore lomo McSweeney's leggings irony keytar flexitarian swag Cosby sweater. DIY Bushwick hoodie, before they sold out farm-to-table Intelligentsia plaid 3 wolf moon put a bird on it retro Austin bicycle rights. Selfies synth selvage photo booth jean shorts, Portland slow-carb banjo Williamsburg Intelligentsia bitters. Brooklyn wayfarers meh, fanny pack bitters narwhal kitsch viral Kickstarter Intelligentsia Pitchfork cornhole chambray chillwave Marfa. Tousled Truffaut cliche, jean shorts YOLO fixie stumptown direct trade. Tousled synth lomo, wolf kogi flannel XOXO pork belly.

+
+
+
+

Cripes... again

+

Bushwick ethical trust fund disrupt, butcher gastropub master cleanse locavore biodiesel mustache before they sold out craft beer keffiyeh swag hella. Salvia High Life crucifix, quinoa actually pop-up post-ironic tousled artisan lo-fi craft beer. Tofu vegan try-hard Truffaut, photo booth normcore slow-carb seitan before they sold out salvia fingerstache single-origin coffee kale chips. Bicycle rights sriracha bespoke McSweeney's try-hard Pinterest. Occupy keffiyeh Godard Marfa fixie tofu. Sustainable chambray Carles shabby chic four loko, vegan tattooed lomo Kickstarter Tonx mixtape sartorial. Viral wolf Pitchfork single-origin coffee salvia, fixie bitters chambray biodiesel Intelligentsia wayfarers.

+

Retro 3 wolf moon fanny pack, squid tote bag flannel Echo Park church-key banh mi. Messenger bag yr mlkshk, four loko Wes Anderson Shoreditch locavore. Biodiesel sustainable farm-to-table, Godard bitters skateboard Intelligentsia. Retro Carles dreamcatcher Tonx butcher. Banksy wayfarers aesthetic, stumptown street art synth bicycle rights gentrify roof party. Plaid kitsch chillwave direct trade. Cliche sustainable 90's leggings drinking vinegar, direct trade Bushwick disrupt flannel fanny pack synth Thundercats messenger bag.

+

Thundercats Tonx mlkshk fap fashion axe farm-to-table slow-carb. Cliche paleo meggings tousled Godard, Pinterest brunch banjo photo booth sustainable YOLO church-key fanny pack. Polaroid irony asymmetrical Pitchfork, umami biodiesel locavore lomo. Literally sriracha disrupt Brooklyn roof party, shabby chic tote bag post-ironic Cosby sweater pop-up gentrify paleo art party try-hard trust fund. Semiotics McSweeney's you probably haven't heard of them flexitarian tofu. Trust fund banjo meggings, semiotics YOLO chambray master cleanse. Banksy chambray flannel, messenger bag mixtape keffiyeh raw denim kale chips Williamsburg.

+

Pitchfork ethical disrupt 3 wolf moon jean shorts, squid seitan mustache Truffaut bespoke tattooed gentrify small batch fanny pack. American Apparel selvage Blue Bottle, food truck hoodie bicycle rights mumblecore lomo McSweeney's leggings irony keytar flexitarian swag Cosby sweater. DIY Bushwick hoodie, before they sold out farm-to-table Intelligentsia plaid 3 wolf moon put a bird on it retro Austin bicycle rights. Selfies synth selvage photo booth jean shorts, Portland slow-carb banjo Williamsburg Intelligentsia bitters. Brooklyn wayfarers meh, fanny pack bitters narwhal kitsch viral Kickstarter Intelligentsia Pitchfork cornhole chambray chillwave Marfa. Tousled Truffaut cliche, jean shorts YOLO fixie stumptown direct trade. Tousled synth lomo, wolf kogi flannel XOXO pork belly.

+
+
+
+
+

wait, I didn't get trapped...

+

All because

+ <script src="Leaflet.Sleep.js"></script> +

was on this page

+
+
+
+

new L.map Options and the defaults

+ + 
+{
+  // true by default, false if you want a wild map
+  sleep: true,
+
+  // time(ms) for the map to fall asleep upon mouseout
+  sleepTime: 750,
+
+  // time(ms) until map wakes on mouseover
+  wakeTime: 750,
+
+  // defines whether or not the user is prompted oh how to wake map
+  sleepNote: true,
+
+  // should hovering wake the map? (clicking always will)
+  hoverToWake: true,
+
+  // opacity (between 0 and 1) of inactive map
+  sleepOpacity: .5
+
+}
+
+
+
+
+
+ + + + diff --git a/unit_10/Leaflet.Sleep-master/package.json b/unit_10/Leaflet.Sleep-master/package.json new file mode 100755 index 0000000..f78facb --- /dev/null +++ b/unit_10/Leaflet.Sleep-master/package.json @@ -0,0 +1,20 @@ +{ + "name": "leaflet-sleep", + "version": "0.5.1", + "main": "Leaflet.Sleep.js", + "description": "Leaflet plugin preventing unwanted scroll capturing", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/CliffCloud/Leaflet.Sleep.git" + }, + "author": "rocks.in.the.cloud+leafletsleep@gmail.com", + "license": "MIT", + "bugs": { + "url": "https://github.com/CliffCloud/Leaflet.Sleep/issues" + }, + "homepage": "http://cliffcloud.github.io/Leaflet.Sleep", + "readmeFilename": "README.md" +} diff --git a/unit_10/index.html b/unit_10/index.html index 5aa2cc7..3f25e9c 100644 --- a/unit_10/index.html +++ b/unit_10/index.html @@ -7,9 +7,13 @@ + + + + @@ -59,8 +63,11 @@

skills + experience

-
- +
+
+ +
+

contact

diff --git a/unit_10/index.sublime-workspace b/unit_10/index.sublime-workspace new file mode 100644 index 0000000..6c93413 --- /dev/null +++ b/unit_10/index.sublime-workspace @@ -0,0 +1,165 @@ +{ + "auto_complete": + { + "selected_items": + [ + ] + }, + "buffers": + [ + ], + "build_system": "", + "build_system_choices": + [ + ], + "build_varint": "", + "command_palette": + { + "height": 0.0, + "last_filter": "", + "selected_items": + [ + ], + "width": 0.0 + }, + "console": + { + "height": 0.0, + "history": + [ + ] + }, + "distraction_free": + { + "menu_visible": true, + "show_minimap": false, + "show_open_files": false, + "show_tabs": false, + "side_bar_visible": false, + "status_bar_visible": false + }, + "file_history": + [ + "/Users/gabesnider/Desktop/gabesnider.github.io/unit_10/index.html" + ], + "find": + { + "height": 0.0 + }, + "find_in_files": + { + "height": 0.0, + "where_history": + [ + ] + }, + "find_state": + { + "case_sensitive": false, + "find_history": + [ + ], + "highlight": true, + "in_selection": false, + "preserve_case": false, + "regex": false, + "replace_history": + [ + ], + "reverse": false, + "show_context": true, + "use_buffer2": true, + "whole_word": false, + "wrap": true + }, + "groups": + [ + { + "sheets": + [ + ] + } + ], + "incremental_find": + { + "height": 0.0 + }, + "input": + { + "height": 0.0 + }, + "layout": + { + "cells": + [ + [ + 0, + 0, + 1, + 1 + ] + ], + "cols": + [ + 0.0, + 1.0 + ], + "rows": + [ + 0.0, + 1.0 + ] + }, + "menu_visible": true, + "output.find_results": + { + "height": 0.0 + }, + "pinned_build_system": "", + "project": "index.sublime-project", + "replace": + { + "height": 0.0 + }, + "save_all_on_build": true, + "select_file": + { + "height": 0.0, + "last_filter": "", + "selected_items": + [ + ], + "width": 0.0 + }, + "select_project": + { + "height": 0.0, + "last_filter": "", + "selected_items": + [ + ], + "width": 0.0 + }, + "select_symbol": + { + "height": 0.0, + "last_filter": "", + "selected_items": + [ + ], + "width": 0.0 + }, + "selected_group": 0, + "settings": + { + }, + "show_minimap": true, + "show_open_files": true, + "show_tabs": true, + "side_bar_visible": true, + "side_bar_width": 150.0, + "status_bar_visible": true, + "template_settings": + { + } +} diff --git a/unit_10/js/gabestravelleaflet.js b/unit_10/js/gabestravelleaflet.js new file mode 100644 index 0000000..24d302d --- /dev/null +++ b/unit_10/js/gabestravelleaflet.js @@ -0,0 +1,70 @@ + var map = L.map('map').setView([32.109333, 34.855499], 2), touch; + + L.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { + subdomains: 'abc', + maxZoom: 18, + minZoom: 1, + zoomControl: false + }).addTo(map); + + var layer = new L.TileLayer("http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", { + noWrap: true + }); + + map.once('focus', function() { map.scrollWheelZoom.enable(); }); + + map.on('click', function() { + if (map.scrollWheelZoom.enabled()) { + map.scrollWheelZoom.disable(); + } + else { + map.scrollWheelZoom.enable(); + } + }); + + L.marker([10.2750, -84.8255]).addTo(map).bindPopup("Monteverde, Costa Rica"); + L.marker([43.6532, -79.3832]).addTo(map).bindPopup("Toronto, Canada"); + L.marker([59.3293, 18.0686]).addTo(map).bindPopup("Stockholm, Sweden"); + L.marker([59.9139, 10.7522]).addTo(map).bindPopup("Oslo, Norway"); + L.marker([55.6761, 12.5683]).addTo(map).bindPopup("Copenhagen, Denmark"); + L.marker([-8.350885, 116.037276]).addTo(map).bindPopup("Gili Trawangan, Bali, Indonesia"); + L.marker([-16.9186, 145.7781]).addTo(map).bindPopup("Cairns, AUS"); + L.marker([-33.8688, 151.2093]).addTo(map).bindPopup("Sydney, AUS"); + L.marker([-25.3444, 131.0369]).addTo(map).bindPopup("Uluru, AUS"); + L.marker([29.4241, -98.4936]).addTo(map).bindPopup("San Antonio, TX, USA"); + L.marker([43.0831, -73.7846]).addTo(map).bindPopup("Saratoga Springs, NY, USA"); + L.marker([41.8781, -87.6298]).addTo(map).bindPopup("Chicago, IL, USA"); + L.marker([36.1627, -86.7816]).addTo(map).bindPopup("Nashville, TN, USA"); + L.marker([36.1128, -113.9961]).addTo(map).bindPopup("Grand Canyon, AZ, USA"); + L.marker([37.7749, -122.4194]).addTo(map).bindPopup("San Francisco, CA, USA"); + L.marker([35.6870, -105.9378]).addTo(map).bindPopup("Santa Fe, NM, USA"); + L.marker([44.4759, -73.2121]).addTo(map).bindPopup("Burlington, VT, USA"); + L.marker([40.7128, -74.0059]).addTo(map).bindPopup("New York City, NY, USA"); + L.marker([38.9072, -77.0369]).addTo(map).bindPopup("Washington, D.C., USA"); + L.marker([19.4326, -99.1332]).addTo(map).bindPopup("Mexico City, Mexico"); + L.marker([-0.1807, -78.4678]).addTo(map).bindPopup("Quito, Ecuador"); + L.marker([-1.3928, -78.4269]).addTo(map).bindPopup("Banos, Ecuador"); + L.marker([-0.9538, -90.9656]).addTo(map).bindPopup("Galapagos Islands, Ecuador"); + L.marker([36.1441, -5.3417]).addTo(map).bindPopup("Rock of Gibraltar"); + L.marker([30.32164, 35.48013]).addTo(map).bindPopup("Petra, Jordan"); + L.marker([32.109333, 34.855499]).addTo(map).bindPopup("Tel Aviv, Israel"); + L.marker([31.7683, 35.2137]).addTo(map).bindPopup("Jerusalem, Israel"); + L.marker([32.7940, 34.9896]).addTo(map).bindPopup("Haifa, Israel"); + L.marker([31.4512, 35.3836]).addTo(map).bindPopup("Ein Gedi, Israel"); + L.marker([29.5577, 34.9519]).addTo(map).bindPopup("Eilat, Israel"); + L.marker([32.1848, 34.8713]).addTo(map).bindPopup("Ra'anana, Israel"); + L.marker([31.6688, 34.5743]).addTo(map).bindPopup("Ashkolon, Israel"); + L.marker([32.3215, 34.8532]).addTo(map).bindPopup("Netanya, Israel"); + L.marker([37.9838, 23.7275]).addTo(map).bindPopup("Athens, Greece"); + L.marker([40.6401, 22.9444]).addTo(map).bindPopup("Thessaloniki, Greece"); + L.marker([40.4168, -3.7038]).addTo(map).bindPopup("Madrid, Spain"); + L.marker([41.3851, 2.1734]).addTo(map).bindPopup("Barcelona, Spain"); + L.marker([36.1627, -86.7816]).addTo(map).bindPopup("Nashville, TN, USA"); + L.marker([-36.84846, 174.76333]).addTo(map).bindPopup("Auckland, NZ"); + L.marker([-38.1368, 176.2497]).addTo(map).bindPopup("Rotorua, NZ"); + L.marker([-43.53205, 172.63623]).addTo(map).bindPopup("Christchurch, NZ"); + L.marker([-45.03116, 168.6626]).addTo(map).bindPopup("Queenstown, NZ"); + L.marker([-37.81411, 144.96328]).addTo(map).bindPopup("Melbourne, AUS"); + L.marker([-28.64737, 153.60198]).addTo(map).bindPopup("Byron Bay, AUS"); + L.marker([-18.2871, 147.6992]).addTo(map).bindPopup("Great Barrier Reef, AUS"); + L.marker([-42.88190, 147.32381]).addTo(map).bindPopup("Hobart, Tasmania, AUS"); \ No newline at end of file diff --git a/unit_10/style.css b/unit_10/style.css index 994dd72..57ac24d 100644 --- a/unit_10/style.css +++ b/unit_10/style.css @@ -69,9 +69,6 @@ body { #js-lang-logo { height: 6em; } -#gabes-map { - height: 400px; -} nav { clear: both; float: left; @@ -127,6 +124,10 @@ section p { section div:nth-of-type(even) div { float: right; } +#map { + overflow: hidden; + width: 100%; +} .about-pic { background: url(images/rice.jpg); background-size:cover;