Merge branch 'master' into 11.5

2019-07-12 15:55:04 +08:00
parent 50b7ac7516 b65e00d0f8
commit 9143f4e38f
468 changed files with 16544 additions and 5813 deletions
@@ -20,7 +20,8 @@
    <form id='webhookForm' method='post' class='form-ajax'>
      <table class='table table-form'>
        <tr>
-          <th><?php echo $lang->webhook->type;?></th>
+          <?php $colWidth = $app->getClientLang() == 'en' ? 'w-120px' : 'w-90px';?>
+          <th class='<?php echo $colWidth;?>'><?php echo $lang->webhook->type;?></th>
          <td><?php echo html::select('type', $lang->webhook->typeList, $webhook->type, "class='form-control'");?></td>
          <td></td>
        </tr>