From e8632ccd48659baad0c186ddf19bc63fa7ce0285 Mon Sep 17 00:00:00 2001
From: Dmitry Naumov-Socolov <naumov.socolov@gmail.com>
Date: Mon, 31 Oct 2016 11:12:49 -0400
Subject: [PATCH] WEB. Improved additional navigation bar. Templates

---
 web/css/styles.min.css                 | 21 +++++++++++++++------
 web/templates/admin/list_cron.html     | 10 +++++-----
 web/templates/admin/list_db.html       |  6 +++---
 web/templates/admin/list_dns.html      |  6 +++---
 web/templates/admin/list_firewall.html |  6 +++---
 web/templates/admin/list_ip.html       |  6 +++---
 web/templates/admin/list_mail.html     |  6 +++---
 web/templates/admin/list_mail_acc.html |  6 +++---
 web/templates/admin/list_packages.html |  6 +++---
 web/templates/admin/list_user.html     |  6 +++---
 web/templates/admin/list_web.html      |  6 +++---
 web/templates/user/list_cron.html      |  8 ++++----
 web/templates/user/list_db.html        |  6 +++---
 web/templates/user/list_dns.html       |  6 +++---
 web/templates/user/list_mail.html      |  6 +++---
 web/templates/user/list_mail_acc.html  |  6 +++---
 web/templates/user/list_user.html      |  6 +++---
 web/templates/user/list_web.html       |  6 +++---
 18 files changed, 69 insertions(+), 60 deletions(-)

diff --git a/web/css/styles.min.css b/web/css/styles.min.css
index d6cf8a523..28d8e59a9 100644
--- a/web/css/styles.min.css
+++ b/web/css/styles.min.css
@@ -1346,9 +1346,11 @@ div.l-content > div.l-separator:nth-of-type(4) {
 }
 
 
