From b18ecb212045d7364856e7bafdf049cd9ed03306 Mon Sep 17 00:00:00 2001 From: leejan16 Date: Tue, 1 Nov 2016 12:12:13 -0400 Subject: [PATCH 1/6] Started the Assignment - Small changes --- README.md | 0 index.html | 6 +++--- script.js | 18 +++++++++--------- style.css | 0 4 files changed, 12 insertions(+), 12 deletions(-) mode change 100644 => 100755 README.md mode change 100644 => 100755 index.html mode change 100644 => 100755 script.js mode change 100644 => 100755 style.css diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/index.html b/index.html old mode 100644 new mode 100755 index f24e1ae..ac148b7 --- a/index.html +++ b/index.html @@ -2,7 +2,7 @@ - Brief Toronto Tour + Assignment Three: HIS495Y @@ -49,9 +46,6 @@
-# Next Section - -The rest of your essay should go under the map, probably. ## in sections like this also _italics_ and __bold__ which can also be written *like this* or **like this** diff --git a/script.js b/script.js index 30c4237..fd2a81d 100755 --- a/script.js +++ b/script.js @@ -24,7 +24,7 @@ var blue_markers = []; function initialize() { my_map_options = { center: my_center, // to change this value, change my_center above - zoom: 7, // higher is closer-up + zoom: 6, // higher is closer-up mapTypeId: google.maps.MapTypeId.HYBRID // you can also use TERRAIN, STREETMAP, SATELLITE }; @@ -37,21 +37,28 @@ function initialize() { map: my_map, icon: blueURL, // this sets the image that represents the marker in the map to the one // located at the URL which is given by the variable blueURL, see above - title: "first Marker", - window_content: "

Marker1

and this would be the extended description

" + title: "FortFrontenac", + window_content: "

Fort Frontenac

and this would be the extended description

" }, {position: new google.maps.LatLng(42.299369, -83.096096), map: my_map, icon: blueURL, // this sets the image that represents the marker in the map - title: "second Marker", + title: "FortDetroit", window_content: "

Marker2

and this would be the extended description

" }, {position: new google.maps.LatLng(43.262389, -79.063116), map: my_map, icon: redURL, // this sets the image that represents the marker in the map - title: "third Marker", - window_content: "

Marker3

and this would be the extended description

" - } + title: "FortNiagara", + window_content: "

Fort Niagara

and this would be the extended description

" + + }, + {position: new google.maps.LatLng(42.652579, -73.756232), + map: my_map, + icon: redURL, // this sets the image that represents the marker in the map + title: "Albany", + window_content: "

Albany

and this would be the extended description

" + } ]; for (j = 0; j < all_my_markers.length; j++) { @@ -64,7 +71,7 @@ function initialize() { // this next line is ugly, and you should change it to be prettier. // be careful not to introduce syntax errors though. - legendHTML += "

" + marker.title + "

