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

Bug #1351: fixed space for elements

Browse source 
This uses fixed width, so maybe this should be adjusted.
Removed the vboxes to reduce the space between the two panels.
This commit is contained in:
Ignacio Diaz Teijido 2012-01-25 17:07:05 +01:00 • committed by Lorenzo Tilve Álvaro
parent 3b576c56da
commit ff3bdbc05e
1 changed files with 48 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
libreplan-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul
View file

@ -76,64 +76,58 @@
<!-- Material search -->
<hbox width="100%" hflex="1">
<!-- Categories -->
<vbox hflex="1">
<panel title="${i18n:_('Categories')}" border="normal">
<panelchildren>
<toolbarbutton style="text-decoration: none" label="${i18n:_('Unselect')}"
onClick="assignedMaterialsController.clearSelectionAllCategoriesTree()" />
<tree id="allCategoriesTree" width="100%" rows="10" sizedByContent="true" vflex="true" hflex="true" multiple="false">
<treecols>
<treecol label="Name" hflex="true"/>
</treecols>
</tree>
</panelchildren>
</panel>
</vbox>
<panel title="${i18n:_('Categories')}" border="normal">
<panelchildren>
<toolbarbutton style="text-decoration: none" label="${i18n:_('Unselect')}"
onClick="assignedMaterialsController.clearSelectionAllCategoriesTree()" />
<tree id="allCategoriesTree" width="100%" rows="10" vflex="true" hflex="true" multiple="false">
<treecols>
<treecol label="Name" width="250px" hflex="true"/>
</treecols>
</tree>
</panelchildren>
</panel>
<vbox hflex="1">
<!-- Found materials -->
<panel title="${i18n:_('Materials')}" border="normal">
<panelchildren>
<!-- Found materials -->
<panel title="${i18n:_('Materials')}" border="normal">
<panelchildren>
<!-- Search textbox -->
<hbox>
<textbox id="txtSearchMaterial" width="250px" style="margin-top: 2px" />
<button label="${i18n:_('Search')}"
onClick="assignedMaterialsController.searchMaterials()"/>
<button label="${i18n:_('Assign')}"
onClick="assignedMaterialsController.assignSelectedMaterials()" />
</hbox>
<!-- Search textbox -->
<hbox>
<textbox id="txtSearchMaterial" width="250px" style="margin-top: 2px" />
<button label="${i18n:_('Search')}"
onClick="assignedMaterialsController.searchMaterials()"/>
<button label="${i18n:_('Assign')}"
onClick="assignedMaterialsController.assignSelectedMaterials()" />
</hbox>
<separator spacing="10px" orient="horizontal" />
<separator spacing="10px" orient="horizontal" />
<listbox id="lbFoundMaterials"
multiple="true"
sizedByContent="true"
model="@{assignedMaterialsController.matchingMaterials}" >
<listhead sizable="true" >
<listheader label="${i18n:_('Code')}" />
<listheader label="${i18n:_('Name')}" hflex="1"/>
<listheader label="${i18n:_('Unit type')}" />
<listheader label="${i18n:_('Unit price')}" />
<listheader label="${i18n:_('Category')}" />
</listhead>
<listitem self="@{each='material'}" value="@{material}">
<listcell label="@{material.code}" />
<listcell label="@{material.description}" />
<listcell>
<listbox mold="select" model="@{assignedMaterialsController.unitTypes}"
onSelect = "assignedMaterialsController.selectUnitType(self)"
itemRenderer="@{assignedMaterialsController.renderer}"
disabled="true"/>
</listcell>
<listcell label="@{material.defaultUnitPrice}" />
<listcell label="@{material.category.name}" />
</listitem>
</listbox>
</panelchildren>
</panel>
</vbox>
<listbox id="lbFoundMaterials"
multiple="true"
model="@{assignedMaterialsController.matchingMaterials}" >
<listhead sizable="false" >
<listheader label="${i18n:_('Code')}" width="230px"/>
<listheader label="${i18n:_('Name')}" width="100px" hflex="1"/>
<listheader label="${i18n:_('Unit type')}" width="70px" />
<listheader label="${i18n:_('Unit price')}" width="70px"/>
<listheader label="${i18n:_('Category')}" width="100px"/>
</listhead>
<listitem self="@{each='material'}" value="@{material}">
<listcell label="@{material.code}" />
<listcell label="@{material.description}" />
<listcell>
<listbox mold="select" model="@{assignedMaterialsController.unitTypes}"
onSelect = "assignedMaterialsController.selectUnitType(self)"
itemRenderer="@{assignedMaterialsController.renderer}"
disabled="true"/>
</listcell>
<listcell label="@{material.defaultUnitPrice}" />
<listcell label="@{material.category.name}" />
</listitem>
</listbox>
</panelchildren>
</panel>
</hbox>
<button label="${i18n:_('Assign materials')}" sclass="global-action"