Commit 3e917342 authored by Steffen Michels's avatar Steffen Michels

- add CSS styles for message container inside group

- fix bug that updates from Message/InstructionContainers inside a group were sent with wrong taskId

git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/trunk@948 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent fb85b646
...@@ -9,12 +9,13 @@ itasks.ttc.common.attachTaskHandlers = function(comp,taskId){ ...@@ -9,12 +9,13 @@ itasks.ttc.common.attachTaskHandlers = function(comp,taskId){
var changeTaskEvent = function () { var changeTaskEvent = function () {
var ct = this.findParentByType(itasks.ttc.FormContainer); var ct = this.findParentByType(itasks.ttc.FormContainer);
if (!ct)
ct = this.findParentByType(itasks.ttc.GroupContainer);
if (!ct) if (!ct)
ct = this.findParentByType(itasks.ttc.InstructionContainer); ct = this.findParentByType(itasks.ttc.InstructionContainer);
if(!ct) if(!ct)
ct = this.findParentByType(itasks.ttc.MessageContainer); ct = this.findParentByType(itasks.ttc.MessageContainer);
if (!ct)
// if element is not inside form/instr/message it's a group's toolbar
ct = this.findParentByType(itasks.ttc.GroupContainer);
if(!ct) return; if(!ct) return;
//Helper function to get the value of a checkbox group //Helper function to get the value of a checkbox group
...@@ -43,12 +44,13 @@ itasks.ttc.common.attachTaskHandlers = function(comp,taskId){ ...@@ -43,12 +44,13 @@ itasks.ttc.common.attachTaskHandlers = function(comp,taskId){
if(this.clickCB) this.clickCB(this); if(this.clickCB) this.clickCB(this);
var ct = this.findParentByType(itasks.ttc.FormContainer); var ct = this.findParentByType(itasks.ttc.FormContainer);
if (!ct)
ct = this.findParentByType(itasks.ttc.GroupContainer);
if (!ct) if (!ct)
ct = this.findParentByType(itasks.ttc.InstructionContainer); ct = this.findParentByType(itasks.ttc.InstructionContainer);
if(!ct) if(!ct)
ct = this.findParentByType(itasks.ttc.MessageContainer); ct = this.findParentByType(itasks.ttc.MessageContainer);
// if element is not inside form/instr/message it's a group's toolbar
if (!ct)
ct = this.findParentByType(itasks.ttc.GroupContainer);
if(!ct) return; if(!ct) return;
var taskId = (comp.taskId)? comp.taskId : ct.taskId var taskId = (comp.taskId)? comp.taskId : ct.taskId
......
...@@ -43,10 +43,11 @@ ...@@ -43,10 +43,11 @@
display: none; display: none;
} }
.GroupFixedNoFocus .FormPanel, .GroupFixedNoFocus .FormPanel,
.GroupFixedNoFocus .ProcessControlPanel, .GroupFixedNoFocus .ProcessControlPanel,
.GroupFixedNoFocus .InstructionContainer-Text, .GroupFixedNoFocus .InstructionContainer-Text,
.GroupFixedNoFocus .InstructionContainer-Context { .GroupFixedNoFocus .InstructionContainer-Context,
.GroupFixedNoFocus .MessagePanel {
background-image : url('img/ttc-icons/TTCBackgroundNoFocus.png') !important; background-image : url('img/ttc-icons/TTCBackgroundNoFocus.png') !important;
border-bottom:1px solid #ddd; border-bottom:1px solid #ddd;
border-left:1px solid #ddd; border-left:1px solid #ddd;
...@@ -66,7 +67,8 @@ ...@@ -66,7 +67,8 @@
.GroupFloating .FormPanel, .GroupFloating .FormPanel,
.GroupFloating .ProcessControlPanel, .GroupFloating .ProcessControlPanel,
.GroupFloating .InstructionContainer-Text, .GroupFloating .InstructionContainer-Text,
.GroupFloating .InstructionContainer-Context { .GroupFloating .InstructionContainer-Context,
.GroupFloating .MessagePanel {
margin: 0px; margin: 0px;
border: none; border: none;
} }
......
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