diff --git a/Euclids Library- Main/Euclids Library/Euclidcenter.png b/www/Euclidcenter.png similarity index 100% rename from Euclids Library- Main/Euclids Library/Euclidcenter.png rename to www/Euclidcenter.png diff --git a/Euclids Library- Main/Euclids Library/GCD.html b/www/GCD.html similarity index 97% rename from Euclids Library- Main/Euclids Library/GCD.html rename to www/GCD.html index 3d06182b..3e1dc6aa 100644 --- a/Euclids Library- Main/Euclids Library/GCD.html +++ b/www/GCD.html @@ -1,34 +1,34 @@ - - - - - Greatest Common Divisor - - - - - - - -
-

Greatest Common Divisor

-
- -
-

(Of two or more integers) the largest integer which divides each number of a set of integers

- -

When $a \ne 0$, there are two solutions to \(ax^2 + bx + c = 0\) and they are -$$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$

- -

When $a \ne 0$, there are two solutions to \(ax^2 + bx + c = 0\) and they are -$$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$

-
- - - - + + + + + Greatest Common Divisor + + + + + + + +
+

Greatest Common Divisor

+
+ +
+

(Of two or more integers) the largest integer which divides each number of a set of integers

+ +

When $a \ne 0$, there are two solutions to \(ax^2 + bx + c = 0\) and they are +$$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$

+ +

When $a \ne 0$, there are two solutions to \(ax^2 + bx + c = 0\) and they are +$$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$

+
+ + + + \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/Line.html b/www/Line.html similarity index 96% rename from Euclids Library- Main/Euclids Library/Line.html rename to www/Line.html index 63bfcfde..0f214cab 100644 --- a/Euclids Library- Main/Euclids Library/Line.html +++ b/www/Line.html @@ -1,35 +1,35 @@ - - - - - Line - - - - -
- -
-

Line - Definition

-
- -
-

An infinite series of points extending infinitely in two directions.

- There's a line here -
- - -
- - - - + + + + + Line + + + + +
+ +
+

Line - Definition

+
+ +
+

An infinite series of points extending infinitely in two directions.

+ There's a line here +
+ + +
+ + + + \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/Quadratic Formula.html b/www/Quadratic Formula.html similarity index 96% rename from Euclids Library- Main/Euclids Library/Quadratic Formula.html rename to www/Quadratic Formula.html index db30a5d9..04faa3d3 100644 --- a/Euclids Library- Main/Euclids Library/Quadratic Formula.html +++ b/www/Quadratic Formula.html @@ -1,48 +1,48 @@ - - - - - Quadratic Formula - - - - - - - - - - -
- -
- Loading.... - - -
-
-

Quadratic Formula - Definition

- -
-

An equation giving the valuse for which a quadratic polynomial is equal to 0

- -

When $a \ne 0$, there are two solutions to \(ax^2 + bx + c = 0\) and they are
-

$x$ $= {-b \pm \sqrt{b^2-4ac} \over 2a}$

-
- - - - - - -
- - - + + + + + Quadratic Formula + + + + + + + + + + +
+ +
+ Loading.... + + +
+
+

Quadratic Formula - Definition

+ +
+

An equation giving the valuse for which a quadratic polynomial is equal to 0

+ +

When $a \ne 0$, there are two solutions to \(ax^2 + bx + c = 0\) and they are
+

$x$ $= {-b \pm \sqrt{b^2-4ac} \over 2a}$

+
+ + + + + + +
+ + + \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/Real_Number.html b/www/Real_Number.html similarity index 97% rename from Euclids Library- Main/Euclids Library/Real_Number.html rename to www/Real_Number.html index a26dec8c..8e4eb99e 100644 --- a/Euclids Library- Main/Euclids Library/Real_Number.html +++ b/www/Real_Number.html @@ -1,36 +1,36 @@ - - - - - Real Number - - -
- -
-

Real Number - Definition

-
- -
-

A value representing a quantity along a line. -

The set of all real numbers is usually denoted $\mathbb{R}$

- - Loading.... -
- -
- - - - + + + + + Real Number + + +
+ +
+

Real Number - Definition

+
+ +
+

A value representing a quantity along a line. +

The set of all real numbers is usually denoted $\mathbb{R}$

+ + Loading.... +
+ +
+ + + + \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/URpedia-master- for templates.zip b/www/URpedia-master- for templates.zip similarity index 100% rename from Euclids Library- Main/Euclids Library/URpedia-master- for templates.zip rename to www/URpedia-master- for templates.zip diff --git a/Euclids Library- Main/Euclids Library/compact.html b/www/compact.html similarity index 97% rename from Euclids Library- Main/Euclids Library/compact.html rename to www/compact.html index 70634850..c48285e1 100644 --- a/Euclids Library- Main/Euclids Library/compact.html +++ b/www/compact.html @@ -1,40 +1,40 @@ - - - - - Compactness(Topology) - Theorem 27 - - - - - - -
- -
-

Compact(Topology) - Definition

-
- -
-

A space $X$ is said to be compact if every open covering $A$ of $X$ contains a finite subcollection that also covers $X$

- -
- - - -
- - - - - + + + + + Compactness(Topology) - Theorem 27 + + + + + + +
+ +
+

Compact(Topology) - Definition

+
+ +
+

A space $X$ is said to be compact if every open covering $A$ of $X$ contains a finite subcollection that also covers $X$

+ +
+ + + +
+ + + + + \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/cover.html b/www/cover.html similarity index 97% rename from Euclids Library- Main/Euclids Library/cover.html rename to www/cover.html index 14fd617b..f991f26e 100644 --- a/Euclids Library- Main/Euclids Library/cover.html +++ b/www/cover.html @@ -1,36 +1,36 @@ - - - - - Compactness(Topology) - Theorem 27 - - - - - - -
- -
-

Covering(Topology) - Definition

-
- -
-

