Přepracováno vykreslování dialogu Faturace požadavků.
Vyhledávací edit dostane focus po otevření okna. Opraveno Main menu. closes #210
This commit is contained in:
@@ -135,6 +135,7 @@
|
|||||||
href="/j_spring_security_logout" />
|
href="/j_spring_security_logout" />
|
||||||
</menupopup>
|
</menupopup>
|
||||||
</menu>
|
</menu>
|
||||||
|
<menuitem label="${labels.Help}" target="blank"
|
||||||
href="https://drive.google.com/folderview?id=0B2inqAvr2t-TODg4ZWZoSThYbGM&usp=sharing_eid"
|
href="https://drive.google.com/folderview?id=0B2inqAvr2t-TODg4ZWZoSThYbGM&usp=sharing_eid"
|
||||||
tooltiptext="${labels.GoogleDriveUrl}" />
|
tooltiptext="${labels.GoogleDriveUrl}" />
|
||||||
<menuseparator />
|
<menuseparator />
|
||||||
|
|||||||
@@ -18,7 +18,7 @@
|
|||||||
<vbox>
|
<vbox>
|
||||||
<image src="/img/lucene_logo.png"/>
|
<image src="/img/lucene_logo.png"/>
|
||||||
<hbox>
|
<hbox>
|
||||||
<textbox value="@bind(vm.keyWord)" instant="true" width="250px"
|
<textbox value="@bind(vm.keyWord)" instant="true" width="250px" onCreate="self.setFocus(true)"
|
||||||
onOK="@command('doSearch')"/>
|
onOK="@command('doSearch')"/>
|
||||||
<button label="${labels.Search}" onClick="@command('doSearch')" sclass="nicebutton"
|
<button label="${labels.Search}" onClick="@command('doSearch')" sclass="nicebutton"
|
||||||
image="/img/search.png"/>
|
image="/img/search.png"/>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<?page title="${labels.Invoicing}" contentType="text/html;charset=UTF-8"?>
|
<?page contentType="text/html;charset=UTF-8"?>
|
||||||
<zk>
|
<zk>
|
||||||
<window
|
<window
|
||||||
id="editWin"
|
id="editWin"
|
||||||
@@ -14,15 +14,17 @@
|
|||||||
zclass="form-caption"
|
zclass="form-caption"
|
||||||
label="${labels.InvoicingFormTitle}" />
|
label="${labels.InvoicingFormTitle}" />
|
||||||
<vlayout vflex="1">
|
<vlayout vflex="1">
|
||||||
<hbox>
|
<hbox
|
||||||
|
vflex="min"
|
||||||
<vbox height="300px">
|
hflex="1">
|
||||||
<button
|
<button
|
||||||
image="/img/item-add.png"
|
image="/img/item-add.png"
|
||||||
label="${labels.InvoicingAdd}"
|
label="${labels.InvoicingAdd}"
|
||||||
sclass="nicebutton"
|
sclass="nicebutton"
|
||||||
onClick="@command('addItem')" />
|
onClick="@command('addItem')" />
|
||||||
|
</hbox>
|
||||||
|
<hbox vflex="1">
|
||||||
|
<vbox vflex="1">
|
||||||
<listbox
|
<listbox
|
||||||
model="@load(vm.dataBean.items)"
|
model="@load(vm.dataBean.items)"
|
||||||
vflex="1"
|
vflex="1"
|
||||||
@@ -65,13 +67,15 @@
|
|||||||
onChange="@command('calculate')" />
|
onChange="@command('calculate')" />
|
||||||
</listcell>
|
</listcell>
|
||||||
<listcell>
|
<listcell>
|
||||||
<button label="${labels.RemoveItem}" sclass="nicebutton" onClick="@command('removeItem', item=each)"/>
|
<button
|
||||||
|
label="${labels.RemoveItem}"
|
||||||
|
sclass="nicebutton"
|
||||||
|
onClick="@command('removeItem', item=each)" />
|
||||||
</listcell>
|
</listcell>
|
||||||
</listitem>
|
</listitem>
|
||||||
</template>
|
</template>
|
||||||
</listbox>
|
</listbox>
|
||||||
</vbox>
|
</vbox>
|
||||||
|
|
||||||
<grid hflex="min">
|
<grid hflex="min">
|
||||||
<columns>
|
<columns>
|
||||||
<column
|
<column
|
||||||
@@ -125,11 +129,7 @@
|
|||||||
</row>
|
</row>
|
||||||
</rows>
|
</rows>
|
||||||
</grid>
|
</grid>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</hbox>
|
</hbox>
|
||||||
|
|
||||||
<listbox
|
<listbox
|
||||||
vflex="1"
|
vflex="1"
|
||||||
model="@load(vm.dataBean.requirement.items)">
|
model="@load(vm.dataBean.requirement.items)">
|
||||||
@@ -198,7 +198,6 @@
|
|||||||
</listitem>
|
</listitem>
|
||||||
</template>
|
</template>
|
||||||
</listbox>
|
</listbox>
|
||||||
|
|
||||||
<include src="/app/formButtons.zul" />
|
<include src="/app/formButtons.zul" />
|
||||||
</vlayout>
|
</vlayout>
|
||||||
</window>
|
</window>
|
||||||
|
|||||||
Reference in New Issue
Block a user