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

* refactor codes.

Browse Source
This commit is contained in:
Catouse
2018-05-21 09:08:08 +08:00
parent 1fc9c5dc7c
commit d27fb779c3
20 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/admin/view/index.html.php
View File

@@ -15,7 +15,7 @@
<?php if(!$bind and !$ignore and common::hasPriv('admin', 'register')):?>
<div id="notice" class='alert alert-success'>
<?php echo html::a(inlink('ignore'), '<i class="icon-close icon-sm"></i> ' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?>
<div class="content"><i class='icon-info-sign'></i> <?php echo sprintf($lang->admin->notice->register, html::a(inlink('register'), $lang->admin->register->click, '', 'class="alert-link"'));?></div>
<div class="content"><i class='icon-exclamation-sign'></i> <?php echo sprintf($lang->admin->notice->register, html::a(inlink('register'), $lang->admin->register->click, '', 'class="alert-link"'));?></div>
</div>
<?php endif;?>

2
module/backup/view/index.html.php
View File

@@ -13,7 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php if(!empty($error)):?>
<div id="notice" class='alert alert-success' style="margin-bottom:35px;">
<div class="content"><i class='icon-info-sign'></i> <?php echo $error;?></div>
<div class="content"><i class='icon-exclamation-sign'></i> <?php echo $error;?></div>
</div>
<?php endif;?>

2
module/custom/view/ajaxmenu.html.php
View File

@@ -38,7 +38,7 @@
<button id='saveMenuBtn' type='button' class='btn btn-primary'><?php echo $lang->save ?></button> &nbsp;
<button id='closeModalBtn' type='button' class='btn'><?php echo $lang->close ?></button> &nbsp;
<button id='resetMenuBtn' type='button' class='btn'><?php echo $lang->custom->restore ?></button> &nbsp;
<span class='text-danger'> &nbsp; <i class="icon icon-info-sign"></i> <?php echo $lang->custom->menuTip ?></span>
<span class='text-danger'> &nbsp; <i class="icon exclamation-sign"></i> <?php echo $lang->custom->menuTip ?></span>
</div>
</div>
</div>

2
module/extension/css/common.css
View File

@@ -1,6 +1,6 @@
.alert-link:hover {text-decoration: underline;}
.alert {width: 100%; display: table;}
code{padding-left:0px;}
.alert.with-icon .icon-ok-sign, .alert.with-icon .icon-info-sign{padding-top:18px;vertical-align:top;}
.alert.with-icon .icon-ok-sign, .alert.with-icon .exclamation-sign{padding-top:18px;vertical-align:top;}
.detail-actions{margin-top:10px;}
.detail-actions .pull-right{margin-top:-10px;}

4
module/extension/view/uninstall.html.php
View File

@@ -22,7 +22,7 @@
</div>
<?php if(isset($confirm) and $confirm == 'no'):?>
<div class='alert alert-pure with-icon'>
<i class='icon-info-sign'></i>
<i class='icon-exclamation-sign'></i>
<div class='content'>
<?php
echo "<p class='waring'>{$lang->extension->confirmUninstall}";
@@ -33,7 +33,7 @@
</div>
<?php elseif(!empty($error)):?>
<div class='alert alert-pure with-icon'>
<i class='icon-info-sign'></i>
<i class='icon-exclamation-sign'></i>
<div class='content'>
<?php
echo "<h3 class='error'>" . $lang->extension->uninstallFailed . "</h3>";

2
module/extension/view/waring.htm.php
View File

@@ -21,7 +21,7 @@
</div>
<?php if($error):?>
<div class='alert alert-danger with-icon'>
<i class='icon-info-sign'></i>
<i class='icon-exclamation-sign'></i>
<div class='content'>
<h3><?php echo $lang->extension->waringInstall;?></h3>
<p><?php echo $error;?></p>

2
module/install/view/step3.html.php
View File

@@ -37,7 +37,7 @@ EOT;
</div>
<div class='modal-body'>
<div class='alert alert-danger alert-pure with-icon'>
<i class='icon-info-sign'></i>
<i class='icon-exclamation-sign'></i>
<div class='content'><?php echo $error;?></div>
</div>
</div>

2
module/install/view/step4.html.php
View File

@@ -18,7 +18,7 @@
</div>
<div class='modal-body'>
<div class='alert alert-danger alert-pure with-icon'>
<i class='icon-info-sign'></i>
<i class='icon-exclamation-sign'></i>
<div class='content'><?php echo $error;?></div>
</div>
</div>

2
module/project/view/create.html.php
View File

@@ -156,7 +156,7 @@
<div class='modal-body'>
<?php if(count($projects) == 1):?>
<div class='alert alert-warning with-icon'>
<i class='icon-info-sign'></i>
<i class='icon-exclamation-sign'></i>
<div class='content'><?php echo $lang->project->copyNoProject;?></div>
</div>
<?php else:?>

2
module/score/view/reset.html.php
View File

@@ -18,7 +18,7 @@
</div>
</div>
<div class="alert with-icon hidden" id="scoreLoading">
<i class="icon-info-sign"></i>
<i class="icon-exclamation-sign"></i>
<div class="content">
<p><?php echo $lang->score->resetTips; ?></p>
<p id="loadingContent"></p>

10
module/task/view/assignto.html.php
View File

@@ -15,10 +15,12 @@
<div id='mainContent' class='main-content'>
<div class='center-block'>
<?php if(!empty($task->team) && $task->assignedTo != $this->app->user->account):?>
<div class="alert with-icon">
<i class="icon-info-sign"></i>
<div class="content">
<p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->transfer);?></p>
<div style="padding: 0 50px 0 0">
<div class="alert with-icon no-margin">
<i class="icon-exclamation-sign"></i>
<div class="content">
<p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->transfer);?></p>
</div>
</div>
</div>
<?php else:?>

