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

ItEr26S10CUCreacionProxectoPlanificacionItEr25S11: Added design improvements to advance types pages

Browse source
This commit is contained in:
Lorenzo Tilve 2009-09-18 11:59:50 +02:00 • committed by Javier Moran Rua
parent 08761a86aa
commit 8b006b67ff
4 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-webapp/src/main/webapp/advance/_editAdvanceTypes.zul
View file

@ -5,11 +5,16 @@
</tabs>
<tabpanels>
<tabpanel>
<grid fixedLayout="false">
<grid fixedLayout="true">
<columns>
<column width="200px" />
<column />
</columns>
<rows>
<row>
<label value="${i18n:_('Unit name')}" />
<textbox value="@{controller.advanceType.unitName}" constraint="@{controller.distinctNames}"/>
<textbox value="@{controller.advanceType.unitName}" constraint="@{controller.distinctNames}" width="300px"/>
</row>
<row>
<label value="${i18n:_('Active')}" />

30
navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul
View file

@ -1,21 +1,33 @@
<window id="${arg.top_id}" title="${i18n:_('Progress types')}">
<window id="${arg.top_id}" title="${i18n:_('Advance type list')}">
<grid id="listing" model="@{controller.advanceTypes}" mold="paging"
pageSize="5">
pageSize="5" fixedLayout="true">
<columns>
<column label="${i18n:_('Operations')}"/>
<column label="${i18n:_('Name')}" sort="auto(name)"/>
<column label="${i18n:_('Enabled')}"/>
<column label="${i18n:_('Operations')}"/>
</columns>
<rows>
<row self="@{each='advanceType'}" value="@{advanceType}">
<hbox>
<button label="${i18n:_('Edit')}" disabled="@{advanceType.immutable}" onClick="controller.goToEditForm(self.parent.parent.value);">
</button>
<button label="${i18n:_('Delete')}" disabled="@{advanceType.immutable}" onClick="controller.confirmRemove(self.parent.parent.value);">
</button>
</hbox>
<label value="@{advanceType.unitName}"/>
<checkbox checked="@{advanceType.active}"/>
<hbox>
<button visible="@{advanceType.updatable}" sclass="icono" image="/common/img/ico_editar1.png"
hoverImage="/common/img/ico_editar.png"
tooltiptext="${i18n:_('Edit')}" disabled="@{advanceType.immutable}" onClick="controller.goToEditForm(self.parent.parent.value);">
</button>
<button visible="@{advanceType.immutable}" sclass="icono" image="/common/img/ico_editar_out.png"
tooltiptext="${i18n:_('Not editable')}" disabled="@{advanceType.immutable}" onClick="controller.goToEditForm(self.parent.parent.value);">
</button>
<button visible="@{advanceType.updatable}" sclass="icono" image="/common/img/ico_borrar1.png"
hoverImage="/common/img/ico_borrar.png"
tooltiptext="${i18n:_('Delete')}" disabled="@{advanceType.immutable}" onClick="controller.confirmRemove(self.parent.parent.value);">
</button>
<button visible="@{advanceType.immutable}" sclass="icono" image="/common/img/ico_borrar_out.png"
tooltiptext="${i18n:_('Not deletable')}" disabled="@{advanceType.immutable}" onClick="controller.confirmRemove(self.parent.parent.value);">
</button>
</hbox>
</row>
</rows>
</grid>

2
navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
View file

@ -13,7 +13,7 @@
apply="org.navalplanner.web.advance.AdvanceTypeCRUDController">
<vbox id="messagesContainer"></vbox>
<list top_id="listWindow" />
<edition top_id="createWindow" title="${i18n:_('Create')}"
<edition top_id="createWindow" title="${i18n:_('Create new advance type')}"
save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />
<edition top_id="editWindow" title="${i18n:_('Edit advance type data')}"
save_button_label="${i18n:_('Save')}" cancel_button_label="${i18n:_('Cancel')}" />

8
navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
View file

@ -270,8 +270,8 @@ table {
background-image:none;
}
/*.z-window-modal-header, */
.z-window-popup-header, .z-window-highlighted-header, .z-window-overlapped-header, .z-window-embedded-header {
.z-window-popup-header, .z-window-highlighted-header,
.z-window-overlapped-header, .z-window-embedded-header {
background-color:#FFFFFF;
color:#48AB48;
font-family:Tahoma,Arial,Helvetica,sans-serif;
@ -287,8 +287,7 @@ table {
}
.zk .z-window-embedded .z-button-cm, .z-window-embedded .z-button-cm {
.zk .z-window-embedded .z-button-cm, .z-window-modal .z-button-cm {
background-color:#58A758;
background-image:none;
border:1px solid #006700;
@ -305,7 +304,6 @@ button.z-button {
top:-5px;
}
.z-tabs-scroll .z-tabs-cnt {
background:#FAFDFE none repeat scroll 0 0;
border-bottom:1px solid #7EAAC6;