Merge pull request #177 from matomo-org/PG-3416-combine-actions-into-single-column

Combine actions into one column

Author: snake14

tests/UI/CustomAlerts_spec.js

@@ -72,7 +72,7 @@ describe("CustomAlerts", function () {
     });
 
     it('should show delete dialog', async function () {
-        await page.click('tbody tr:first-child td.delete button');
+        await page.click('tbody tr:first-child td button.deleteAlert');
         await page.waitForTimeout(350); // wait for animation
         var elem = await page.jQuery('.modal.open');
         expect(await elem.screenshot()).to.matchImage('delete');

tests/UI/expected-ui-screenshots/CustomAlerts_list.png

@@ -13,8 +13,7 @@
           <th>{{ translate('General_Website') }}</th>
           <th>{{ translate('General_Period') }}</th>
           <th>{{ translate('General_Report') }}</th>
-          <th>{{ translate('General_Edit') }}</th>
-          <th>{{ translate('General_Delete') }}</th>
+          <th>{{ translate('General_Actions') }}</th>
         </tr>
       </thead>
       <tbody>
@@ -40,8 +39,6 @@
               })"
               :title="translate('General_Edit')"
             ></a>
-          </td>
-          <td class="delete">
             <button
               class="deleteAlert table-action"
               @click="deleteAlert(alert.idalert)"