Revize f20e0b8b

Fix: merge-fix (all buttons in one td)

application/view/searchContent.php

@@ -614 +614 @@
                         result += "<td class=\"action-td\">" +
                             "<button class=\"btn mr-1\" title=\"Upravit\"  data-toggle=\"modal\" data-target=\"#edit-modal\" data-pseudo-id='" + id + "' data-title=\"Upravit záznam\"><i class=\"fa fa-pencil\"></i></button>" + //TODO ADMIN change , regular send report
                             "<button class=\"btn\" title=\"Detail\"  data-toggle=\"modal\" data-target=\"#detail-modal\" data-pseudo-id='" + id + "'><i class=\"fa fa-search\"></i></button>" +
+                            "<button class=\"btn ml-1\" title=\"Odstranit\"  data-toggle=\"modal\" data-target=\"#remove-modal\" data-pseudo-id='" + id + "'><i class=\"fa fa-trash\"></i></button>" + //TODO ADMIN change , regular send report
                             "</td>";
-                        result += "<td class=\"action-td\">" +
-                            "<button class=\"btn\" title=\"Odstranit\"  data-toggle=\"modal\" data-target=\"#remove-modal\" data-pseudo-id='" + id + "'><i class=\"fa fa-trash\"></i></button>" +
-                            "</td>"; //added button for removing entry
                         result += "</tr>";
                     });
                     document.getElementById("search-table").innerHTML = result;