" + marker.window_content + "
"; + legendHTML += "
" + marker.window_content + "
"; marker.info = new google.maps.InfoWindow({content: marker.window_content}); var listener = google.maps.event.addListener(marker, 'click', function() { // if you want to allow multiple info windows, uncomment the next line diff --git a/style.css b/style.css index a9552ec..7b7a8b3 100755 --- a/style.css +++ b/style.css @@ -1,6 +1,9 @@ /* This is a very simple CSS setup that shows the size of the relevant divs and -- important! -- sets the size of the map container */ /* add any styling for the central column here */ +p { + text-indent: 50px !important; +} div.container { } @@ -64,6 +67,9 @@ div#map_canvas h1 { } +#map_legend h1 { + font-size: 12px; +} div.address { } @@ -71,4 +77,3 @@ div.address { div.description { } - From f371c9e1ee2c325dde85a9c39b7ef469aea68342 Mon Sep 17 00:00:00 2001 From: leejan16 Date: Sun, 6 Nov 2016 01:12:49 -0500 Subject: [PATCH 5/6] Almost there... --- essay.md | 8 -------- index.html | 21 +++++++++++---------- script.js | 26 +++++++++++++++++++------- style.css | 8 ++++---- 4 files changed, 34 insertions(+), 29 deletions(-) delete mode 100644 essay.md diff --git a/essay.md b/essay.md deleted file mode 100644 index 6d34775..0000000 --- a/essay.md +++ /dev/null @@ -1,8 +0,0 @@ -# Next Section - -The rest of your essay should go under the map, probably. - -## in sections like this -also _italics_ and __bold__ which can also be written *like this* or **like this** -etc. Be sure to [make use of links](http://digital.hackinghistory.ca) -- that's one of the reasons we write on the Web, and I've asked you to use links for all yor footnotes/references as well. - diff --git a/index.html b/index.html index 5feeed3..09b35fd 100755 --- a/index.html +++ b/index.html @@ -27,11 +27,16 @@ ### Strategic Commerce, Diplomacy, and Warfare in the Lake Ontario Region -The Great Lakes region has always been a contested territory, -control over which meant access to transportation, sustenance, and trade. -Before the arrival of the French, British, and eventually, the Americans, the Iroquois, Huron, and Algonquin tribes competed for the rich resources which the Lake and its region offered. -Once the Europeans arrived it became evident that mutual accommodation over the Great Lakes became necessary, as the space became what Richard White calls the “Middle Ground” for both formal and informal interactions between the Native Americans and the settlers [(Contested Territories: xiv)](http://strapdownjs.com/). The opinion of “to whom” the Lakes belonged seemed to irrevocably diverge between the two groups. The Iroquois who met with their rivals, the French in 1700 to discuss a settlement of peace claimed that the northern part of the lake, surrounding Fort Frontenac was theirs to hunt and fish freely, “since the beginning of the world." The agreed mutual use of the regions of Lake Ontario demonstrated that, as trader and interpreter John wrote, the “necessity, of a strict alliance with them [Native Americans] as long as we retain any possessions in Canada." -. +The Great Lakes region has always been a contested territory, control over which meant access to transportation, sustenance, and trade. Before the arrival of the French, British, and eventually, the Americans, the Iroquois, Huron, and Algonquin tribes competed for the rich resources which the Lake and its surrounding regions offered. Once the Europeans arrived it became evident that mutual accommodation over the Great Lakes became necessary, as the space became what Richard White calls the “Middle Ground” for both formal and informal interactions between the Native Americans and the settlers [(Beatty-Medina and Rinehart, 2012: xiv)]( https://www.amazon.ca/Contested-Territories-Americans-Non-Natives-1700-1850/dp/1611860458). The opinion of “to whom” the Lakes belonged seemed to irrevocably diverge between the two groups. Despite their differences, the agreed mutual use of the regions of Lake Ontario demonstrated, as trader and interpreter John Long wrote, the “necessity, of a strict alliance with them [Native Americans]”, for as long as the British were to, “retain any possessions in Canada" [(Long,1791:Preface)](https://archive.org/details/voyagestravelsof00long). + +Several key forts in the Ontario Lake region played to the strategical advantage of different actors. It is crucial to recognize that throughout the 18th century, negotiations with Native American groups was crucial for any consolidated settlements. For example, the British Fort Niagara, which acted as a gateway for supplies going to all western posts was in part possible due to the 1763-1764 peace conference wherein the Senecas, who controlled the Niagara corridor at the time, ceded it to the British. Acknowledging the fact that the British could neither be defeated or driven away, the Senecas, like most other indigenous groups, agreed to mutually beneficial conditions through which the control over the Lake and its waterways could be shared. + +In pitting the Iroquois against the French, the British would frequently warn that the construction of Fort Detroit (and previously Fort Frontenac) would lead to the annihilation of the Iroquois hunting grounds and even the eventual enslavement of the Iroquois people. Iroquois met with their rivals during 1700 and 1701 in order to discuss a settlement of peace. It was here that the Iroquois expressed their cultural and historical affinity to the northern part of the Great Lakes, and especially the hunting grounds surrounding Fort Frontenac which they claimed to have hunted and fished freely, “since the beginning of the world"[(Brandao and Starna, 1996:212)]( http://www.jstor.org.myaccess.library.utoronto.ca/stable/483396). + +In this turn-of-the-century agreement, after decades of bloodshed which led to the annihilation of 50% of the Iroquois warrior population, the French assured the Iroquois that Fort Detroit would serve as a deterrent for future hunting conflicts north of Lake Ontario and Erie [(Brandao and Starna, 1996:231)](http://www.jstor.org.myaccess.library.utoronto.ca/stable/483396). Such a peace would be beneficial for French trade and for the Native Americans it would allow fur trade with Albany, a major trading post East of the Great Lakes. The forts demonstrated the importance of appeasement, acquiescence, and collaboration in creating conditions for the peaceful sharing of the lake. + +

Note:

  • Blue Markers: Forts
    • +
  • Red Markers: Towns, Territories, Others
    • @@ -46,11 +51,7 @@
    - -## in sections like this -also _italics_ and __bold__ which can also be written *like this* or **like this** -etc. Be sure to [make use of links](http://digital.hackinghistory.ca) -- that's one of the reasons we write on the Web, and I've asked you to use links for all yor footnotes/references as well. - + diff --git a/script.js b/script.js index fd2a81d..34e0d8e 100755 --- a/script.js +++ b/script.js @@ -3,7 +3,7 @@ // whenever we need to -- they have 'global scope' var my_map; // this will hold the map var my_map_options; // this will hold the options we'll use to create the map -var my_center = new google.maps.LatLng(43.630981, -77.821655); // center of map +var my_center = new google.maps.LatLng(43.649243, -78.365479); // center of map var my_markers = []; // we use this in the main loop below to hold the markers // this one is strange. In google maps, there is usually only one // infowindow -- its content and position change when you click on a @@ -38,27 +38,39 @@ function initialize() { icon: blueURL, // this sets the image that represents the marker in the map to the one // located at the URL which is given by the variable blueURL, see above title: "FortFrontenac", - window_content: "

    Fort Frontenac

    and this would be the extended description

    " + window_content: "

    Fort Frontenac

    Also called Fort Oswego by 18th century trader John Long- he describes this fort as being the key to the United States as it facilitated passageway to the North and to the Hudson River.

    " }, {position: new google.maps.LatLng(42.299369, -83.096096), map: my_map, icon: blueURL, // this sets the image that represents the marker in the map title: "FortDetroit", - window_content: "

    Marker2

    and this would be the extended description

    " + window_content: "

    Marker2

    and this would be the extended description

    " }, {position: new google.maps.LatLng(43.262389, -79.063116), map: my_map, - icon: redURL, // this sets the image that represents the marker in the map + icon: blueURL, // this sets the image that represents the marker in the map title: "FortNiagara", - window_content: "

    Fort Niagara

    and this would be the extended description

    " + window_content: "

    Fort Niagara

    An important fort which would later come into British posession thanks to negotiations with the Seneca Native Indians. This fort was also the strategical supply point for the British and key for being able to quickly transport troops west in case of rebellion or war.

    " }, {position: new google.maps.LatLng(42.652579, -73.756232), map: my_map, icon: redURL, // this sets the image that represents the marker in the map title: "Albany", - window_content: "

    Albany

    and this would be the extended description

    " - } + window_content: "

    Albany

    Albany was a major trade hub where many Native groups such as the Iroquois and the western tribes often sold their pelts. The merchants at this post would often send agents to other forts such as Fort Frontenac in order to procure goods.

    " + }, + {position: new google.maps.LatLng(41.866748, -77.838135), + map: my_map, + icon: redURL, // this sets the image that represents the marker in the map + title: "NativeTerritory", + window_content: "

    Native Territories

    According to 18th century trader John Long, all land beneath Lake Ontario, Lake Erie, and the St. Lawrence River was claimed by the Five Nations Natives.

    " + }, + {position: new google.maps.LatLng(43.654460, -77.893066), + map: my_map, + icon: redURL, // this sets the image that represents the marker in the map + title: "War on the Lake", + window_content: "

    War on the Lake

    In one of his accounts John Long writes that women and children sometimes sang war songs while rowing their canoes across Lake Ontario.

    " + } ]; for (j = 0; j < all_my_markers.length; j++) { diff --git a/style.css b/style.css index 7b7a8b3..591d490 100755 --- a/style.css +++ b/style.css @@ -30,7 +30,7 @@ div#map_legend { /* if you want, you can make the text in the legend less ugly by adding extra css classes */ -div#map_legend h1, div#map_legend h3 { +div#map_legend h3, div#map_legend h4 { } @@ -51,10 +51,10 @@ button.rounded { border: 1px black solid; } button#hide { - background:orange; + background:red; } button#show { - background:green; + background:lime; } /* use these last three to style the text inside the @@ -67,7 +67,7 @@ div#map_canvas h1 { } -#map_legend h1 { +#map_legend h2 { font-size: 12px; } div.address { From 602e668b3d1afdcc9fdefb196846adce4f8d06d5 Mon Sep 17 00:00:00 2001 From: leejan16 Date: Sun, 6 Nov 2016 23:36:06 -0500 Subject: [PATCH 6/6] Think I'm Done... --- index.html | 8 ++++---- script.js | 20 ++++++++++---------- style.css | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/index.html b/index.html index 09b35fd..44abacb 100755 --- a/index.html +++ b/index.html @@ -29,11 +29,11 @@ The Great Lakes region has always been a contested territory, control over which meant access to transportation, sustenance, and trade. Before the arrival of the French, British, and eventually, the Americans, the Iroquois, Huron, and Algonquin tribes competed for the rich resources which the Lake and its surrounding regions offered. Once the Europeans arrived it became evident that mutual accommodation over the Great Lakes became necessary, as the space became what Richard White calls the “Middle Ground” for both formal and informal interactions between the Native Americans and the settlers [(Beatty-Medina and Rinehart, 2012: xiv)]( https://www.amazon.ca/Contested-Territories-Americans-Non-Natives-1700-1850/dp/1611860458). The opinion of “to whom” the Lakes belonged seemed to irrevocably diverge between the two groups. Despite their differences, the agreed mutual use of the regions of Lake Ontario demonstrated, as trader and interpreter John Long wrote, the “necessity, of a strict alliance with them [Native Americans]”, for as long as the British were to, “retain any possessions in Canada" [(Long,1791:Preface)](https://archive.org/details/voyagestravelsof00long). -Several key forts in the Ontario Lake region played to the strategical advantage of different actors. It is crucial to recognize that throughout the 18th century, negotiations with Native American groups was crucial for any consolidated settlements. For example, the British Fort Niagara, which acted as a gateway for supplies going to all western posts was in part possible due to the 1763-1764 peace conference wherein the Senecas, who controlled the Niagara corridor at the time, ceded it to the British. Acknowledging the fact that the British could neither be defeated or driven away, the Senecas, like most other indigenous groups, agreed to mutually beneficial conditions through which the control over the Lake and its waterways could be shared. +Several key forts in the Lake Ontario region played to the strategical advantage of different actors. It is crucial to recognize that throughout the 18th century, negotiations with Native American groups was key for any consolidated settlements. For example, the British Fort Niagara, which acted as a gateway for supplies going to all western posts was in part possible due to the 1763-1764 peace conference wherein the Senecas, who controlled the Niagara corridor at the time, ceded it to the British. Acknowledging the fact that the British could neither be defeated or driven away, the Senecas, like most other indigenous groups, agreed to mutually beneficial conditions through which the control over the Lake and its waterways could be shared. -In pitting the Iroquois against the French, the British would frequently warn that the construction of Fort Detroit (and previously Fort Frontenac) would lead to the annihilation of the Iroquois hunting grounds and even the eventual enslavement of the Iroquois people. Iroquois met with their rivals during 1700 and 1701 in order to discuss a settlement of peace. It was here that the Iroquois expressed their cultural and historical affinity to the northern part of the Great Lakes, and especially the hunting grounds surrounding Fort Frontenac which they claimed to have hunted and fished freely, “since the beginning of the world"[(Brandao and Starna, 1996:212)]( http://www.jstor.org.myaccess.library.utoronto.ca/stable/483396). +In another incident, pitting the Iroquois against the French, the British would frequently warn that the construction of Fort Detroit (and previously Fort Frontenac) would lead to the annihilation of the Iroquois hunting grounds and even the eventual enslavement of the Iroquois people. Iroquois met with their rivals during 1700 and 1701 in order to discuss a settlement of peace. It was here that the Iroquois expressed their cultural and historical affinity to the northern part of the Great Lakes, and especially the hunting grounds surrounding Fort Frontenac which they claimed to have hunted and fished freely, “since the beginning of the world"[(Brandao and Starna, 1996:212)]( http://www.jstor.org.myaccess.library.utoronto.ca/stable/483396). -In this turn-of-the-century agreement, after decades of bloodshed which led to the annihilation of 50% of the Iroquois warrior population, the French assured the Iroquois that Fort Detroit would serve as a deterrent for future hunting conflicts north of Lake Ontario and Erie [(Brandao and Starna, 1996:231)](http://www.jstor.org.myaccess.library.utoronto.ca/stable/483396). Such a peace would be beneficial for French trade and for the Native Americans it would allow fur trade with Albany, a major trading post East of the Great Lakes. The forts demonstrated the importance of appeasement, acquiescence, and collaboration in creating conditions for the peaceful sharing of the lake. +In this turn-of-the-century agreement, after decades of bloodshed which led to the annihilation of 50% of the Iroquois warrior population, the French assured the Iroquois that Fort Detroit would serve as a deterrent for future hunting conflicts north of Lake Ontario and Erie [(Brandao and Starna, 1996:231)](http://www.jstor.org.myaccess.library.utoronto.ca/stable/483396). Such a peace would be beneficial for French trade and for the Native Americans it would allow fur trade with Albany, a major trading post east of the Great Lakes. The forts demonstrated the importance of appeasement, acquiescence, and collaboration in creating conditions for the peaceful sharing of the lake.

    Note:

  • Blue Markers: Forts
  • Red Markers: Towns, Territories, Others
    • @@ -48,7 +48,7 @@

    Note:

  • Blue Markers: Forts
    • -
    +
    diff --git a/script.js b/script.js index 34e0d8e..0695894 100755 --- a/script.js +++ b/script.js @@ -3,7 +3,7 @@ // whenever we need to -- they have 'global scope' var my_map; // this will hold the map var my_map_options; // this will hold the options we'll use to create the map -var my_center = new google.maps.LatLng(43.649243, -78.365479); // center of map +var my_center = new google.maps.LatLng(43.349243, -78.365479); // center of map var my_markers = []; // we use this in the main loop below to hold the markers // this one is strange. In google maps, there is usually only one // infowindow -- its content and position change when you click on a @@ -24,7 +24,7 @@ var blue_markers = []; function initialize() { my_map_options = { center: my_center, // to change this value, change my_center above - zoom: 6, // higher is closer-up + zoom: 7, // higher is closer-up mapTypeId: google.maps.MapTypeId.HYBRID // you can also use TERRAIN, STREETMAP, SATELLITE }; @@ -37,33 +37,33 @@ function initialize() { map: my_map, icon: blueURL, // this sets the image that represents the marker in the map to the one // located at the URL which is given by the variable blueURL, see above - title: "FortFrontenac", + title: " FortFrontenac", window_content: "

    Fort Frontenac

    Also called Fort Oswego by 18th century trader John Long- he describes this fort as being the key to the United States as it facilitated passageway to the North and to the Hudson River.

    " }, {position: new google.maps.LatLng(42.299369, -83.096096), map: my_map, icon: blueURL, // this sets the image that represents the marker in the map - title: "FortDetroit", - window_content: "

    Marker2

    and this would be the extended description

    " + title: " FortDetroit", + window_content: "

    Fort Detroit

    An initially highly contentious fort, through agreements between the French and the Iroquois the fort was finally built. The French claimed that the fort would act as a place of arbitration for the hunting grounds surrounding it as well as provide the Iroquois with arms and provisions.

    " }, {position: new google.maps.LatLng(43.262389, -79.063116), map: my_map, icon: blueURL, // this sets the image that represents the marker in the map - title: "FortNiagara", - window_content: "

    Fort Niagara

    An important fort which would later come into British posession thanks to negotiations with the Seneca Native Indians. This fort was also the strategical supply point for the British and key for being able to quickly transport troops west in case of rebellion or war.

    " + title: " FortNiagara", + window_content: "

    Fort Niagara

    An important fort which would later come into British posession thanks to negotiations with the Seneca Native Indians. This fort was also the strategical supply point for the British and key for being able to quickly transport troops west in case of rebellion or war.

    " }, {position: new google.maps.LatLng(42.652579, -73.756232), map: my_map, icon: redURL, // this sets the image that represents the marker in the map - title: "Albany", - window_content: "

    Albany

    Albany was a major trade hub where many Native groups such as the Iroquois and the western tribes often sold their pelts. The merchants at this post would often send agents to other forts such as Fort Frontenac in order to procure goods.

    " + title: " Albany", + window_content: "

    Albany

    Albany was a major trade hub where many Native groups such as the Iroquois and the western tribes often sold their pelts. The merchants at this post would often send agents to other forts such as Fort Frontenac in order to procure goods.

    " }, {position: new google.maps.LatLng(41.866748, -77.838135), map: my_map, icon: redURL, // this sets the image that represents the marker in the map title: "NativeTerritory", - window_content: "

    Native Territories

    According to 18th century trader John Long, all land beneath Lake Ontario, Lake Erie, and the St. Lawrence River was claimed by the Five Nations Natives.

    " + window_content: "

    Native Territories

    According to 18th century trader John Long, all land beneath Lake Ontario, Lake Erie, and the St. Lawrence River was claimed by the Five Nations Natives.

    " }, {position: new google.maps.LatLng(43.654460, -77.893066), map: my_map, diff --git a/style.css b/style.css index 591d490..b951695 100755 --- a/style.css +++ b/style.css @@ -25,13 +25,13 @@ div#map_canvas { /* this is the legend div. Can you make it into a right sidebar? you may have to add some extra css to the mapcontainer div */ div#map_legend { - +border:10px } /* if you want, you can make the text in the legend less ugly by adding extra css classes */ div#map_legend h3, div#map_legend h4 { - + background-color:E3E3E3 !important; } // make it obvious that the legend text is clickable @@ -54,7 +54,7 @@ button#hide { background:red; } button#show { - background:lime; + background:orange; } /* use these last three to style the text inside the @@ -63,7 +63,7 @@ button#show { */ -div#map_canvas h1 { +div#map_canvas h1 {font-size:14; }