Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2018-05-11 09:59:30 +08:00
parent 4793ee5dd0 b43d4bbf5f
commit 792e972393
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/view/checkweak.html.php
+1 -1
View File
@@ -18,7 +18,7 @@
</div>
</div>
<div id='mainContent' class='main-content'>
<div class='center-block mw-800px main-table pd-0'>
<div class='main-table pd-0'>
<table class='table table-condensed table-hover table-striped table-fixed'>
<thead>
<th class='w-id'><?php echo $lang->idAB;?></th>
module/cron/view/create.html.php
+1 -1
View File
@@ -60,7 +60,7 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton()?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td>
</tr>
</table>
</form>
module/cron/view/edit.html.php
+1 -1
View File
@@ -60,7 +60,7 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton()?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide')?></td>
</tr>
</table>
</form>
module/mail/view/ztcloud.html.php
+10 -9
View File
@@ -61,15 +61,16 @@
</td>
</tr>
<tr>
<td colspan='2' class='text-center'>
<?php
echo html::submitButton();
if($this->config->mail->turnon and $mailExist) echo html::linkButton($lang->mail->test, inlink('test'));
echo html::linkButton($lang->mail->reset, inlink('reset'));
if(common::hasPriv('mail', 'browse') and !empty($config->mail->async) and !empty($config->global->cron)) echo html::linkButton($lang->mail->browse, inlink('browse'));
?>
</td>
</tr>
<td></td>
<td colspan='4' class='text-left'>
<?php
echo html::submitButton('', '', 'btn btn-primary btn-wide');
if($this->config->mail->turnon and $mailExist) echo html::linkButton($lang->mail->test, inlink('test'), '', '', 'btn btn-wide');
echo html::linkButton($lang->mail->reset, inlink('reset'), '', '', 'btn btn-wide');
if(common::hasPriv('mail', 'browse') and !empty($config->mail->async) and !empty($config->global->cron)) echo html::linkButton($lang->mail->browse, inlink('browse'), '', '', 'btn btn-wide');
?>
</td>
</tr>
</table>
</form>
<?php endif;?>
module/message/view/setting.html.php
+1 -1
View File
@@ -70,7 +70,7 @@
</tbody>
<tfoot>
<tr>
<td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
<td colspan='<?php echo count($lang->message->typeList) + 1?>' class='text-center'><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide');?></td>
</tr>
</tfoot>
</table>
module/webhook/css/browse.css
-1
View File
@@ -1 +0,0 @@
.text {overflow: hidden; text-overflow: ellipsis;}
module/webhook/view/browse.html.php
+2 -2
View File
@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Gang Liu <liugang@cnezsoft.com>
* @package webhook
* @package webhook
* @version $Id$
* @link http://www.zentao.net
*/
@@ -33,7 +33,7 @@
<td class='text' title='<?php echo $webhook->name;?>'><?php echo $webhook->name;?></td>
<td class='text' title='<?php echo $webhook->url;?>'><?php echo $webhook->url;?></td>
<td class='c-actions'>
<?php
<?php
common::printIcon('webhook', 'log', "webhookID=$id", '', 'list', 'file-text');
common::printIcon('webhook', 'edit', "webhookID=$id", '', 'list');
if(common::hasPriv('webhook', 'delete'))
module/webhook/view/create.html.php
+2 -2
View File
@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Gang Liu <liugang@cnezsoft.com>
* @package webhook
* @package webhook
* @version $Id$
* @link http://www.zentao.net
*/
@@ -65,7 +65,7 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton() . html::backButton();?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide');?></td>
</tr>
</table>
</form>
module/webhook/view/edit.html.php
+2 -2
View File
@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2017 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Gang Liu <liugang@cnezsoft.com>
* @package webhook
* @package webhook
* @version $Id$
* @link http://www.zentao.net
*/
@@ -68,7 +68,7 @@
</tr>
<tr>
<th></th>
<td><?php echo html::submitButton() . html::backButton();?></td>
<td><?php echo html::submitButton('', '', 'btn btn-primary btn-wide');?> <?php echo html::backButton('', '', 'btn btn-default btn-wide')?></td>
</tr>
</table>
</form>