Of a set, a collection $A$ of subsets of a space $X$ where the union of element of $A$ is equal to $X$.

- -
- - - -
- + + + + + Compactness(Topology) - Theorem 27 + + + + + + +
+ +
+

Covering(Topology) - Definition

+
+ +
+

Of a set, a collection $A$ of subsets of a space $X$ where the union of element of $A$ is equal to $X$.

+ +
+ + + +
+ \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/css/navigation.css b/www/css/navigation.css similarity index 93% rename from Euclids Library- Main/Euclids Library/css/navigation.css rename to www/css/navigation.css index cda987f7..c61c991b 100644 --- a/Euclids Library- Main/Euclids Library/css/navigation.css +++ b/www/css/navigation.css @@ -1,25 +1,25 @@ -nav ul{ - list-style-type: none; - margin-top: 0px; - margin-bottom: 0px; - padding-left: 0px; -} - -nav li{ - border: 1px solid #000000; -} - -nav li a{ - color: #000000; - display: block; - padding: 5px 20px; -} - -nav a:hover { - color: white; - background-color: #333333; -} - -.menu li {display: table-cell;} - +nav ul{ + list-style-type: none; + margin-top: 0px; + margin-bottom: 0px; + padding-left: 0px; +} + +nav li{ + border: 1px solid #000000; +} + +nav li a{ + color: #000000; + display: block; + padding: 5px 20px; +} + +nav a:hover { + color: white; + background-color: #333333; +} + +.menu li {display: table-cell;} + .menu ul {border-collapse: collapse;} \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/css/styles.css b/www/css/styles.css similarity index 92% rename from Euclids Library- Main/Euclids Library/css/styles.css rename to www/css/styles.css index 4e2594da..c69b86ee 100644 --- a/Euclids Library- Main/Euclids Library/css/styles.css +++ b/www/css/styles.css @@ -1,97 +1,97 @@ -body { background-color: #DFEFF0; - color: #333333; - font-family: "Arial", Helvetica, sans-serif; - } - -h1 { color: #AD235E; - border-bottom-style: solid; - border-width: 1px; - border-color: #AD235E; - } - -h2{ - font-style: italic; - font-weight: normal; - margin-bottom: 0px; -} - -p { - margin-top: 0px; -} - -figure { - float: right; - margin-left: 20px; -} - -ul { - padding-left: 15px; -} - -a { - color: #7D9C9F; - text-decoration: none; -} - -a:hover {color: #AD235E;} - -/*.floating-box { - display: table-cell; - float: right; - /*width: 50px; - height: 75px; - margin: 10px; - -} */ - -.floatright { - float: right; -} - -.floatleft { - float: left; -} - -article ,aside{ - display: table-cell; -} - -article { - padding-right: 20px; -} - -.container { - margin: 0 auto; - width: 80%; - max-width: 900px; -} - -.lead { - /*background-image: url(../images/backgorund.png) ; */ - padding: 15px; -} - -.wrapper { - background-color: rgba(255, 255, 255, 0.6); - padding: 10px; - overflow: auto; -} - -.center { - position: center; -} - -.knowlstyle { -border: 1px solid black; -} - -article p {display: table-cell; float: left; overflow: auto; width: 70%; padding-left: 10px;} - -footer { - border-top: 1px solid #AD235E;; -} - -article img { - width: 200px; - height:200px; -} +body { background-color: #DFEFF0; + color: #333333; + font-family: "Arial", Helvetica, sans-serif; + } + +h1 { color: #AD235E; + border-bottom-style: solid; + border-width: 1px; + border-color: #AD235E; + } + +h2{ + font-style: italic; + font-weight: normal; + margin-bottom: 0px; +} + +p { + margin-top: 0px; +} + +figure { + float: right; + margin-left: 20px; +} + +ul { + padding-left: 15px; +} + +a { + color: #7D9C9F; + text-decoration: none; +} + +a:hover {color: #AD235E;} + +/*.floating-box { + display: table-cell; + float: right; + /*width: 50px; + height: 75px; + margin: 10px; + +} */ + +.floatright { + float: right; +} + +.floatleft { + float: left; +} + +article ,aside{ + display: table-cell; +} + +article { + padding-right: 20px; +} + +.container { + margin: 0 auto; + width: 80%; + max-width: 900px; +} + +.lead { + /*background-image: url(../images/backgorund.png) ; */ + padding: 15px; +} + +.wrapper { + background-color: rgba(255, 255, 255, 0.6); + padding: 10px; + overflow: auto; +} + +.center { + position: center; +} + +.knowlstyle { +border: 1px solid black; +} + +article p {display: table-cell; float: left; overflow: auto; width: 70%; padding-left: 10px;} + +footer { + border-top: 1px solid #AD235E;; +} + +article img { + width: 200px; + height:200px; +} diff --git a/Euclids Library- Main/Euclids Library/eulib.html b/www/eulib.html similarity index 95% rename from Euclids Library- Main/Euclids Library/eulib.html rename to www/eulib.html index 176ccc35..9c1857bd 100644 --- a/Euclids Library- Main/Euclids Library/eulib.html +++ b/www/eulib.html @@ -1,12 +1,12 @@ - - - - - Euclid's Library Home Page - - - -
- Loading Banner... -
+ + + + + Euclid's Library Home Page + + + +
+ Loading Banner... +
\ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/images/200x200pixels.jpeg.gif b/www/images/200x200pixels.jpeg.gif similarity index 100% rename from Euclids Library- Main/Euclids Library/images/200x200pixels.jpeg.gif rename to www/images/200x200pixels.jpeg.gif diff --git a/Euclids Library- Main/Euclids Library/images/Carriershokaku.jpg b/www/images/Carriershokaku.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/images/Carriershokaku.jpg rename to www/images/Carriershokaku.jpg diff --git a/Euclids Library- Main/Euclids Library/images/Eulibbanner.png b/www/images/Eulibbanner.png similarity index 100% rename from Euclids Library- Main/Euclids Library/images/Eulibbanner.png rename to www/images/Eulibbanner.png diff --git a/Euclids Library- Main/Euclids Library/images/Shanghai.jpeg b/www/images/Shanghai.jpeg similarity index 100% rename from Euclids Library- Main/Euclids Library/images/Shanghai.jpeg rename to www/images/Shanghai.jpeg diff --git a/Euclids Library- Main/Euclids Library/images/backgorund.png b/www/images/backgorund.png similarity index 100% rename from Euclids Library- Main/Euclids Library/images/backgorund.png rename to www/images/backgorund.png diff --git a/Euclids Library- Main/Euclids Library/images/logo.png b/www/images/logo.png similarity index 100% rename from Euclids Library- Main/Euclids Library/images/logo.png rename to www/images/logo.png diff --git a/Euclids Library- Main/Euclids Library/images/tempknowl.png b/www/images/tempknowl.png similarity index 100% rename from Euclids Library- Main/Euclids Library/images/tempknowl.png rename to www/images/tempknowl.png diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/demo1.html b/www/jsImgSlider/demo1.html similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/demo1.html rename to www/jsImgSlider/demo1.html diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/demo2.html b/www/jsImgSlider/demo2.html similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/demo2.html rename to www/jsImgSlider/demo2.html diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/demo3.html b/www/jsImgSlider/demo3.html similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/demo3.html rename to www/jsImgSlider/demo3.html diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/demo4.html b/www/jsImgSlider/demo4.html similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/demo4.html rename to www/jsImgSlider/demo4.html diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/demo5.html b/www/jsImgSlider/demo5.html similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/demo5.html rename to www/jsImgSlider/demo5.html diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/demo6.html b/www/jsImgSlider/demo6.html similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/demo6.html rename to www/jsImgSlider/demo6.html diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/demo7.html b/www/jsImgSlider/demo7.html similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/demo7.html rename to www/jsImgSlider/demo7.html diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/demo8.html b/www/jsImgSlider/demo8.html similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/demo8.html rename to www/jsImgSlider/demo8.html diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/generic.css b/www/jsImgSlider/generic.css similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/generic.css rename to www/jsImgSlider/generic.css diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/image-slider-1.jpg b/www/jsImgSlider/images/image-slider-1.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/image-slider-1.jpg rename to www/jsImgSlider/images/image-slider-1.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/image-slider-2.jpg b/www/jsImgSlider/images/image-slider-2.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/image-slider-2.jpg rename to www/jsImgSlider/images/image-slider-2.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/image-slider-3.jpg b/www/jsImgSlider/images/image-slider-3.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/image-slider-3.jpg rename to www/jsImgSlider/images/image-slider-3.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/image-slider-4.jpg b/www/jsImgSlider/images/image-slider-4.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/image-slider-4.jpg rename to www/jsImgSlider/images/image-slider-4.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/image-slider-5.jpg b/www/jsImgSlider/images/image-slider-5.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/image-slider-5.jpg rename to www/jsImgSlider/images/image-slider-5.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/slider-1.jpg b/www/jsImgSlider/images/slider-1.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/slider-1.jpg rename to www/jsImgSlider/images/slider-1.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/slider-2.jpg b/www/jsImgSlider/images/slider-2.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/slider-2.jpg rename to www/jsImgSlider/images/slider-2.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/slider-3.jpg b/www/jsImgSlider/images/slider-3.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/slider-3.jpg rename to www/jsImgSlider/images/slider-3.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/slider-4.jpg b/www/jsImgSlider/images/slider-4.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/slider-4.jpg rename to www/jsImgSlider/images/slider-4.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb-1.gif b/www/jsImgSlider/images/thumb-1.gif similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb-1.gif rename to www/jsImgSlider/images/thumb-1.gif diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb-2.gif b/www/jsImgSlider/images/thumb-2.gif similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb-2.gif rename to www/jsImgSlider/images/thumb-2.gif diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb-3.gif b/www/jsImgSlider/images/thumb-3.gif similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb-3.gif rename to www/jsImgSlider/images/thumb-3.gif diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb-4.gif b/www/jsImgSlider/images/thumb-4.gif similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb-4.gif rename to www/jsImgSlider/images/thumb-4.gif diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb1.jpg b/www/jsImgSlider/images/thumb1.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb1.jpg rename to www/jsImgSlider/images/thumb1.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb2.jpg b/www/jsImgSlider/images/thumb2.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb2.jpg rename to www/jsImgSlider/images/thumb2.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb3.jpg b/www/jsImgSlider/images/thumb3.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb3.jpg rename to www/jsImgSlider/images/thumb3.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb4.jpg b/www/jsImgSlider/images/thumb4.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb4.jpg rename to www/jsImgSlider/images/thumb4.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb5.jpg b/www/jsImgSlider/images/thumb5.jpg similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/images/thumb5.jpg rename to www/jsImgSlider/images/thumb5.jpg diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/1/bullet.png b/www/jsImgSlider/themes/1/bullet.png similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/1/bullet.png rename to www/jsImgSlider/themes/1/bullet.png diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/1/js-image-slider.css b/www/jsImgSlider/themes/1/js-image-slider.css similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/1/js-image-slider.css rename to www/jsImgSlider/themes/1/js-image-slider.css diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/1/js-image-slider.js b/www/jsImgSlider/themes/1/js-image-slider.js similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/1/js-image-slider.js rename to www/jsImgSlider/themes/1/js-image-slider.js diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/2/js-image-slider.css b/www/jsImgSlider/themes/2/js-image-slider.css similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/2/js-image-slider.css rename to www/jsImgSlider/themes/2/js-image-slider.css diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/2/js-image-slider.js b/www/jsImgSlider/themes/2/js-image-slider.js similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/2/js-image-slider.js rename to www/jsImgSlider/themes/2/js-image-slider.js diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/3/active-bg.png b/www/jsImgSlider/themes/3/active-bg.png similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/3/active-bg.png rename to www/jsImgSlider/themes/3/active-bg.png diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/3/js-image-slider.css b/www/jsImgSlider/themes/3/js-image-slider.css similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/3/js-image-slider.css rename to www/jsImgSlider/themes/3/js-image-slider.css diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/3/js-image-slider.js b/www/jsImgSlider/themes/3/js-image-slider.js similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/3/js-image-slider.js rename to www/jsImgSlider/themes/3/js-image-slider.js diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/3/thumbs-bar.gif b/www/jsImgSlider/themes/3/thumbs-bar.gif similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/3/thumbs-bar.gif rename to www/jsImgSlider/themes/3/thumbs-bar.gif diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/active-bg.png b/www/jsImgSlider/themes/4/active-bg.png similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/active-bg.png rename to www/jsImgSlider/themes/4/active-bg.png diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/bullet.png b/www/jsImgSlider/themes/4/bullet.png similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/bullet.png rename to www/jsImgSlider/themes/4/bullet.png diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/js-image-slider.css b/www/jsImgSlider/themes/4/js-image-slider.css similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/js-image-slider.css rename to www/jsImgSlider/themes/4/js-image-slider.css diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/js-image-slider.js b/www/jsImgSlider/themes/4/js-image-slider.js similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/js-image-slider.js rename to www/jsImgSlider/themes/4/js-image-slider.js diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/navbuttons.gif b/www/jsImgSlider/themes/4/navbuttons.gif similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/navbuttons.gif rename to www/jsImgSlider/themes/4/navbuttons.gif diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/navbuttons2.gif b/www/jsImgSlider/themes/4/navbuttons2.gif similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/navbuttons2.gif rename to www/jsImgSlider/themes/4/navbuttons2.gif diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/thumbs-bar.gif b/www/jsImgSlider/themes/4/thumbs-bar.gif similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/4/thumbs-bar.gif rename to www/jsImgSlider/themes/4/thumbs-bar.gif diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/5/js-image-slider.css b/www/jsImgSlider/themes/5/js-image-slider.css similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/5/js-image-slider.css rename to www/jsImgSlider/themes/5/js-image-slider.css diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/5/js-image-slider.js b/www/jsImgSlider/themes/5/js-image-slider.js similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/5/js-image-slider.js rename to www/jsImgSlider/themes/5/js-image-slider.js diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/6/bullet.png b/www/jsImgSlider/themes/6/bullet.png similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/6/bullet.png rename to www/jsImgSlider/themes/6/bullet.png diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/6/js-image-slider.css b/www/jsImgSlider/themes/6/js-image-slider.css similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/6/js-image-slider.css rename to www/jsImgSlider/themes/6/js-image-slider.css diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/6/js-image-slider.js b/www/jsImgSlider/themes/6/js-image-slider.js similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/6/js-image-slider.js rename to www/jsImgSlider/themes/6/js-image-slider.js diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/6/mcVideoPlugin.js b/www/jsImgSlider/themes/6/mcVideoPlugin.js similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/6/mcVideoPlugin.js rename to www/jsImgSlider/themes/6/mcVideoPlugin.js diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/6/video.png b/www/jsImgSlider/themes/6/video.png similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/6/video.png rename to www/jsImgSlider/themes/6/video.png diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/7/js-image-slider.css b/www/jsImgSlider/themes/7/js-image-slider.css similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/7/js-image-slider.css rename to www/jsImgSlider/themes/7/js-image-slider.css diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/7/js-image-slider.js b/www/jsImgSlider/themes/7/js-image-slider.js similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/7/js-image-slider.js rename to www/jsImgSlider/themes/7/js-image-slider.js diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/8/closeBtn.gif b/www/jsImgSlider/themes/8/closeBtn.gif similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/8/closeBtn.gif rename to www/jsImgSlider/themes/8/closeBtn.gif diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/8/js-image-slider.css b/www/jsImgSlider/themes/8/js-image-slider.css similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/8/js-image-slider.css rename to www/jsImgSlider/themes/8/js-image-slider.css diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/8/js-image-slider.js b/www/jsImgSlider/themes/8/js-image-slider.js similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/8/js-image-slider.js rename to www/jsImgSlider/themes/8/js-image-slider.js diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/8/tooltip.css b/www/jsImgSlider/themes/8/tooltip.css similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/8/tooltip.css rename to www/jsImgSlider/themes/8/tooltip.css diff --git a/Euclids Library- Main/Euclids Library/jsImgSlider/themes/8/tooltip.js b/www/jsImgSlider/themes/8/tooltip.js similarity index 100% rename from Euclids Library- Main/Euclids Library/jsImgSlider/themes/8/tooltip.js rename to www/jsImgSlider/themes/8/tooltip.js diff --git a/Euclids Library- Main/Euclids Library/knowl.js b/www/knowl.js similarity index 97% rename from Euclids Library- Main/Euclids Library/knowl.js rename to www/knowl.js index b42ff51f..738b0760 100644 --- a/Euclids Library- Main/Euclids Library/knowl.js +++ b/www/knowl.js @@ -1,182 +1,182 @@ -/* - * Knowl - Feature Demo for Knowls - * Copyright (C) 2011 Harald Schilly - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * 4/11/2012 Modified by David Guichard to allow inline knowl code. - * Sample use: - * This is an inline knowl. - */ - -/* 8/14/14 Modified by David Farmer to allow knowl content to be - * taken from the element with a given id. - * - * The syntax is Proof - */ - -/* javascript code for the knowl features - * global counter, used to uniquely identify each knowl-output element - * that's necessary because the same knowl could be referenced several times - * on the same page */ - - if (!(knowlscript) ) { -var knowl_id_counter = 0; - -function knowl_click_handler($el) { - // the knowl attribute holds the id of the knowl - var knowl_id = $el.attr("knowl"); - // the uid is necessary if we want to reference the same content several times - var uid = $el.attr("knowl-uid"); - var output_id = '#knowl-output-' + uid; - var $output_id = $(output_id); - // create the element for the content, insert it after the one where the - // knowl element is included (e.g. inside a

tag) (sibling in DOM) - var idtag = "id='"+output_id.substring(1) + "'"; - var kid = "id='kuid-"+ uid + "'"; - // if we already have the content, toggle visibility - if ($output_id.length > 0) { - $("#kuid-"+uid).slideToggle("fast"); - $el.toggleClass("active"); - - // otherwise download it or get it from the cache - } else { - var knowl = "
loading '"+knowl_id+"'
"; - - // check, if the knowl is inside a td or th in a table. otherwise assume its - // properly sitting inside a
or

- if($el.parent().is("td") || $el.parent().is("th") ) { - // assume we are in a td or th tag, go 2 levels up - var cols = $el.parent().parent().children().length; - $el.parents().eq(1).after( - // .parents().eq(1) was formerly written as .parent().parent() - ""+knowl+""); - } else if ($el.parent().is("li")) { - $el.parent().after(knowl); - } - // the following is implemented stupidly, but I had to do it quickly. - // someone please replace it with an appropriate loop -- DF - // the '.is("p")' is for the first paragraph of a theorem or proof - //also, after you close the knowl, it still has a shaded background - else if ($el.parent().parent().is("li")) { - $el.parent().parent().after(knowl); - } - else if ($el.parent().css('display') == "block" || $el.parent().is("p")) { - $el.parent().after(knowl); - } else if ($el.parent().parent().css('display') == "block" || $el.parent().parent().is("p")) { - $el.parent().parent().after(knowl); - } else { - $el.parent().parent().parent().after(knowl); - } - -//else { -// // $el.parent().after(knowl); -// var theparents=$el.parents(); -// var ct=0; -// while (theparents[ct] != "block" && ct<2) -// ct++; -// ct=0; -// //$el.parents().eq(ct).after(knowl); -// $el.parents().eq(ct).after(theparents[1]); -// } - - // "select" where the output is and get a hold of it - var $output = $(output_id); - var $knowl = $("#kuid-"+uid); - $output.addClass("loading"); - $knowl.hide(); - // DRG: inline code - if ($el.attr("class") == 'internal') { - $output.html($el.attr("value")); - $knowl.hide(); - $el.addClass("active"); - if(window.MathJax == undefined) { - $knowl.slideDown("slow"); - } else { - $knowl.addClass("processing"); - MathJax.Hub.Queue(['Typeset', MathJax.Hub, $output.get(0)]); - MathJax.Hub.Queue([ function() { $knowl.removeClass("processing"); $knowl.slideDown("slow"); }]); - } - } - else if ($el.attr("class") == 'id-ref') { - //get content from element with the given id - $output.html($("#".concat($el.attr("refid"))).html()); - $knowl.hide(); - $el.addClass("active"); - if(window.MathJax == undefined) { - $knowl.slideDown("slow"); - } else { - // sagecell.makeSagecell({inputLocation: 'div.sagecell-sage', - // linked: true, - // languages: ['sage'], - // evalButtonText: 'Evaluate sage code'}); - $knowl.addClass("processing"); - MathJax.Hub.Queue(['Typeset', MathJax.Hub, $output.get(0)]); - MathJax.Hub.Queue([ function() { $knowl.removeClass("processing"); $knowl.slideDown("slow"); }]); - // sagecell.makeSagecell({inputLocation: "div.knowl-output"}); - // sagecell.makeSagecell({inputLocation: "#kuid-0"}); - } - } - else { - // Get code from server. - $output.load(knowl_id, - function(response, status, xhr) { - $knowl.removeClass("loading"); - if (status == "error") { - $el.removeClass("active"); - $output.html("

ERROR: " + xhr.status + " " + xhr.statusText + '
'); - $output.show(); - } else if (status == "timeout") { - $el.removeClass("active"); - $output.html("
ERROR: timeout. " + xhr.status + " " + xhr.statusText + '
'); - $output.show(); - } else { - $knowl.hide(); - $el.addClass("active"); - } - // if we are using MathJax, then we reveal the knowl after it has finished rendering the contents - if(window.MathJax == undefined) { - $knowl.slideDown("slow"); - } else { - $knowl.addClass("processing"); - MathJax.Hub.Queue(['Typeset', MathJax.Hub, $output.get(0)]); - MathJax.Hub.Queue([ function() { $knowl.removeClass("processing"); $knowl.slideDown("slow"); }]); - } - }); - } - } -} //~~ end click handler for *[knowl] elements - -/** register a click handler for each element with the knowl attribute - * @see jquery's doc about 'live'! the handler function does the - * download/show/hide magic. also add a unique ID, - * necessary when the same reference is used several times. */ -$(function() { - // $("*[knowl]").live({ - $("body").on("click", "*[knowl]", function(evt) { -// click: function(evt) { - evt.preventDefault(); - var $knowl = $(this); - if(!$knowl.attr("knowl-uid")) { - $knowl.attr("knowl-uid", knowl_id_counter); - knowl_id_counter++; - } - knowl_click_handler($knowl, evt); -// } - }); -}); -} - -knowlscript = true; +/* + * Knowl - Feature Demo for Knowls + * Copyright (C) 2011 Harald Schilly + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * 4/11/2012 Modified by David Guichard to allow inline knowl code. + * Sample use: + * This is an inline knowl. + */ + +/* 8/14/14 Modified by David Farmer to allow knowl content to be + * taken from the element with a given id. + * + * The syntax is Proof + */ + +/* javascript code for the knowl features + * global counter, used to uniquely identify each knowl-output element + * that's necessary because the same knowl could be referenced several times + * on the same page */ + + if (!(knowlscript) ) { +var knowl_id_counter = 0; + +function knowl_click_handler($el) { + // the knowl attribute holds the id of the knowl + var knowl_id = $el.attr("knowl"); + // the uid is necessary if we want to reference the same content several times + var uid = $el.attr("knowl-uid"); + var output_id = '#knowl-output-' + uid; + var $output_id = $(output_id); + // create the element for the content, insert it after the one where the + // knowl element is included (e.g. inside a

tag) (sibling in DOM) + var idtag = "id='"+output_id.substring(1) + "'"; + var kid = "id='kuid-"+ uid + "'"; + // if we already have the content, toggle visibility + if ($output_id.length > 0) { + $("#kuid-"+uid).slideToggle("fast"); + $el.toggleClass("active"); + + // otherwise download it or get it from the cache + } else { + var knowl = "
loading '"+knowl_id+"'
"; + + // check, if the knowl is inside a td or th in a table. otherwise assume its + // properly sitting inside a
or

+ if($el.parent().is("td") || $el.parent().is("th") ) { + // assume we are in a td or th tag, go 2 levels up + var cols = $el.parent().parent().children().length; + $el.parents().eq(1).after( + // .parents().eq(1) was formerly written as .parent().parent() + ""+knowl+""); + } else if ($el.parent().is("li")) { + $el.parent().after(knowl); + } + // the following is implemented stupidly, but I had to do it quickly. + // someone please replace it with an appropriate loop -- DF + // the '.is("p")' is for the first paragraph of a theorem or proof + //also, after you close the knowl, it still has a shaded background + else if ($el.parent().parent().is("li")) { + $el.parent().parent().after(knowl); + } + else if ($el.parent().css('display') == "block" || $el.parent().is("p")) { + $el.parent().after(knowl); + } else if ($el.parent().parent().css('display') == "block" || $el.parent().parent().is("p")) { + $el.parent().parent().after(knowl); + } else { + $el.parent().parent().parent().after(knowl); + } + +//else { +// // $el.parent().after(knowl); +// var theparents=$el.parents(); +// var ct=0; +// while (theparents[ct] != "block" && ct<2) +// ct++; +// ct=0; +// //$el.parents().eq(ct).after(knowl); +// $el.parents().eq(ct).after(theparents[1]); +// } + + // "select" where the output is and get a hold of it + var $output = $(output_id); + var $knowl = $("#kuid-"+uid); + $output.addClass("loading"); + $knowl.hide(); + // DRG: inline code + if ($el.attr("class") == 'internal') { + $output.html($el.attr("value")); + $knowl.hide(); + $el.addClass("active"); + if(window.MathJax == undefined) { + $knowl.slideDown("slow"); + } else { + $knowl.addClass("processing"); + MathJax.Hub.Queue(['Typeset', MathJax.Hub, $output.get(0)]); + MathJax.Hub.Queue([ function() { $knowl.removeClass("processing"); $knowl.slideDown("slow"); }]); + } + } + else if ($el.attr("class") == 'id-ref') { + //get content from element with the given id + $output.html($("#".concat($el.attr("refid"))).html()); + $knowl.hide(); + $el.addClass("active"); + if(window.MathJax == undefined) { + $knowl.slideDown("slow"); + } else { + // sagecell.makeSagecell({inputLocation: 'div.sagecell-sage', + // linked: true, + // languages: ['sage'], + // evalButtonText: 'Evaluate sage code'}); + $knowl.addClass("processing"); + MathJax.Hub.Queue(['Typeset', MathJax.Hub, $output.get(0)]); + MathJax.Hub.Queue([ function() { $knowl.removeClass("processing"); $knowl.slideDown("slow"); }]); + // sagecell.makeSagecell({inputLocation: "div.knowl-output"}); + // sagecell.makeSagecell({inputLocation: "#kuid-0"}); + } + } + else { + // Get code from server. + $output.load(knowl_id, + function(response, status, xhr) { + $knowl.removeClass("loading"); + if (status == "error") { + $el.removeClass("active"); + $output.html("

ERROR: " + xhr.status + " " + xhr.statusText + '
'); + $output.show(); + } else if (status == "timeout") { + $el.removeClass("active"); + $output.html("
ERROR: timeout. " + xhr.status + " " + xhr.statusText + '
'); + $output.show(); + } else { + $knowl.hide(); + $el.addClass("active"); + } + // if we are using MathJax, then we reveal the knowl after it has finished rendering the contents + if(window.MathJax == undefined) { + $knowl.slideDown("slow"); + } else { + $knowl.addClass("processing"); + MathJax.Hub.Queue(['Typeset', MathJax.Hub, $output.get(0)]); + MathJax.Hub.Queue([ function() { $knowl.removeClass("processing"); $knowl.slideDown("slow"); }]); + } + }); + } + } +} //~~ end click handler for *[knowl] elements + +/** register a click handler for each element with the knowl attribute + * @see jquery's doc about 'live'! the handler function does the + * download/show/hide magic. also add a unique ID, + * necessary when the same reference is used several times. */ +$(function() { + // $("*[knowl]").live({ + $("body").on("click", "*[knowl]", function(evt) { +// click: function(evt) { + evt.preventDefault(); + var $knowl = $(this); + if(!$knowl.attr("knowl-uid")) { + $knowl.attr("knowl-uid", knowl_id_counter); + knowl_id_counter++; + } + knowl_click_handler($knowl, evt); +// } + }); +}); +} + +knowlscript = true; diff --git a/Euclids Library- Main/Euclids Library/knowltamplate.html b/www/knowltamplate.html similarity index 100% rename from Euclids Library- Main/Euclids Library/knowltamplate.html rename to www/knowltamplate.html diff --git a/Euclids Library- Main/Euclids Library/knowltest.html b/www/knowltest.html similarity index 97% rename from Euclids Library- Main/Euclids Library/knowltest.html rename to www/knowltest.html index 550dd47f..1e9d4a99 100644 --- a/Euclids Library- Main/Euclids Library/knowltest.html +++ b/www/knowltest.html @@ -1,30 +1,30 @@ - - - - - Testing Knwol Javascript Extension - - - - - - - -

test

- -

When $a \ne 0$, there are two solutions to \(ax^2 + bx + c = 0\) and they are -$$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$

- -

When $a \ne 0$, there are two solutions to \(ax^2 + bx + c = 0\) and they are -$$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$

- - - - - - + + + + + Testing Knwol Javascript Extension + + + + + + + +

test

+ +

When $a \ne 0$, there are two solutions to \(ax^2 + bx + c = 0\) and they are +$$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$

+ +

When $a \ne 0$, there are two solutions to \(ax^2 + bx + c = 0\) and they are +$$x = {-b \pm \sqrt{b^2-4ac} \over 2a}.$$

+ + + + + + \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/linesonplane.png b/www/linesonplane.png similarity index 100% rename from Euclids Library- Main/Euclids Library/linesonplane.png rename to www/linesonplane.png diff --git a/Euclids Library- Main/Euclids Library/ordertopology.html b/www/ordertopology.html similarity index 97% rename from Euclids Library- Main/Euclids Library/ordertopology.html rename to www/ordertopology.html index 1be65ecf..b4a28fbb 100644 --- a/Euclids Library- Main/Euclids Library/ordertopology.html +++ b/www/ordertopology.html @@ -1,37 +1,37 @@ - - - - - Compactness(Topology) - Theorem 27 - - - - - - -
- -
-

Order Topoloogy - Definition

-
- -
-

A topology on an ordered set $X$ generated by the basis: $\\$ 1. all intervals $(a, b)$ $\\$ 2. $[a_0, b)$ if a least element $a_0$ exists $\\$ 3. $(a, b_0)$ if a greatest element $b_0$ exists

- -
- - - -
- - + + + + + Compactness(Topology) - Theorem 27 + + + + + + +
+ +
+

Order Topoloogy - Definition

+
+ +
+

A topology on an ordered set $X$ generated by the basis: $\\$ 1. all intervals $(a, b)$ $\\$ 2. $[a_0, b)$ if a least element $a_0$ exists $\\$ 3. $(a, b_0)$ if a greatest element $b_0$ exists

+ +
+ + + +
+ + \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/simplyordersettheorem.html b/www/simplyordersettheorem.html similarity index 97% rename from Euclids Library- Main/Euclids Library/simplyordersettheorem.html rename to www/simplyordersettheorem.html index fc6a033c..f1672d1e 100644 --- a/Euclids Library- Main/Euclids Library/simplyordersettheorem.html +++ b/www/simplyordersettheorem.html @@ -1,43 +1,43 @@ - - - - - Compactness(Topology) - Theorem 27 - - - - - - - - - - -
- -
- Loading.... - - -
-
- -
-

Compactness(Topology) - Theorem 27

-
- -
- - - + + + + + Compactness(Topology) - Theorem 27 + + + + + + + + + + +
+ +
+ Loading.... + + +
+
+ +
+

Compactness(Topology) - Theorem 27

+
+ +
+ + + \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/start.html b/www/start.html similarity index 98% rename from Euclids Library- Main/Euclids Library/start.html rename to www/start.html index 16a616df..497d5b56 100644 --- a/Euclids Library- Main/Euclids Library/start.html +++ b/www/start.html @@ -1,108 +1,108 @@ - - - - - - Lab 08 - the title of your content - - - - -
-
-

Loading...

-
World War II, a big war
-
- - - -
-
- -
- - -

Asia

- -
- Loading.... -
Fig 1- Image of Siege of Shanghai
-
- -

In the mid-to-late 1930s, Japanese forces in Manchukuo had sporadic border clashes with the Soviet Union and Mongolia. The Japanese doctrine of Hokushin-ron, which emphasised Japan's expansion northward, was favoured by the Imperial Army during this time. With the devastating Japanese defeat at Khalkin Gol in 1939 and ally Nazi Germany pursuing neutrality with the Soviets, this policy would prove difficult to maintain. Japan and the Soviet Union eventually signed a Neutrality Pact in April 1941, and Japan adopted the doctrine of Nanshin-ron, promoted by the Navy, which took its focus southward, eventually leading to its war with the United States and the Western Allies.

- -
- -
- -

Chronology

- -

Europe

- - And now some text - - - -

Spanish Civil War

- -

When civil war broke out in Spain, Hitler and Mussolini lent military support to the Nationalist rebels, led by General Francisco Franco. The Soviet Union supported the existing government, the Spanish Republic. Over 30,000 foreign volunteers, known as the International Brigades, also fought against the Nationalists. Both Germany and the USSR used this proxy war as an opportunity to test in combat their most advanced weapons and tactics. The bombing of Guernica by the German Condor Legion in April 1937 heightened widespread concerns that the next major war would include extensive terror bombing attacks on civilians. The Nationalists won the civil war in April 1939; Franco, now dictator, bargained with both sides during the Second World War, but never concluded any major agreements. He did send volunteers to fight on the Eastern Front under German command but Spain remained neutral and did not allow either side to use its territory

- - - -

Japanese Invasion of China

- - -
- Loading... -
Fig 2- Image of Japanese Aircraft Carrier Shokaku
-
- -

In July 1937, Japan captured the former Chinese imperial capital of Beijing after instigating the Marco Polo Bridge Incident, which culminated in the Japanese campaign to invade all of China. The Soviets quickly signed a non-aggression pact with China to lend materiel support, effectively ending China's prior co-operation with Germany. Generalissimo Chiang Kai-shek deployed his best army to defend Shanghai, but, after three months of fighting, Shanghai fell. The Japanese continued to push the Chinese forces back, capturing the capital Nanking in December 1937. After the fall of Nanking, tens of thousands if not hundreds of thousands of Chinese civilians and disarmed combatants were murdered by the Japanese. - In March 1938, Nationalist Chinese forces won their first major victory at Taierzhuang but then the city of Xuzhou was taken by Japanese in May. In June 1938, Chinese forces stalled the Japanese advance by flooding the Yellow River; this manoeuvre bought time for the Chinese to prepare their defences at Wuhan, but the city was taken by October.

- -
- - - - -
- - + + + + + + Lab 08 - the title of your content + + + + +
+
+

Loading...

+
World War II, a big war
+
+ + + +
+
+ +
+ + +

Asia

+ +
+ Loading.... +
Fig 1- Image of Siege of Shanghai
+
+ +

In the mid-to-late 1930s, Japanese forces in Manchukuo had sporadic border clashes with the Soviet Union and Mongolia. The Japanese doctrine of Hokushin-ron, which emphasised Japan's expansion northward, was favoured by the Imperial Army during this time. With the devastating Japanese defeat at Khalkin Gol in 1939 and ally Nazi Germany pursuing neutrality with the Soviets, this policy would prove difficult to maintain. Japan and the Soviet Union eventually signed a Neutrality Pact in April 1941, and Japan adopted the doctrine of Nanshin-ron, promoted by the Navy, which took its focus southward, eventually leading to its war with the United States and the Western Allies.

+ +
+ +
+ +

Chronology

+ +

Europe

+ + And now some text + + + +

Spanish Civil War

+ +

When civil war broke out in Spain, Hitler and Mussolini lent military support to the Nationalist rebels, led by General Francisco Franco. The Soviet Union supported the existing government, the Spanish Republic. Over 30,000 foreign volunteers, known as the International Brigades, also fought against the Nationalists. Both Germany and the USSR used this proxy war as an opportunity to test in combat their most advanced weapons and tactics. The bombing of Guernica by the German Condor Legion in April 1937 heightened widespread concerns that the next major war would include extensive terror bombing attacks on civilians. The Nationalists won the civil war in April 1939; Franco, now dictator, bargained with both sides during the Second World War, but never concluded any major agreements. He did send volunteers to fight on the Eastern Front under German command but Spain remained neutral and did not allow either side to use its territory

+ + + +

Japanese Invasion of China

+ + +
+ Loading... +
Fig 2- Image of Japanese Aircraft Carrier Shokaku
+
+ +

In July 1937, Japan captured the former Chinese imperial capital of Beijing after instigating the Marco Polo Bridge Incident, which culminated in the Japanese campaign to invade all of China. The Soviets quickly signed a non-aggression pact with China to lend materiel support, effectively ending China's prior co-operation with Germany. Generalissimo Chiang Kai-shek deployed his best army to defend Shanghai, but, after three months of fighting, Shanghai fell. The Japanese continued to push the Chinese forces back, capturing the capital Nanking in December 1937. After the fall of Nanking, tens of thousands if not hundreds of thousands of Chinese civilians and disarmed combatants were murdered by the Japanese. + In March 1938, Nationalist Chinese forces won their first major victory at Taierzhuang but then the city of Xuzhou was taken by Japanese in May. In June 1938, Chinese forces stalled the Japanese advance by flooding the Yellow River; this manoeuvre bought time for the Chinese to prepare their defences at Wuhan, but the city was taken by October.

+ +
+ + + + +
+ + \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/topologicalspace.html b/www/topologicalspace.html similarity index 97% rename from Euclids Library- Main/Euclids Library/topologicalspace.html rename to www/topologicalspace.html index 4ba797dc..de0074ed 100644 --- a/Euclids Library- Main/Euclids Library/topologicalspace.html +++ b/www/topologicalspace.html @@ -1,37 +1,37 @@ - - - - - Compactness(Topology) - Theorem 27 - - - - - - -
- -
-

Topological Space - Definition

-
- -
-

A set X which has an associated collection of subsests constituting a topology $T$

- -
- - - -
- - + + + + + Compactness(Topology) - Theorem 27 + + + + + + +
+ +
+

Topological Space - Definition

+
+ +
+

A set X which has an associated collection of subsests constituting a topology $T$

+ +
+ + + +
+ + \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/topology.html b/www/topology.html similarity index 97% rename from Euclids Library- Main/Euclids Library/topology.html rename to www/topology.html index 7c63de11..bdc51a91 100644 --- a/Euclids Library- Main/Euclids Library/topology.html +++ b/www/topology.html @@ -1,37 +1,37 @@ - - - - - Compactness(Topology) - Theorem 27 - - - - - - -
- -
-

Topology - Definition

-
- -
-

A collection of subsets $T$ over of a space $X$ $(T, X)$ such satisfying: \\ 1. All unions of set in $T$ are in $T$ \\ 2. All finite intersections of sets in $T$ are in $T$ \\ 3. $X$ and $\emptyset$ are in $T$

- -
- - - -
- - + + + + + Compactness(Topology) - Theorem 27 + + + + + + +
+ +
+

Topology - Definition

+
+ +
+

A collection of subsets $T$ over of a space $X$ $(T, X)$ such satisfying: \\ 1. All unions of set in $T$ are in $T$ \\ 2. All finite intersections of sets in $T$ are in $T$ \\ 3. $X$ and $\emptyset$ are in $T$

+ +
+ + + +
+ + \ No newline at end of file diff --git a/Euclids Library- Main/Euclids Library/wikireal number line.png b/www/wikireal number line.png similarity index 100% rename from Euclids Library- Main/Euclids Library/wikireal number line.png rename to www/wikireal number line.png