IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Browse Source 
Conflicts:
	src/main/webapp/app/mainMenu.zul
This commit is contained in:
František Přibyl
2015-02-09 13:35:35 +01:00
parent 277ea0f993 678c140a94
commit 93e1ef1fd3
19 changed files with 1152 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/app/mainMenu.zul
-1
View File
@@ -135,7 +135,6 @@
href="/j_spring_security_logout" />
</menupopup>
</menu>
<menuitem label="${labels.Help}" target="blank"
href="https://drive.google.com/folderview?id=0B2inqAvr2t-TODg4ZWZoSThYbGM&amp;usp=sharing_eid"
tooltiptext="${labels.GoogleDriveUrl}" />
<menuseparator />
src/main/webapp/app/search/searchForm.zul
+57 -52
View File
@@ -1,57 +1,62 @@
<?page title="${labels.AgendaSearch}" contentType="text/html;charset=UTF-8"?>
<zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<zk xmlns="http://www.zkoss.org/2005/zul"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
<window border="normal" closable="false"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.search.SearchForm')"
vflex="1">
<caption src="/img/search-032.png" zclass="form-caption" label="${labels.AgendaSearch}" />
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<vbox width="100%"
vflex="1">
<hbox hflex="1" align="center">
<div align="center" hflex="1">
<vbox>
<image src="/img/lucene_logo.png"/>
<hbox>
<textbox value="@bind(vm.keyWord)" instant="true" width="250px" onOK="@command('doSearch')"/>
<button label="${labels.Search}" onClick="@command('doSearch')" sclass="nicebutton" image="/img/search.png" />
</hbox>
</vbox>
</div>
</hbox>
<panel hflex="1" vflex="1">
<panelchildren style="overflow:auto;">
<vbox children="@load(vm.results)" width="100%">
<template name="children">
<vbox width="100%">
<separator bar="true" width="100%"/>
<label value="@load(each.recordName)" style="font-weight: bold; font-size:14px;"/>
<label value="@load(each.description)"/>
<hbox>
<label value="${labels.created}: "/>
<label value="@load(each.created)"/>
</hbox>
<hbox>
<label value="${labels.ownedBy}: "/>
<label value="@load(each.ownedBy)"/>
</hbox>
<hbox>
<label value="${labels.modified}: "/>
<label value="@load(each.modified)"/>
</hbox>
<hbox>
<label value="${labels.modifiedBy}: "/>
<label value="@load(each.modifiedBy)"/>
</hbox>
<a href="@load(each.url)" label="@load(each.url)"/>
</vbox>
</template>
</vbox>
</panelchildren>
</panel>
</vbox>
<window border="normal" closable="false"
apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.search.SearchForm')"
vflex="1">
<caption src="/img/search-032.png" zclass="form-caption" label="${labels.AgendaSearch}"/>
</window>
<vbox width="100%"
vflex="1">
<hbox hflex="1" align="center">
<div align="center" hflex="1">
<vbox>
<image src="/img/lucene_logo.png"/>
<hbox>
<textbox value="@bind(vm.keyWord)" instant="true" width="250px"
onOK="@command('doSearch')"/>
<button label="${labels.Search}" onClick="@command('doSearch')" sclass="nicebutton"
image="/img/search.png"/>
</hbox>
</vbox>
</div>
</hbox>
<panel hflex="1" vflex="1">
<panelchildren style="overflow:auto;">
<vbox children="@load(vm.results)" width="100%">
<template name="children">
<vbox width="100%">
<separator bar="true" width="100%"/>
<label value="@load(each.recordName)" style="font-weight: bold; font-size:14px;"/>
<label value="@load(each.description)"/>
<hbox>
<label value="${labels.created}: "/>
<label value="@load(each.created)"/>
</hbox>
<hbox>
<label value="${labels.ownedBy}: "/>
<label value="@load(each.ownedBy)"/>
</hbox>
<hbox>
<label value="${labels.modified}: "/>
<label value="@load(each.modified)"/>
</hbox>
<hbox>
<label value="${labels.modifiedBy}: "/>
<label value="@load(each.modifiedBy)"/>
</hbox>
<a href="@load(each.url)" label="@load(each.url)"/>
</vbox>
</template>
</vbox>
</panelchildren>
</panel>
</vbox>
</window>
</zk>