-.l-unit--outdated {
-  background-color: #9B3D35;
-  color: #fff;
+.units .l-unit.l-unit--outdated {
+  background-color: #ffcaca;
+  color: #555;
+  border-left: 5px solid #ff6f6f;
+  border-bottom: 1px solid #fff;
 }
 
 .l-unit--suspended .l-unit__name,
@@ -1358,6 +1360,13 @@ div.l-content > div.l-separator:nth-of-type(4) {
   color: #c0c0c0;
 }
 
+.l-unit--outdated .l-unit__name {
+  color: #333;
+}
+.l-unit--outdated b {
+  color: #555;
+}
+
 .l-unit--suspended .l-percent {
   border-color: #fff;
 }
@@ -1381,7 +1390,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
 
 .l-unit--outdated.selected {
   background: #765D5D !important;
-  color: #FEF482 !important;
+  color: #333 !important;
 }
 
 
@@ -1394,7 +1403,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
 .l-unit--suspended.selected .l-percent__fill,
 .l-unit--suspended.selected .l-unit__name,
 .l-unit--suspended.selected .l-unit__name span {
-  color: #b2ac87 !important;
+  color: #333 !important;
 }
 
 .l-unit.selected .l-percent {
@@ -1484,7 +1493,7 @@ div.l-content > div.l-separator:nth-of-type(4) {
 }
 
 .l-unit.l-unit--outdated .l-unit__date {
-  color: #fff7ae;
+  color: #d24c4c;
   font-size: 10px;
   letter-spacing: 3px;
   text-transform: uppercase;
diff --git a/web/templates/admin/list_cron.html b/web/templates/admin/list_cron.html
index 1acd3fb48..4bea20c06 100644
--- a/web/templates/admin/list_cron.html
+++ b/web/templates/admin/list_cron.html
@@ -19,7 +19,7 @@
                 }
               ?>
               </td>
-              <td class="l-sort-toolbar__search-box">
+              <td class="l-sort-toolbar__search-box step-left">
                 <form action="/search/" method="get">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                   <input type="text" name="q" class="search-input" value="<? echo isset($_POST['q']) ? htmlspecialchars($_POST['q']) : '' ?>" />
@@ -30,10 +30,7 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
-              <td class="step-right">
+              <td class="">
                 <form action="/bulk/cron/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                 <div class="l-select">
@@ -48,6 +45,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </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>
diff --git a/web/templates/admin/list_db.html b/web/templates/admin/list_db.html
index bf3500091..cdcac786b 100644
--- a/web/templates/admin/list_db.html
+++ b/web/templates/admin/list_db.html
@@ -52,9 +52,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/db/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -68,6 +65,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
diff --git a/web/templates/admin/list_dns.html b/web/templates/admin/list_dns.html
index 74e6b7919..5ce29219c 100644
--- a/web/templates/admin/list_dns.html
+++ b/web/templates/admin/list_dns.html
@@ -23,9 +23,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/dns/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -39,6 +36,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </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>
diff --git a/web/templates/admin/list_firewall.html b/web/templates/admin/list_firewall.html
index 06bbe68cc..889de6a2e 100644
--- a/web/templates/admin/list_firewall.html
+++ b/web/templates/admin/list_firewall.html
@@ -28,9 +28,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Action')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/firewall/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -42,6 +39,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Action')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
         </div>
diff --git a/web/templates/admin/list_ip.html b/web/templates/admin/list_ip.html
index 18675c3d0..7da9fa2cf 100644
--- a/web/templates/admin/list_ip.html
+++ b/web/templates/admin/list_ip.html
@@ -24,9 +24,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/ip/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -39,6 +36,9 @@
                 </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>
diff --git a/web/templates/admin/list_mail.html b/web/templates/admin/list_mail.html
index 47aea6fe0..025364419 100644
--- a/web/templates/admin/list_mail.html
+++ b/web/templates/admin/list_mail.html
@@ -30,9 +30,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -46,6 +43,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
diff --git a/web/templates/admin/list_mail_acc.html b/web/templates/admin/list_mail_acc.html
index 0d33639f8..5433d732d 100644
--- a/web/templates/admin/list_mail_acc.html
+++ b/web/templates/admin/list_mail_acc.html
@@ -29,9 +29,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -45,6 +42,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
diff --git a/web/templates/admin/list_packages.html b/web/templates/admin/list_packages.html
index 27442da7d..65a09e4b0 100644
--- a/web/templates/admin/list_packages.html
+++ b/web/templates/admin/list_packages.html
@@ -20,9 +20,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/package/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -34,6 +31,9 @@
                 </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>
diff --git a/web/templates/admin/list_user.html b/web/templates/admin/list_user.html
index d665108d8..b3b627e77 100644
--- a/web/templates/admin/list_user.html
+++ b/web/templates/admin/list_user.html
@@ -28,9 +28,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/user/" method="post" id="objects">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -51,6 +48,9 @@
                   </div>
                   <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </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>
diff --git a/web/templates/admin/list_web.html b/web/templates/admin/list_web.html
index 3c9fe3780..f802dce28 100644
--- a/web/templates/admin/list_web.html
+++ b/web/templates/admin/list_web.html
@@ -23,9 +23,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/web/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -39,6 +36,9 @@
                 </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>
           <!--  -->
diff --git a/web/templates/user/list_cron.html b/web/templates/user/list_cron.html
index 3736fad21..796eda31f 100644
--- a/web/templates/user/list_cron.html
+++ b/web/templates/user/list_cron.html
@@ -30,10 +30,7 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
-              <td class="step-right">
+              <td class="">
                 <form action="/bulk/cron/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
                 <div class="l-select">
@@ -46,6 +43,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </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>
diff --git a/web/templates/user/list_db.html b/web/templates/user/list_db.html
index c6b00a315..63972dba3 100644
--- a/web/templates/user/list_db.html
+++ b/web/templates/user/list_db.html
@@ -53,9 +53,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/db/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -67,6 +64,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
diff --git a/web/templates/user/list_dns.html b/web/templates/user/list_dns.html
index fd3d479b4..f8b521250 100644
--- a/web/templates/user/list_dns.html
+++ b/web/templates/user/list_dns.html
@@ -23,9 +23,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/dns/" method="post">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -37,6 +34,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </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>
diff --git a/web/templates/user/list_mail.html b/web/templates/user/list_mail.html
index 232c1925d..9c5ce8422 100644
--- a/web/templates/user/list_mail.html
+++ b/web/templates/user/list_mail.html
@@ -30,9 +30,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -44,6 +41,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
diff --git a/web/templates/user/list_mail_acc.html b/web/templates/user/list_mail_acc.html
index 37b82bc1e..fd5fd925c 100644
--- a/web/templates/user/list_mail_acc.html
+++ b/web/templates/user/list_mail_acc.html
@@ -29,9 +29,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/mail/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -43,6 +40,9 @@
                 </div>
                 <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </td>
+              <td class="sort-by">
+                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
+              </td>
             </tr>
           </table>
           <!--  -->
diff --git a/web/templates/user/list_user.html b/web/templates/user/list_user.html
index e30b419c4..d10666dce 100644
--- a/web/templates/user/list_user.html
+++ b/web/templates/user/list_user.html
@@ -28,9 +28,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/user/" method="post" id="objects">
                   <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -49,6 +46,9 @@
                   </div>
                   <input type="submit" value="" class="l-sort-toolbar__filter-apply" />
               </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>
diff --git a/web/templates/user/list_web.html b/web/templates/user/list_web.html
index af79aede4..ce4e7de6d 100644
--- a/web/templates/user/list_web.html
+++ b/web/templates/user/list_web.html
@@ -23,9 +23,6 @@
                 <input id="toggle-all" type="checkbox" name="toggle-all" value="toggle-all" onChange="checkedAll('objects');">
                 <label for="toggle-all" class="check-label toggle-all"><?=__('toggle all')?></label>
               </td>
-              <td class="sort-by">
-                <?=__('sort by');?>: <span><b><?=__('Date')?></b></span> <i class="l-icon-down-arrow media-top"></i>
-              </td>
               <td>
                 <form action="/bulk/web/" method="post" id="objects">
                 <input type="hidden" name="token" value="<?=$_SESSION['token']?>" />
@@ -37,6 +34,9 @@
                 </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>
           <!--  -->