From 25e63399404e8ba814aa0b1e65d83ea50cd1b2f2 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Thu, 27 Apr 2017 19:34:00 +0200
Subject: [PATCH] Fix domain admin table, move quick actions

---
 data/web/css/mailbox.css |  6 ++----
 data/web/js/admin.js     |  2 +-
 data/web/js/mailbox.js   |  1 +
 data/web/mailbox.php     | 17 ++++++++++-------
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/data/web/css/mailbox.css b/data/web/css/mailbox.css
index 1305a916b..4a110ba1a 100644
--- a/data/web/css/mailbox.css
+++ b/data/web/css/mailbox.css
@@ -12,8 +12,6 @@ table.footable>tbody>tr.footable-empty>td {
   overflow: visible !important;
 }
 .footer-add-item {
-  text-align:center;
-  font-style: italic;
   display:block;
   padding: 10px;
   background: #F5F5F5;
@@ -28,11 +26,11 @@ table.footable>tbody>tr.footable-empty>td {
 }
 .mass-select-all {
   cursor:pointer;
-  color:grey;
+  color:#555;
 }
 #alias_table {
   cursor:pointer;
 }
 #alias_table .footable-paging {
   cursor:	auto;
-}
\ No newline at end of file
+}
diff --git a/data/web/js/admin.js b/data/web/js/admin.js
index feaf3907e..647dba9a5 100644
--- a/data/web/js/admin.js
+++ b/data/web/js/admin.js
@@ -1,7 +1,7 @@
 $(document).ready(function() {
   $.ajax({
     dataType: 'json',
-    url: '/api/v1/domain-admin/all',
+    url: '/api/v1/get/domain-admin/all',
     jsonp: false,
     error: function () {
       alert('Cannot draw domain administrator table');
diff --git a/data/web/js/mailbox.js b/data/web/js/mailbox.js
index 56cc6d044..9876ec36c 100644
--- a/data/web/js/mailbox.js
+++ b/data/web/js/mailbox.js
@@ -237,6 +237,7 @@ $(document).ready(function() {
       $.each(data, function (i, item) {
         item.action = '<div class="btn-group">' +
           '<a href="/edit.php?alias=' + encodeURI(item.address) + '" class="btn btn-xs btn-default"><span class="glyphicon glyphicon-pencil"></span> ' + lang.edit + '</a>' +
+          '<a href="/remove.php?alias=' + encodeURI(item.address) + '" class="btn btn-xs btn-danger"><span class="glyphicon glyphicon-pencil"></span> ' + lang.remove + '</a>' +
 					'</div>';
         item.chkbox = '<input type="checkbox" class="alias_item" name="sel_aliases" value="' + item.address + '" />';
         if (item.is_catch_all == 1) {
diff --git a/data/web/mailbox.php b/data/web/mailbox.php
index 091648095..dc2088968 100644
--- a/data/web/mailbox.php
+++ b/data/web/mailbox.php
@@ -102,14 +102,17 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
               <table id="alias_table" class="table table-striped"></table>
             </div>
             <div class="mass-actions">
-              <span id="select_all_aliases" class="mass-select-all"><?=$lang['mailbox']['toggle_all'];?></span>
-              <span>&ndash; <?=$lang['mailbox']['quick_actions'];?>: 
-                <a id="delete_selected_alias" href="#" class="mass-each-action"><?=$lang['mailbox']['remove'];?></a> |
-                <a id="activate_selected_alias" href="#" class="mass-each-action"><?=$lang['mailbox']['activate'];?></a> |
-                <a id="deactivate_selected_alias" href="#" class="mass-each-action"><?=$lang['mailbox']['deactivate'];?></a>
-              </span>
+              <p id="select_all_aliases" class="mass-select-all">
+                ↪ <?=$lang['mailbox']['toggle_all'];?>
+              </p>
+            </div>
+            <div class="footer-add-item">
+              <b><?=$lang['mailbox']['quick_actions'];?>:</b>
+              <a id="delete_selected_alias" href="#" class="mass-each-action"><?=$lang['mailbox']['remove'];?></a> |
+              <a id="activate_selected_alias" href="#" class="mass-each-action"><?=$lang['mailbox']['activate'];?></a> |
+              <a id="deactivate_selected_alias" href="#" class="mass-each-action"><?=$lang['mailbox']['deactivate'];?></a>
+              <a class="pull-right" href="/add.php?alias"><?=$lang['mailbox']['add_alias'];?></a>
             </div>
-            <span class="footer-add-item"><a href="/add.php?alias"><?=$lang['mailbox']['add_alias'];?></a></span>
           </div>
         </div>