From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Mon, 16 Jul 2018 14:22:06 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=198ef06c499f7463e2a724e3325a0dc9b670e7d9;p=mediacube.git

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

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
index 00000000..9ec4db8f
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
index 00000000..32bf8a02
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
index 00000000..f3871089
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
index 00000000..33b5c989
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 c7523a44..3d3212d8 100644
--- 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">
 
 						<groupbox closable="false" mold="3d" width="100%" height="100%">
-							<div width="100%" sclass="menuButtons">
-								<button label="Kosárba" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not vm.hasTSMMediaFile)"
-									sclass="buttonBold" />
-								<button id="copyMediaIdButton" label="MédiaId vágólapra másolás" onClick="@command('copyMediaIdToClipboard')" autodisable="self"
-									disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" />
-								<button id="metadataButton" label="Szerkesztés" onClick="@command('openMetaDataDialog')" autodisable="self"
-									disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" />
-							</div>
+						
+							<toolbar vflex="min" style="font-size:8px">
+								<toolbarbutton image="/img/ic_compare_arrows_black_18dp.png" autodisable="self" onClick="@command('showInResults')" 
+									disabled="@load(vm.selectedObject eq null)"
+									label="Szinkronizálás"/>
+								<toolbarbutton image="/img/ic_shopping_cart_black_18dp.png" autodisable="self" onClick="@command('downloadMedia')" 
+									disabled="@load(not vm.hasTSMMediaFile)"
+									label="Visszatöltés" />
+								<toolbarbutton image="/img/baseline_share_black_18dp.png" autodisable="self" onClick="@command('copyMediaIdToClipboard')"
+									disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)"
+									label="Megosztás" />
+									
+								<toolbarbutton image="/img/baseline_edit_black_18dp.png" autodisable="self" onClick="@command('openMetaDataDialog')"
+									disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)"
+									label="Szerkesztés" />
+							</toolbar>
+						
+<!-- 							<div width="100%" sclass="menuButtons"> -->
+<!-- 								<button label="Kosárba" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not vm.hasTSMMediaFile)" -->
+<!-- 									sclass="buttonBold" /> -->
+<!-- 								<button id="copyMediaIdButton" label="MédiaId vágólapra másolás" onClick="@command('copyMediaIdToClipboard')" autodisable="self" -->
+<!-- 									disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" /> -->
+<!-- 								<button id="metadataButton" label="Szerkesztés" onClick="@command('openMetaDataDialog')" autodisable="self" -->
+<!-- 									disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" /> -->
+<!-- 							</div> -->
 
 							<div width="100%" height="90%" style="padding: 4px; overflow:auto; background-color: white">
 								<div>
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 61945fbc..966f73a3 100644
--- 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;
 	}
 
+	@Command
+	public void showInResults() {
+
+	}
+
 	public void updateAllChecked() {
 		final boolean[] check = { true };
 		for (String key : typeFilters.keySet()) {