Merge branch 'master' of https://github.com/easysoft/zentaopms
This commit is contained in:
@@ -0,0 +1,2 @@
|
||||
#whiteListBox .input-group:last-child{margin-top:10px}
|
||||
#whiteListBox .input-group:last-child .input-group-addon{padding:5px 16px}
|
||||
+11
-11
@@ -84,7 +84,7 @@ $config->task->datatable->fieldList['status']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['estimate']['title'] = 'estimateAB';
|
||||
$config->task->datatable->fieldList['estimate']['fixed'] = 'no';
|
||||
$config->task->datatable->fieldList['estimate']['width'] = '60';
|
||||
$config->task->datatable->fieldList['estimate']['width'] = '80';
|
||||
$config->task->datatable->fieldList['estimate']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['consumed']['title'] = 'consumedAB';
|
||||
@@ -105,17 +105,17 @@ $config->task->datatable->fieldList['progress']['sort'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['deadline']['title'] = 'deadlineAB';
|
||||
$config->task->datatable->fieldList['deadline']['fixed'] = 'no';
|
||||
$config->task->datatable->fieldList['deadline']['width'] = '60';
|
||||
$config->task->datatable->fieldList['deadline']['width'] = '100';
|
||||
$config->task->datatable->fieldList['deadline']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['openedBy']['title'] = 'openedByAB';
|
||||
$config->task->datatable->fieldList['openedBy']['fixed'] = 'no';
|
||||
$config->task->datatable->fieldList['openedBy']['width'] = '70';
|
||||
$config->task->datatable->fieldList['openedBy']['width'] = '90';
|
||||
$config->task->datatable->fieldList['openedBy']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['openedDate']['title'] = 'openedDate';
|
||||
$config->task->datatable->fieldList['openedDate']['fixed'] = 'no';
|
||||
$config->task->datatable->fieldList['openedDate']['width'] = '90';
|
||||
$config->task->datatable->fieldList['openedDate']['width'] = '110';
|
||||
$config->task->datatable->fieldList['openedDate']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['estStarted']['title'] = 'estStarted';
|
||||
@@ -140,7 +140,7 @@ $config->task->datatable->fieldList['assignedDate']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['finishedBy']['title'] = 'finishedByAB';
|
||||
$config->task->datatable->fieldList['finishedBy']['fixed'] = 'no';
|
||||
$config->task->datatable->fieldList['finishedBy']['width'] = '80';
|
||||
$config->task->datatable->fieldList['finishedBy']['width'] = '100';
|
||||
$config->task->datatable->fieldList['finishedBy']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['finishedDate']['title'] = 'finishedDateAB';
|
||||
@@ -150,17 +150,17 @@ $config->task->datatable->fieldList['finishedDate']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['canceledBy']['title'] = 'canceledBy';
|
||||
$config->task->datatable->fieldList['canceledBy']['fixed'] = 'no';
|
||||
$config->task->datatable->fieldList['canceledBy']['width'] = '80';
|
||||
$config->task->datatable->fieldList['canceledBy']['width'] = '110';
|
||||
$config->task->datatable->fieldList['canceledBy']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['canceledDate']['title'] = 'canceledDate';
|
||||
$config->task->datatable->fieldList['canceledDate']['fixed'] = 'no';
|
||||
$config->task->datatable->fieldList['canceledDate']['width'] = '90';
|
||||
$config->task->datatable->fieldList['canceledDate']['width'] = '100';
|
||||
$config->task->datatable->fieldList['canceledDate']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['closedBy']['title'] = 'closedBy';
|
||||
$config->task->datatable->fieldList['closedBy']['fixed'] = 'no';
|
||||
$config->task->datatable->fieldList['closedBy']['width'] = '80';
|
||||
$config->task->datatable->fieldList['closedBy']['width'] = '100';
|
||||
$config->task->datatable->fieldList['closedBy']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['closedDate']['title'] = 'closedDate';
|
||||
@@ -170,13 +170,13 @@ $config->task->datatable->fieldList['closedDate']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['closedReason']['title'] = 'closedReason';
|
||||
$config->task->datatable->fieldList['closedReason']['fixed'] = 'no';
|
||||
$config->task->datatable->fieldList['closedReason']['width'] = '80';
|
||||
$config->task->datatable->fieldList['closedReason']['width'] = '120';
|
||||
$config->task->datatable->fieldList['closedReason']['required'] = 'no';
|
||||
|
||||
global $lang;
|
||||
$config->task->datatable->fieldList['story']['title'] = "storyAB";
|
||||
$config->task->datatable->fieldList['story']['fixed'] = 'no';
|
||||
$config->task->datatable->fieldList['story']['width'] = '40';
|
||||
$config->task->datatable->fieldList['story']['width'] = '70';
|
||||
$config->task->datatable->fieldList['story']['required'] = 'no';
|
||||
$config->task->datatable->fieldList['story']['name'] = $lang->task->story;
|
||||
|
||||
@@ -192,7 +192,7 @@ $config->task->datatable->fieldList['lastEditedBy']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['lastEditedDate']['title'] = 'lastEditedDate';
|
||||
$config->task->datatable->fieldList['lastEditedDate']['fixed'] = 'no';
|
||||
$config->task->datatable->fieldList['lastEditedDate']['width'] = '90';
|
||||
$config->task->datatable->fieldList['lastEditedDate']['width'] = '120';
|
||||
$config->task->datatable->fieldList['lastEditedDate']['required'] = 'no';
|
||||
|
||||
$config->task->datatable->fieldList['actions']['title'] = 'actions';
|
||||
|
||||
Reference in New Issue
Block a user