diff --git a/module/my/view/bug.html.php b/module/my/view/bug.html.php index a787c333b8..9389300426 100644 --- a/module/my/view/bug.html.php +++ b/module/my/view/bug.html.php @@ -13,14 +13,14 @@
my->bug;?>
- +
'> diff --git a/module/project/control.php b/module/project/control.php index 0da1e593e4..25bcdfecc4 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -50,6 +50,7 @@ class project extends control $this->view->projectStats = $this->project->getProjectStats($status); $this->view->projectID = $projectID; $this->view->users = $this->loadModel('user')->getPairs('noletter'); + $this->view->status = $status; $this->display(); } diff --git a/module/project/css/common.css b/module/project/css/common.css index 5ec2fe558e..e69de29bb2 100644 --- a/module/project/css/common.css +++ b/module/project/css/common.css @@ -1,3 +0,0 @@ -#productsBox span{display:block; float:left; width:250px; overflow:hidden; word-break:keep-all; white-space:nowrap} -#whitelistBox span{display:block; float:left; width:150px; overflow:hidden; word-break:keep-all; white-space:nowrap} -caption a{padding:5px} diff --git a/module/project/css/create.css b/module/project/css/create.css index b452ac306e..19ef722026 100644 --- a/module/project/css/create.css +++ b/module/project/css/create.css @@ -1 +1,10 @@ -#goal,#desc{width: 89.3%} \ No newline at end of file +#tipsModal {margin-top: 10%;} +#copyProjects {padding: 0} +#copyProjects {padding: 0 2px} +#copyProjects > div {position: relative;} +#copyProjects a {display: block; min-height: 30px; line-height: 30px; padding: 5px 15px; border: 1px solid #e5e5e5; color: #333; margin: 5px 0} +#copyProjects a > i {display: inline-block; margin-right: 5px;} +#copyProjects a:hover {border:1px solid #39B3D7; background-color: #E5F9FF; text-decoration: none} +#copyProjects a.active {border-color: #229F24; color: #229F24; background-color: #E5FFE6} +#copyProjects a.active:after {position: absolute; content: '\e60d'; font-family: ZenIcon; font-size: 20px; right: 25px;} +#copyProjects a.cancel {color: #D2322D} diff --git a/module/project/js/create.js b/module/project/js/create.js index f9eff2e5e7..bdd1ffa849 100644 --- a/module/project/js/create.js +++ b/module/project/js/create.js @@ -1,16 +1,10 @@ -function switchCopyProject(switcher) -{ - if($(switcher).attr('checked')) - { - $('#copyProjectBox').removeClass('hidden'); - } - else - { - $('#copyProjectBox').addClass('hidden'); - } -} - function setCopyProject(projectID) { location.href = createLink('project', 'create', 'projectID=0©ProjectID=' + projectID); } + +$(function() +{ + $('#cpmBtn').click(function(){$('#copyProjectModal').modal('show')}); + $('#copyProjects a').click(function(){setCopyProject($(this).data('id')); $('#copyProjectModal').modal('hide')}); +}); diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 14b1c7385d..494029b64e 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -21,6 +21,8 @@ $lang->project->name = '项目名称'; $lang->project->code = '项目代号'; $lang->project->begin = '开始日期'; $lang->project->end = '结束日期'; +$lang->project->dateRange = '起始日期'; +$lang->project->to = '至'; $lang->project->days = '可用工作日'; $lang->project->day = '天'; $lang->project->status = '项目状态'; @@ -181,6 +183,12 @@ $lang->project->doneProjects = '已结束'; $lang->project->unDoneProjects = '未结束'; $lang->project->copyTeam = '复制团队'; $lang->project->noMatched = '找不到包含"%s"的项目'; +$lang->project->copyTitle = '请选择一个项目来复制'; +$lang->project->copyNoProject = '没有可用的项目来复制'; +$lang->project->copyFromProject = '复制自项目： %s'; +$lang->project->reCopyProject = '重新复制'; +$lang->project->cancelCopy = '取消复制'; +$lang->project->byPeriod = '按时间段'; /* 交互提示。*/ $lang->project->confirmDelete = '您确定删除项目[%s]吗？'; diff --git a/module/project/view/batchedit.html.php b/module/project/view/batchedit.html.php index 31f7441e97..26d0ffda73 100755 --- a/module/project/view/batchedit.html.php +++ b/module/project/view/batchedit.html.php @@ -10,20 +10,27 @@ */ ?> - -'> -
- - - - - - - - - - +
+
+ icons['project']);?> + icons['batchEdit']);?> project->common . $lang->colon . $lang->project->batchEdit;?> +
+
+'> +
idAB;?> project->name;?>project->code;?> project->PM;?> project->status;?>project->begin;?>project->end;?> project->days;?>
+ + + + + + + + + + + + @@ -31,12 +38,17 @@ - - - + + + - +
idAB;?> project->name;?>project->code;?> project->PM;?> project->status;?>project->begin;?>project->end;?> project->days;?>
code, "class='form-control'");?> PM, 'class=form-control');?> project->statusList, $projects[$projectID]->status, 'class=form-control');?>begin, "class='text-1 w-date date' onchange='computeWorkDays(this.id)'");?>end, "class='text-1 w-date date' onchange='computeWorkDays(this.id)'");?>days, "class='w-100px'") . $lang->project->day;?>begin, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?>end, "class='form-control form-date' onchange='computeWorkDays(this.id)'");?> +
+ days, "class='form-control'");?> + project->day;?> +
+
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 0688cd6151..bb4d050a34 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -11,18 +11,26 @@ */ ?> + createLink('project', 'task', 'projectID=' . $projectID);?> - - - + @@ -32,68 +40,124 @@ $(document).ready(function() project->placeholder);?> -
- - - - > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - > - - - - - - -
-
project->create;?>
-
project->copy . '?', '', 'onclick=switchCopyProject(this);');?>
-
project->copy;?>
project->name;?>
project->code;?>
project->begin;?>
project->end;?> - - project->endList , '', "onclick='computeEndDate(this.value)'");?> -
project->days;?>project->day;?>
project->teamname;?>
project->type;?>project->typeList, '', "class='form-control'") . $lang->project->typeDesc;?>
project->manageProducts;?>project->linkProduct}' multiple");?>
project->desc;?>
project->acl;?>project->aclList, $acl, "onclick='setWhite(this.value);'"));?>
project->whitelist;?>
-
+
+
+
+ icons['project']);?> + project->create;?> +
+
+ +
+ project->copyFromProject, html::icon($lang->icons['project']) . ' ' . $projects[$copyProjectID]);?> +
+
+ icons['cancel']) . ' ' . $lang->project->cancelCopy;?> ? + +
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > + + + + + + +
project->name;?>
project->code;?>
project->dateRange;?> +
+ project->begin . "'");?> + project->to;?> + project->end . "'");?> +
+ +
    + project->endList as $key => $name):?> +
    • + +
