Merge branch 'applemooz_master' into 'master'

# Conflicts:
#   install/tpl/apache_ispconfig.vhost.master

Author: Pascal Dreissen

interface/web/admin/lib/lang/nl_system_config.lng

@@ -68,7 +68,7 @@ $wb['customer_no_template_error_regex_txt'] = 'The customer No. template contain
 $wb['customer_no_start_txt'] = 'Customer No. start value';
 $wb['customer_no_counter_txt'] = 'Customer No. counter';
 $wb['session_timeout_txt'] = 'Session timeout (minutes)';
-$wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
+$wb['session_allow_endless_txt'] = 'Enable "stay logged in"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Minimum password length';
 $wb['min_password_strength_txt'] = 'Minimum password strength';

interface/web/themes/default/assets/images/logo.png

@@ -91,4 +91,7 @@
 }
 .icon-delete:before {
 	content: "\e613";
-}
+}
+.icon-wizard:before {
+        content: "\e60c";
+}

interface/web/themes/default/assets/images/logo@2x.png

@@ -66,8 +66,8 @@ body {
 
 #logo {
   float: left;
-  width: 200px;
-  height: 65px;
+  width: 75px;
+  height: 40px;
   margin-top:10px;
   /*background: url("../images/logo.png") no-repeat;*/ }
   #logo a {
@@ -693,10 +693,19 @@ span.flag-za {background-position:0 -5391px}
 span.flag-zm {background-position:0 -5413px}
 span.flag-zw {background-position:0 -5435px}
 
+#logo {
+    background-image: url("../images/logo.png");
+    background-size: 75px auto; 
+    background-repeat: no-repeat;
+   }
+
 @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) {
   #logo {
     background-image: url("../images/logo@2x.png");
-    background-size: 200px 65px; } }
+    background-size: 75px auto; 
+    background-repeat: no-repeat;
+    }
+}
 
 .input-group-field {
     display: table-cell;
@@ -774,7 +783,9 @@ input[type="password"].form-control[readonly] {
 .systemmonitor-state.state-info .statusMsg {
     display: none;
 }
-
+#footer {
+    display: none;
+}
 span.notification_text {
     display: block;
     margin-left: auto;
@@ -784,11 +795,9 @@ span.notification_text {
     font-family: inherit;
     color: white;
 }
-
 span.company_name {
     font-weight: bold;
 }
-
 span.tmp_account_name {
     font-size: 0.9em;
 }

interface/web/themes/default/assets/stylesheets/fonts.css

@@ -35,7 +35,7 @@
             <!-- off canvas menu button -->
             <div class='menu-btn left'>&#9776;</div>
             <!-- logo -->
-            <div id='logo' style="background: url({tmpl_var name="base64_logo_txt"}) no-repeat;width:{tmpl_var name="base64_logo_width"};height:{tmpl_var name="base64_logo_height"}"><a href='#'></a></div>
+            <div id='logo'><a href='#'></a></div>
           </div>
           <div id='headerbar' class='clear'>
             <!-- logout button -->