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

Moved orderelement tree node operations to first row

Browse source 
FEA: ItEr63S03BugFixing
This commit is contained in:
Lorenzo Tilve 2010-11-09 15:55:04 +01:00
parent eee0679266
commit 0b8bbbbdc2
6 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-webapp/src/main/resources/i18n/es.po
View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-11-08 19:55+0100\n"
"PO-Revision-Date: 2010-11-08 19:55+0100\n"
"PO-Revision-Date: 2010-11-09 11:42+0100\n"
"Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
"Language-Team: Spanish <>\n"
"MIME-Version: 1.0\n"
@ -5888,8 +5888,8 @@ msgid "missing code in a work report."
msgstr "falta el código en un parte de trabajo."
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:30
msgid "New order element name:"
msgstr "Nombre del nuevo elemento de pedido:"
msgid "New order element:"
msgstr "Nuevo elemento de pedido:"
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28
@ -6703,6 +6703,9 @@ msgstr "Borrar elemento de pedido seleccionado"
msgid "Choose an order element to operate on it"
msgstr "Elija un elemento de pedido para operar sobre él"
#~ msgid "New order element name:"
#~ msgstr "Nombre del nuevo elemento de pedido:"
#~ msgid "Name/Code"
#~ msgstr "Nombre/Código"

9
navalplanner-webapp/src/main/resources/i18n/gl.po
View file

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-11-08 19:55+0100\n"
"PO-Revision-Date: 2010-11-08 20:08+0100\n"
"PO-Revision-Date: 2010-11-09 11:57+0100\n"
"Last-Translator: Jacobo Aragunde Pérez <jaragunde@igalia.com>\n"
"Language-Team: Galician <>\n"
"MIME-Version: 1.0\n"
@ -5868,8 +5868,8 @@ msgid "missing code in a work report."
msgstr "falta código nun parte de traballo."
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:30
msgid "New order element name:"
msgstr "Nome do novo elemento de pedido:"
msgid "New order element:"
msgstr "Novo elemento de pedido:"
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java:28
@ -6683,6 +6683,9 @@ msgstr "Borrar elemento de pedido seleccionado"
msgid "Choose an order element to operate on it"
msgstr "Seleccione un elemento de pedido para operar sobre el"
#~ msgid "New order element name:"
#~ msgstr "Nome do novo elemento de pedido:"
#~ msgid "Name/Code"
#~ msgstr "Nome/Código"

2
navalplanner-webapp/src/main/resources/i18n/keys.pot
View file

@ -5738,7 +5738,7 @@ msgid "missing code in a work report."
msgstr ""
#: navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul:30
msgid "New order element name:"
msgid "New order element:"
msgstr ""
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java:28

2
navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
View file

