Explorar o código

Update add new mail account page

Kristan Kenney %!s(int64=6) %!d(string=hai) anos
pai
achega
6a2f4afbab
Modificáronse 2 ficheiros con 8 adicións e 9 borrados
  1. 1 1
      web/css/styles.min.css
  2. 7 8
      web/templates/admin/add_mail_acc.html

+ 1 - 1
web/css/styles.min.css

@@ -2824,7 +2824,7 @@ a.button.cancel {
   color: #777;
   color: #777;
   border: 1px solid #d9d9d9;
   border: 1px solid #d9d9d9;
   padding: 0px 5px 12px 20px;
   padding: 0px 5px 12px 20px;
-  margin-top: 46px;
+  margin-top: 38px;
   min-width: 320px;
   min-width: 320px;
   overflow: hidden;
   overflow: hidden;
   box-shadow: 0px 1px 4px rgba(0,0,0,0.15);
   box-shadow: 0px 1px 4px rgba(0,0,0,0.15);

+ 7 - 8
web/templates/admin/add_mail_acc.html

@@ -39,7 +39,7 @@
                     </table>
                     </table>
                 </td>
                 </td>
                 <td class="data-dotted">
                 <td class="data-dotted">
-                    <table class="data-col2" width="600px">
+                    <table class="data-col2" width="440px">
                         <tr>
                         <tr>
                             <td class="vst-text step-top">
                             <td class="vst-text step-top">
                                 <?php print __('Domain');?>
                                 <?php print __('Domain');?>
@@ -97,7 +97,7 @@
                                 </tr>
                                 </tr>
                                 <tr>
                                 <tr>
                                     <td>
                                     <td>
-                                        <textarea size="20" class="vst-textinput" name="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
+                                        <textarea size="20" class="vst-textinput short" name="v_aliases"><?=htmlentities(trim($v_aliases, "'"))?></textarea>
                                     </td>
                                     </td>
                                 </tr>
                                 </tr>
                                 <tr>
                                 <tr>
@@ -107,7 +107,7 @@
                                 </tr>
                                 </tr>
                                 <tr>
                                 <tr>
                                     <td>
                                     <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>
                                     </td>
                                 </tr>
                                 </tr>
                                 <tr>
                                 <tr>
@@ -144,11 +144,10 @@
             <td class="mail-infoblock-td">
             <td class="mail-infoblock-td">
                 <div class="mail-infoblock">
                 <div class="mail-infoblock">
                     <table>
                     <table>
-                        <?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
+                    <?php $uname_arr=posix_uname(); $hostname=$uname_arr['nodename']; ?>
                         <tr>
                         <tr>
                             <td colspan="2">
                             <td colspan="2">
                                 <select id="mail_configuration" class="vst-list flat">
                                 <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="hostname" domain="<?=$v_domain?>"><?=__('Use domain hostname')?></option>
                                     <option v_type="starttls"><?=__('Use STARTTLS')?></option>
                                     <option v_type="starttls"><?=__('Use STARTTLS')?></option>
                                     <option v_type="ssl"><?=__('Use SSL / TLS')?></option>
                                     <option v_type="ssl"><?=__('Use SSL / TLS')?></option>
@@ -166,7 +165,7 @@
                         </tr>
                         </tr>
                         <tr>
                         <tr>
                             <td><?=__('IMAP hostname')?>:</td>
                             <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>
                         <tr>
                         <tr>
                             <td><?=__('IMAP port')?>:</td>
                             <td><?=__('IMAP port')?>:</td>
@@ -182,7 +181,7 @@
                         </tr>
                         </tr>
                         <tr>
                         <tr>
                             <td><?=__('SMTP hostname')?>:</td>
                             <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>
                         <tr>
                         <tr>
                             <td><?=__('SMTP port')?>:</td>
                             <td><?=__('SMTP port')?>:</td>
@@ -198,7 +197,7 @@
                         </tr>
                         </tr>
                         <?
                         <?
                             list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
                             list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"].":");
-                            $webmail = "http://".$http_host."/webmail/";
+                            $webmail = "http://webmail.".$v_domain."/";
                             if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                             if (!empty($_SESSION['MAIL_URL'])) $webmail = $_SESSION['MAIL_URL'];
                         ?>
                         ?>
                         <tr>
                         <tr>