+
+
+
project->days;?> +
+ + project->day;?> +
+
project->teamname;?>
project->type;?> + project->typeList, '', "class='form-control'");?> +
project->typeDesc;?>
+
project->manageProducts;?>project->linkProduct}' multiple");?>
project->desc;?>
project->acl;?>project->aclList, $acl, "onclick='setWhite(this.value);'", 'block'));?>
project->whitelist;?>
+
+
+ diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php index 0002750069..af896ac3b9 100644 --- a/module/project/view/index.html.php +++ b/module/project/view/index.html.php @@ -11,29 +11,36 @@ ?> - -

- id"), $lang->project->all);?> - id"), $lang->project->statusList['wait']);?> - id"), $lang->project->statusList['doing']);?> - id"), $lang->project->statusList['suspended']);?> - id"), $lang->project->statusList['done']);?> -

-
'> - - - - - - - - - - - - - - +
+
icons['project']) . ' ' . $lang->project->allProject;?>
+
+ createLink('project', 'create'), " " . $lang->project->create,'', "class='btn'") ?> +
+ +
+'> +
idAB;?>project->name;?>project->code;?>project->PM;?>project->end;?>project->status;?>project->totalEstimate;?>project->totalConsumed;?>project->totalLeft;?>project->progess;?>project->burn;?>
+ + + + + + + + + + + + + + + @@ -51,20 +58,20 @@ - - + - @@ -72,4 +79,5 @@
idAB;?>project->name;?>project->code;?>project->PM;?>project->end;?>project->status;?>project->totalEstimate;?>project->totalConsumed;?>project->totalLeft;?>project->progess;?>project->burn;?>
hours->totalEstimate;?> hours->totalConsumed;?> hours->totalLeft;?> + hours->progress;?> height='13' text-align: /> hours->progress;?>% burns);?>'>burns);?>'>
-
- - project->batchEdit);?> +
+
+ " . html::selectAll() . html::selectReverse() . '
';?> + icons['edit']) . ' ' . $lang->project->batchEdit);?>
+ diff --git a/module/task/js/create.js b/module/task/js/create.js index 750306af33..cf2a6aa634 100644 --- a/module/task/js/create.js +++ b/module/task/js/create.js @@ -97,7 +97,7 @@ function setStories(moduleID, projectID) $(document).ready(function() { - var options = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 10, width: '100%', placeholder_text_single: selectAnOption, placeholder_text_multiple: selectSoomeOptions}; + var options = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 10, width: '100%', placeholder_text_single: selectAnOption, placeholder_text_multiple: selectSomeOptions}; setPreview(); $("#story").chosen(options); $("#mailto").chosen(options); diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 4da5190a14..a53b2b73df 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -387,6 +387,7 @@ body {font-size: 12px; color:#141414;padding-bottom: 40px;} #titlebar > .heading > small > i {position: relative; top: 1px;} #titlebar .actions {position: absolute; right: 20px; top: 13px;} #titlebar .actions > .btn, #titlebar .actions > .btn-group {margin-left: 8px;} +#titlebar .actions > .text {display: inline-block; margin-left: 8px;} /* table in outer */ .outer .table {margin-bottom: 0;} @@ -654,6 +655,3 @@ td>select{padding-left: 0;padding-right: 0} .link-button a{ color:#036; font-weight:normal; font-size:14px;padding: 3px 4px;} .link-button a i{font-size: 18px;} .link-button a:hover {color:#000;} - -.alert{padding: 15px; margin-bottom: 20px; border: 1px solid transparent; border-radius: 3px; background-color: #f1f1f1; border-color: #e4e4e4; color: #333;} -.alert-danger{background-color: #ffe6e5; border-color: #ffccd3; color: #d2322d;}