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

ItEr37S16RFMaquetacionDesenhoAplicacionItEr36S18: Applied general styles to calendar views

Browse source
This commit is contained in:
Lorenzo Tilve 2009-12-04 14:04:02 +01:00 • committed by Javier Moran Rua
parent c2ba2cc2d0
commit da604b54b2
4 changed files with 38 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
navalplanner-webapp/src/main/webapp/calendars/_edition.zul
View file

@ -18,10 +18,10 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.top_id}" title="${arg.title}" border="normal">
<window id="${arg.top_id}" title="${arg.title}">
<tabbox mold="accordion-lite">
<tabbox>
<tabs>
<tab label="${i18n:_('Data')}" id="dataTab" />
<tab label="${i18n:_('History')}"
@ -115,17 +115,6 @@
disabled="@{calendarController.editionController.isLastVersion}" />
</hbox>
<hbox>
<button onClick="calendarController.editionController.save();"
label="${arg.save_button_label}"
visible="${arg.save_button_visible}" />
<button onClick="calendarController.editionController.cancel();"
label="${arg.cancel_button_label}" />
<button onClick="calendarController.editionController.createNewVersion();"
label="${i18n:_('Create new version')}"
visible="@{calendarController.editionController.isEditing}" />
</hbox>
</vbox>
</tabpanel>
@ -149,4 +138,19 @@
</tabpanels>
</tabbox>
<hbox>
<button onClick="calendarController.editionController.save();"
label="${arg.save_button_label}"
sclass="save-button global-action"
visible="${arg.save_button_visible}" />
<button onClick="calendarController.editionController.cancel();"
label="${arg.cancel_button_label}"
sclass="cancel-button global-action" />
<button onClick="calendarController.editionController.createNewVersion();"
label="${i18n:_('Create new version')}"
visible="@{calendarController.editionController.isEditing}"
sclass="create-button global-action" />
</hbox>
</window>

3
navalplanner-webapp/src/main/webapp/calendars/_list.zul
View file

@ -20,7 +20,8 @@
<window id="${arg.top_id}" title="${i18n:_('Calendars List')}">
<tree id="tree" model="@{calendarController.baseCalendarsTreeModel}"
treeitemRenderer="@{calendarController.baseCalendarsTreeitemRenderer}">
treeitemRenderer="@{calendarController.baseCalendarsTreeitemRenderer}"
zclass="z-dottree">
<treecols sizable="true">
<treecol label="${i18n:_('Name')}" />
<treecol label="${i18n:_('Operations')}" />

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

@ -264,6 +264,12 @@ button.z-button {
background-repeat: no-repeat;
}
/* Embed tabbpanels button destyling */
.z-tabpanel .global-action.z-button .z-button-cm {
background-image: none;
padding: 2px 18px;
margin-left: 5px;
}
/* --- END -- Button styles --
=================================================== */

19
navalplanner-webapp/src/main/webapp/resources/worker/_calendar.zul
View file

@ -24,12 +24,19 @@
<div visible="@{controller.isCalendarNull}">
<hbox>
<label value="${i18n:_('Select parent calendar')}" />
<combobox id="createDerivedCalendar"
model="@{controller.baseCalendars}"
itemRenderer="@{controller.baseCalendarsComboitemRenderer}" />
</hbox>
<grid fixedLayout="true">
<columns>
<column width="200px" />
<column />
</columns>
<rows>
<row>
<label value="${i18n:_('Select parent calendar')}" />
<combobox id="createDerivedCalendar" model="@{controller.baseCalendars}"
itemRenderer="@{controller.baseCalendarsComboitemRenderer}" />
</row>
</rows>
</grid>
</div>