Merge branch 'master' of https://git.bukova.info/repos/git/isspst
Conflicts: src/main/resources/hibernate.cfg.xml src/main/webapp/WEB-INF/spring/root-context.xml
This commit is contained in:
@@ -0,0 +1,55 @@
|
||||
.nicebutton {
|
||||
font-family: Arial;
|
||||
color: #050005;
|
||||
font-size: 12px;
|
||||
padding-top: 3px;
|
||||
padding-right: 10px;
|
||||
padding-bottom: 3px;
|
||||
padding-left: 10px;
|
||||
margin: 4px;
|
||||
text-decoration: none;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
-webkit-box-shadow: 0px 1px 3px #666666;
|
||||
-moz-box-shadow: 0px 1px 3px #666666;
|
||||
box-shadow: 0px 1px 3px #666666;
|
||||
text-shadow: 1px 1px 2px #666666;
|
||||
border: solid #8abaed 1px;
|
||||
background: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#efefef));
|
||||
background: -moz-linear-gradient(top, #ffffff, #efefef);
|
||||
-ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#efefef);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#efefef);
|
||||
display:inline-block; /* IE is so silly */
|
||||
}
|
||||
.nicebutton:hover {
|
||||
background: #c5e8fa;
|
||||
}
|
||||
.nicebutton:disabled {
|
||||
font-family: Arial;
|
||||
color: #c4c4c4;
|
||||
font-size: 12px;
|
||||
padding-top: 3px;
|
||||
padding-right: 10px;
|
||||
padding-bottom: 3px;
|
||||
padding-left: 10px;
|
||||
margin: 5px;
|
||||
text-decoration: none;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
-webkit-box-shadow: 0px 1px 3px #666666;
|
||||
-moz-box-shadow: 0px 1px 3px #666666;
|
||||
text-shadow: 0px 0px 0px #9e9e9e;
|
||||
box-shadow: 0px 1px 3px #666666;
|
||||
border: solid #d91c71 0px;
|
||||
background: #ebebeb;
|
||||
}
|
||||
|
||||
.error {
|
||||
color: red;
|
||||
}
|
||||
|
||||
.bold {
|
||||
font-weight: bold;
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
<?page title="buttons" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<button image="/img/save.png" label="Uložit" onClick="@command('save', window=editWin) @global-command('refresh')" sclass="nicebutton" /><button image="~./zul/img/misc/drag-disallow.png" label="Zrušit" onClick="editWin.detach()" sclass="nicebutton"/>
|
||||
</zk>
|
||||
@@ -31,6 +31,7 @@
|
||||
<menuitem label="Střediska" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
|
||||
<menuitem label="${labels.AgendaBuildings}" href="/buildings"/>
|
||||
<menuitem label="Místnosti" href="/admin/users"/>
|
||||
<menuitem label="Dodavatelé" href="/admin/addressbook"/>
|
||||
</menubar>
|
||||
</tabpanel>
|
||||
<tabpanel>
|
||||
|
||||
@@ -1,7 +1,47 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<html xmlns="native" xmlns:u="zul" xmlns:zk="zk">
|
||||
<u:style src="/app/page.css"/>
|
||||
|
||||
<script type="text/javascript">
|
||||
zk.afterLoad("zk", function () {
|
||||
var oldProgressbox = zUtl.progressbox;
|
||||
zUtl.progressbox = function () {
|
||||
oldProgressbox.apply(this, arguments);
|
||||
var $mask = jq('.z-loading');
|
||||
if ($mask) {
|
||||
var $img = jq('.z-loading-indicator'),
|
||||
$body = jq(document.body),
|
||||
body = $body[0],
|
||||
bw = $body.width() + body.scrollLeft - 10,
|
||||
bh = $body.height() + body.scrollTop - 10;
|
||||
|
||||
// update mask and image's style
|
||||
$mask.width(bw);
|
||||
$mask.height(bh);
|
||||
$mask.css('opacity', .75);
|
||||
|
||||
$img.width('150px');
|
||||
$img.css('margin-left', (bw - $img.width()) / 2 + 'px');
|
||||
$img.css('margin-top', (bh - $img.height()) / 2 + 'px');
|
||||
|
||||
// update mask size when window scroll
|
||||
if (!window.eventBinded) {
|
||||
var $win = jq(window);
|
||||
$win.scroll(function () {
|
||||
var $maskInst = jq('.z-loading');
|
||||
if ($maskInst[0]) {
|
||||
$maskInst.width(bw + $win.scrollLeft());
|
||||
$maskInst.height(bh + $win.scrollTop());
|
||||
}
|
||||
});
|
||||
window.eventBinded = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<div id="container">
|
||||
<div id="header">
|
||||
hlavicka
|
||||
</div>
|
||||
@@ -11,11 +51,13 @@
|
||||
</div>
|
||||
|
||||
<div id="maincolumn">
|
||||
|
||||
<u:include src="${gridZul}"/>
|
||||
</div>
|
||||
|
||||
<div id="footer">Footer
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</html>
|
||||
@@ -0,0 +1,9 @@
|
||||
<?page title="toolbar" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<toolbar>
|
||||
<toolbarbutton image="/img/add.png" tooltiptext="Nový" id="btnNew" onClick="@command('addNew')" disabled="@load(vm.filter)" />
|
||||
<toolbarbutton image="/img/edit.png" tooltiptext="Upravit" id="btnEdit" onClick="@command('edit')" disabled="@load(empty vm.dataBean ? 'true' : 'false')"/>
|
||||
<toolbarbutton image="/img/delete.png" tooltiptext="Smazat" id="btnDelete" onClick="@command('delete')" disabled="@load(empty vm.dataBean ? 'true' : 'false')"/>
|
||||
<toolbarbutton image="/img/funnel.png" tooltiptext="Filtr" id="btnFilter" onClick="@command('filter')" />
|
||||
</toolbar>
|
||||
</zk>
|
||||
Reference in New Issue
Block a user