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

Merge branch 'sprint/220_tianshujie_61965' into 'master'

Browse Source 
Sprint/220 tianshujie 61965

See merge request easycorp/zentaopms!4655
This commit is contained in:
王怡栋
2022-07-26 05:04:41 +00:00
parent 284aea9aac 1f9d835e39
commit f16edca7bf
19 changed files with 115 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/menu.php
-2
View File
@@ -309,8 +309,6 @@ $lang->kanbanProject->menu->settings['subMenu']->view = array('link' => "
$lang->kanbanProject->menu->settings['subMenu']->products = array('link' => "{$lang->product->common}|project|manageProducts|project=%s", 'alias' => 'manageproducts');
$lang->kanbanProject->menu->settings['subMenu']->members = array('link' => "{$lang->team->common}|project|team|project=%s", 'alias' => 'managemembers,team');
$lang->kanbanProject->menu->settings['subMenu']->whitelist = array('link' => "{$lang->whitelist}|project|whitelist|project=%s", 'subModule' => 'personnel');
$lang->kanbanProject->menu->settings['subMenu']->stakeholder = array('link' => "{$lang->stakeholder->common}|stakeholder|browse|project=%s", 'subModule' => 'stakeholder');
$lang->kanbanProject->menu->settings['subMenu']->group = array('link' => "{$lang->priv}|project|group|project=%s", 'alias' => 'group,manageview,managepriv');
/* Execution menu. */
$lang->execution->homeMenu = new stdclass();
module/project/model.php
-6
View File
@@ -2636,12 +2636,6 @@ class projectModel extends model
unset($this->lang->project->menu->settings['subMenu']->whitelist);
}
if($project->model == 'kanban')
{
unset($this->lang->project->menu->settings['subMenu']->stakeholder);
unset($this->lang->project->menu->settings['subMenu']->group);
}
common::setMenuVars('project', $objectID);
return $objectID;
}
module/task/view/view.html.php
+2 -2
View File
@@ -166,8 +166,8 @@
<?php endif;?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php if(!isonlybody()):?>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
<?php if(!isonlybody() and $this->app->getViewType() != 'xhtml'):?>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn'");?>
<?php echo "<div class='divider'></div>";?>
<?php endif;?>
<?php $task->executionList = $execution;?>
module/todo/config.php
+1 -1
View File
@@ -21,7 +21,7 @@ $config->todo->editor->view = array('id' => 'comment,lastComment', 'tools' =>
$config->todo->list = new stdclass();
$config->todo->list->exportFields = 'id, account, date, begin, end, type, idvalue, pri, name, desc, status, private';
$config->todo->list->customBatchCreateFields = 'type,pri,desc,beginAndEnd';
$config->todo->list->customBatchEditFields = 'pri,desc,beginAndEnd,status';
$config->todo->list->customBatchEditFields = 'pri,beginAndEnd,status';
$config->todo->custom = new stdclass();
$config->todo->custom->batchCreateFields = 'type,pri,desc,beginAndEnd';
module/todo/control.php
+12 -2
View File
@@ -75,12 +75,15 @@ class todo extends control
}
unset($this->lang->todo->typeList['cycle']);
$this->view->title = $this->lang->todo->common . $this->lang->colon . $this->lang->todo->create;
$this->view->position[] = $this->lang->todo->common;
$this->view->position[] = $this->lang->todo->create;
$this->view->date = date("Y-m-d", strtotime($date));
$this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta);
$this->view->time = date::now();
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted|noempty');
$this->display();
}
@@ -115,9 +118,11 @@ class todo extends control
return print(js::locate($this->createLink('my', 'todo', "type=$date"), 'parent'));
}
/* Set Custom*/
unset($this->lang->todo->typeList['cycle']);
/* Set Custom*/
foreach(explode(',', $this->config->todo->list->customBatchCreateFields) as $field) $customFields[$field] = $this->lang->todo->$field;
$this->view->customFields = $customFields;
$this->view->showFields = $this->config->todo->custom->batchCreateFields;
@@ -127,6 +132,7 @@ class todo extends control
$this->view->date = (int)$date == 0 ? $date : date('Y-m-d', strtotime($date));
$this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta);
$this->view->time = date::now();
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted|noempty');
$this->display();
}
@@ -163,12 +169,15 @@ class todo extends control
if($todo->private and $this->app->user->account != $todo->account) return print('private');
unset($this->lang->todo->typeList['cycle']);
$todo->date = date("Y-m-d", strtotime($todo->date));
$this->view->title = $this->lang->todo->common . $this->lang->colon . $this->lang->todo->edit;
$this->view->position[] = $this->lang->todo->common;
$this->view->position[] = $this->lang->todo->edit;
$this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta);
$this->view->todo = $todo;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted|noempty');
$this->display();
}
@@ -260,6 +269,7 @@ class todo extends control
$this->view->time = date::now();
$this->view->title = $title;
$this->view->position = $position;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted|noempty');
$this->display();
}
@@ -357,7 +367,7 @@ class todo extends control
}
$this->view->todo = $this->todo->getById($todoID);
$this->view->members = $this->loadModel('user')->getPairs('noclosed');
$this->view->members = $this->loadModel('user')->getPairs('noclosed|noempty|nodeleted');
$this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta);
$this->view->actions = $this->loadModel('action')->getList('todo', $todoID);
$this->view->users = $this->user->getPairs('noletter');
module/todo/css/batchcreate.css
+9 -2
View File
@@ -6,13 +6,17 @@
html[lang="en"] #todoBatchAddForm .col-pri {width: 105px;}
#todoBatchAddForm .col-date {width: 180px;}
#todoBatchAddForm .col-pending {width: 70px;}
#todoBatchAddForm .col-assignedTo {width: 120px;}
#todoBatchAddForm .col-name {width: auto;}
#todoBatchAddForm .col-future {width: 90px;}
#todoBatchAddForm .col-future #select-all {overflow: visible;}
html[lang="en"] #todoBatchAddForm .col-pending {width: 90px;}
#todoBatchAddForm .chosen-container-single .chosen-single {border-radius: 0;}
#todoBatchAddForm .control-time-begin + .chosen-container-single .chosen-single {border-radius: 2px 0 0 2px; border-right-width: 0; padding-right: 1px;}
#todoBatchAddForm .control-time-begin + .chosen-container-active .chosen-single {border-right-width: 1px; padding-right: 0;}
#todoBatchAddHeader [name="date"]:disabled {color: #ccc; text-decoration: line-through;}
.main-header > .input-group {width: 240px;}
html[lang="en"] .main-header > .input-group {width: 250px;}
#mainContent .main-header > .input-group {width: 240px;}
html[lang="en"] #mainContent .main-header > .input-group, html[lang="de"] #mainContent .main-header > .input-group {width: 250px;}
#formSettingBtn {position: absolute; top: 14px; right: 20px; z-index: 1000;}
#formSettingBtn .dropdown {margin-right: 0px;}
@@ -20,3 +24,6 @@ html[lang="en"] .main-header > .input-group {width: 250px;}
#formSettingBtn .checkboxes {padding: 10px 3px;}
#formSettingBtn .checkbox-primary {width: 50%; float: left; margin: 3px 0;}
#formSetting .btn {margin-right: 8px;}
[lang^='fr'] #formSetting {width: 345px !important;}
[lang^='de'] #formSetting {width: 380px !important;}
.visible {overflow: visible !important;}
module/todo/css/batchedit.css
+5 -3
View File
@@ -3,6 +3,8 @@
div[id*="ends"] .chosen-single {border-left: none;}
.c-id {width: 40px;}
.c-pri {width: 100px;}
.c-status {width: 120px;}
.c-date {width: 300px;}
.c-pri, .c-date {width: 100px;}
.c-status, .c-assignedTo {width: 120px;}
.c-beginAndEnd{width: 300px;}
.c-assignedTo {padding-left: 0px !important;}
.visible {overflow: visible;}
module/todo/css/create.css
+2
View File
@@ -7,3 +7,5 @@
.nameBox {display: grid;}
.pri-selector > .btn {padding: 5px 12px;}
#assignedTo_chosen.chosen-container .chosen-results {max-height: 180px;}
.inputGroupWidth {padding-top: 5px;}
.nameBox + span {border-radius: 0px;}
module/todo/css/edit.css
+4
View File
@@ -5,3 +5,7 @@
.nameBox {display: grid;}
.chosen-container-single .chosen-single {height: 34px;}
#begin_chosen .chosen-single {border-right-width: 0px;}
.beginBox {padding-right: 0px;}
.endBox {padding-left: 0px;}
.beforeDaysBox {width: 250px; padding-top: 5px;}
.nameBox + span {border-radius: 0px;}
module/todo/js/edit.js
+19
View File
@@ -9,4 +9,23 @@ $(function()
var value = $select.val();
$selector.find('.pri-text').html('<span class="label-pri label-pri-' + value + '" title="' + value + '">' + value + '</span>');
});
alignWidth();
$(window).resize(function()
{
alignWidth();
});
});
/**
* Align with the date width.
*
* @access public
* @return void
*/
function alignWidth()
{
var dateWidth = $('#date').parent().width();
$('.dateWidth').width(dateWidth);
}
module/todo/lang/de.php
+1
View File
@@ -71,6 +71,7 @@ $lang->todo->closedBy = 'ClosedBy';
$lang->todo->closedDate = 'ClosedDate';
$lang->todo->deadline = 'Fällig';
$lang->todo->deleted = 'Deleted';
$lang->todo->ditto = 'Dito';
$lang->todo->cycleDaysLabel = 'Interval days';
$lang->todo->beforeDaysLabel = 'Days in advance';
module/todo/lang/en.php
+1
View File
@@ -71,6 +71,7 @@ $lang->todo->closedBy = 'ClosedBy';
$lang->todo->closedDate = 'ClosedDate';
$lang->todo->deadline = 'Expiration';
$lang->todo->deleted = 'Deleted';
$lang->todo->ditto = 'Ditto';
$lang->todo->cycleDaysLabel = 'Interval days';
$lang->todo->beforeDaysLabel = 'Days in advance';
module/todo/lang/fr.php
+1
View File
@@ -71,6 +71,7 @@ $lang->todo->closedBy = 'ClosedBy';
$lang->todo->closedDate = 'ClosedDate';
$lang->todo->deadline = 'Expiration';
$lang->todo->deleted = 'Deleted';
$lang->todo->ditto = 'Idem';
$lang->todo->cycleDaysLabel = 'Interval days';
$lang->todo->beforeDaysLabel = 'Days in advance';
module/todo/lang/zh-cn.php
+1
View File
@@ -71,6 +71,7 @@ $lang->todo->closedBy = '由谁关闭';
$lang->todo->closedDate = '关闭时间';
$lang->todo->deadline = '过期时间';
$lang->todo->deleted = '已删除';
$lang->todo->ditto = '同上';
$lang->todo->cycleDaysLabel = '间隔天数';
$lang->todo->beforeDaysLabel = '提前天数';
module/todo/model.php
+7 -2
View File
@@ -141,9 +141,11 @@ class todoModel extends model
$validTodos = array();
$now = helper::now();
$assignedTo = $this->app->user->account;
for($i = 0; $i < $this->config->todo->batchCreate; $i++)
{
$isExist = false;
$assignedTo = $todos->assignedTos[$i] == 'ditto' ? $assignedTo : $todos->assignedTos[$i];
foreach($this->config->todo->objectList as $objects)
{
if(isset($todos->{$objects}[$i + 1]))
@@ -175,7 +177,7 @@ class todoModel extends model
$todo->status = "wait";
$todo->private = 0;
$todo->idvalue = 0;
$todo->assignedTo = $this->app->user->account;
$todo->assignedTo = $assignedTo;
$todo->assignedBy = $this->app->user->account;
$todo->assignedDate = $now;
$todo->vision = $this->config->vision;
@@ -324,8 +326,11 @@ class todoModel extends model
if(!empty($todoIDList))
{
/* Initialize todos from the post data. */
$oldTodos = $this->dao->select('*')->from(TABLE_TODO)->where('id')->in(array_keys($todos))->fetchAll('id');
foreach($todoIDList as $todoID)
{
$oldTodo = $oldTodos[$todoID];
$todo = new stdclass();
$todo->date = $data->dates[$todoID];
$todo->type = $data->types[$todoID];
@@ -334,6 +339,7 @@ class todoModel extends model
$todo->name = !in_array($todo->type, $this->config->todo->moduleList) ? $data->names[$todoID] : '';
$todo->begin = isset($data->begins[$todoID]) ? $data->begins[$todoID] : 2400;
$todo->end = isset($data->ends[$todoID]) ? $data->ends[$todoID] : 2400;
$todo->assignedTo = isset($data->assignedTos[$todoID]) ? $data->assignedTos[$todoID] : $oldTodo->assignedTo;
if(in_array($todo->type, $this->config->todo->moduleList))
{
@@ -344,7 +350,6 @@ class todoModel extends model
$todos[$todoID] = $todo;
}
$oldTodos = $this->dao->select('*')->from(TABLE_TODO)->where('id')->in(array_keys($todos))->fetchAll('id');
foreach($todos as $todoID => $todo)
{
$oldTodo = $oldTodos[$todoID];
module/todo/view/batchcreate.html.php
+11 -7
View File
@@ -41,7 +41,7 @@
{
if($field)$visibleFields[$field] = '';
}
$columns = count($visibleFields) + 2;
$columns = count($visibleFields) + 3;
?>
<form id='todoBatchAddForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'batchCreate');?>' data-ride='table'>
<table class='table table-form table-fixed with-border'>
@@ -52,8 +52,9 @@
<th class='col-pri<?php echo zget($visibleFields, 'pri', ' hidden')?>'><?php echo $lang->todo->pri;?></th>
<th class='col-name required'><?php echo $lang->todo->name;?></th>
<th class='col-desc<?php echo zget($visibleFields, 'desc', ' hidden');?>'><?php echo $lang->todo->desc;?></th>
<th class='col-assignedTo'><?php echo $lang->todo->assignTo;?></th>
<th class='col-date<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
<th><div class='checkbox-primary check-all<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>' style='overflow:visible' id="select-all"><label><?php echo $lang->todo->periods['future']?></label></div></th>
<th class='col-future'><div class='checkbox-primary check-all visible<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>' id="select-all"><label><?php echo $lang->todo->periods['future']?></label></div></th>
</tr>
</thead>
<tbody>
@@ -62,14 +63,17 @@
<?php for($i = 0; $i < $config->todo->batchCreate; $i++):?>
<tr class='text-left'>
<td class='col-id'><?php echo $i+1;?></td>
<td <?php echo zget($visibleFields, 'type', "class='hidden'")?> style='overflow:visible'><?php echo html::select("types[$i]", $lang->todo->typeList, '', "onchange='loadList(this.value, " . ($i + 1) . ")' class='form-control chosen'");?></td>
<td <?php echo zget($visibleFields, 'pri', "class='hidden'")?> style='overflow:visible'><?php echo html::select("pris[$i]", $lang->todo->priList, $pri, "class='form-control'");?></td>
<td style='overflow:visible'>
<td class="visible <?php echo zget($visibleFields, 'type', 'hidden')?>"><?php echo html::select("types[$i]", $lang->todo->typeList, '', "onchange='loadList(this.value, " . ($i + 1) . ")' class='form-control'");?></td>
<td class="visible <?php echo zget($visibleFields, 'pri', 'hidden')?>"><?php echo html::select("pris[$i]", $lang->todo->priList, $pri, "class='form-control'");?></td>
<td class='visible'>
<div id='<?php echo "nameBox" . ($i+1);?>' class='hidden'><?php echo html::input("names[$i]", '', 'class="text-left form-control"');?></div>
<div class='<?php echo "nameBox" . ($i+1);?>'><?php echo html::input("names[$i]", '', 'class="text-left form-control"');?></div>
</td>
<td <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo html::textarea("descs[$i]", '', "rows='1' class='form-control'");?></td>
<td <?php echo zget($visibleFields, 'beginAndEnd', "class='hidden'")?> style='overflow:visible'>
<?php $assignedTo = $i > 0 ? 'ditto' : $app->user->account;?>
<?php if($i > 0) $users['ditto'] = $lang->todo->ditto;?>
<td class='visible'><?php echo html::select("assignedTos[$i]", $users, $assignedTo, "class='form-control chosen'");?></td>
<td class="visible <?php echo zget($visibleFields, 'beginAndEnd', 'hidden')?>">
<div class='w-p50 pull-left'>
<?php echo html::select("begins[$i]", $times, $time, "onchange=\"setBeginsAndEnds($i, 'begin');\" class='form-control chosen control-time-begin'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));?>
</div>
@@ -77,7 +81,7 @@
<?php echo html::select("ends[$i]", $times, '', "onchange=\"setBeginsAndEnds($i, 'end');\" class='form-control chosen control-time-end'" . (isset($visibleFields['beginAndEnd']) ? '' : " disabled"));?>
</div>
</td>
<td <?php echo zget($visibleFields, 'beginAndEnd', "class='hidden'")?> style='overflow:visible'>
<td class="visible <?php echo zget($visibleFields, 'beginAndEnd', 'hidden')?>">
<div class='checkbox-primary'>
<input type='checkbox' name="switchTime[<?php echo $i?>]" id="switchTime<?php echo $i?>" class='control-time-switch' onclick='switchTimeList(<?php echo $i?>);' />
<label for="switchTime<?php echo $i?>"> <?php echo $lang->todo->periods['future'];?></label>
module/todo/view/batchedit.html.php
+12 -12
View File
@@ -32,19 +32,19 @@
{
if($field)$visibleFields[$field] = '';
}
$columns = count($visibleFields) + 4;
$columns = count($visibleFields) + 5;
?>
<form method='post' target='hiddenwin' action='<?php echo $this->inlink('batchEdit', "from=todoBatchEdit");?>'>
<table class='table table-form'>
<thead>
<tr class='text-center'>
<th class='c-id'> <?php echo $lang->idAB;?></th>
<th class='c-date'> <?php echo $lang->todo->date;?></th>
<th class='c-type'> <?php echo $lang->todo->type;?></th>
<th class='c-id'><?php echo $lang->idAB;?></th>
<th class='c-date'><?php echo $lang->todo->date;?></th>
<th class='c-type'><?php echo $lang->todo->type;?></th>
<th class='c-pri<?php echo zget($visibleFields, 'pri', ' hidden')?>'> <?php echo $lang->todo->pri;?></th>
<th><?php echo $lang->todo->name;?></th>
<th <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo $lang->todo->desc;?></th>
<th class='c-date<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
<th class='c-name'><?php echo $lang->todo->name;?></th>
<th class='c-assignedTo'><?php echo $lang->todo->assignedTo;?></th>
<th class='c-beginAndEnd<?php echo zget($visibleFields, 'beginAndEnd', ' hidden')?>'><?php echo $lang->todo->beginAndEnd;?></th>
<th class='c-status<?php echo zget($visibleFields, 'status', ' hidden')?>'> <?php echo $lang->todo->status;?></th>
</tr>
</thead>
@@ -66,8 +66,8 @@
}
?>
</td>
<td style='overflow:visible' <?php echo zget($visibleFields, 'pri', "class='hidden'")?>><?php echo html::select("pris[$todo->id]", $lang->todo->priList, $todo->pri, "class='form-control chosen'");?></td>
<td style='overflow:visible'>
<td class="visible <?php echo zget($visibleFields, 'pri', 'hidden')?>"><?php echo html::select("pris[$todo->id]", $lang->todo->priList, $todo->pri, "class='form-control chosen'");?></td>
<td class='visible'>
<div id='<?php echo "nameBox" . $todo->id;?>' class='hidden'><?php echo html::input("names[$todo->id]", $todo->name, "class='text-left form-control hiddenwin'"); ?></div>
<div class='<?php echo "nameBox" . $todo->id;?> text-left'>
<?php
@@ -114,8 +114,8 @@
?>
</div>
</td>
<td <?php echo zget($visibleFields, 'desc', "class='hidden'")?>><?php echo html::textarea("descs[$todo->id]", $todo->desc, "rows='1' class='form-control'");?></td>
<td <?php echo zget($visibleFields, 'beginAndEnd', "class='hidden'")?> style='overflow:visible'>
<td class='visible'><?php echo html::select("assignedTos[$todo->id]", $users, $todo->assignedTo, "class='form-control chosen'");?></td>
<td class="visible <?php echo zget($visibleFields, 'beginAndEnd', 'hidden')?>">
<div class='input-group'>
<?php
echo html::select("begins[$todo->id]", $times, substr($todo->begin, 0, 2) . substr($todo->begin, 3, 2), "onchange=\"setBeginsAndEnds($todo->id, 'begin');\" class='form-control chosen control-time-begin'" . ((isset($visibleFields['beginAndEnd']) && $todo->begin != '') ? '' : " disabled"));
@@ -130,7 +130,7 @@
</span>
</div>
</td>
<td <?php echo zget($visibleFields, 'status', "class='hidden'")?> style='overflow:visible'><?php echo html::select("status[$todo->id]", $lang->todo->statusList, $todo->status, "class='form-control chosen'");?></td>
<td class="visible <?php echo zget($visibleFields, 'status', 'hidden')?>"><?php echo html::select("status[$todo->id]", $lang->todo->statusList, $todo->status, "class='form-control chosen'");?></td>
</tr>
<?php endforeach;?>
</tbody>
module/todo/view/create.html.php
+8 -4
View File
@@ -105,7 +105,7 @@
</div>
</div>
<?php echo html::hidden('config[type]', 'day')?>
<div class='input-group inputGroupWidth' style='padding-top:5px;'>
<div class='input-group inputGroupWidth'>
<?php printf($lang->todo->beforeDays, html::input('config[beforeDays]', 0, "class='form-control'"));?>
</div>
</td>
@@ -118,13 +118,17 @@
<th><?php echo $lang->todo->type;?></th>
<td><?php echo html::select('type', $lang->todo->typeList, '', 'onchange="loadList(this.value);" class="form-control"');?></td>
</tr>
<tr>
<th><?php echo $lang->todo->assignTo;?></th>
<td><?php echo html::select('assignedTo', $users, $app->user->account, 'class="form-control chosen"');?></td>
</tr>
<tr>
<th id='nameBoxLabel'><?php echo $lang->todo->name;?></th>
<td colspan='2'>
<div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control'");?></div>
<div class='input-group title-group required'>
<div class='nameBox'><?php echo html::input('name', isset($name) ? $name : '', "class='form-control'");?></div>
<span class="input-group-addon fix-border br-0" style="border-radius: 0px;"><?php echo $lang->todo->pri;?></span>
<span class="input-group-addon fix-border br-0"><?php echo $lang->todo->pri;?></span>
<div class="input-group-btn pri-selector" data-type="pri">
<button type="button" class="btn dropdown-toggle br-0" data-toggle="dropdown">
<span class="pri-text"><span class="label-pri label-pri-3">3</span></span> &nbsp;<span class="caret"></span>
@@ -149,8 +153,8 @@
<td>
<div class='input-group'>
<?php
echo html::select('begin', $times, date('Y-m-d') != $date ? key($times) : $time, 'onchange=selectNext(); class="form-control chosen" style="width: 50%;"');
echo html::select('end', $times, '', 'class="form-control chosen" style="width: 50%; margin-left:-1px"');
echo html::select('begin', $times, date('Y-m-d') != $date ? key($times) : $time, 'onchange=selectNext(); class="form-control chosen"');
echo html::select('end', $times, '', 'class="form-control chosen"');
?>
</div>
</td>
module/todo/view/edit.html.php
+11 -5
View File
@@ -111,7 +111,7 @@
</div>
</div>
<?php echo html::hidden('config[type]', $todo->config->type)?>
<div class='input-group' style='width:250px; padding-top:5px;'>
<div class='input-group beforeDaysBox'>
<?php printf($lang->todo->beforeDays, html::input('config[beforeDays]', $todo->config->beforeDays, "class='form-control'"));?>
</div>
</div>
@@ -126,18 +126,24 @@
<?php if($todo->type != 'cycle'):?>
<div class="row form-group">
<label class="col-sm-1"><?php echo $lang->todo->type;?></label>
<div class="col-sm-2">
<div class="col-sm-4 dateWidth">
<?php echo html::select('type', $lang->todo->typeList, $todo->type, "onchange='loadList(this.value, \"\", \"{$todo->type}\", {$todo->idvalue})' class='form-control'");?>
</div>
</div>
<?php endif;?>
<div class="row form-group">
<label class="col-sm-1"><?php echo $lang->todo->assignTo;?></label>
<div class="col-sm-4 dateWidth">
<?php echo html::select('assignedTo', $users, $todo->assignedTo, "class='form-control chosen'");?>
</div>
</div>
<div class="row form-group">
<label id='nameBoxLabel' class="col-sm-1"><?php echo ($todo->type == 'custom' or $config->vision == 'rnd') ? $lang->todo->name : $lang->todo->idvalue;?></label>
<div class="col-sm-10">
<div id='nameBox' class='hidden'><?php echo html::input('name', $todo->name, "class='form-control'");?></div>
<div class='input-group title-group required'>
<div class='nameBox'><?php echo html::input('name', $todo->name, "class='form-control'");?></div>
<span class="input-group-addon fix-border br-0" style="border-radius: 0px;"><?php echo $lang->todo->pri;?></span>
<span class="input-group-addon fix-border br-0"><?php echo $lang->todo->pri;?></span>
<div class="input-group-btn pri-selector" data-type="pri">
<button type="button" class="btn dropdown-toggle br-0" data-toggle="dropdown">
<span class="pri-text"><span class="label-pri label-pri-<?php echo $todo->pri;?>"><?php echo $todo->pri;?></span></span> &nbsp;<span class="caret"></span>
@@ -163,10 +169,10 @@
</div>
<div class="row form-group">
<label class="col-sm-1"><?php echo $lang->todo->beginAndEnd;?></label>
<div class="col-sm-2" style='padding-right:0px'>
<div class="col-sm-2 beginBox">
<?php echo html::select('begin', $times, $todo->begin, 'onchange=selectNext(); class="form-control chosen" data-drop_direction="up"')?>
</div>
<div class="col-sm-2" style='padding-left:0px'>
<div class="col-sm-2 endBox">
<?php echo html::select('end', $times, $todo->end, 'class="form-control chosen" data-drop_direction="up"');?>
</div>
<div class="col-sm-4">