Procházet zdrojové kódy

Fix domain admin table, move quick actions

andryyy před 8 roky
rodič
revize
25e6339940
4 změnil soubory, kde provedl 14 přidání a 12 odebrání
  1. 2 4
      data/web/css/mailbox.css
  2. 1 1
      data/web/js/admin.js
  3. 1 0
      data/web/js/mailbox.js
  4. 10 7
      data/web/mailbox.php

+ 2 - 4
data/web/css/mailbox.css

@@ -12,8 +12,6 @@ table.footable>tbody>tr.footable-empty>td {
   overflow: visible !important;
   overflow: visible !important;
 }
 }
 .footer-add-item {
 .footer-add-item {
-  text-align:center;
-  font-style: italic;
   display:block;
   display:block;
   padding: 10px;
   padding: 10px;
   background: #F5F5F5;
   background: #F5F5F5;
@@ -28,11 +26,11 @@ table.footable>tbody>tr.footable-empty>td {
 }
 }
 .mass-select-all {
 .mass-select-all {
   cursor:pointer;
   cursor:pointer;
-  color:grey;
+  color:#555;
 }
 }
 #alias_table {
 #alias_table {
   cursor:pointer;
   cursor:pointer;
 }
 }
 #alias_table .footable-paging {
 #alias_table .footable-paging {
   cursor:	auto;
   cursor:	auto;
-}
+}

+ 1 - 1
data/web/js/admin.js

@@ -1,7 +1,7 @@
 $(document).ready(function() {
 $(document).ready(function() {
   $.ajax({
   $.ajax({
     dataType: 'json',
     dataType: 'json',
-    url: '/api/v1/domain-admin/all',
+    url: '/api/v1/get/domain-admin/all',
     jsonp: false,
     jsonp: false,
     error: function () {
     error: function () {
       alert('Cannot draw domain administrator table');
       alert('Cannot draw domain administrator table');

+ 1 - 0
data/web/js/mailbox.js

@@ -237,6 +237,7 @@ $(document).ready(function() {
       $.each(data, function (i, item) {
       $.each(data, function (i, item) {
         item.action = '<div class="btn-group">' +
         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="/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>';
 					'</div>';
         item.chkbox = '<input type="checkbox" class="alias_item" name="sel_aliases" value="' + item.address + '" />';
         item.chkbox = '<input type="checkbox" class="alias_item" name="sel_aliases" value="' + item.address + '" />';
         if (item.is_catch_all == 1) {
         if (item.is_catch_all == 1) {

+ 10 - 7
data/web/mailbox.php

@@ -102,14 +102,17 @@ $_SESSION['return_to'] = $_SERVER['REQUEST_URI'];
               <table id="alias_table" class="table table-striped"></table>
               <table id="alias_table" class="table table-striped"></table>
             </div>
             </div>
             <div class="mass-actions">
             <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>
             </div>
-            <span class="footer-add-item"><a href="/add.php?alias"><?=$lang['mailbox']['add_alias'];?></a></span>
           </div>
           </div>
         </div>
         </div>