Merge branch 'master' of github.com:serghey-rodin/vesta

Author: Serghey Rodin

bin/v-list-user-log

@@ -24,6 +24,7 @@ json_list() {
     echo "{"
     for str in $logs; do
         eval $str
+        CMD=${CMD//\"/\\\"}
         echo -n '    "'$ID'": {
         "CMD": "'$CMD'",
         "UNDO": "'$UNDO'",

install/vst-install-debian.sh

@@ -556,6 +556,7 @@ if [ "$clamd" = 'no' ]; then
 fi
 if [ "$spamd" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/spamassassin//")
+    software=$(echo "$software" | sed -e "s/libmail-dkim-perl//")
 fi
 if [ "$dovecot" = 'no' ]; then
     software=$(echo "$software" | sed -e "s/dovecot-imapd//")

upd/switch_rpath.sh

@@ -27,6 +27,8 @@ for ip in $(ls /usr/local/vesta/data/ips); do
 done
 echo "</IfModule>" >> $conf
 
+sed -i "s/LogFormat \"%h/LogFormat \"%a/g" /etc/apache2/apache2.conf
+
 # Restarting apache
 /usr/sbin/apachectl restart > /dev/null 2>&1
 

web/css/styles.min.css

@@ -595,15 +595,6 @@ a {
   text-decoration: line-through;
 }
 
-.unselectable {
-  -webkit-touch-callout: none;
-  -webkit-user-select: none;
-  -khtml-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
 .clearfix:before,
 .clearfix:after {
   content: '';
@@ -839,8 +830,6 @@ input[type="checkbox"] {
   font-size: 12px;
   padding: 0;
   color: #7f7f7f;
-  max-height: 95%;
-  overflow: auto;
 }
 .notification-container .unseen {
   color: #ABABAB;
@@ -851,33 +840,21 @@ input[type="checkbox"] {
   border-bottom: 1px solid #555;
   padding: 10px 15px 24px;
 }
-.notification-container li.empty {
-  padding-top: 50px;
-  height: 50px;
-  font-size: 15px;
-  font-style: italic;
-  text-align: center;
-  color: #999;
-}
-
 .notification-container .mark-seen {
-  background: rgba(0, 0, 0, 0) url("/images/sprite.png?1446554103") repeat scroll -426px 165px;
-  border: 3px solid #454545;
+  background-color: #abc04b;
+  border: 2px solid #454545;
+  border-radius: 10px;
   cursor: pointer;
   display: none;
   float: right;
-  height:11px;
+  height: 7px;
   margin-right: -5px;
   margin-top: 0;
-  width: 11px;
-  opacity: 0.5;
-  border-radius: 10px;
+  width: 7px;
 }
 .notification-container .mark-seen:hover {
   background-color: #333;
-  border-color: #333;
-
-  opacity: 0.8;
+  border-color: #abc04b;
 }
 .notification-container .mark-seen:active {
   background-color: #777;
@@ -1151,13 +1128,13 @@ div.l-content > div.l-separator:nth-of-type(4) {
 
 .l-sort-toolbar td.toggle-all {
   padding-top: 7px;
-  padding-right: 40px;
+  padding-right: 20px;
 }
 
 .l-sort-toolbar .sort-by {
   cursor: pointer;
   padding-top: 7px;
-  padding-right: 40px;
+  padding-left: 40px;
 }
 .l-sort-toolbar .sort-by:hover {
   color: #555;
@@ -1369,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,
@@ -1381,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;
 }
@@ -1404,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;
 }
 
 
@@ -1417,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 {
@@ -1507,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;
@@ -3122,6 +3108,7 @@ form#vstobjects.suspended {
 .l-sort-toolbar__search-box {
   float: right !important;
   padding-top: 3px;
+  padding-right: 0 !important;
 }
 .ui-dialog .ui-dialog-buttonpane button:nth-of-type(2) {
   -background-color: #dfdedd;

web/inc/i18n/ar.php

@@ -584,6 +584,7 @@
     'Starred' => 'المحدد بنجمة',
     'Name' => 'الاسم',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'مدير الملفات',
     'size' => 'الحجم',
@@ -751,8 +752,6 @@
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
-
 // Texts below doesn't exist in en.php
     '%s rule' => 'قواعد %s',
     'MainDomain' => 'النطاق الرئيسي',

web/inc/i18n/bs.php

@@ -584,6 +584,7 @@
     'Starred' => 'Označen zvjezdicom',
     'Name' => 'Ime',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'veličina',
@@ -750,5 +751,4 @@
 
     'maximum characters length, including prefix' => 'maksimalna dužina sme biti %s karaktera, uključujući i prefix',
 
-    'no notifications' => 'no notifications',
 );

web/inc/i18n/cn.php

@@ -585,6 +585,8 @@
     'Starred' => '星标',
     'Name' => '名称',
 
+    'save to favorites' => 'save to favorites',
+
     'File Manager' => '文件管理',
     'type' => '类型',
     'size' => '大小',
@@ -751,5 +753,4 @@
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );

web/inc/i18n/cz.php

@@ -585,6 +585,7 @@
     'Starred' => 'Starred',
     'Name' => 'Name',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -752,5 +753,4 @@
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );

web/inc/i18n/da.php

@@ -586,6 +586,7 @@
     'Starred' => 'Starred',
     'Name' => 'Navn',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -753,5 +754,4 @@
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );

web/inc/i18n/de.php

@@ -584,6 +584,7 @@
     'Starred' => 'Starred',
     'Name' => 'Name',
 
+    'save to favorites' => 'save to favorites',
 
     'File Manager' => 'File Manager',
     'size' => 'size',
@@ -751,5 +752,4 @@
 
     'maximum characters length, including prefix' => 'maximum %s characters length, including prefix',
 
-    'no notifications' => 'no notifications',
 );