2
module/task/view/edit.html.php
View File

@@ -71,7 +71,7 @@
<div class='detail-title'><?php echo $lang->files;?></div>
<div class='detail-content'><?php echo $this->fetch('file', 'buildform');?></div>
</div>
<div class='detail text-center'>
<div class='detail text-center form-actions'>
<?php echo html::hidden('lastEditedDate', $task->lastEditedDate);?>
<?php echo html::hidden('consumed', $task->consumed);?>
<?php echo html::submitButton('', '', 'btn btn-wide btn-primary');?>

2
module/task/view/finish.html.php
View File

@@ -17,7 +17,7 @@
<div class='center-block'>
<?php if(!empty($task->team) && $task->assignedTo != $this->app->user->account):?>
<div class="alert with-icon">
<i class="icon-info-sign"></i>
<i class="icon-exclamation-sign"></i>
<div class="content">
<p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->finish);?></p>
</div>

10
module/task/view/recordestimate.html.php
View File

@@ -18,10 +18,12 @@
<div id='mainContent' class='main-content'>
<div class='center-block'>
<?php if(!empty($task->team) && $task->assignedTo != $this->app->user->account):?>
<div class="alert with-icon">
<i class="icon-info-sign"></i>
<div class="content">
<p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->logEfforts);?></p>
<div style="padding: 0 50px 0 0">
<div class="alert with-icon no-margin">
<i class="icon-exclamation-sign"></i>
<div class="content">
<p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->logEfforts);?></p>
</div>
</div>
</div>
<?php else:?>

2
module/task/view/start.html.php
View File

@@ -20,7 +20,7 @@
if(!empty($task->team) && $task->assignedTo != $this->app->user->account):
?>
<div class="alert with-icon">
<i class="icon-info-sign"></i>
<i class="icon-exclamation-sign"></i>
<div class="content">
<p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->start);?></p>
</div>

8
module/testreport/lang/en.php
View File

