diff --git a/src/main/webapp/WEB-INF/locales/zk-label.properties b/src/main/webapp/WEB-INF/locales/zk-label.properties index d2d55f7e..9f0ab6e5 100644 --- a/src/main/webapp/WEB-INF/locales/zk-label.properties +++ b/src/main/webapp/WEB-INF/locales/zk-label.properties @@ -218,7 +218,10 @@ Permissions=Práva NumberSeries=Číselné řady User=Uživatel ChangePassword=Změnit heslo +Login=Přihlásit +Loggingin=Přihlášení Logout=Odhlásit +WrongNameOrPassword=Špatné jméno nebo heslo DateFormat=dd. MM. yyyy diff --git a/src/main/webapp/admin/index.zhtml b/src/main/webapp/admin/index.zhtml deleted file mode 100644 index be965415..00000000 --- a/src/main/webapp/admin/index.zhtml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - -Objednávky - - - administrace - - \ No newline at end of file diff --git a/src/main/webapp/app/info.zul b/src/main/webapp/app/info.zul index 5be89c4e..b1a6f57b 100644 --- a/src/main/webapp/app/info.zul +++ b/src/main/webapp/app/info.zul @@ -1,47 +1,65 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/app/mainMenu.zul b/src/main/webapp/app/mainMenu.zul index ed19343c..18e917dc 100644 --- a/src/main/webapp/app/mainMenu.zul +++ b/src/main/webapp/app/mainMenu.zul @@ -29,6 +29,7 @@ label="${labels.CurrentRequirements}" href="/trips/requirement" /> @@ -37,10 +38,12 @@ @@ -49,6 +52,7 @@ href="/lists/addressbook" disabled="${not sec:isAllGranted('PERM_READ_ADDRESSBOOK')}" /> @@ -97,6 +101,7 @@ label="${labels.ChangePassword}…" onClick="@command('passwd')" /> diff --git a/src/main/webapp/img/house-016.png b/src/main/webapp/img/house-016.png new file mode 100644 index 00000000..00bc7859 Binary files /dev/null and b/src/main/webapp/img/house-016.png differ diff --git a/src/main/webapp/img/house-032.png b/src/main/webapp/img/house-032.png new file mode 100644 index 00000000..b8c14f0a Binary files /dev/null and b/src/main/webapp/img/house-032.png differ diff --git a/src/main/webapp/img/lock-032.png b/src/main/webapp/img/lock-032.png new file mode 100644 index 00000000..0751daa1 Binary files /dev/null and b/src/main/webapp/img/lock-032.png differ diff --git a/src/main/webapp/img/material.png b/src/main/webapp/img/material.png deleted file mode 100644 index 0ba0c079..00000000 Binary files a/src/main/webapp/img/material.png and /dev/null differ diff --git a/src/main/webapp/img/painting-016.png b/src/main/webapp/img/painting-016.png new file mode 100644 index 00000000..015c4882 Binary files /dev/null and b/src/main/webapp/img/painting-016.png differ diff --git a/src/main/webapp/img/painting-032.png b/src/main/webapp/img/painting-032.png new file mode 100644 index 00000000..2fd84a8d Binary files /dev/null and b/src/main/webapp/img/painting-032.png differ diff --git a/src/main/webapp/img/palet-024.png b/src/main/webapp/img/palet-024.png new file mode 100644 index 00000000..4f70b384 Binary files /dev/null and b/src/main/webapp/img/palet-024.png differ diff --git a/src/main/webapp/img/palet-032.png b/src/main/webapp/img/palet-032.png new file mode 100644 index 00000000..a19c177f Binary files /dev/null and b/src/main/webapp/img/palet-032.png differ diff --git a/src/main/webapp/img/pickup-024.png b/src/main/webapp/img/pickup-024.png new file mode 100644 index 00000000..8900aab3 Binary files /dev/null and b/src/main/webapp/img/pickup-024.png differ diff --git a/src/main/webapp/img/pickup-032.png b/src/main/webapp/img/pickup-032.png new file mode 100644 index 00000000..a17196b1 Binary files /dev/null and b/src/main/webapp/img/pickup-032.png differ diff --git a/src/main/webapp/img/unlock-016.png b/src/main/webapp/img/unlock-016.png new file mode 100644 index 00000000..d9d5e4f2 Binary files /dev/null and b/src/main/webapp/img/unlock-016.png differ diff --git a/src/main/webapp/lists/buildings/building.zul b/src/main/webapp/lists/buildings/building.zul index c1693c99..ad062fc3 100644 --- a/src/main/webapp/lists/buildings/building.zul +++ b/src/main/webapp/lists/buildings/building.zul @@ -1,23 +1,47 @@ - - + + - - + - - - + + + - - +
- +
@@ -27,7 +51,11 @@
- +
@@ -37,7 +65,11 @@
- +
@@ -45,7 +77,6 @@
- - - \ No newline at end of file diff --git a/src/main/webapp/lists/buildings/buildingForm.zul b/src/main/webapp/lists/buildings/buildingForm.zul index 7dfea89f..d5fcd9e0 100644 --- a/src/main/webapp/lists/buildings/buildingForm.zul +++ b/src/main/webapp/lists/buildings/buildingForm.zul @@ -1,53 +1,102 @@ - - + + - + ${labels.BuildingsFormCode} : - + ${labels.BuildingsFormName} : - + ${labels.BuildingsFormDescription} : - + -