From 02be1c5ce6bb3a85631ddbaf89689cb1456ba142 Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 19 Apr 2018 14:46:59 +0800 Subject: [PATCH 1/3] * Rewrite putoff file of project. --- module/project/view/putoff.html.php | 89 +++++++++++++++-------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/module/project/view/putoff.html.php b/module/project/view/putoff.html.php index 05893a5ee3..e670cac219 100644 --- a/module/project/view/putoff.html.php +++ b/module/project/view/putoff.html.php @@ -12,55 +12,58 @@ ?> - -
-
-
- icons['project']);?> id;?> - createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?> - project->putoff;?> icons['putoff']);?> -
+
+
+

+ id;?> + createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?> + arrow . $lang->project->putoff;?> +

-
+ - - - + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + +
project->dateRange;?> -
- begin, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->begin . "'");?> - project->to;?> - end, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->end . "'");?> -
- -
    - project->endList as $key => $name):?> -
    • - -
+
project->dateRange;?> +
+ begin, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->begin . "'");?> + project->to;?> + end, "class='form-control form-date' onchange='computeWorkDays()' placeholder='" . $lang->project->end . "'");?> +
+ +
    + project->endList as $key => $name):?> +
    • + +
+
- -
project->days;?> -
- days, "class='form-control' autocomplete='off'");?> - project->day;?> -
-
comment;?>
goback, $this->session->taskList); ?>
project->days;?> +
+ days, "class='form-control' autocomplete='off'");?> + project->day;?> +
+
comment;?>
goback, $this->session->taskList); ?>
+
project->weekend);?> From 437a019d6206c7ce68680c3c32164184c06d5d19 Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 19 Apr 2018 14:48:43 +0800 Subject: [PATCH 2/3] * Rewrite suspend file of project. --- module/project/view/suspend.html.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/module/project/view/suspend.html.php b/module/project/view/suspend.html.php index 70be041044..e0c6a6e8e3 100644 --- a/module/project/view/suspend.html.php +++ b/module/project/view/suspend.html.php @@ -12,19 +12,19 @@ ?> -
-
-
- icons['project']);?> id;?> - createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?> - project->suspend;?> icons['suspend']);?> -
+
+
+

+ id;?> + createLink('project', 'view', 'project=' . $project->id), $project->name, '_blank');?> + arrow . $lang->project->suspend;?> +

-
+ - - + + @@ -32,6 +32,7 @@
comment;?>comment;?>
+
From ba972a0d4317d781565135759265997fe7fc741c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Thu, 19 Apr 2018 14:56:37 +0800 Subject: [PATCH 3/3] * adjust for task #3852. --- module/story/view/edit.html.php | 441 ++++++++++++++++---------------- www/theme/default/style.css | 3 + 2 files changed, 225 insertions(+), 219 deletions(-) diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php index 18a72bb565..e4ceb29d98 100644 --- a/module/story/view/edit.html.php +++ b/module/story/view/edit.html.php @@ -12,229 +12,232 @@ ?>
-
-
-

- icons['story']);?> id;?> - createLink('story', 'view', "storyID=$story->id"), $story->title, '', 'class="story-title"');?> - arrow . ' ' . $lang->story->edit;?> -

-
- save)?> -
-
-
-
-
-
-
- - title, 'class="form-control disabled" disabled="disabled" autocomplete="off"');?> + +
+

+ icons['story']);?> id;?> + createLink('story', 'view', "storyID=$story->id"), $story->title, '', 'class="story-title"');?> + arrow . ' ' . $lang->story->edit;?> +

