Merge branch 'master' of github.com:easysoft/zentaopms
This commit is contained in:
wangyidong
@@ -69,12 +69,12 @@ table th.col-closed {width:15%}
|
||||
.story-pri.pri-4 {background-color:#795523;}
|
||||
|
||||
.board-story {background: #dd7503}
|
||||
.board-story.stage-projected {background-color:#808080;}
|
||||
.board-story.stage-developing {background-color:#d2322d;}
|
||||
.board-story.stage-developed {background-color:#229E70;}
|
||||
.board-story.stage-testing {background-color:#e84e0f;}
|
||||
.board-story.stage-tested {background-color:#795523;}
|
||||
.board-story.stage-released {background-color:#8957a1;}
|
||||
.board-story.stage-projected {background-color:#777;}
|
||||
.board-story.stage-developing {background-color:#D2322D;}
|
||||
.board-story.stage-developed {background-color:#229F24;}
|
||||
.board-story.stage-testing {background-color:#EF6C00;}
|
||||
.board-story.stage-tested {background-color:#827717;}
|
||||
.board-story.stage-released {background-color:#9C27B0;}
|
||||
|
||||
.bug-pri,.task-pri {display: inline-block; width: 16px; height: 16px; text-align: center; border-radius: 8px; border: 1px solid #ddd; font-size: 12px}
|
||||
|
||||
|
||||
@@ -628,11 +628,6 @@ class task extends control
|
||||
}
|
||||
}
|
||||
}
|
||||
if($this->cookie->reload2Parent)
|
||||
{
|
||||
setcookie('reload2Parent', false, 0, $this->config->webRoot);
|
||||
die(js::reload('parent'));
|
||||
}
|
||||
|
||||
if(isonlybody()) die(js::closeModal('parent.parent', 'this'));
|
||||
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
|
||||
|
||||
@@ -13,18 +13,18 @@ $(function()
|
||||
{
|
||||
$(this).click(function()
|
||||
{
|
||||
var saveRecord = false;
|
||||
$('#recordForm .form-date').each(function()
|
||||
var hasRecord = false;
|
||||
$('#recordForm').find('input[name^="dates"], input[name^="consumed"], input[name^="left"], textarea[name^="work"]').each(function()
|
||||
{
|
||||
if($(this).val() !== '')
|
||||
{
|
||||
saveRecord = confirm(confirmSaveRecord);
|
||||
hasRecord = true;
|
||||
return false;
|
||||
}
|
||||
});
|
||||
if(saveRecord)
|
||||
if(hasRecord)
|
||||
{
|
||||
$.cookie('reload2Parent', true, {path:config.webRoot});
|
||||
alert(noticeSaveRecord);
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -144,7 +144,7 @@ $lang->task->remindBug = "This task from Bug, update the Bug:%s or n
|
||||
$lang->task->confirmChangeProject = "Change {$lang->projectCommon} will change module, story and assignedTo also, are you sure?";
|
||||
$lang->task->confirmFinish = '"Left" is zero, this task will be done. Are you sure?';
|
||||
$lang->task->confirmRecord = '"Left" is zero, this task will be done. Are you sure?';
|
||||
$lang->task->confirmSaveRecord = 'Please save the estimate record which has not been saved.';
|
||||
$lang->task->noticeSaveRecord = 'Please save the estimate record which has not been saved.';
|
||||
$lang->task->commentActions = '%s. %s, commented by<strong>%s</strong>.';
|
||||
|
||||
$lang->task->error = new stdclass();
|
||||
|
||||
@@ -144,7 +144,7 @@ $lang->task->remindBug = "该任务为Bug转化得到，是否更新
|
||||
$lang->task->confirmChangeProject = "修改{$lang->projectCommon}会导致相应的所属模块、相关需求和指派人发生变化，确定吗？";
|
||||
$lang->task->confirmFinish = '"预计剩余"为0，确认将任务状态改为"已完成"吗？';
|
||||
$lang->task->confirmRecord = '"剩余"为0，任务将标记为"已完成"，您确定吗？';
|
||||
$lang->task->confirmSaveRecord = '您有尚未保存的工时记录，请先将其保存。';
|
||||
$lang->task->noticeSaveRecord = '您有尚未保存的工时记录，请先将其保存。';
|
||||
$lang->task->commentActions = '%s. %s, 由 <strong>%s</strong> 添加备注。';
|
||||
|
||||
$lang->task->error = new stdclass();
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
?>
|
||||
<?php include '../../common/view/header.lite.html.php';?>
|
||||
<?php include '../../common/view/datepicker.html.php';?>
|
||||
<?php js::set('confirmRecord', $lang->task->confirmRecord);?>
|
||||
<?php js::set('confirmSaveRecord', $lang->task->confirmSaveRecord);?>
|
||||
<?php js::set('confirmRecord', $lang->task->confirmRecord);?>
|
||||
<?php js::set('noticeSaveRecord', $lang->task->noticeSaveRecord);?>
|
||||
<div id='titlebar'>
|
||||
<div class='heading'>
|
||||
<span class='prefix'><?php echo html::icon($lang->icons['task']);?> <strong><?php echo $task->id;?></strong></span>
|
||||
|
||||
@@ -41,9 +41,9 @@
|
||||
<th class='w-30px'><?php echo $lang->idAB;?></th>
|
||||
<th class='w-120px<?php echo zget($visibleFields, 'type', ' hidden')?>'><?php echo $lang->todo->type;?></th>
|
||||
<th class='w-80px<?php echo zget($visibleFields, 'pri', ' hidden')?>'><?php echo $lang->todo->pri;?></th>
|
||||
<th class='w-p30 red'><?php echo $lang->todo->name;?></th>
|
||||
<th class='w-p25 red'><?php echo $lang->todo->name;?></th>
|
||||
<th <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo $lang->todo->desc;?></th>
|
||||
<th class='w-300px<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
|
||||
<th class='w-230px<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<?php $pri = 3;?>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
/* Width definitions */
|
||||
.w-p5 {width: 5%} .w-p10 {width: 10%} .w-p15 {width: 15%} .w-p20 {width: 20%} .w-p25 {width: 25%} .w-p30 {width: 30%} .w-p35 {width: 35%} .w-p40 {width: 40%} .w-p45 {width: 45%} .w-p50 {width: 50%} .w-p55 {width: 55%} .w-p60 {width: 60%} .w-p65 {width: 65%} .w-p70 {width: 70%} .w-p75 {width: 75%} .w-p80 {width: 80%} .w-p85 {width: 85%} .w-p90 {width: 90%} .w-p94 {width: 94%} .w-p95 {width: 95%} .w-p98 {width: 98%} .w-p99 {width: 99%} .w-p100{width: 100%}
|
||||
|
||||
.w-auto {width: auto} .w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-180px {width:180px} .w-200px {width:200px} .w-250px {width:250px} .w-300px {width:300px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} .w-700px {width:700px} .w-800px {width:800px} .w-900px {width:900px}
|
||||
.w-auto {width: auto} .w-20px {width:20px} .w-30px {width:30px} .w-35px {width:35px} .w-40px {width:40px} .w-45px {width:45px} .w-50px {width:50px} .w-60px {width:60px} .w-70px {width:70px} .w-80px {width:80px} .w-90px {width:90px} .w-100px {width:100px} .w-110px {width:110px} .w-120px {width:120px} .w-130px {width:130px} .w-140px {width:140px} .w-150px {width:150px} .w-160px {width:160px} .w-180px {width:180px} .w-200px {width:200px} .w-230px {width:230px} .w-250px {width:250px} .w-300px {width:300px} .w-400px {width:400px} .w-500px {width:500px} .w-600px {width:600px} .w-700px {width:700px} .w-800px {width:800px} .w-900px {width:900px}
|
||||
.mw-200px {max-width:200px!important} .mw-300px {max-width:300px!important} .mw-400px {max-width:400px!important} .mw-500px {max-width:500px!important} .mw-600px {max-width:600px!important} .mw-700px {max-width:700px!important} .mw-800px {max-width:800px!important} .mw-900px {max-width:900px!important} .mw-1400px {max-width:1400px!important}
|
||||
|
||||
.w-id {width:70px;} .w-pri {width:40px;} .w-severity {width:50px;} .w-hour {width:57px;} .w-date {width:90px;} .w-user {width:80px;} .w-status {width:60px} .w-type {width:80px} .w-resolution {width:70px}
|
||||
|
||||
Reference in New Issue
Block a user