From 198ef06c499f7463e2a724e3325a0dc9b670e7d9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Mon, 16 Jul 2018 14:22:06 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31174

---
 .../img/baseline_edit_black_18dp.png          | Bin 0 -> 165 bytes
 .../img/baseline_share_black_18dp.png         | Bin 0 -> 230 bytes
 .../img/ic_compare_arrows_black_18dp.png      | Bin 0 -> 148 bytes
 .../img/ic_shopping_cart_black_18dp.png       | Bin 0 -> 219 bytes
 .../pages/searchitems.zul                     |  33 +++++++++++++-----
 .../user/jobengine/zk/model/SearchModel.java  |   5 +++
 6 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 server/user.jobengine.osgi.server/img/baseline_edit_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/baseline_share_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/ic_compare_arrows_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/ic_shopping_cart_black_18dp.png

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 0000000000000000000000000000000000000000..9ec4db8f9dbc646713f4f18a379b0cbcccb0c0c8
GIT binary patch
literal 165
zcmV;W09yZvP)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0001NNkl<Zcmci2
zAre497=Y2QsgkBTgrq5o89{L;joWY%%>fi6EI+d&+FfJt^5X{?4W7LetO%X0`2-9I
zLTf596FDIxiquqQ1Vu?ibzKr&M7PjXma}Y>FBEmB<c|yV?s6n|f%<4Y1)tjiSRXse
TUG_go00000NkvXXu0mjfOcXd$

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..32bf8a02ff9e0d6ff7b4abd6025ba907385dd1b8
GIT binary patch
literal 230
zcmV<C02%*@P)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz00023Nkl<Zcmbus
zH6k!z007YUcWxZOqPyz?Z2AUfHs?^Qb^%7+%yJUD?*3fh)9?A5G%eD+sMf9ER;?F|
z3W8u1zKW?<2v`%9W?V35%e7(u0pPnbNfLFtx1&i!l3l@-W2f5u64fgRf(?lxzJh;%
zAV6HEUBQ842bz5m=Z8GsB<OT!MUIzAHR4`}Zio8)7KciEf*@#vuVNNV0W!Uy)V1JR
gl^3OGmE!H50Jl>$R_<=_zyJUM07*qoM6N<$f;5m}DF6Tf

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..f38710892286216d69a83149aa719866669b0c27
GIT binary patch
literal 148
zcmeAS@N?(olHy`uVBq!ia0y~yU=RXf4i*LmhCj#M?l3SgM0>h8hEy;nOUN|L-7qPQ
zP1?z8mc&2dpb&<TCLZYxnn4K_3{z&YPib*rFJYD9;c^I?_)t;qb;B+>hp8)*JP!88
z9rz%>h)39Df#p_){pV#i{ARnH)YOn1pu)+pg;jCsM1M(h1_lNOPgg&ebxsLQ0HdcZ
AR{#J2

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..33b5c989adc48ca272b849aa7c6040043af0d81d
GIT binary patch
literal 219
zcmV<103`p3P)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0001@Nkl<Zcmb8o
zF%AJ?5J&OXXsu>j5hPlPPPM@mTtkQh5OD$rU`aF%!B!3-jv)%M)>M-(-&o6Us+ate
z;WstraxK1!$m9+bT9W151{HG88I5tQK2ENba8!BN5kow&nVc~?X4J)4@FLMWGQtSC
zvBxscE+pQy@ys|Cj|NN$v?@}4JWWzEV(pz&N&}aqj96=LrJmIB^q5fA3Zx?b@dj&-
VYZU*<-!T9H002ovPDHLkV1i}#Rf+%r

literal 0
HcmV?d00001

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()) {
-- 
2.54.0