+
+ save)?> +
+
+
+
+
+
+
+ + title, 'class="form-control disabled" disabled="disabled" autocomplete="off"');?> +
+
+
+
story->legendSpec;?>
+
spec;?>
+
+
+
story->verify;?>
+
verify;?>
+
+
+
story->comment;?>
+
+ +
+
+
linkStories);?>
+
childStories);?>
+
+ lastEditedDate); + echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary'); + echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide'); + ?> +
+
+
-
- story->legendSpec;?> -
spec;?>
-
-
- story->verify;?> -
verify;?>
-
-
- story->comment;?> -
- +
+
+
+
story->legendBasicInfo;?>
+ + + + + + + + + + + + + + + + + + + + + + + + + + status != 'draft'):?> + + + + + + + + + + + + + + + + + + + + + +
story->product;?> +
+ product, "onchange='loadProduct(this.value);' class='form-control chosen'");?> + type != 'normal') echo html::select('branch', $branches, $story->branch, "onchange='loadBranch();' class='form-control' style='width:65px'");?> +
+
story->module;?> +
+ module, "class='form-control chosen'"); + if(count($moduleOptionMenu) == 1) + { + echo ""; + echo html::a($this->createLink('tree', 'browse', "rootID=$story->product&view=story¤tModuleID=0&branch=$story->branch"), $lang->tree->manage, '_blank'); + echo '  '; + echo html::a("javascript:loadProductModules($story->product)", $lang->refresh); + echo ''; + } + ?> +
+
story->plan;?> +
+ session->currentProductType != 'normal' and empty($story->branch)) ? true : false;?> + plan, "class='form-control chosen'" . ($multiple ? ' multiple' : '')); + if(count($plans) == 1) + { + echo ""; + echo html::a($this->createLink('productplan', 'create', "productID=$story->product&branch=$story->branch"), $lang->productplan->create, '_blank'); + echo html::a("javascript:loadProductPlans($story->product)", $lang->refresh); + echo ''; + } + ?> +
+
story->source;?>story->sourceList, $story->source, "class='form-control chosen'");?>
story->sourceNote;?>sourceNote, "class='form-control' autocomplete='off'");?> +
story->status;?>story->statusList[$story->status];?>
story->stage;?>story->stageList, $story->stage, "class='form-control chosen'");?>
story->pri;?>story->priList, $story->pri, "class='form-control chosen'");?>
story->estimate;?>estimate, "class='form-control' autocomplete='off'");?>
story->keywords;?>keywords, "class='form-control' autocomplete='off'");?>
story->mailto;?> + mailto), "class='form-control' multiple");?> + fetch('my', 'buildContactLists')?> +
+
+
+
story->legendLifeTime;?>
+ + + + + + + + + + reviewedBy):?> + + + + + + status == 'closed'):?> + + + + + + + + + +
story->openedBy;?>openedBy];?>
story->assignedTo;?>assignedTo, 'class="form-control chosen"');?>
story->reviewedBy;?>reviewedBy), 'class="form-control chosen" multiple');?>
story->closedBy;?>closedBy, 'class="form-control chosen"');?>
story->closedReason;?>story->reasonList, $story->closedReason, "class='form-control' onchange='setStory(this.value)'");?>
+
+ +
+
story->legendMisc;?>
+ + status == 'closed'):?> + + + + + + + + + + status == 'closed'):?> + + + + + +
story->duplicateStory;?>duplicateStory, "class='form-control' autocomplete='off'");?>
story->linkStories;?> + createLink('story', 'linkStory', "storyID=$story->id&type=linkStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?> + linkStories):?> +
    + linkStories); + foreach($linkStories as $linkStoryID) + { + if(isset($story->extraStories[$linkStoryID])) + { + echo '
  • '; + echo html::a(inlink('view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID], '_blank'); + echo html::a("javascript:unlinkStory($story->id, \"linkStories\", $linkStoryID)", '', '', "title='{$lang->unlink}' style='float:right'"); + echo '
    • '; + } + } + ?> +
