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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Changed styles for assignment window main buttons

Browse source
This commit is contained in:
Lorenzo Tilve 2010-06-15 20:22:03 +02:00 • committed by Javier Moran Rua
parent a9f45ae93a
commit e4e94a5d79
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
View file

@ -209,7 +209,7 @@ public class QueueComponent extends XulElement implements
final GenericResourceAllocation generic = (GenericResourceAllocation) resourceAllocation;
result.append(_("Criteria: {0} ", Criterion.getNames(generic.getCriterions())));
}
result.append(_("Allocation: [{0}%,{1}%]", element.getStartDate()
result.append(_("Allocation: [{0},{1}]", element.getStartDate()
.toString(), element.getEndDate()));
return result.toString();

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

@ -1357,3 +1357,7 @@ tr.z-tree-row-seld .z-row-cnt {
margin-top:5px;
}
.tooltip-actions {
margin-bottom: 10px;
margin-left: 10px;
}

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

@ -81,11 +81,11 @@
<tabPanelSubcontract id="subcontractTabpanel" />
</tabpanels>
</tabbox>
<hbox>
<button id="ok" label="${i18n:_('Accept')}"
<hbox sclass="tooltip-actions">
<button id="ok" label="${i18n:_('Accept')}" sclass="save-button global-action"
onClick="editController.accept();" />
<button id="cancel" label="${i18n:_('Cancel')}"
onClick="editController.cancel();" />
<button id="cancel" label="${i18n:_('Cancel')}" sclass="cancel-button global-action"
onClick="editController.cancel();" />
</hbox>
</window>
@ -176,9 +176,9 @@
</combobox>
<hbox>
<button label="${i18n:_('Assign')}"
<button label="${i18n:_('Assign')}" sclass="save-button"
onClick="calendarController.assign(calendarCombo.selectedItem);" />
<button label="${i18n:_('Cancel')}"
<button label="${i18n:_('Cancel')}" sclass="cancel-button"
onClick="calendarController.cancel();" />
</hbox>