From 9c06cc55c74493eef363d802f893758578a99221 Mon Sep 17 00:00:00 2001 From: Gabriel Dempsey Date: Mon, 9 Oct 2023 19:23:13 -0700 Subject: [PATCH 1/3] First change --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 7eb0fd4..7ae030c 100644 --- a/index.html +++ b/index.html @@ -50,8 +50,8 @@

Index

$("#i_summary").attr("src","oak_summary.html"); }) $("#beech").click(function(){ - - + $("#i_content").attr("src","beech_content.html"); + $("#i_summary").attr("src","beech_summary.html"); }) /* This will not be merged ! */ From 6eace0a27a5758c40d7d14b6026f56a100e9ebf7 Mon Sep 17 00:00:00 2001 From: Gabriel Dempsey Date: Mon, 9 Oct 2023 19:52:16 -0700 Subject: [PATCH 2/3] writing functionality for maple tree --- img/maple_content.html | 23 +++++++++++++++++++++++ img/maple_summary.html | 34 ++++++++++++++++++++++++++++++++++ index.html | 7 +++++++ 3 files changed, 64 insertions(+) create mode 100644 img/maple_content.html create mode 100644 img/maple_summary.html diff --git a/img/maple_content.html b/img/maple_content.html new file mode 100644 index 0000000..8f1ae95 --- /dev/null +++ b/img/maple_content.html @@ -0,0 +1,23 @@ + + +

Maple

+ +

Maple trees allow us to have Yummy syrup.

+ +

they also got a nice looking leaf.

\ No newline at end of file diff --git a/img/maple_summary.html b/img/maple_summary.html new file mode 100644 index 0000000..b24feed --- /dev/null +++ b/img/maple_summary.html @@ -0,0 +1,34 @@ + + + + +

Maple

+ +

Tree or shrub

+ +

Family: Don't know +

+ \ No newline at end of file diff --git a/index.html b/index.html index 7ae030c..42b3d9c 100644 --- a/index.html +++ b/index.html @@ -24,6 +24,7 @@

The Tree Encyclopedia

Index

+

@@ -49,11 +50,17 @@

Index

$("#i_content").attr("src","oak_content.html"); $("#i_summary").attr("src","oak_summary.html"); }) + $("#beech").click(function(){ $("#i_content").attr("src","beech_content.html"); $("#i_summary").attr("src","beech_summary.html"); }) + $("#maple").click(function(){ + $("#i_content").attr("src","maple_content.html"); + $("#i_summary").attr("src","maple_summary.html"); + }) + /* This will not be merged ! */ From 0dff445a8835ae816907e14f8176d74e9277d257 Mon Sep 17 00:00:00 2001 From: Gabriel Dempsey Date: Tue, 10 Oct 2023 17:12:02 -0700 Subject: [PATCH 3/3] Fixed Maple Tree Page --- img/maple_content.html | 23 ----------------- index.html | 2 +- maple_content.html | 26 ++++++++++++++++++++ img/maple_summary.html => maple_summary.html | 4 +-- 4 files changed, 29 insertions(+), 26 deletions(-) delete mode 100644 img/maple_content.html create mode 100644 maple_content.html rename img/maple_summary.html => maple_summary.html (87%) diff --git a/img/maple_content.html b/img/maple_content.html deleted file mode 100644 index 8f1ae95..0000000 --- a/img/maple_content.html +++ /dev/null @@ -1,23 +0,0 @@ - - -

Maple

- -

Maple trees allow us to have Yummy syrup.

- -

they also got a nice looking leaf.

\ No newline at end of file diff --git a/index.html b/index.html index 42b3d9c..1fae714 100644 --- a/index.html +++ b/index.html @@ -24,7 +24,7 @@

The Tree Encyclopedia

Index

-

+

diff --git a/maple_content.html b/maple_content.html new file mode 100644 index 0000000..7dc0da9 --- /dev/null +++ b/maple_content.html @@ -0,0 +1,26 @@ + + +

Maple

+ +

Maple, (Acer), any of a large genus (about 200 species) of shrubs or trees in the family Sapindaceae, widely distributed in the North Temperate Zone but concentrated in China. Maples constitute one of the most important groups of ornamentals for planting in lawns, along streets, and in parks. They offer a great variety of form, size, and foliage; many display striking autumn colour. Several yield maple syrup, and some provide valuable, dense hard wood for furniture and other uses. All maples bear pairs of winged seeds, called samaras or keys. The leaves are arranged oppositely on twigs. Many maples have lobed leaves, but a few have leaves separated into leaflets.

+ +

Among the popular smaller maples the hedge, or field, maple (A. campestre) and Amur, or ginnala, maple (A. ginnala) are useful in screens or hedges; both have spectacular foliage in fall, the former yellow and the latter pink to scarlet. +

+ +

Info found at this website: https://www.britannica.com/plant/maple-tree

\ No newline at end of file diff --git a/img/maple_summary.html b/maple_summary.html similarity index 87% rename from img/maple_summary.html rename to maple_summary.html index b24feed..d0c3704 100644 --- a/img/maple_summary.html +++ b/maple_summary.html @@ -28,7 +28,7 @@

Maple

Tree or shrub

- -

Family: Don't know + +

Family: Close Relatives to Horse Chestnuts

\ No newline at end of file