Commit 85f1f6d7 authored by Bas Lijnse's avatar Bas Lijnse

Updated display of parallel tasks

git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/trunk@1147 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent 5c9454f3
......@@ -14,24 +14,17 @@ itasks.ttc.ParallelContainer = Ext.extend(Ext.Panel, {
{ unstyled: true
, autoScroll: true
, cls: 'ParallelControlContainer'
, width: 720
, items: [
{ cls: 'TTCSubject'
, unstyled: true
, html: this.subject
, width: 720
},
{ bodyStyle: 'padding: 4px'
, items : [
{ unstyled: true
, html: this.description
, bodyStyle: 'padding-bottom: 4px'
},
this.grid
]
, cls: 'ParallelControlPanel'
, width: 720
{ cls: 'TTCDescription'
, unstyled: true
}
, html: this.description
},
this.grid
]
});
......@@ -59,12 +52,10 @@ itasks.ttc.ParallelContainer = Ext.extend(Ext.Panel, {
root: 'subtasks',
fields: [
{name: 'finished', type: 'bool'},
//'properties',
'taskId',
'subject',
'delegatedTo',
'progress',
//'subtaskId',
'description'
]
});
......@@ -72,24 +63,25 @@ itasks.ttc.ParallelContainer = Ext.extend(Ext.Panel, {
var col = new Ext.grid.ColumnModel({
defaults: {
menuDisabled: true,
sortable: true
sortable: true,
resizable: false
},
columns: [
{header: 'Done', dataIndex: 'finished', renderer: this.renderFinished, width: 36, resizable: false},
//{header: 'Priority', dataIndex: 'properties', width: 70, renderer: this.renderPriority},
{header: 'Subject', dataIndex: 'subject', width: 250},
{header: 'Delegated To', dataIndex: 'delegatedTo', width: 150, renderer: this.renderDelegated, cellActions:[{ iconCls: 'icon-edit', qtip: 'Re-asign the task to another user'}]},
{header: 'Description', dataIndex: 'description', width: 180},
{header: 'Task Id', dataIndex: 'taskId', hidden: itasks.app.debug, width: 85}
{header: 'Status', dataIndex: 'finished', renderer: this.renderFinished, width: 50},
{header: 'Subject', dataIndex: 'subject', width: 450},
{header: 'Assigned to', dataIndex: 'delegatedTo', renderer: this.renderDelegated, cellActions:[{ iconCls: 'icon-edit', qtip: 'Re-asign the task to another user'}]}
]
});
this.grid = new Ext.grid.EditorGridPanel({
cls: 'ParallelControlPanel',
border: false,
store : store,
colModel: col,
width: '100%',
width: 700,
height: 250,
plugins:[this.cellActions],
autoExpandColumn: 2,
clicksToEdit: 'auto'
});
......
......@@ -8,8 +8,10 @@
background-image : url('img/ttc-icons/TTCDescriptionBackground.png') !important;
background-repeat: repeat-x;
border: 1px solid #99BBE8;
color: #000;
margin: 10px 10px 0px 10px;
font-weight: bold;
padding: 5px;
}
.TTCDescription {
background-image : url('img/ttc-icons/TTCBackground80.png') !important;
......@@ -39,28 +41,11 @@
/* Group Container */
.GroupContainer {
background-color: #eee;
/* background-color: #eee; */
}
.GroupFixed .x-plain-tbar {
display: none;
}
/*
.GroupFixedNoFocus .FormPanel,
.GroupFixedNoFocus .ProcessControlPanel,
.GroupFixedNoFocus .InstructionContainer-Text,
.GroupFixedNoFocus .InstructionContainer-Context,
.GroupFixedNoFocus .MessagePanel,
.GroupFixedNoFocus .MonitorPanel {
background-image : url('img/ttc-icons/TTCBackgroundNoFocus.png') !important;
border-bottom:1px solid #ddd;
border-left:1px solid #ddd;
border-right:1px solid #ddd;
background-repeat: repeat;
}
*/
.GroupFixedNoFocus .TTCSubject {
background-image: url("img/ttc-icons/TTCDescriptionBackgroundNoFocus.png") !important;
border:1px solid #ddd;
......@@ -74,7 +59,6 @@
.GroupFloating .GroupUnpinButton {
display: none;
}
.GroupFloating .TTCDescription,
.GroupFloating .FormPanel,
.GroupFloating .ProcessControlPanel,
......@@ -158,23 +142,10 @@
background-repeat: no-repeat ;
background-position: 3px 3px;
}
.ParallelControlDescription{
background-image : url('img/ttc-icons/TTCDescriptionBackground.png') !important;
background-repeat: repeat-x;
border: 1px solid #99BBE8;
margin: 10px 0px 0px 10px;
width: 700px;
}
.ParallelControlPanel{
background-image : url('img/ttc-icons/TTCBackground80.png') !important;
border-left: 1px solid #99BBE8;
border-bottom: 1px solid #99BBE8;
border-right: 1px solid #99BBE8;
border: solid #99BBE8;
border-width: 0px 1px 1px 1px;
margin: 0px 0px 0px 10px;
background-repeat: repeat;
width: 700px;
}
/* Instruction Container */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment