Merge branch 'bugfix-webui' into develop

Author: Kristan Kenney

web/css/styles.min.css

@@ -3070,16 +3070,15 @@ a.button.cancel {
   vertical-align: top;
 }
 .mail-infoblock {
-  margin-left: -130px;
-  font-size: 13px;
+  font-size: 14px;
   color: #777;
   border: 1px solid #d9d9d9;
   padding: 0px 5px 12px 20px;
-  margin-top: 47px;
+  margin-top: 46px;
   min-width: 320px;
   overflow: hidden;
   box-shadow: 0px 1px 4px rgba(0,0,0,0.15);
-  border-radius: 4px;
+  border-radius: 5px;
 }
 .mail-infoblock:hover {
   overflow: visible;

web/templates/admin/edit_mail_acc.html

@@ -45,7 +45,7 @@
                         </table>
                     </td>
                     <td class="data-dotted">
-                      <table class="data-col2" width="600px">
+                      <table class="data-col2" width="440px">
                         <tr>
                             <td class="vst-text step-top input-label">
                                 <?php print __('Account');?>
@@ -96,7 +96,7 @@
                         </tr>
                         <tr>
                             <td>
-                                <textarea size="20" class="vst-textinput" name="v_fwd"><?=htmlentities(trim($v_fwd, "'"))?></textarea>
+                                <textarea size="20" class="vst-textinput short" name="v_fwd"><?=htmlentities(trim($v_fwd, "'"))?></textarea>
                             </td>
                         </tr>
                         <tr>
@@ -155,7 +155,6 @@
                         <tr>
                             <td colspan="2">
                                 <select id="mail_configuration" class="vst-list flat">
-                                    <option v_type="hostname" domain="<?=$hostname?>"><?=__('Use server hostname')?></option>
                                     <option v_type="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
                                     <option v_type="starttls"><?=__('Use STARTTLS')?></option>
                                     <option v_type="ssl"><?=__('Use SSL / TLS')?></option>
@@ -173,7 +172,7 @@
                         </tr>
                         <tr>
                             <td><?=__('IMAP hostname')?>:</td>
-                            <td><div id="td_imap_hostname"><?=$hostname?></div></td>
+                            <td><div id="td_imap_hostname">mail.<?=$v_domain?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('IMAP port')?>:</td>
@@ -189,7 +188,7 @@
                         </tr>
                         <tr>
                             <td><?=__('SMTP hostname')?>:</td>
-                            <td><div id="td_smtp_hostname"><?=$hostname?></div></td>
+                            <td><div id="td_smtp_hostname">mail.<?=$v_domain?></div></td>
                         </tr>
                         <tr>
                             <td><?=__('SMTP port')?>:</td>
@@ -205,7 +204,7 @@
                         </tr>
                         <?
                             list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                            $webmail = "http://webmail.".$http_host."/";
+                            $webmail = "http://webmail.".$v_domain."/";
                             if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                         ?>
                         <tr>

web/templates/admin/list_mail.html

@@ -17,7 +17,6 @@
                   $webmail = "http://webmail.".$http_host."/";
                   if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                 ?>
-                <a class="vst" href="<?=$webmail?>" target="_blank"><?=__('open webmail')?> <i></i></a>
               </td>
               <td class="l-sort-toolbar__search-box step-left">
                 <form action="/search/" method="get">

web/templates/admin/list_mail_acc.html

@@ -16,7 +16,6 @@
                   $webmail = "http://webmail.".$http_host."/";
                   if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                 ?>
-                <a class="vst" href="<?=$webmail?>" target="_blank"><?=__('open webmail')?> <i></i></a>
               </td>
               <td class="l-sort-toolbar__search-box step-left">
                 <form action="/search/" method="get">

web/templates/user/list_mail.html

@@ -17,7 +17,6 @@
                   $webmail = "http://".$http_host."/webmail/";
                   if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                 ?>
-                <a class="vst" href="<?=$webmail?>" target="_blank"><?=__('open webmail')?> <i></i></a>
               </td>
               <td class="l-sort-toolbar__search-box step-left">
                 <form action="/search/" method="get">

web/templates/user/list_mail_acc.html

@@ -16,7 +16,6 @@
                   $webmail = "http://".$http_host."/webmail/";
                   if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                 ?>
-                <a class="vst" href="<?=$webmail?>" target="_blank"><?=__('open webmail')?> <i></i></a>
               </td>
               <td class="l-sort-toolbar__search-box step-left">
                 <form action="/search/" method="get">