diff --git a/css/history.css b/css/history.css
index 62d0ac3baefc07ec0cb431950db38ff8f673f80d..dd3da3a4a4d0a78a73d2ae396e0a16831bafa735 100755
--- a/css/history.css
+++ b/css/history.css
@@ -1,7 +1,6 @@
.history_container {
margin-top: 10%;
height: 79%;
- border: 1px solid red; /*OJO LALI HAPUS IKI*/
}
.history_container .subheader {
@@ -31,7 +30,6 @@
font-family: calibri;
position: relative;;
- border: 0.5px solid black;
display: block;
text-decoration: none;
@@ -48,9 +46,7 @@
table.history_table {
margin-top: 5px;
- border: 1px solid blue; /*OJO LALI HAPUS IKI*/
width: 100%;
- border: 1px solid purple;
padding: 0;
border-collapse: collapse;
}
@@ -89,7 +85,6 @@ p.history_comment {
}
table.history_table th, td {
- border: 1px solid purple;
padding: 5px;
border-collapse: collapse;
}
@@ -105,4 +100,11 @@ img.history_pict {
display: inline;
margin: 0;
+}
+
+.hide_hist_button {
+ margin: 0;
+ color: white;
+ background-color: red;
+ font-size: 9px;
}
\ No newline at end of file
diff --git a/history/driver_history.html b/history/driver_history.html
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/history/driver_history.php b/history/driver_history.php
index d1e4a056aa85944398e99ddf15f82175ed8a7471..f9789aabea9e82b3ce7324a7cd24606fdb032320 100644
--- a/history/driver_history.php
+++ b/history/driver_history.php
@@ -25,6 +25,9 @@
</div>
<div class="menu_container">
<?php include'../template/menu.php';?>
+ <script type="text/javascript">
+ document.getElementById("history_link").setAttribute("class", "menu menu_active");
+ </script>
</div>
<div class="history_container">
<div class="subheader">
@@ -64,14 +67,15 @@
echo
"<tr>
<td>
- <img class='history_pict' src='../profile/getProfilePict.php?id=".$row['cust_id']."'
+ <img class='history_pict' src='../profile/getProfilePict.php?id=".$row['cust_id']."'>
+ <button class='hide_hist_button' type='button' value='hide' onclick='hide_row(this)'>Hide</button>
</td>
<td>
<p class='history_date'>".$row['date']."</p>
<p class='history_username'>".$driver_name."</p>
<p class='history_loc'>".$row['pick_city']." - ".$row['dest_city']."</p>
- <p class='history_rating'>rating ".$row['score']."</p>
- <p class='history_comment'>You commented:</p>
+ <p class='history_rating'>gave ".$row['score']." stars for this order</p>
+ <p class='history_comment'>and left comment:</p>
<p class='history_comment' style='margin-left: 30px;'>".$row['comment']."</p>
</td>
</tr>";
@@ -85,4 +89,6 @@
</div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
+
+<script type="text/javascript" src="hide_history.js"></script>
\ No newline at end of file
diff --git a/history/hide_history.js b/history/hide_history.js
new file mode 100644
index 0000000000000000000000000000000000000000..13ad2f0eab422aaaff00c740cd8b4fa8a30e3d29
--- /dev/null
+++ b/history/hide_history.js
@@ -0,0 +1,4 @@
+function hide_row(o) {
+ var p = o.parentNode.parentNode;
+ p.parentNode.removeChild(p);
+}
\ No newline at end of file
diff --git a/history/history.html b/history/history.html
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/history/order_history.html b/history/order_history.html
deleted file mode 100755
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/history/transaction_history.php b/history/transaction_history.php
index 9be4a6d8871de85b61c668da0461ce722d77ee81..789778ffa99161c62bcfa67db4c59f0d40fd06b8 100644
--- a/history/transaction_history.php
+++ b/history/transaction_history.php
@@ -5,6 +5,9 @@
<link rel="stylesheet" type="text/css" href="../css/default_style.css">
<link rel="stylesheet" type="text/css" href="../css/history.css">
<link rel="stylesheet" type="text/css" href="../css/header.css">
+ <script type="text/javascript" src="hide_history.js">
+ </script>
+}
</head>
<body>
<div class="frame">
@@ -25,6 +28,9 @@
</div>
<div class="menu_container">
<?php include'../template/menu.php';?>
+ <script>
+ document.getElementById("history_link").setAttribute("class", "menu menu_active");
+ </script>
</div>
<div class="history_container">
<div class="subheader">
@@ -63,7 +69,8 @@
echo
"<tr>
<td>
- <img class='history_pict' src='../profile/getProfilePict.php?id=".$row['driver_id']."'
+ <img class='history_pict' src='../profile/getProfilePict.php?id=".$row['driver_id']."'>
+ <button class='hide_hist_button' type='button' value='hide' onclick='hide_row(this)'>Hide</button>
</td>
<td>
<p class='history_date'>".$row['date']."</p>
@@ -85,3 +92,5 @@
</div>
</body>
</html>
+
+<script type="text/javascript" src="hide_history.js"></script>
\ No newline at end of file
diff --git a/order/order.php b/order/order.php
index e9e8bbd77110ac9e06420403ff11096b28cd4a78..dd2165055dc367c38037c8eb7446f2552abd83b5 100644
--- a/order/order.php
+++ b/order/order.php
@@ -26,6 +26,9 @@
</div>
<div class="menu_container">
<?php include'../template/menu.php';?>
+ <script>
+ document.getElementById("order_link").setAttribute("class", "menu menu_active");
+ </script>
</div>
<h1>Make an Order</h1>
diff --git a/profile/edit_location.php b/profile/edit_location.php
index e8a34d9770b612427a882ee62224858aca1dedef..48d2bcdf1ee64b966c2e56c61ae5e3d12d531bac 100644
--- a/profile/edit_location.php
+++ b/profile/edit_location.php
@@ -25,6 +25,9 @@
</div>
<div class="menu_container">
<?php include'../template/menu.php';?>
+ <script>
+ document.getElementById("profile_link").setAttribute("class", "menu menu_active");
+ </script>
</div>
<div class="editloc_container">
<div class="subheader">
diff --git a/profile/edit_profile.php b/profile/edit_profile.php
index 58e19a280713f54220ed2a69b9bb8eeb7d5de8e8..fba1b06afef7c661b4a2513495d304150eaa4464 100644
--- a/profile/edit_profile.php
+++ b/profile/edit_profile.php
@@ -27,6 +27,9 @@
</div>
<div class="menu_container">
<?php include'../template/menu.php';?>
+ <script>
+ document.getElementById("profile_link").setAttribute("class", "menu menu_active");
+ </script>
</div>
<div class="edit_profile_container">
<div class="subheader">
diff --git a/profile/profile.php b/profile/profile.php
index 9ad0639935fba5bafa90cbbf54010d833cbb96ee..0f45fde3346be1f477e476c13258db180b3b1b7b 100644
--- a/profile/profile.php
+++ b/profile/profile.php
@@ -24,6 +24,9 @@
</div>
<div class="menu_container">
<?php include'../template/menu.php';?>
+ <script>
+ document.getElementById("profile_link").setAttribute("class", "menu menu_active");
+ </script>
</div>
<div class="profile_container">
<div class="subheader">