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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2019-05-31 16:13:54 +08:00
parent 65467ed5d9 f122d6977d
commit a86a212e76
23 changed files with 26 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/css/batchcreate.css
-1
View File
@@ -1 +0,0 @@
#batchCreateForm .chosen-container .chosen-drop{min-width:200px;}
module/bug/css/batchedit.css
-1
View File
@@ -1,3 +1,2 @@
.chosen-container[id^="plan"] .chosen-drop {min-width: 300px; border-top: 1px solid #ddd!important}
.duplicate-input {border-left-width: 0; border-radius: 0 2px 2px 0; padding-left: 9px}
.duplicate-input:focus {border-left-width: 1px; padding-left: 8px}
module/bug/css/create.css
-3
View File
@@ -7,9 +7,6 @@
#buildBoxActions {padding-left: 15px;}
#module_chosen.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
#os_chosen.chosen-container .chosen-drop{min-width: 200px}
#openedBuild_chosen.chosen-container .chosen-drop {min-width: 450px; border-top: 1px solid #ddd!important}
#module + .chosen-container-single .chosen-single,
#task + .chosen-container-single .chosen-single,
#openedBuild + .chosen-container-multi .chosen-choices {border-top-left-radius: 0; border-bottom-left-radius: 0;}
module/bug/css/resolve.css
-1
View File
@@ -1,2 +1 @@
.chosen-container[id^="buildProject"] {max-width: 160px; border-radius: 0}
.chosen-container[id^="buildProject"] .chosen-drop {min-width: 300px;!important}
module/doc/view/create.html.php
+1 -1
View File
@@ -27,7 +27,7 @@
</html>
<?php else:?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/ueditor.html.php';?>
<?php include '../../common/view/kindeditor.html.php';?>
<?php include '../../common/view/markdown.html.php';?>
<?php js::set('holders', $lang->doc->placeholder);?>
<?php js::set('type', 'doc');?>
module/doc/view/edit.html.php
+1 -1
View File
@@ -11,7 +11,7 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php if($doc->contentType == 'html') include '../../common/view/ueditor.html.php';?>
<?php if($doc->contentType == 'html') include '../../common/view/kindeditor.html.php';?>
<?php if($doc->contentType == 'markdown') include '../../common/view/markdown.html.php';?>
<?php if($this->app->getClientLang() == 'en'):?>
<style> #whiteListBox .input-group:last-child .input-group-addon{padding:5px 16px} </style>
module/project/css/all.css
-1
View File
@@ -1,2 +1 @@
#product_chosen .chosen-single{width:180px;}
#product_chosen .chosen-drop {min-width: 300px;!important}
module/project/lang/en.php
+16 -16
View File
@@ -84,7 +84,7 @@ $lang->team->account = 'Username';
$lang->team->role = 'Role';
$lang->team->join = 'Joined';
$lang->team->hours = 'Hours/day';
$lang->team->days = 'day';
$lang->team->days = 'Day';
$lang->team->totalHours = 'Total Hours';
$lang->team->limited = 'Limited User';
@@ -100,7 +100,7 @@ $lang->project->statusList['doing'] = 'Doing';
$lang->project->statusList['suspended'] = 'Suspended';
$lang->project->statusList['closed'] = 'Closed';
$lang->project->aclList['open'] = "Default (Users who have the privilege to visit {$lang->projectCommon} can access it.)";
$lang->project->aclList['open'] = "Default (Users who can visit {$lang->projectCommon} can access it.)";
$lang->project->aclList['private'] = 'Private (For team members only.)';
$lang->project->aclList['custom'] = 'Whitelist (Team members and the whitelist members can access it.)';
@@ -119,12 +119,12 @@ $lang->project->computeBurn = 'Update';
$lang->project->burnData = 'Burndown Data';
$lang->project->fixFirst = 'Edit Estimates of 1st Day';
$lang->project->team = 'Team Member';
$lang->project->doc = 'Doc';
$lang->project->doclib = 'Doc Library';
$lang->project->doc = 'Document';
$lang->project->doclib = 'Docoment Library';
$lang->project->manageProducts = 'Link ' . $lang->productCommon . 's';
$lang->project->linkStory = 'Link Story';
$lang->project->linkStoryByPlan = 'Link Story From Plan';
$lang->project->linkPlan = 'Link Plan';
$lang->project->linkStory = 'Link Stories';
$lang->project->linkStoryByPlan = 'Link Stories By Plans';
$lang->project->linkPlan = 'Link Plans';
$lang->project->unlinkStoryTasks = 'Unlink';
$lang->project->linkedProducts = 'Linked Products';
$lang->project->unlinkedProducts = 'Unlinked Products';
@@ -140,7 +140,7 @@ $lang->project->unlinkMember = 'Remove Member';
$lang->project->unlinkStory = 'Unlink Story';
$lang->project->batchUnlinkStory = 'Batch Unlink Stories';
$lang->project->importTask = 'Transfer Task';
$lang->project->importPlanStories = 'Link Story From Plan';
$lang->project->importPlanStories = 'Link Stories By Plans';
$lang->project->importBug = 'Import Bug';
$lang->project->updateOrder = 'Rank';
$lang->project->tree = 'Tree';
@@ -206,13 +206,13 @@ $lang->project->memberHours = '<div class="table-col"><div class="clearf
$lang->project->countSummary = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Tasks</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Doing</div><div class="segment-value"><span class="label label-dot label-primary"></span> %s</div></div><div class="segment"><div class="segment-title">Waiting</div><div class="segment-value"><span class="label label-dot label-primary muted"></span> %s</div></div></div></div>';
$lang->project->timeSummary = '<div class="table-col"><div class="clearfix segments"><div class="segment"><div class="segment-title">Estimates</div><div class="segment-value">%s</div></div><div class="segment"><div class="segment-title">Cost</div><div class="segment-value text-red">%s</div></div><div class="segment"><div class="segment-title">Left</div><div class="segment-value">%s</div></div></div></div>';
$lang->project->groupSummaryAB = "<div>Tasks <strong>%s ：</strong><span class='text-muted'>Waiting</span> %s &nbsp; <span class='text-muted'>Doing</span> %s</div><div>Estimates <strong>%s ：</strong><span class='text-muted'>Cost</span> %s &nbsp; <span class='text-muted'>Left</span> %s</div>";
$lang->project->wbs = "Decompose Task";
$lang->project->batchWBS = "Batch Decompose";
$lang->project->wbs = "Create Task";
$lang->project->batchWBS = "Batch Create";
$lang->project->howToUpdateBurn = "<a href='https://api.zentao.pm/goto.php?item=burndown' target='_blank' title='How to update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
$lang->project->whyNoStories = "No story can be linked. Please check whether there is any story in {$lang->projectCommon} which is linked to {$lang->productCommon} and make sure it has been reviewed.";
$lang->project->productStories = "Stories linked to {$lang->projectCommon} are the subeset of stories linked to {$lang->productCommon}. Stories can only be linked after they pass the review. <a href='%s'> Link Story</a> now.";
$lang->project->haveDraft = "%s stories in draft, so they can't be linked.";
$lang->project->doneProjects = 'Done';
$lang->project->doneProjects = 'Finished';
$lang->project->selectDept = 'Select Department';
$lang->project->selectDeptTitle = 'Select User';
$lang->project->copyTeam = 'Copy Team';
@@ -226,7 +226,7 @@ $lang->project->cancelCopy = 'Cancel Copy';
$lang->project->byPeriod = 'By Time';
$lang->project->byUser = 'By User';
$lang->project->noProject = "No {$lang->projectCommon}. ";
$lang->project->noMembers = 'No members. ';
$lang->project->noMembers = 'No members yet. ';
/* 交互提示。*/
$lang->project->confirmDelete = "Do you want to delete the {$lang->projectCommon}[%s]?";
@@ -241,8 +241,8 @@ $lang->project->setTeam = 'Set Team';
$lang->project->linkStory = 'Link Story';
$lang->project->createTask = 'Create Task';
$lang->project->goback = "Go Back";
$lang->project->noweekend = 'excl. Weekend';
$lang->project->withweekend = 'incl. Weekend';
$lang->project->noweekend = 'Exclude Weekend';
$lang->project->withweekend = 'Include Weekend';
$lang->project->interval = 'Intervals';
$lang->project->fixFirstWithLeft = 'Edit Hours Left';
@@ -286,9 +286,9 @@ $lang->project->resetKanban = "Reset";
$lang->project->printKanban = "Print";
$lang->project->bugList = "Bugs";
$lang->project->kanbanHideCols = 'Closed and Cancelled columns';
$lang->project->kanbanHideCols = 'Closed & Cancelled Columns';
$lang->project->kanbanShowOption = 'Unfold';
$lang->project->kanbanColsColor = 'Customize column color';
$lang->project->kanbanColsColor = 'Customize Column Color';
$lang->kanbanSetting = new stdclass();
$lang->kanbanSetting->noticeReset = 'Do you want to reset Kanban?';
module/report/css/common.css
-4
View File
@@ -31,10 +31,6 @@ td .deviation{padding-left:20px; text-align:left;}
.d0{color:#76B043;}
.d20{color:#33A52E;}
.chosen-container[id^="product"] .chosen-drop {min-width: 300px;!important}
.chosen-container[id^="project"] .chosen-drop {min-width: 300px;!important}
.chosen-container[id^="dept"] .chosen-drop {min-width: 400px;!important}
.checkboxes {margin-bottom: 10px;}
.checkboxes .checkbox-primary {margin-bottom: 5px;}
.fixed-header-copy thead tr th{color:#fff !important;}
module/search/view/buildform.html.php
-2
View File
@@ -25,13 +25,11 @@ $operatorWidth = $app->getClientLang() == 'en' ? 'w-100px' : 'w-90px';
#<?php echo $formId;?> > table {margin: 0 auto;}
#<?php echo $formId;?> > table > tbody > tr > td {padding: 8px;}
#<?php echo $formId;?> .form-actions {padding-bottom: 20px; padding-top: 0;}
#<?php echo $formId;?> .chosen-container[id^="field"] .chosen-drop {min-width: 180px;}
<?php if($app->getClientLang() == 'en'):?>
#<?php echo $formId;?> [id^="valueBox"] .chosen-container .chosen-single {min-width: 70px;}
<?php else:?>
#<?php echo $formId;?> [id^="valueBox"] .chosen-container .chosen-single {min-width: 100px;}
<?php endif;?>
#<?php echo $formId;?> [id^="valueBox"] .chosen-container .chosen-drop {min-width: 300px;}
#<?php echo $formId;?> .chosen-container .chosen-drop ul.chosen-results li {white-space:normal}
#<?php echo $formId;?> input.date::-webkit-input-placeholder {color: #838A9D; opacity: 1;}
#<?php echo $formId;?> input.date::-moz-placeholder {color: #838A9D; opacity: 1;}
module/story/css/batchcreate.css
+1 -3
View File
@@ -1,9 +1,7 @@
#batchCreateForm .col-id {width: 50px; text-align: center; color: #838A9D}
#batchCreateForm .col-module,
#batchCreateForm .col-plan {width: 180px;}
#batchCreateForm .chosen[name^="plan"] + .chosen-container .chosen-drop,
#batchCreateForm .chosen[name^="module"] + .chosen-container .chosen-drop {min-width: 300px;}
#batchCreateForm .col-pri {width: 100px;}
#batchCreateForm .col-review,
#batchCreateForm .col-estimate {width: 90px;}
.body-modal .main-header > h2 {max-width: 80%;}
.body-modal .main-header > h2 {max-width: 80%;}
module/story/css/batchedit.css
-1
View File
@@ -1,2 +1 @@
#suhosinInfo {margin-bottom: 0;}
.chosen-container .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
module/story/lang/en.php
+7 -7
View File
@@ -26,8 +26,8 @@ $lang->story->delete = "Delete";
$lang->story->view = "Story Detail";
$lang->story->setting = "Settings";
$lang->story->tasks = "Linked Task";
$lang->story->bugs = "Linked Bug";
$lang->story->cases = "Linked Case";
$lang->story->bugs = "Linked Bugs";
$lang->story->cases = "Linked Cases";
$lang->story->taskCount = 'Tasks';
$lang->story->bugCount = 'Bugs';
$lang->story->caseCount = 'Cases';
@@ -87,7 +87,7 @@ $lang->story->plan = 'Linked Plans';
$lang->story->planAB = 'Plan';
$lang->story->comment = 'Comment';
$lang->story->linkStories = 'Linked Stories';
$lang->story->childStories = 'Decompose Story';
$lang->story->childStories = 'Decomposed Story';
$lang->story->duplicateStory = 'Copy Story';
$lang->story->reviewResult = 'Review Result';
$lang->story->preVersion = 'Last Version';
@@ -172,11 +172,11 @@ $lang->story->legendRelated = 'Related Info';
$lang->story->legendMailto = 'Mailto';
$lang->story->legendAttatch = 'Files';
$lang->story->legendProjectAndTask = $lang->projectCommon . ' Tasks';
$lang->story->legendBugs = 'Linked Bug';
$lang->story->legendBugs = 'Linked Bugs';
$lang->story->legendFromBug = 'From Bug';
$lang->story->legendCases = 'Linked Case';
$lang->story->legendLinkStories = 'Linked Story';
$lang->story->legendChildStories = 'Decompose Story';
$lang->story->legendChildStories = 'Decomposed Story';
$lang->story->legendSpec = 'Description';
$lang->story->legendVerify = 'Acceptance';
$lang->story->legendMisc = 'Misc.';
@@ -204,7 +204,7 @@ $lang->story->ignoreChangeStage = 'Story %s is a draft. Please review it..';
$lang->story->form = new stdclass();
$lang->story->form->area = 'Scope';
$lang->story->form->desc = 'What Story is it? What is the acceptance?';
$lang->story->form->desc = 'What story is it? What is the acceptance?';
$lang->story->form->resource = 'Who will allocate resources? How long does it take?';
$lang->story->form->file = 'If any file that is linked to a story, please click Here to upload it.';
@@ -231,7 +231,7 @@ $lang->story->report->select = 'Select Report Type';
$lang->story->report->create = 'Create Report';
$lang->story->report->value = 'Reports';
$lang->story->report->charts['storysPerProduct'] = 'Group by ' . $lang->productCommon . 'Story';
$lang->story->report->charts['storysPerProduct'] = 'Group by ' . $lang->productCommon . ' Story';
$lang->story->report->charts['storysPerModule'] = 'Group by Module Story';
$lang->story->report->charts['storysPerSource'] = 'Group by Story Source';
$lang->story->report->charts['storysPerPlan'] = 'Group by Plan';
module/task/css/batchcreate.css
-2
View File
@@ -1,6 +1,4 @@
.chosen-container[id^="story"] {width: 200px; max-width: 150px;}
.chosen-container[id^="story"] .chosen-drop {min-width: 450px !important;}
.chosen-container[id^="module"] .chosen-drop {min-width: 400px !important;}
[id^=name] {min-width: 165px;}
#mainContent .main-header h2{max-width:300px}
module/task/css/batchedit.css
-1
View File
@@ -1 +0,0 @@
.chosen-container[id^="module"] .chosen-drop {min-width: 400px;!important}
module/testcase/css/batchcreate.css
-2
View File
@@ -2,8 +2,6 @@
.w-180px{width:180px}
.half-left {text-align:right}
.half-right{text-align:left}
.chosen-container[id^="module"] .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
.chosen-container[id^="story"] .chosen-drop {min-width: 450px; border-top: 1px solid #ddd!important}
#batchCreateForm .input-group,
#batchCreateForm .input-group .form-control {position: static;}
module/testcase/css/batchedit.css
-2
View File
@@ -1,7 +1,5 @@
.w-340px {width:340px}
.chosen {z-index:99}
.chosen-container[id^="module"] .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
.chosen-container[id^="stories"] .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
#batchEditForm .input-group,
#batchEditForm .input-group .form-control {position: static;}
module/testcase/css/create.css
-1
View File
@@ -14,7 +14,6 @@
#story_chosen .chosen-results > li.no-results {cursor: pointer;}
#story_chosen .chosen-results > li.no-results:hover {color: #1a4f85; background-color: #ddd;}
#story_chosen .chosen-results > li.no-results > span {font-weight: bold;}
#module_chosen .chosen-drop {min-width: 400px; border-top: 1px solid #ddd!important}
.row .col-sm-10{width:89%;}
.row .col-sm-2{padding-left:0px; width:11%;}
module/testcase/css/showimport.css
Vendored
-1
View File
@@ -1,2 +1 @@
.table table td,.outer .table table tbody > tr:last-child td {padding: 2px 0 2px 5px!important; border: none!important;}
.chosen-container-single .chosen-drop {min-width: 300px; border-top: 1px solid #ddd!important}
module/testsuite/css/showimport.css
Vendored
-1
View File
@@ -1,2 +1 @@
.table table td,.outer .table table tbody > tr:last-child td {padding: 2px 0 2px 5px!important; border: none!important;}
.chosen-container-single .chosen-drop {min-width: 300px; border-top: 1px solid #ddd!important}
module/user/css/batchcreate.css
-1
View File
@@ -1,2 +1 @@
.chosen-container[id^="dept"] .chosen-drop {min-width: 400px;!important}
th.required:after {position: relative; right: 10px;}
module/user/css/batchedit.css
-1
View File
@@ -1,2 +1 @@
.chosen-container[id^="dept"] .chosen-drop {min-width: 400px;!important}
th.required:after {position: relative; right: 10px;}
module/user/css/common.css
-2
View File
@@ -1,5 +1,3 @@
#featurebar ul.nav li .chosen-container a.chosen-single{background:#F8FAFE; border:none; -webkit-box-shadow:none;box-shadow:none; padding-top:5px;}
#featurebar ul.nav li .chosen-container .chosen-drop {min-width: 200px;!important}
#dept_chosen.chosen-container .chosen-drop {min-width: 400px;!important}
.w-verifyPassword {width: 120px !important;}
.w-enVerifyPassword {width: 150px !important;}