Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

data/web/css/build/008-mailcow.css

@@ -81,7 +81,7 @@
     transform: rotate(359deg);
   }
 }
-pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;}
+pre{white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;}
 .footable-sortable {
   -webkit-user-select: none;  
   -moz-user-select: none;    
@@ -104,11 +104,11 @@ body {
   max-width: 550px;
   z-index: 2000;
 }
-.input-group-sm .btn { margin-top: 0px !important }
+.input-group-sm .btn { margin-top: 0 !important }
 legend {
   -webkit-user-select: none;
   -moz-user-select: none;
-  -ms-user-select: none
+  -ms-user-select: none;
   -o-user-select: none;
   user-select: none;
   font-size: 12pt;
@@ -172,4 +172,9 @@ nav .glyphicon {
 .progress-bar {
   font-size: 12px;
   line-height: 14px;
+}
+.footer {
+  margin-top: 100px;
+  margin-bottom: 20px;
+  color: #959595;
 }

data/web/css/site/admin.css

@@ -5,7 +5,7 @@ table.footable>tbody>tr.footable-empty>td {
 .pagination a {
   text-decoration: none !important;
 }
-.panel panel-default {
+.panel.panel-default {
   overflow: visible !important;
 }
 .table-responsive {
@@ -66,7 +66,7 @@ body.modal-open {
   z-index: 1;
 }
 .table-condensed .input-sm {
-  width: 100%!important;  
+  width: 100%!important;
 }
 .table-condensed > thead > tr > th, .table-condensed > tbody > tr > th, .table-condensed > tfoot > tr > th, .table-condensed > thead > tr > td, .table-condensed > tbody > tr > td, .table-condensed > tfoot > tr > td {
   padding: 3px;

data/web/css/site/debug.css

@@ -5,7 +5,7 @@ table.footable>tbody>tr.footable-empty>td {
 .pagination a {
   text-decoration: none !important;
 }
-.panel panel-default {
+.panel.panel-default {
   overflow: visible !important;
 }
 .table-responsive {
@@ -44,4 +44,4 @@ tbody {
 .container-indicator {
   width: 15px;
   height: 15px;
-}
+}

data/web/css/site/edit.css

@@ -5,7 +5,7 @@ table.footable>tbody>tr.footable-empty>td {
 .pagination a {
   text-decoration: none !important;
 }
-.panel panel-default {
+.panel.panel-default {
   overflow: visible !important;
 }
 .table-responsive {

data/web/css/site/mailbox.css

@@ -5,7 +5,7 @@ table.footable>tbody>tr.footable-empty>td {
 .pagination a {
   text-decoration: none !important;
 }
-.panel panel-default {
+.panel.panel-default {
   overflow: visible !important;
 }
 .table-responsive {

data/web/css/site/quarantine.css

@@ -7,7 +7,7 @@ table.footable>tbody>tr.footable-empty>td {
   text-decoration: none !important;
 }
 
-.panel panel-default {
+.panel.panel-default {
   overflow: visible !important;
 }
 
@@ -71,9 +71,9 @@ span#qid_detail_score {
 
 span.rspamd-symbol {
   display: inline-block;
-  margin: 2px 6px 2px 0px;
+  margin: 2px 6px 2px 0;
   border-radius: 4px;
-  padding: 0px 7px;
+  padding: 0 7px;
 }
 
 span.rspamd-symbol.positive {
@@ -103,7 +103,6 @@ span.mail-address-item {
   border-radius: 4px;
   border: 1px solid #ccc;
   padding: 2px 7px;
-  margin-right: 7px;
   display: inline-block;
   margin: 2px 6px 2px 0;
 }

data/web/css/site/user.css

@@ -5,7 +5,7 @@ table.footable>tbody>tr.footable-empty>td {
 .pagination a {
   text-decoration: none !important;
 }
-.panel panel-default {
+.panel.panel-default {
   overflow: visible !important;
 }
 .table-responsive {
@@ -25,7 +25,7 @@ table.footable>tbody>tr.footable-empty>td {
 }
 .mass-actions-user {
   user-select: none;
-  padding:10px 0 10px 0;
+  padding:10px 0;
 }
 .inputMissingAttr {
   border-color: #FF4136;
@@ -33,7 +33,6 @@ table.footable>tbody>tr.footable-empty>td {
 #logText {
   white-space: pre-wrap;
   white-space: -moz-pre-wrap;
-  white-space: -pre-wrap;
   white-space: -o-pre-wrap;
   word-wrap: break-word;
 }
@@ -47,4 +46,4 @@ table tbody tr {
 
 table tbody tr td input[type="checkbox"] {
   cursor: pointer;
-}
+}

data/web/inc/footer.inc.php

@@ -1,10 +1,7 @@
 <?php
 require_once $_SERVER['DOCUMENT_ROOT'] . '/modals/footer.php';
 logger();
-?>
-<div style="margin-bottom: 100px;"></div>
 
-<?php
 $hash = $js_minifier->getDataHash();
 $JSPath = '/tmp/' . $hash . '.js';
 if(!file_exists($JSPath)) {
@@ -165,7 +162,7 @@ $(document).ready(function() {
   });
 
   // Reload after session timeout
-  var session_lifetime = <?=(intval($SESSION_LIFETIME) * 1000) + 15000;?>;
+  var session_lifetime = <?=((int)$SESSION_LIFETIME * 1000) + 15000;?>;
   <?php
   if (isset($_SESSION['mailcow_cc_username'])):
   ?>
@@ -183,16 +180,16 @@ $(document).ready(function() {
   }
 });
 </script>
-<?php
+
-if (!empty($UI_TEXTS['ui_footer'])):
+  <div class="container footer">
-?>
+    <?php
-  <div class="container" style="margin-bottom:20px;color:#959595;">
+    if (!empty($UI_TEXTS['ui_footer'])):
-  <hr>
+    ?>
-    <?=$UI_TEXTS['ui_footer'];?>
+     <hr><?=$UI_TEXTS['ui_footer'];?>
+    <?php
+    endif;
+    ?>
   </div>
-<?php
-endif;
-?>
 </body>
 </html>
 <?php