Move sort options in toolbar

web/css/styles.min.css

@@ -1383,10 +1383,6 @@ div.l-content > div.l-separator:nth-of-type(4) {
   padding-left: 96px;
 }
 
-.l-sort-toolbar td:first-of-type {
-  padding-left: 10px;
-}
-
 .l-sort-toolbar td.step-right:first-of-type {
   padding-right: 20px;
 }
@@ -3150,6 +3146,7 @@ form#vstobjects.suspended {
 
 .l-sort-toolbar table td {
   float: left;
+  margin-left: 10px;
 }
 .l-sort-toolbar__search-box {
   float: right !important;

web/templates/admin/list_cron.html

@@ -18,6 +18,9 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -40,9 +43,6 @@
                 </div>
                 <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
             </tr>
           </table>
         </div>

web/templates/admin/list_db.html

@@ -43,6 +43,9 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -63,9 +66,6 @@
                 </div>
                 <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
             </tr>
           </table>
           <!--  -->

web/templates/admin/list_dns.html

@@ -14,6 +14,9 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
+              <td class="sort-by">
+		            <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,9 +37,6 @@
                 </div>
                 <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
-	      <td class="sort-by">
-		<?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-	      </td>
             </tr>
           </table>
         </div>

web/templates/admin/list_firewall.html

@@ -20,7 +20,7 @@
             <tr>
               <td class="sort-by">
                   <?=__('sort by');?>: <span><b><?=__('Action')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-                </td>
+              </td>
               <td>
                 <form action="/bulk/firewall/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />

web/templates/admin/list_mail.html

@@ -13,12 +13,8 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
-              <td class="">
-                <?
-                  list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                  $webmail = "http://".$http_host."/webmail/";
-                  if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
-                ?>
+              <td class="sort-by">
+                  <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
               </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
@@ -40,9 +36,7 @@
                 </div>
                 <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
+
             </tr>
           </table>
           <!--  -->

web/templates/admin/list_mail_acc.html

@@ -20,6 +20,9 @@
                   if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                 ?>
               </td>
+              <td class="sort-by">
+                  <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -40,9 +43,6 @@
                 </div>
                 <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
             </tr>
           </table>
           <!--  -->

web/templates/admin/list_packages.html

@@ -12,6 +12,9 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,9 +37,7 @@
                 </div>
                 <input type="submit" class="l-sort-toolbar__filter-apply" value="" />
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
+
             </tr>
           </table>
         </div>

web/templates/admin/list_web.html

@@ -14,6 +14,9 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,9 +37,6 @@
                 </div>
                 <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
             </tr>
           </table>
           <!--  -->

web/templates/user/list_dns.html

@@ -12,6 +12,9 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,9 +37,7 @@
                 </div>
                 <button type="submit" class="l-sort-toolbar__filter-apply" value=""><i class="fas fa-arrow-right"></i></button>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
+
             </tr>
           </table>
         </div>

web/templates/user/list_web.html

@@ -12,6 +12,9 @@
         <div class="l-sort-toolbar clearfix">
           <table>
             <tr>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
               <td class="l-sort-toolbar__search-box">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,9 +37,6 @@
                 </div>
                 <input type="submit" class="l-sort-toolbar__filter-apply" value=""/>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
             </tr>
           </table>
           <!--  -->