From e5e47d57411b67c736e286b6f3333d3e8ea8ef61 Mon Sep 17 00:00:00 2001
From: /jedi/ <hartmann@qabel.de>
Date: Sat, 2 Mar 2019 02:17:53 +0100
Subject: [PATCH] clean up table

---
 templates/found_item_table.php | 20 +++++++++-----------
 templates/sidebar.php          | 19 +++++++++++--------
 templates/table.php            |  3 +++
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/templates/found_item_table.php b/templates/found_item_table.php
index bac8000..1682c77 100644
--- a/templates/found_item_table.php
+++ b/templates/found_item_table.php
@@ -14,8 +14,8 @@
     <tr>
         <th>UID</th>
         <th>was</th>
-        <th>wann</th>
-        <th>wo</th>
+        <!--th>wann</th>
+        <th>wo</th-->
         <th>kiste</th>
         <th>foto</th>
         <th></th>
@@ -25,8 +25,8 @@
     <tr>
         <th>UID</th>
         <th>was</th>
-        <th>wann</th>
-        <th>wo</th>
+        <!--th>wann</th>
+        <th>wo</th-->
         <th>kiste</th>
         <th>foto</th>
         <th></th>
@@ -34,13 +34,13 @@
     </tfoot>
     <tbody>
     <?php
-    foreach( get_founditems(true) as $item){
+    foreach( get_founditems() as $item){
         ?>
         <tr>
             <td><?php echo $item["uid"]; ?> </td>
             <td><?php echo $item["was"]; ?></td>
-            <td><?php echo $item["wann"]; ?></td>
-            <td><?php echo $item["wo"]; ?></td>
+            <!--td><?php echo $item["wann"]; ?></td>
+            <td><?php echo $item["wo"]; ?></td-->
             <td><?php echo $item["container"];?></td>
             <td>
                 <?php
@@ -53,17 +53,15 @@
                     }
                 ?>
             </td>
-            <!--<td><img style="height: 48px;" src="/upload/<?php echo $item["hash"]; ?>"></td>-->
             <td>
                 <div class="btn-group" role="group">
                     <button type="button" class="btn btn-outline-secondary"><i class="fas fa-fw fa-check-circle"></i></button>
                     <!--<a href="/found_item_edit/<?php echo $item["id"]; ?>/" type="button" class="btn btn-outline-secondary"><i class="fas fa-fw fa-edit"></i></a>-->
                     <button type="button" class="btn btn-outline-secondary" data-toggle="modal" data-target="#exampleModal"
-                            onclick="fill_edit_form(<?php echo $item["id"]; ?>,'<?php echo $item["was"]; ?>','<?php echo $item["wann"]; ?>',
-                                    '<?php echo $item["wo"]; ?>','<?php echo $item["hash"]; ?>','<?php echo $item["container"];?>')">
+                            onclick='fill_edit_form(<?php echo json_encode($item); ?>);' title="edit">
                         <i class="fas fa-fw fa-edit"></i>
                     </button>
-                    <button type="button" class="btn btn-outline-danger" onclick="delete_item(<?php echo $item["id"]; ?>)"><i class="fas fa-fw fa-trash-alt"></i></button>
+                    <button type="button" class="btn btn-outline-danger" onclick="delete_item(<?php echo $item["id"]; ?>)" title="delete"><i class="fas fa-fw fa-trash-alt"></i></button>
                 </div>
             </td>
             <!--td>
diff --git a/templates/sidebar.php b/templates/sidebar.php
index 14449df..8cfc46b 100644
--- a/templates/sidebar.php
+++ b/templates/sidebar.php
@@ -31,6 +31,15 @@
         </a>
     </li>
 
+    <li class="nav-item">
+        <a class="nav-link" href="/matches/">
+            <i class="fas fa-fw fa-check"></i>
+            <span>Matches</span>
+        </a>
+    </li>
+
+
+    <div class="dropdown-divider"></div>
 
 
     <!--li class="nav-item">
@@ -57,13 +66,7 @@
             <span>Lost</span>
         </a>
     </li-->
-    <li class="nav-item">
-        <a class="nav-link" href="/matches/">
-            <i class="fas fa-fw fa-check"></i>
-            <span>Matches</span>
-        </a>
-    </li>
-    <li class="nav-item">
+    <!--li class="nav-item">
         <a class="nav-link" href="/tinder/">
             <i class="fas fa-fw fa-comments"></i>
             <span>Tinder</span>
@@ -74,7 +77,7 @@
             <i class="fas fa-fw fa-comments"></i>
             <span>NeoTinder</span>
         </a>
-    </li>
+    </li-->
     <!--li class="nav-item dropdown">
         <a class="nav-link dropdown-toggle" href="#" id="pagesDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <i class="fas fa-fw fa-folder"></i>
diff --git a/templates/table.php b/templates/table.php
index 12bdd22..5421ddf 100644
--- a/templates/table.php
+++ b/templates/table.php
@@ -35,6 +35,9 @@
                     <?php
                     include "templates/found_item_table.php";
                     ?>
+
+
+                    
                 </div>
             </div>
             <div class="card-footer small text-muted">Updated yesterday at 11:59 PM</div>