Merge branch 'master' of https://git.etud.insa-toulouse.fr/rees/progWeb

history_mythology.html

@@ -31,7 +31,7 @@
 
             <li><a href="#Mythology">Mythology</a></li> 
             <ul>
-                <li> <a href="#Introduction2">Introduction</a></li>
+                <li> <a href="#Gods">Gods and Goddesses</a></li>
 
 
             </ul>
@@ -61,13 +61,104 @@
     
     <section>
         <h1 id = "Mythology">Mythology</h1>
+
+
         <article>
-            <p id = "Greece"><b>New Greece</b></p>
+            <p id = "Gods"><b>Gods and Goddesses</b></p>
-            <p>aef</p>
 
+            <table border="1">
+                <thead>
+                    <tr>    
+                        <th rowspan="2">Category</th>
+                        <th rowspan="2">Name</th>
+                        <th colspan="2">Characteristics</th>
+                    </tr>
+                    <tr>
+                        <th>Gender</th>
+                        <th>Activity</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td rowspan="12">Olympian Gods</td>
+                        <td>Zeus</td>
+                        <td>Male</td>
+                        <td>God of the Gods</td>
+                    </tr>
+                    <tr>
+                        <td>Poseidon</td>
+                        <td>Male</td>
+                        <td>Sea, Horses</td>
+                    </tr>
+                    <tr>
+                        <td>Hades</td>
+                        <td>Male</td>
+                        <td>Underworld</td>
+                    </tr>
+                    <tr>
+                        <td>Ares</td>
+                        <td>Male</td>
+                        <td>War, Weapons</td>
+                    </tr>
+                    <tr>
+                        <td>Hera</td>
+                        <td>Female</td>
+                        <td>Marriage, Women, Family</td>
+                    </tr>
+                    <tr>
+                        <td>Apollo</td>
+                        <td>Male</td>
+                        <td>Sun, Music, Poetry, Healing</td>
+                    </tr>
+                    <tr>
+                        <td>Artemis</td>
+                        <td>Female</td>
+                        <td>Hunt, Wilderness</td>
+                    </tr>
+                    <tr>
+                        <td>Athena</td>
+                        <td>Female</td>
+                        <td>Wisdom, Military Victory</td>
+                    </tr>
+                    <tr>
+                        <td>Aphrodite</td>
+                        <td>Female</td>
+                        <td>Beauty, Love</td>
+                    </tr>
+                    <tr>
+                        <td>Hephaestus</td>
+                        <td>Male</td>
+                        <td>Fire, Blacksmiths, Crafstmen </td>
+                    </tr>
+                    <tr>
+                        <td>Hermes</td>
+                        <td>Male</td>
+                        <td>Herald of the Gods, Proctector of Thieves, Orators and Travellers</td>
+                    </tr>
+                    <tr>
+                        <td>Dionysus</td>
+                        <td>Male</td>
+                        <td>Wine, Insanity</td>
+                    </tr>
+                    <tr>
+                        <td rowspan="3">Other Major Gods</td>
+                        <td>Demeter</td>
+                        <td>Female</td>
+                        <td>Agriculture</td>
+                    </tr>
+                    <tr>
+                        <td>Hestia</td>
+                        <td>Female</td>
+                        <td>Home, Hearth</td>
+                    </tr>
+                    <tr>
+                        <td>Persephone</td>
+                        <td>Female</td>
+                        <td>Spring, Queen of Underworld</td>
+                    </tr>
+                </tbody>
+            </table>
         </article> 
-
-       
         <img src="./photos/titanomachy.jpg" alt="titanomachy" width="2000px"/>
     </section>