changes..

Author: Azham

.gitignore

@@ -1 +1,2 @@
-dbinfo.php
+/dbinfo.php
+/rss/db.php

api/.htaccess

@@ -0,0 +1,19 @@
+Options +FollowSymLinks
+
+RewriteEngine on
+#get details by specifying format
+    #get all details in db
+    RewriteRule ^people/([A-Za-z0-9-]+)/?$ http://www.cems.uwe.ac.uk/~tam2-naphiel/dsa/api/api.php?c=leader&f=$1 [L]
+    RewriteRule ^battles/([A-Za-z0-9-]+)/?$ http://www.cems.uwe.ac.uk/~tam2-naphiel/dsa/api/api.php?c=battle&f=$1 [L]
+
+    #get details by specifying names
+    RewriteRule ^people/([\ A-Za-z0-9-]+)/([A-Za-z0-9_]+)/?$ http://www.cems.uwe.ac.uk/~tam2-naphiel/dsa/api/api.php?c=leader&f=$2&n=$1 [L]
+    RewriteRule ^battles/([\ A-Za-z0-9-]+)/([A-Za-z0-9-]+)/?$ http://www.cems.uwe.ac.uk/~tam2-naphiel/dsa/api/api.php?c=battle&f=$2&n=$1 [L]   
+
+#using default format i.e xml
+RewriteRule ^people/?$ http://www.cems.uwe.ac.uk/~tam2-naphiel/dsa/api/api.php?c=leader&f=xml [L]
+RewriteRule ^battles/?$ http://www.cems.uwe.ac.uk/~tam2-naphiel/dsa/api/api.php?c=battle&f=xml [L]
+RewriteRule ^people/([\ A-Za-z0-9-]+)/?$ http://www.cems.uwe.ac.uk/~tam2-naphiel/dsa/api/api.php?c=leader&f=xml&n=$1 [L]
+RewriteRule ^battles/([\ A-Za-z0-9-]+)/?$ http://www.cems.uwe.ac.uk/~tam2-naphiel/dsa/api/api.php?c=battle&f=xml&n=$1 [L]   
+#custom error page in case of bad api call
+ErrorDocument 404 http://www.cems.uwe.ac.uk/~tam2-naphiel/dsa/api/404.php

book.psd

@@ -0,0 +1,36 @@
+ <?php
+        $servername="stocks";
+$username="fet13023117";
+$password="H46LMffy";
+$database="fet13023117";
+
+// Create connection
+$conn = new mysqli($servername, $username, $password, $database);
+// Check connection
+if ($conn->connect_error) {
+    die("Connection failed: " . $conn->connect_error);
+} 
+
+
+        $sql = "SELECT * FROM battle";
+      $result = mysqli_query($conn, $sql);
+
+        
+
+$battles = array();
+           
+          
+
+            while ($row = mysqli_fetch_array($result)) {
+     
+              
+               
+                array_push($battles, array("id" => $row["battle_id"],"battle_name" => $row["battle_name"], "name" => str_replace(" ", "", $row["battle_name"]),"description" => $row["description"], "beligerents" => $row["Beligerents"],"outcome" => $row["outcome"],"lat" => $row["lat"],"lng" => $row["lng"] ));
+                
+            }
+      
+                
+          $numberOfBattles = sizeof($battles);
+       
+        $conn->close();
+        ?>

css/Drawing with markers-webfont.eot

@@ -1,71 +1,54 @@
 body
 {
-
-
 }
-
-
-
 .wrapper{
     width:100%;
-    width:1336px;    
-
+    width:1336px; 
     background-color:#A7C5C7;
     margin-left:auto;
     margin-right:auto;
-
     position:relative;
 }
-
 .header{
-
     position:absolute;
     top:0px;
     height:100px;
-
     width:100%;
     z-index:50;
 }
-
 .nav_bar{
-
-    z-index:49;
+    font-family: Georgia;
+    color: #523928;
+    font-weight: bold;
     position:absolute;
-    top:100px;
+    top:60px;
+    left:80px;
     width: 100%;
     height:25px;
 
-    background:rgba(240, 240, 240, 0.8);
-
 }
 @font-face {
     font-family: 'drawing_with_markersregular';
     src: url('Drawing with markers-webfont.eot');
     src: url('Drawing with markers-webfont.eot?#iefix') format('embedded-opentype'),
-         url('Drawing with markers-webfont.woff2') format('woff2'),
-         url('Drawing with markers-webfont.woff') format('woff'),
-         url('Drawing with markers-webfont.ttf') format('truetype'),
-         url('Drawing with markers-webfont.svg#drawing_with_markersregular') format('svg');
+        url('Drawing with markers-webfont.woff2') format('woff2'),
+        url('Drawing with markers-webfont.woff') format('woff'),
+        url('Drawing with markers-webfont.ttf') format('truetype'),
+        url('Drawing with markers-webfont.svg#drawing_with_markersregular') format('svg');
     font-weight: normal;
     font-style: normal;
-
 }
-
 h4:first-of-type:first-letter { float: left; color: #903; font-size: 75px; line-height: 60px; padding-top: 4px; padding-right: 8px; padding-left: 3px; font-family: Georgia; }
-
 .leftPage{
     position:absolute;
     top:85px;
     left:75px;
     width:578px;
     height:780px;
-font-family: Georgia;
-color: #523928;
-//opacity: .825;
-
-
+    font-family: Georgia;
+    text-align:justify;
+    color: #523928;
 }
-
 .api{
     position:absolute;
     //top:150px;
@@ -75,27 +58,21 @@ color: #523928;
     border-radius: 5px;
     opacity:.55;
 }
-
 .api_container{
     position:absolute;
     top:85px;
     left:665px;
     width:578px;
     height:780px;
-    //box-shadow:  inset 39px 1px 53px -8px #575757;
+    //box-shadow: inset 39px 1px 53px -8px #575757;
     border-radius: 5px;
 }
-
-
-
-
 .book{
     position:absolute;
     top:50px;
     background-repeat:no-repeat;
     width:1336px;
     height:927px;
-
 }
 .footer{
     position:absolute;
@@ -105,5 +82,62 @@ color: #523928;
     text-align:center;
     color:white;
     padding-top:10px;
+}
+
+a:link {
+    color: #523928;
+}
+
+a{
+    text-decoration: none;
+}
+
+a:visited {
+    color: #523928;
+}
+
+
+a:hover {
+    color: #523928;
+}
+
 
+a:active {
+    color: #523928;
+}
+
+#home
+{
+position: absolute;
+margin-top: 10px;
+margin-left: 15px;
+}
+#azham
+{
+position: absolute;
+margin-top: 5px;
+margin-left: 105px;
+}
+#hannad
+{
+position: absolute;
+margin-top: 3px;
+margin-left: 195px;
+}
+#josh
+{
+position: absolute;
+margin-top: 2px;
+margin-left: 300px;
+}
+#kayne{
+position: absolute;
+margin-top: -5px;
+margin-left: 385px;
+}
+#rss
+{
+position: absolute;
+margin-top: -5px;
+margin-left: 486px;
 }