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

Merge branch 'sprint/master_zhouxudong_57871' into 'sprint/205'

Browse Source 
Sprint/master zhouxudong 57871

See merge request easycorp/zentaopms!4024
This commit is contained in:
王怡栋
2022-06-21 06:03:28 +00:00
parent 93a6442a55 e3ae6ed6a0
commit a3bb60c87d
8 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/effort/ext/view/calendar.html.php
+5 -2
View File
@@ -13,6 +13,9 @@
<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
<?php include $app->getModuleRoot() . 'common/view/datepicker.html.php';?>
<?php include $app->getExtensionRoot() . 'biz/common/ext/view/calendar.html.php';?>
<style>
#date {float: left; margin-right: 10px; margin-left: 0px;}
</style>
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<?php if(common::hasPriv('my', 'todo')) echo html::a(helper::createLink('my', 'todo', "type=all"), $lang->todo->all . " <span class='label label-light label-badge'>{$todoCount}</span>", '', "class='btn btn-link'");?>
@@ -34,10 +37,10 @@
<div id="effortCalendar" class="calendar">
<header class="calender-header table-row">
<div class="btn-toolbar col-4 table-col text-middle">
<button type="button" class="btn btn-info btn-icon btn-mini btn-prev"><i class="icon-chevron-left"></i></button>
<button type="button" class="btn btn-info btn-mini btn-today"><?php echo $lang->today;?></button>
<button type="button" class="btn btn-info btn-icon btn-mini btn-prev"><i class="icon-chevron-left"></i></button>
<span id="date" class="calendar-caption"></span>
<button type="button" class="btn btn-info btn-icon btn-mini btn-next"><i class="icon-chevron-right"></i></button>
<span class="calendar-caption"></span>
</div>
<div class="col-4 text-center table-col">
<ul class="nav nav-primary">
extension/lite/todo/ext/view/calendar.html.php
+3 -2
View File
@@ -19,6 +19,7 @@
#sidebar > .sidebar-toggle {left: 3px; right: auto;}
.hide-sidebar #sidebar > .cell {display: none;}
.hide-sidebar #sidebar > .sidebar-toggle > .icon:before {content: "\e314";}
#date {float: left; margin-right: 10px; margin-left: 0px;}
</style>
<?php js::set('moreLang', $this->lang->side->more);?>
<?php js::set('moduleList', $config->todo->moduleList);?>
@@ -41,10 +42,10 @@
<div id="todoCalendar" class="calendar">
<header class="calender-header table-row">
<div class="btn-toolbar col-4 table-col text-middle">
<button type="button" class="btn btn-info btn-icon btn-mini btn-prev"><i class="icon-chevron-left"></i></button>
<button type="button" class="btn btn-info btn-mini btn-today"><?php echo $lang->today;?></button>
<button type="button" class="btn btn-info btn-icon btn-mini btn-prev"><i class="icon-chevron-left"></i></button>
<span id="date" class="calendar-caption"></span>
<button type="button" class="btn btn-info btn-icon btn-mini btn-next"><i class="icon-chevron-right"></i></button>
<span class="calendar-caption"></span>
</div>
<div class="col-4 text-center table-col">
<ul class="nav nav-primary">
module/block/view/recentprojectblock.html.php
+4 -3
View File
@@ -17,12 +17,12 @@
#cards .project-infos > span {display: inline-block; line-height: 12px;}
#cards .project-infos > span > .icon {font-size: 12px; display: inline-block; position: relative; top: -1px}
#cards .project-infos > span + span {margin-left: 10px;}
#cards .project-detail {position: absolute; bottom: 16px; left: 16px; right: 16px; font-size: 12px; padding-left: 10px;}
#cards .project-detail {position: absolute; bottom: 27px; left: 16px; right: 16px; font-size: 12px; padding-left: 10px;}
#cards .project-detail > p {margin-bottom: 8px;}
#cards .project-detail .progress {height: 4px;}
#cards .project-detail .progress-text-left .progress-text {width: 50px; left: -50px;}
#cards .panel-heading {cursor: pointer;}
#cards .project-stages-container {margin: 0 0 -16px 0; padding: 0 4px; height: 46px; overflow-x: auto; position: relative;}
#cards .project-stages-container {margin: 0 0 -16px 0; padding: 0 4px; height: 40px; overflow-x: auto; position: relative;}
#cards .project-stages:after {content: ' '; width: 30px; display: block; right: -5px; top: 16px; bottom: -5px; z-index: 1; background: linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,1) 100%); position: absolute;}
#cards .project-stages-row {position: relative; height: 30px; z-index: 0;}
#cards .project-stage-item {white-space: nowrap; position: absolute; top: 0; min-width: 48px; padding-top: 13px; color: #838A9D;}
@@ -33,6 +33,7 @@
#cards .project-stage-item.is-going::before {background-color: #0C64EB;}
#dashboard .block-recentproject .panel-body {padding: 0;}
.execution-name {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
.scrollbar::-webkit-scrollbar:horizontal {height: 5px;}
</style>
<div class="panel-body">
<?php if(empty($projects)):?>
@@ -83,7 +84,7 @@
<div class='label label-outline'><?php echo zget($lang->project->statusList, $project->status);?></div>
<?php else: ?>
<p class='text-muted'><?php echo $lang->project->ongoingStage;?></p>
<div class='project-stages-container scrollbar-hover'>
<div class='project-stages-container scrollbar-hover scrollbar'>
<div class='project-stages-row'>
<?php foreach ($projectProjects as $project):?>
<div class='project-stage-item is-<?php echo $project->status;?><?php if($project->status !== 'wait') echo ' is-going';?>'>
module/my/css/todo.css
+2
View File
@@ -2,3 +2,5 @@
.datepicker-wrapper .form-control {max-width: 110px; line-height: 25px; height: 26px !important;}
.btn-group button.dropdown-toggle.btn-primary {padding: 6px;}
.btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
.btn-toolbar .space {min-height: 1px; margin: 0 -3px 0 10px;}
.iconCenter {top: -2px !important;}
module/my/view/todo.html.php
+2 -2
View File
@@ -172,9 +172,9 @@
$actionLink = $this->createLink('todo', 'import2Today');
echo "<div class='input-control has-icon-right space'>";
echo '<input type="text" name="date" id="importDate" value="' . date('Y-m-d') . '" class="form-control form-date">';
echo '<label for="importDate" class="input-control-icon-right"><i class="icon icon-delay"></i></label>';
echo '<label for="importDate" class="input-control-icon-right iconCenter"><i class="icon icon-delay"></i></label>';
echo '</div>';
echo html::commonButton($lang->todo->import, "onclick=\"setFormAction('$actionLink')\"");
echo html::commonButton($lang->todo->changeDate, "onclick=\"setFormAction('$actionLink')\"");
}
?>
</div>
module/productplan/model.php
+1
View File
@@ -216,6 +216,7 @@ class productplanModel extends model
->beginIF($branch !== '')->andWhere('branch')->eq($branch)->fi()
->andWhere('parent')->le(0)
->andWhere('deleted')->eq(0)
->orderBy('id_desc')
->fetchPairs();
if($exclude) unset($planPairs[$exclude]);
module/todo/lang/en.php
+1
View File
@@ -36,6 +36,7 @@ $lang->todo->cycleConfig = "Recurrence";
$lang->todo->project = "Project";
$lang->todo->product = "Product";
$lang->todo->execution = $lang->executionCommon;
$lang->todo->changeDate = "Change Date";
$lang->todo->reasonList['story'] = "Convert to Story";
$lang->todo->reasonList['task'] = "Convert to Task";
module/todo/lang/zh-cn.php
+1
View File
@@ -36,6 +36,7 @@ $lang->todo->cycleConfig = "周期设置";
$lang->todo->project = "所属项目";
$lang->todo->product = "所属产品";
$lang->todo->execution = "所属{$lang->execution->common}";
$lang->todo->changeDate = "修改日期";
$lang->todo->reasonList['story'] = "转{$lang->SRCommon}";
$lang->todo->reasonList['task'] = "转任务";