@ -663,7 +663,7 @@ div.z-grid {
height:25px;
}
.orderTree .operations {
width:160px;
width:80px;
}
.orderTree .name {
min-width:120px;

4
navalplanner-webapp/src/main/webapp/orders/_list.zul
View file

@ -28,10 +28,10 @@
<column label="${i18n:_('Code')}" align="center" sort="auto(lower(code))"/>
<column id="columnDateStart" label="${i18n:_('Starting date')}" align="center" sort="auto(initDate,deadline)" sortDirection="ascending" sclass="date"/>
<column label="${i18n:_('Deadline')}" align="center" sort="auto(deadline,initDate)" sclass="date"/>
<column label="${i18n:_('Customer')}" align="center" sort="auto(lower(customer))" />
<column label="${i18n:_('Customer')}" align="center" sort="auto(lower(customer))" sclass="customer" />
<column label="${i18n:_('Customer reference')}" align="center"/>
<column label="${i18n:_('Total Budget')}" align="center"/>
<column label="${i18n:_('Total Hours')}" align="center"/>
<column label="${i18n:_('Total Hours')}" align="center" sclass="hours" />
<column label="${i18n:_('State')}" align="center"/>
<column label="${i18n:_('Operations')}" align="center"/>
</columns>

28
navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul
View file

@ -25,13 +25,14 @@
<vbox width="100%">
<hbox valign="pack" style="margin-bottom:4px;" width="100%">
<hbox valign="pack">
<templateFinderPopup id="templateFinderPopupAtTree" acceptButtonLabel="${i18n:_('Create Order Element')}" caption="${i18n:_('Choosing Template')}" />
<label value="${i18n:_('New order element name:')}" />
<textbox value="" id="newOrderElementName" width="200px"
<label value="${i18n:_('New order element:')}" />
<textbox value="" id="newOrderElementName" width="150px"
onOK="treeController.addElement(self.parent);" disabled="true" />
<label value="${i18n:_('Hours:')}" />
<intbox value="0" id="newOrderElementHours" width="50px"
<intbox value="0" id="newOrderElementHours" width="40px"
onOK="treeController.addElement(self.parent);"
constraint="no negative" disabled="true" />
<button id="btnNew" label="${treeComponent.addElementLabel}"
@ -39,37 +40,36 @@
<button id="btnNewFromTemplate" label="${i18n:_('Add From Template')}"
onClick="treeController.createFromTemplate();" disabled="true"
visible="${treeComponent.createFromTemplateEnabled}"/>
</hbox>
<hbox valign="pack">
<label value="${i18n:_('Operations with selected order element:')}" />
<button id="editOrderElementButton" image="/common/img/ico_editar1.png"
</hbox><hbox style="float:right" valign="pack">
<label value="${i18n:_('Selected node:')}" />
<button id="editOrderElementButton" sclass="icono" image="/common/img/ico_editar1.png"
tooltiptext="${i18n:_('Edit selected order element')}"
onClick="treeController.editSelectedOrderElement();" />
<button id="createTemplateButton" image="/common/img/ico_derived1.png"
<button id="createTemplateButton" sclass="icono" image="/common/img/ico_derived1.png"
hoverImage="/common/img/ico_derived.png"
tooltiptext="${i18n:_('Create template from selected order element')}"
onClick="treeController.createTemplateFromSelectedOrderElement();" />
<button id="downButton" image="/common/img/ico_bajar1.png"
<button id="downButton" sclass="icono" image="/common/img/ico_bajar1.png"
hoverImage="/common/img/ico_bajar.png"
tooltiptext="${i18n:_('Move selected order element down')}"
onClick="treeController.moveSelectedOrderElementDown();" />
<button id="upButton" image="/common/img/ico_subir1.png"
<button id="upButton" sclass="icono" image="/common/img/ico_subir1.png"
hoverImage="/common/img/ico_subir.png"
tooltiptext="${i18n:_('Move selected order element up')}"
onClick="treeController.moveSelectedOrderElementUp();" />
<button id="leftButton" image="/common/img/ico_izq1.png"
<button id="leftButton" sclass="icono" image="/common/img/ico_izq1.png"
hoverImage="/common/img/ico_izq.png"
tooltiptext="${i18n:_('Unindent selected order element')}"
onClick="treeController.unindentSelectedOrderElement();" />
<button id="rightButton" image="/common/img/ico_derecha1.png"
<button id="rightButton" sclass="icono" image="/common/img/ico_derecha1.png"
hoverImage="/common/img/ico_derecha.png"
tooltiptext="${i18n:_('Indent selected order element')}"
onClick="treeController.indentSelectedOrderElement();" />
<button id="deleteOrderElementButton" image="/common/img/ico_borrar1.png"
<button id="deleteOrderElementButton" sclass="icono" image="/common/img/ico_borrar1.png"
hoverImage="/common/img/ico_borrar.png"
tooltiptext="${i18n:_('Delete selected order element')}"
onClick="treeController.deleteSelectedOrderElement();" />
</hbox>
</hbox></hbox>
<vbox width="100%">
<tree id="tree" height="440px" multiple="false" droppable="true"
onDrop="treeController.move(self, event.dragged)"