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
2014-11-05 05:23:31 +00:00
parent 93c65f8476 a3440966bc
commit 58bfad91a3
12 changed files with 115 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/js/batchcreate.js
+9
View File
@@ -78,3 +78,12 @@ $(document).on('mousedown', 'select', function()
$(this).val(value);
}
})
if(navigator.userAgent.indexOf("Firefox") < 0)
{
$(document).on('input keyup paste change', 'textarea.autosize', function()
{
this.style.height = 'auto';
this.style.height = (this.scrollHeight + 2) + "px";
});
}
module/bug/view/batchcreate.html.php
+3 -3
View File
@@ -64,7 +64,7 @@
<td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, 'trunk', "class='form-control chosen' multiple");?></td>
<td><?php echo html::input("title[$i]", $bugTitle, 'class=form-control');?></td>
<td>
<?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control'");?>
<?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?>
</td>
<td><?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
<td><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
@@ -95,7 +95,7 @@
<td class='text-left' style='overflow:visible' id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control chosen' multiple");?></td>
<td><?php echo html::input("title[$i]", '', 'class=form-control');?></td>
<td>
<?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control'");?>
<?php echo html::textarea("stepses[$i]", '', "rows='1' class='form-control autosize'");?>
</td>
<td><?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control'");?></td>
<td><?php echo html::select("severities[$i]", $lang->bug->severityList, '', "class='form-control'");?></td>
@@ -118,7 +118,7 @@
<td class='text-left' style='overflow:visible' id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control' multiple");?></td>
<td><?php echo html::input("titles[%s]", '', 'class=form-control');?></td>
<td>
<?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control'");?>
<?php echo html::textarea("stepses[%s]", '', "rows='1' class='form-control autosize'");?>
</td>
<td><?php echo html::select("types[%s]", $lang->bug->typeList, '', "class='form-control'");?></td>
<td><?php echo html::select("severities[%s]", $lang->bug->severityList, '', "class='form-control'");?></td>
module/product/view/browse.html.php
+2 -2
View File
@@ -234,7 +234,7 @@
</form>
</div>
<script language='javascript'>
$('#module<?php echo $moduleID;?>').addClass('active')
$('#<?php echo $browseType;?>Tab').addClass('active')
$('#module<?php echo $moduleID;?>').addClass('active');
$('#<?php echo $browseType;?>Tab').addClass('active');
</script>
<?php include '../../common/view/footer.html.php';?>
module/story/js/batchcreate.js
+10 -1
View File
@@ -15,4 +15,13 @@ $(document).on('click', '.chosen-with-drop', function()
$(select).val(value);
$(select).trigger("chosen:updated");
}
})
});
if(navigator.userAgent.indexOf("Firefox") < 0)
{
$(document).on('input keyup paste change', 'textarea.autosize', function()
{
this.style.height = 'auto';
this.style.height = (this.scrollHeight + 2) + "px";
});
}
module/story/view/batchcreate.html.php
+3 -3
View File
@@ -46,7 +46,7 @@
<td class='text-left' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("plan[$i]", $plans, $planID, "class='form-control chosen'");?></td>
<td><?php echo html::input("title[$i]", $storyTitle, "class='form-control'");?></td>
<td><?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control'");?></td>
<td><?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control autosize'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("pri[$i]", $priList, $pri, "class='form-control'");?></td>
<td><?php echo html::input("estimate[$i]", $estimate, "class='form-control'");?></td>
<td>
@@ -69,7 +69,7 @@
<td class='text-left' style='overflow:visible'><?php echo html::select("module[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("plan[$i]", $plans, $planID, "class='form-control chosen'");?></td>
<td><?php echo html::input("title[$i]", $storyTitle, "class='form-control'");?></td>
<td><?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control'");?></td>
<td><?php echo html::textarea("spec[$i]", $spec, "rows='1' class='form-control autosize'");?></td>
<td class='text-left' style='overflow:visible'><?php echo html::select("pri[$i]", $priList, $pri, "class='form-control'");?></td>
<td><?php echo html::input("estimate[$i]", $estimate, "class='form-control'");?></td>
<td><?php echo html::select("needReview[$i]", $lang->story->reviewList, 0, "class='form-control'");?></td>
@@ -86,7 +86,7 @@
<td class='text-left' style='overflow:visible'><?php echo html::select("plan[%s]", $plans, $planID, "class='form-control'");?></td>
<td><?php echo html::input("title[%s]", $storyTitle, "class='form-control'");?></td>
<td>
<?php echo html::textarea("spec[%s]", $spec, "rows='1' class='form-control'");?>
<?php echo html::textarea("spec[%s]", $spec, "rows='1' class='form-control autosize'");?>
</td>
<td class='text-left' style='overflow:visible'><?php echo html::select("pri[%s]", $priList, $pri, "class='form-control'");?></td>
<td><?php echo html::input("estimate[%s]", $estimate, "class='form-control'");?></td>
module/task/js/batchcreate.js
+10 -1
View File
@@ -1,6 +1,6 @@
$(function() {
for(i = 0; i < batchCreateNum; i++) $("#story" + i).chosen(defaultChosenOptions);
})
});
/* Get select of stories.*/
function setStories(moduleID, projectID, num)
@@ -78,3 +78,12 @@ $(document).on('mousedown', 'select', function()
$(this).val(value);
}
})
if(navigator.userAgent.indexOf("Firefox") < 0)
{
$(document).on('input keyup paste change', 'textarea.autosize', function()
{
this.style.height = 'auto';
this.style.height = (this.scrollHeight + 2) + "px";
});
}
module/task/view/batchcreate.html.php
+2 -2
View File
@@ -73,7 +73,7 @@
<td style='overflow:visible'><?php echo html::select("assignedTo[$i]", $members, $member, "class='form-control chosen'");?></td>
<td><?php echo html::input("estimate[$i]", '', 'class=form-control text-center');?></td>
<td>
<?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control'");?>
<?php echo html::textarea("desc[$i]", '', "rows='1' class='form-control autosize'");?>
</td>
<td><?php echo html::select("pri[$i]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
</tr>
@@ -99,7 +99,7 @@
<td style='overflow:visible'><?php echo html::select("assignedTo[%s]", $members, $member, "class='form-control'");?></td>
<td><?php echo html::input("estimate[%s]", '', 'class=form-control text-center');?></td>
<td>
<?php echo html::textarea("desc[%s]", '', "rows='1' class='form-control'");?>
<?php echo html::textarea("desc[%s]", '', "rows='1' class='form-control autosize'");?>
</td>
<td><?php echo html::select("pri[%s]", (array)$lang->task->priList, $pri, 'class=form-control');?></td>
</tr>
module/todo/lang/en.php
+1
View File
@@ -25,6 +25,7 @@ $lang->todo->browse = "Browse";
$lang->todo->import2Today = "Import to today";
$lang->todo->import = "Import to";
$lang->todo->changeStatus = "Change";
$lang->todo->legendBasic = "Basic Info";
$lang->todo->id = 'ID';
$lang->todo->account = 'Owner';
module/todo/lang/zh-cn.php
+1
View File
@@ -25,6 +25,7 @@ $lang->todo->browse = "浏览待办";
$lang->todo->import2Today = "导入到今天";
$lang->todo->import = "导入";
$lang->todo->changeStatus = "更改";
$lang->todo->legendBasic = "基本信息";
$lang->todo->id = '编号';
$lang->todo->account = '所有者';
module/todo/view/view.html.php
+71 -62
View File
@@ -19,72 +19,81 @@
<strong><?php echo $todo->name;?></strong>
</div>
</div>
<div class='main' style='margin-top: 10px'>
<div class='panel mg-0'>
<div class='panel-heading'>
<strong><?php
if($todo->type == 'bug') echo html::a($this->createLink('bug', 'view', "id={$todo->idvalue}"), $todo->name);
if($todo->type == 'task') echo html::a($this->createLink('task', 'view', "id={$todo->idvalue}"), $todo->name);
if($todo->type == 'custom') echo $todo->name;
?></strong>
<div class='panel-actions pull-right' title='<?php echo $lang->todo->beginAndEnd;?>' style='line-height: 35px'>
<?php echo $lang->todo->beginAndEnd;?>:
<?php
if(isset($times[$todo->begin])) echo $times[$todo->begin];
if(isset($times[$todo->end])) echo ' ~ ' . $times[$todo->end];
?>
</div>
<div title='<?php echo $lang->todo->status;?>' class='panel-actions todo-<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></div>
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<fieldset>
<legend>
<?php
echo $lang->todo->desc;
if($todo->type == 'bug') echo html::a($this->createLink('bug', 'view', "id={$todo->idvalue}"), ' BUG#' . $todo->idvalue);
if($todo->type == 'task') echo html::a($this->createLink('task', 'view', "id={$todo->idvalue}"), ' TASK#' . $todo->idvalue);
?>
</legend>
<div><?php echo $todo->desc;?></div>
</fieldset>
<?php $actionTheme = 'fieldset'; include '../../common/view/action.html.php';?>
</div>
<div class='panel-body'>
<div class='article-content'><?php echo $todo->desc;?></div>
<hr class='small'>
<table class='table table-data table-borderless'>
<tr>
<th class='w-80px'><?php echo $lang->todo->account;?></th>
<td><?php echo $todo->account;?></td>
<th class='w-80px'><?php echo $lang->todo->date;?></th>
<td><?php echo $todo->date == '20300101' ? $lang->todo->periods['future'] : date(DT_DATE1, strtotime($todo->date));?></td>
</tr>
<tr>
<th><?php echo $lang->todo->type;?></th>
<td><?php echo $lang->todo->typeList[$todo->type];?></td>
<th><?php echo $lang->todo->pri;?></th>
<td><?php echo $lang->todo->priList[$todo->pri];?></td>
</tr>
</table>
</div>
<div class='panel-footer text-center'>
<?php
if($this->session->todoList)
{
$browseLink = $this->session->todoList;
}
elseif($todo->account == $app->user->account)
{
$browseLink = $this->createLink('my', 'todo');
}
else
{
$browseLink = $this->createLink('user', 'todo', "account=$todo->account");
}
common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'button', '', 'hiddenwin', 'showinonlybody btn-success');
if($todo->account == $app->user->account)
{
common::printIcon('todo', 'edit', "todoID=$todo->id");
common::printIcon('todo', 'delete', "todoID=$todo->id", '', 'button', '', 'hiddenwin');
}
common::printRPN($browseLink);
?>
</div>
<div class='col-side'>
<div class='main main-side'>
<fieldset>
<legend><?php echo $lang->todo->legendBasic;?></legend>
<table class='table table-data table-condensed table-borderless'>
<tr>
<th><?php echo $lang->todo->pri;?></th>
<td><?php echo $lang->todo->priList[$todo->pri];?></td>
</tr>
<tr>
<th><?php echo $lang->todo->status;?></th>
<td><?php echo $lang->todo->statusList[$todo->status];?></td>
</tr>
<tr>
<th><?php echo $lang->todo->type;?></th>
<td><?php echo $lang->todo->typeList[$todo->type];?></td>
</tr>
<tr>
<th class='w-80px'><?php echo $lang->todo->account;?></th>
<td><?php echo $todo->account;?></td>
</tr>
<tr>
<th class='w-80px'><?php echo $lang->todo->date;?></th>
<td><?php echo $todo->date == '20300101' ? $lang->todo->periods['future'] : date(DT_DATE1, strtotime($todo->date));?></td>
</tr>
<tr>
<th><?php echo $lang->todo->beginAndEnd;?></th>
<td><?php if(isset($times[$todo->begin])) echo $times[$todo->begin]; if(isset($times[$todo->end])) echo ' ~ ' . $times[$todo->end];?></td>
</tr>
</table>
</div>
</div>
</div>
<div class='main'>
<?php $actionTheme = 'table'; include '../../common/view/action.html.php';?>
<?php else:?>
<?php echo $lang->todo->thisIsPrivate;?>
<?php endif;?>
<div class='panel-footer text-center'>
<?php
if($this->session->todoList)
{
$browseLink = $this->session->todoList;
}
elseif($todo->account == $app->user->account)
{
$browseLink = $this->createLink('my', 'todo');
}
else
{
$browseLink = $this->createLink('user', 'todo', "account=$todo->account");
}
common::printIcon('todo', 'finish', "id=$todo->id", $todo, 'button', '', 'hiddenwin', 'showinonlybody btn-success');
if($todo->account == $app->user->account)
{
common::printIcon('todo', 'edit', "todoID=$todo->id");
common::printIcon('todo', 'delete', "todoID=$todo->id", '', 'button', '', 'hiddenwin');
}
common::printRPN($browseLink);
?>
</div>
</div>
<?php else:?>
<?php echo $lang->todo->thisIsPrivate;?>
<?php endif;?>
<?php include '../../common/view/footer.html.php';?>
module/upgrade/view/index.html.php
+1 -2
View File
@@ -16,8 +16,7 @@
<strong><?php echo $lang->upgrade->warnning;?></strong>
</div>
<div class='modal-body'>
<div class='alert with-icon'>
<i class='icon-info-sign'></i>
<div class='alert alert-pure'>
<div class='content'><?php echo $lang->upgrade->warnningContent;?></div>
</div>
</div>
www/theme/zui/css/min.css
+2 -2
View File
File diff suppressed because one or more lines are too long