git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.osgi.server/img/baseline_edit_black_18dp.png b/server/user.jobengine.osgi.server/img/baseline_edit_black_18dp.png
new file mode 100644 (file)
index 0000000..9ec4db8
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/baseline_edit_black_18dp.png differ

diff --git a/server/user.jobengine.osgi.server/img/baseline_share_black_18dp.png b/server/user.jobengine.osgi.server/img/baseline_share_black_18dp.png
new file mode 100644 (file)
index 0000000..32bf8a0
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/baseline_share_black_18dp.png differ

diff --git a/server/user.jobengine.osgi.server/img/ic_compare_arrows_black_18dp.png b/server/user.jobengine.osgi.server/img/ic_compare_arrows_black_18dp.png
new file mode 100644 (file)
index 0000000..f387108
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/ic_compare_arrows_black_18dp.png differ

diff --git a/server/user.jobengine.osgi.server/img/ic_shopping_cart_black_18dp.png b/server/user.jobengine.osgi.server/img/ic_shopping_cart_black_18dp.png
new file mode 100644 (file)
index 0000000..33b5c98
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/ic_shopping_cart_black_18dp.png differ

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index c7523a4433a69a7382ed6d95b64cce139d6c008b..3d3212d86780a35618d92e867ee8d1033f0bcf4a 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -201,14 +201,31 @@
                                        <center border="none">\r
 \r
                                                <groupbox closable="false" mold="3d" width="100%" height="100%">\r
-                                                       <div width="100%" sclass="menuButtons">\r
-                                                               <button label="Kosárba" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not vm.hasTSMMediaFile)"\r
-                                                                       sclass="buttonBold" />\r
-                                                               <button id="copyMediaIdButton" label="MédiaId vágólapra másolás" onClick="@command('copyMediaIdToClipboard')" autodisable="self"\r
-                                                                       disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" />\r
-                                                               <button id="metadataButton" label="Szerkesztés" onClick="@command('openMetaDataDialog')" autodisable="self"\r
-                                                                       disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" />\r
-                                                       </div>\r
+                                               \r
+                                                       <toolbar vflex="min" style="font-size:8px">\r
+                                                               <toolbarbutton image="/img/ic_compare_arrows_black_18dp.png" autodisable="self" onClick="@command('showInResults')" \r
+                                                                       disabled="@load(vm.selectedObject eq null)"\r
+                                                                       label="Szinkronizálás"/>\r
+                                                               <toolbarbutton image="/img/ic_shopping_cart_black_18dp.png" autodisable="self" onClick="@command('downloadMedia')" \r
+                                                                       disabled="@load(not vm.hasTSMMediaFile)"\r
+                                                                       label="Visszatöltés" />\r
+                                                               <toolbarbutton image="/img/baseline_share_black_18dp.png" autodisable="self" onClick="@command('copyMediaIdToClipboard')"\r
+                                                                       disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)"\r
+                                                                       label="Megosztás" />\r
+                                                                       \r
+                                                               <toolbarbutton image="/img/baseline_edit_black_18dp.png" autodisable="self" onClick="@command('openMetaDataDialog')"\r
+                                                                       disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)"\r
+                                                                       label="Szerkesztés" />\r
+                                                       </toolbar>\r
+                                               \r
+<!--                                                   <div width="100%" sclass="menuButtons"> -->\r
+<!--                                                           <button label="Kosárba" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not vm.hasTSMMediaFile)" -->\r
+<!--                                                                   sclass="buttonBold" /> -->\r
+<!--                                                           <button id="copyMediaIdButton" label="MédiaId vágólapra másolás" onClick="@command('copyMediaIdToClipboard')" autodisable="self" -->\r
+<!--                                                                   disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" /> -->\r
+<!--                                                           <button id="metadataButton" label="Szerkesztés" onClick="@command('openMetaDataDialog')" autodisable="self" -->\r
+<!--                                                                   disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" /> -->\r
+<!--                                                   </div> -->\r
 \r
                                                        <div width="100%" height="90%" style="padding: 4px; overflow:auto; background-color: white">\r
                                                                <div>\r

diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 61945fbc90edb4c82183f46486240e6bf1e3ac71..966f73a301dc1545849326f80e22f192faa0d50d 100644 (file)
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -466,6 +466,11 @@ public class SearchModel extends AsyncBaseModel {
                this.selectedObject = selectedObject;\r
        }\r
 \r
+       @Command\r
+       public void showInResults() {\r
+\r
+       }\r
+\r
        public void updateAllChecked() {\r
                final boolean[] check = { true };\r
                for (String key : typeFilters.keySet()) {\r