+ +
story->childStories;?> + createLink('story', 'linkStory', "storyID=$story->id&type=childStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?> +
    + childStories); + foreach($childStories as $childStoryID) + { + if(isset($story->extraStories[$childStoryID])) + { + echo '
  • '; + echo html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID" . $story->extraStories[$childStoryID], '_blank'); + echo html::a("javascript:unlinkStory($story->id, \"childStories\", $childStoryID)", '', '', "title='{$lang->unlink}' style='float:right'"); + echo '
    • '; + } + } + ?> +
+
+
-
-
linkStories);?>
-
childStories);?>
-
- lastEditedDate); - echo html::submitButton($lang->save, '', 'btn btn-wide btn-primary'); - echo html::linkButton($lang->goback, $app->session->storyList ? $app->session->storyList : inlink('view', "storyID=$story->id"), 'self', '', 'btn btn-wide'); - ?>
-
-
-
-
-
- story->legendBasicInfo;?> - - - - - - - - - - - - - - - - - - - - - - - - - - status != 'draft'):?> - - - - - - - - - - - - - - - - - - - - - -
story->product;?> -
- product, "onchange='loadProduct(this.value);' class='form-control chosen'");?> - type != 'normal') echo html::select('branch', $branches, $story->branch, "onchange='loadBranch();' class='form-control' style='width:65px'");?> -
-
story->module;?> -
- module, "class='form-control chosen'"); - if(count($moduleOptionMenu) == 1) - { - echo ""; - echo html::a($this->createLink('tree', 'browse', "rootID=$story->product&view=story¤tModuleID=0&branch=$story->branch"), $lang->tree->manage, '_blank'); - echo '  '; - echo html::a("javascript:loadProductModules($story->product)", $lang->refresh); - echo ''; - } - ?> -
-
story->plan;?> -
- session->currentProductType != 'normal' and empty($story->branch)) ? true : false;?> - plan, "class='form-control chosen'" . ($multiple ? ' multiple' : '')); - if(count($plans) == 1) - { - echo ""; - echo html::a($this->createLink('productplan', 'create', "productID=$story->product&branch=$story->branch"), $lang->productplan->create, '_blank'); - echo html::a("javascript:loadProductPlans($story->product)", $lang->refresh); - echo ''; - } - ?> -
-
story->source;?>story->sourceList, $story->source, "class='form-control chosen'");?>
story->sourceNote;?>sourceNote, "class='form-control' autocomplete='off'");?> -
story->status;?>story->statusList[$story->status];?>
story->stage;?>story->stageList, $story->stage, "class='form-control chosen'");?>
story->pri;?>story->priList, $story->pri, "class='form-control chosen'");?>
story->estimate;?>estimate, "class='form-control' autocomplete='off'");?>
story->keywords;?>keywords, "class='form-control' autocomplete='off'");?>
story->mailto;?> - mailto), "class='form-control' multiple");?> - fetch('my', 'buildContactLists')?> -
-
-
- story->legendLifeTime;?> - - - - - - - - - - reviewedBy):?> - - - - - - status == 'closed'):?> - - - - - - - - - -
story->openedBy;?>openedBy];?>
story->assignedTo;?>assignedTo, 'class="form-control chosen"');?>
story->reviewedBy;?>reviewedBy), 'class="form-control chosen" multiple');?>
story->closedBy;?>closedBy, 'class="form-control chosen"');?>
story->closedReason;?>story->reasonList, $story->closedReason, "class='form-control' onchange='setStory(this.value)'");?>
-
- -
- story->legendMisc;?> - - status == 'closed'):?> - - - - - - - - - - status == 'closed'):?> - - - - - -
story->duplicateStory;?>duplicateStory, "class='form-control' autocomplete='off'");?>
story->linkStories;?> - createLink('story', 'linkStory', "storyID=$story->id&type=linkStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?> -
    - linkStories); - foreach($linkStories as $linkStoryID) - { - if(isset($story->extraStories[$linkStoryID])) - { - echo '
  • '; - echo html::a(inlink('view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID], '_blank'); - echo html::a("javascript:unlinkStory($story->id, \"linkStories\", $linkStoryID)", '', '', "title='{$lang->unlink}' style='float:right'"); - echo '
    • '; - } - } - ?> -
-
story->childStories;?> - createLink('story', 'linkStory', "storyID=$story->id&type=childStories", '', true), $lang->story->linkStory, '', "data-toggle='modal' data-type='iframe' data-width='95%'");?> -
    - childStories); - foreach($childStories as $childStoryID) - { - if(isset($story->extraStories[$childStoryID])) - { - echo '
  • '; - echo html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID" . $story->extraStories[$childStoryID], '_blank'); - echo html::a("javascript:unlinkStory($story->id, \"childStories\", $childStoryID)", '', '', "title='{$lang->unlink}' style='float:right'"); - echo '
    • '; - } - } - ?> -
-
-
-
-
-
- +
diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 3b77343dc3..bee9848e53 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -83,4 +83,7 @@ body.body-modal #mainMenu{margin-top:5px;} .fixedTfootAction.scrolled .pager .dropdown > a:hover, .fixedTfootAction.scrolled .pager > a:hover {background-color: #2e6dad} +.fixedTheadOfList {position: fixed; top: 0px; z-index:1000;} +.fixedTheadOfList > thead > tr > th {background-color: #2e6dad; border-bottom-color: #bbb; color: #dedede} + .search-list .list-group {max-height: 214px; height:auto !important;}