@@ -67,8 +67,8 @@ $lang->testreport->errorTrunk = "The trunk version cannot create a test repo
$lang->testreport->moreProduct = "A test report can only be generated for the same product.";
$lang->testreport->bugSummary = <<<EOD
<strong>%s</strong> Bug(s) generated in total <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-info-sign'></i></a>,
<strong>%s</strong> Bug(s) remained unresolve <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-info-sign'></i></a>,
<strong>%s</strong> Bug(s) failure of case <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-info-sign'></i></a>.
Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='resolution is resolved or delayedg / status is resolved or closed'><i class='icon-info-sign'></i></a>: <strong>%s</strong>，Bugs created from case Rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-info-sign'></i></a>: <strong>%s</strong>
<strong>%s</strong> Bug(s) generated in total <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-exclamation-sign'></i></a>,
<strong>%s</strong> Bug(s) remained unresolve <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-exclamation-sign'></i></a>,
<strong>%s</strong> Bug(s) failure of case <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-exclamation-sign'></i></a>.
Bug Effective Rate <a data-toggle='tooltip' class='text-warning' title='resolution is resolved or delayedg / status is resolved or closed'><i class='icon-exclamation-sign'></i></a>: <strong>%s</strong>，Bugs created from case Rate<a data-toggle='tooltip' class='text-warning' title='Bugs created from cases / bugs'><i class='icon-exclamation-sign'></i></a>: <strong>%s</strong>
EOD;

6
module/testreport/lang/zh-cn.php
View File

@@ -67,8 +67,8 @@ $lang->testreport->errorTrunk = "主干版本不能创建测试报告，请
$lang->testreport->moreProduct = "只能对同一个产品生成测试报告。";
$lang->testreport->bugSummary = <<<EOD
共发现<strong>%s</strong>个Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-info-sign'></i></a>，
遗留<strong>%s</strong>个Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-info-sign'></i></a>。
用例执行产生<strong>%s</strong>个Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-info-sign'></i></a>。
共发现<strong>%s</strong>个Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-exclamation-sign'></i></a>，
遗留<strong>%s</strong>个Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-exclamation-sign'></i></a>。
用例执行产生<strong>%s</strong>个Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-exclamation-sign'></i></a>。
有效Bug率（方案为已解决或延期 / 状态为已解决或已关闭）：<strong>%s</strong>，用例发现Bug率（用例创建的Bug / 发现Bug数）：<strong>%s</strong>
EOD;

6
module/testreport/lang/zh-tw.php
View File

@@ -67,8 +67,8 @@ $lang->testreport->errorTrunk = "主幹版本不能創建測試報告，請
$lang->testreport->moreProduct = "只能對同一個產品生成測試報告。";
$lang->testreport->bugSummary = <<<EOD
共發現<strong>%s</strong>個Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-info-sign'></i></a>，
遺留<strong>%s</strong>個Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-info-sign'></i></a>。
用例執行產生<strong>%s</strong>個Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-info-sign'></i></a>。
共發現<strong>%s</strong>個Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->foundBugTip}'><i class='icon-exclamation-sign'></i></a>，
遺留<strong>%s</strong>個Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->legacyBugTip}'><i class='icon-exclamation-sign'></i></a>。
用例執行產生<strong>%s</strong>個Bug <a data-toggle='tooltip' class='text-warning' title='{$lang->testreport->fromCaseBugTip}'><i class='icon-exclamation-sign'></i></a>。
有效Bug率（方案為已解決或延期 / 狀態為已解決或已關閉）：<strong>%s</strong>，用例發現Bug率（用例創建的Bug / 發現Bug數）：<strong>%s</strong>
EOD;

2
module/user/view/deny.html.php
View File

@@ -15,7 +15,7 @@ include '../../common/view/header.lite.html.php';
<div class='modal-header'><strong><?php echo $app->user->account, ' ', $lang->user->deny;?></strong></div>
<div class='modal-body'>
<div class='alert with-icon alert-pure'>
<i class='icon-info-sign'></i>
<i class='icon-exclamation-sign'></i>
<div class='content'>
<?php
$moduleName = isset($lang->$module->common) ? $lang->$module->common: $module;

4
www/js/zui/min.js
View File

File diff suppressed because one or more lines are too long