From 60b0e77a6f00552ee14451c3caf04c3af8eaa719 Mon Sep 17 00:00:00 2001
From: =?utf8?q?M=C3=A1rk=20M=C3=A9r=C3=A9sz?= <USER\mark.meresz>
Date: Mon, 23 Jul 2018 14:32:53 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31214

---
 .../pages/metadatadetails.zul                 | 28 +++++++++----------
 .../pages/searchitems.zul                     |  8 ++----
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/server/user.jobengine.osgi.server/pages/metadatadetails.zul b/server/user.jobengine.osgi.server/pages/metadatadetails.zul
index b40b6e81..8a578d57 100644
--- a/server/user.jobengine.osgi.server/pages/metadatadetails.zul
+++ b/server/user.jobengine.osgi.server/pages/metadatadetails.zul
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<window id="window"  title="" width="900px" height="660px" position="top_center" sizable="true" border="normal" apply="org.zkoss.bind.BindComposer"
+<window id="window"  title="" width="900px" height="655px" position="top_center" sizable="true" border="normal" apply="org.zkoss.bind.BindComposer"
 	viewModel="@id('vm') @init('user.jobengine.zk.model.MetadataDetailsModel')" forward="onCancel=closeButton.onClick">
 	<style>
 		.z-window-header{ background:#008ac8; color:white; font-size:16px; padding:10px; } .z-row:hover > .z-row-inner{ background:#7ad6ff40; }
 	</style>
 	<attribute name="onSize"><![CDATA[
-	        String height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.059813084112149535);
+	        Integer gridHeight=Integer.parseInt(self.getHeight().replace("px",""))-48;
+	        String height= String.valueOf(gridHeight*1/18);
             item_houseid.setHeight(height+"px");
             Clients.resize(item_houseid);
             item_title.setHeight(height+"px");
             Clients.resize(item_title);
             item_type.setHeight(height+"px");
             Clients.resize(item_type);
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.21495327102803738);
-            item_description.setHeight(height+"px");
-            Clients.resize(item_description);
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.0599250936329588);
             media_houseid.setHeight(height+"px");
             Clients.resize(media_houseid);
             media_title.setHeight(height+"px");
             Clients.resize(media_title);
             media_type.setHeight(height+"px");
             Clients.resize(media_type);
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.41869158878504675);
+            height= String.valueOf(gridHeight*3/18);
+            item_description.setHeight(height+"px");
+            Clients.resize(item_description);
+            height= String.valueOf(gridHeight*9/18);
             media_description.setHeight(height+"px");
             Clients.resize(media_description);
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.41869158878504675*0.9);
+            height= String.valueOf(gridHeight*9/18*0.88);
             media_description_content.setHeight(height+"px");
             Clients.resize(media_description_content);
         ]]></attribute>
 	<vlayout height="100%">
-		<div id="div" vflex="10">
+		<div id="div" vflex="true" >
 			<listbox vflex="1" style="border: none; background: #e3e3e3 !important;">
 				<listhead>
-					<listheader label="Tulajdonság" width="20%" />
-					<listheader label="Metaadat" />
+					<listheader label="" width="20%" />
+					<listheader label="" />
 				</listhead>
 					<listitem id="item_houseid">
 						<listcell label="Anyag azonosítója:" />
@@ -50,7 +50,7 @@
 					</listitem>
 					<listitem id="item_description">
 						<listcell label="Anyag leírása" />
-						<listcell><textbox rows="7" disabled="true" width="99%" value="@load(vm.archivedMedia.item.description)"></textbox></listcell>
+						<listcell><textbox rows="6" disabled="true" width="99%" value="@load(vm.archivedMedia.item.description)"></textbox></listcell>
 					</listitem>
 					<listitem id="media_houseid">
 						<listcell label="Média azonosítója:" />
@@ -71,14 +71,14 @@
 					</listitem>
 					<listitem id="media_description">
 						<listcell label="Média leírása:" />
-						<listcell><textbox rows="15" inplace="true" width="99%" id="media_description_content"
+						<listcell><textbox rows="21" inplace="true" width="99%" id="media_description_content"
 							value="@load(vm.archivedMedia.media.description) @save(vm.archivedMedia.media.description,before='save')">
 						</textbox></listcell>
 					</listitem>
 			</listbox>
 		</div>
 		<div vflex="min">
-		<hbox width="100%"  pack="center" align="center">
+		<hbox width="100%" vflex="min" pack="center" align="center">
 			<button id="saveButton" label="Mentés" onClick="@command('save')"/>
 			<button id="closeButton" label="Mégse" onClick="@command('close')" />
 		</hbox>
diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 99779b4b..2e5f0057 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -190,13 +190,7 @@
 														<label style="font:20px Century Gothic; color:#008AC8;" value="@load(each.item.title)" />
 													</hlayout>
 													<html sclass="relevant">
-
-
-														
 														<![CDATA[ <div style='width: 90%'>${each.relevant}</div> ]]>
-														
-														
-														
 													</html>
 												</div>
 											</hlayout>
@@ -242,6 +236,7 @@
 					<center border="none">
 						<div height="100%">
 							<toolbar width="100%" height="40px" style="font-size:8px">
+							<div style="width:400px; margin:auto;">
 								<div sclass="menuButtons">
 									<toolbarbutton image="/img/ic_compare_arrows_black_18dp.png" autodisable="self" onClick="@command('showInResults')"
 										disabled="@load(vm.selectedObject eq null)" label="Szinkronizálás" />
@@ -252,6 +247,7 @@
 									<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" />
 								</div>
+								</div>
 							</toolbar>
 							<div id="mediaDetails" width="100%" vflex="true" style="padding: 4px; overflow:auto; background-color: white">
 								<div>
-- 
2.54.0