RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #800] Fix closable button in 'Calendar allocation' window

Browse source 
* Add panel to group widgets, as in others window in the application

FEA: ItEr68S04BugFixing
This commit is contained in:
Diego Pino Garcia 2011-01-11 11:26:57 +01:00
parent f47dd66a8e
commit cbd5f93e53
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
navalplanner-webapp/src/main/webapp/planner/order.zul
View file

@ -141,25 +141,35 @@
</window>
<!-- Calendar allocation -->
<window id="calendarAllocationWindow"
apply="${calendarController}"
title="${i18n:_('Calendar allocation')}" width="600px"
closable="true" visible="false">
apply="${calendarController}"
title="${i18n:_('Calendar allocation')}"
width="600px"
visible="false"
closable="true"
onClose="self.visible = false; event.stopPropagation();" >
<vbox>
<label value="${i18n:_('Select the calendar')}" />
<combobox id="calendarCombo">
<comboitem self="@{each='baseCalnedar'}" value="@{baseCalnedar}"
label="@{baseCalnedar.name}" />
</combobox>
<panel title="${i18n:_('Calendar')}"
border="normal" style="overflow:auto" >
<panelchildren>
<combobox id="calendarCombo">
<comboitem self="@{each='baseCalendar'}" value="@{baseCalendar}"
label="@{baseCalendar.name}" />
</combobox>
</panelchildren>
</panel>
<!-- Control buttons -->
<hbox>
<button label="${i18n:_('Assign')}" sclass="save-button global-action"
onClick="calendarController.assign(calendarCombo.selectedItem);" />
<button label="${i18n:_('Cancel')}" sclass="cancel-button global-action"
onClick="calendarController.cancel();" />
<button label="${i18n:_('Accept')}"
sclass="save-button global-action"
onClick="calendarController.assign(calendarCombo.selectedItem);" />
<button label="${i18n:_('Cancel')}"
sclass="cancel-button global-action"
onClick="calendarController.cancel();" />
</hbox>
</vbox>