From 7983cfd34f5d4559807446d00835ffcdf999afff Mon Sep 17 00:00:00 2001 From: David Sun Date: Sat, 23 Sep 2023 14:55:42 -0400 Subject: [PATCH 1/3] first commit --- index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 7eb0fd4..9f253df 100644 --- a/index.html +++ b/index.html @@ -50,7 +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"); }) From 0bd72177f8fce91375f0bb63dd33cdad17156c65 Mon Sep 17 00:00:00 2001 From: David Sun Date: Sat, 23 Sep 2023 15:02:10 -0400 Subject: [PATCH 2/3] second commit --- apple_content.html | 25 +++++++++++++++++++++++++ apple_summary.html | 36 ++++++++++++++++++++++++++++++++++++ index.html | 6 ++++++ 3 files changed, 67 insertions(+) create mode 100644 apple_content.html create mode 100644 apple_summary.html diff --git a/apple_content.html b/apple_content.html new file mode 100644 index 0000000..339ece4 --- /dev/null +++ b/apple_content.html @@ -0,0 +1,25 @@ + +

Beech

+ +

The common apple is native to Central Asia and Afghanistan, now grown worldwide for its crisp, crunchy fruit. Many cultivars exist with differences in color, flavor, and recommended food use.

+ +

While they grow tall from seed, many apple trees you can buy are grafted with dwarfing rootstocks so they maintain a much smaller size. Varieties have different chilling hour requirements so be sure to choose the right one for your area.

+ + \ No newline at end of file diff --git a/apple_summary.html b/apple_summary.html new file mode 100644 index 0000000..e87e7c6 --- /dev/null +++ b/apple_summary.html @@ -0,0 +1,36 @@ + + + +

Apple

+ +

Tree

+ + +

Family: Rosaceae

+ + + \ No newline at end of file diff --git a/index.html b/index.html index 9f253df..e1fa932 100644 --- a/index.html +++ b/index.html @@ -24,6 +24,7 @@

The Tree Encyclopedia

Index

+

@@ -53,6 +54,11 @@

Index

$("#i_content").attr("src","beech_content.html"); $("#i_summary").attr("src","beech_summary.html"); + }) + $("#apple").click(function(){ + $("#i_content").attr("src","apple_content.html"); + $("#i_summary").attr("src","apple_summary.html"); + }) /* This will not be merged ! */ From e4434ad6561bdbf16a7ae2a92fdff7307d8c801a Mon Sep 17 00:00:00 2001 From: David Sun Date: Sat, 23 Sep 2023 15:03:04 -0400 Subject: [PATCH 3/3] third commit --- apple_content.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apple_content.html b/apple_content.html index 339ece4..8e09297 100644 --- a/apple_content.html +++ b/apple_content.html @@ -16,7 +16,7 @@ padding: 0px; } -

Beech

+

Apple

The common apple is native to Central Asia and Afghanistan, now grown worldwide for its crisp, crunchy fruit. Many cultivars exist with differences in color, flavor, and recommended food use.