From: Márk Mérész <USER\mark.meresz>
Date: Mon, 23 Jul 2018 07:43:28 +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=952049a35197af7a69d7cbe8d91667ee97c2284f;p=mediacube.git

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

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 94b17065..eacfc02b 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -19,33 +19,24 @@
 		.RED100.type-inlist { border-color: #FFCDD2!important; }
 
 		.RED100 .z-toolbarbutton-content { background: #FFCDD2; }
-	
-		.RED200.type-inlist { border-color: #EF9A9A!important; }
-		.RED200 .z-toolbarbutton-content { background: #EF9A9A; border-color: #EF9A9A;; }
 
-		.BROWN100.type-inlist {  border-color: #D7CCC8!important; }
-		.BROWN100 .z-toolbarbutton-content { background: #D7CCC8; border-color: #D7CCC8; }
+		.RED200.type-inlist { border-color: #EF9A9A!important; } .RED200 .z-toolbarbutton-content { background: #EF9A9A; border-color: #EF9A9A;; }
 
-		.YELLOW200.type-inlist {  border-color: #FFF59D!important; }
-		.YELLOW200 .z-toolbarbutton-content { background: #FFF59D; }
+		.BROWN100.type-inlist { border-color: #D7CCC8!important; } .BROWN100 .z-toolbarbutton-content { background: #D7CCC8; border-color: #D7CCC8; }
 
-		.INDIGO100.type-inlist {  border-color: #C5CAE9!important; }
-		.INDIGO100 .z-toolbarbutton-content { background: #C5CAE9; }
-		
-		.INDIGO200.type-inlist {  border-color: #9FA8DA!important; }
-		.INDIGO200 .z-toolbarbutton-content { background: #9FA8DA; }
-		
-		.BLUE100.type-inlist {  border-color: #BBDEFB!important; }
-		.BLUE100 .z-toolbarbutton-content { background: #BBDEFB; }
-		
-		.BLUE200.type-inlist {  border-color: #90CAF9!important; }
-		.BLUE200 .z-toolbarbutton-content { background: #90CAF9; }
-		
-		.TEAL100.type-inlist {  border-color: #B2DFDB!important; }
-		.TEAL100 .z-toolbarbutton-content { background: #B2DFDB; }
-		
-		.TEAL200.type-inlist {  border-color: #80CBC4!important; }
-		.TEAL200 .z-toolbarbutton-content { background: #80CBC4; }
+		.YELLOW200.type-inlist { border-color: #FFF59D!important; } .YELLOW200 .z-toolbarbutton-content { background: #FFF59D; }
+
+		.INDIGO100.type-inlist { border-color: #C5CAE9!important; } .INDIGO100 .z-toolbarbutton-content { background: #C5CAE9; }
+
+		.INDIGO200.type-inlist { border-color: #9FA8DA!important; } .INDIGO200 .z-toolbarbutton-content { background: #9FA8DA; }
+
+		.BLUE100.type-inlist { border-color: #BBDEFB!important; } .BLUE100 .z-toolbarbutton-content { background: #BBDEFB; }
+
+		.BLUE200.type-inlist { border-color: #90CAF9!important; } .BLUE200 .z-toolbarbutton-content { background: #90CAF9; }
+
+		.TEAL100.type-inlist { border-color: #B2DFDB!important; } .TEAL100 .z-toolbarbutton-content { background: #B2DFDB; }
+
+		.TEAL200.type-inlist { border-color: #80CBC4!important; } .TEAL200 .z-toolbarbutton-content { background: #80CBC4; }
 
 		.z-toolbarbutton-content { text-shadow: none; background: transparent; border: 1px solid transparent; border-radius: 3px; margin: 1px; }
 
@@ -67,6 +58,7 @@
 
 		.buttonBold{ font-weight:bold; width:200px;} .menuButtons{ display: flex; justify-content: space-around; padding:5px 20px 5px 20px; } .menuButtons
 		>button{ width:200px; } .z-messagebox-window{ top:40% !important; width:30% !important; } .z-toolbar-start{ width:100%; }
+
 	</style>
 	<div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.SearchModel')">
 		<timer id="timer" delay="1" repeats="false" onTimer="@command('uiTick')" />
@@ -74,8 +66,8 @@
 			<west border="none" size="60%" splittable="true" minsize="500">
 				<div height="100%" width="100%">
 					<groupbox vflex="min" closable="false">
-						<vlayout >
-							<hbox pack="left" align="top" id="searchFiltersMenu"> 
+						<vlayout>
+							<hbox pack="left" align="top" id="searchFiltersMenu">
 								<toolbar class="toolbar" style="width: 40px;">
 									<toolbarbutton label="Mind" style="font-size:9px;padding:0px;margin:0px 10px 0px 0px;background:none;" mode="toggle"
 										checked="@bind(vm.allChecked)" />
@@ -100,7 +92,7 @@
 						</vlayout>
 						<hbox width="100%" pack="center" align="left">
 							<combobox id="search" hflex="1" focus="true" model="@load(vm.searchHistory)" autodrop="true" buttonVisible="false"
-								tooltiptext="Gépelje be a keresendő kifejezést és nyomja meg az Enter-t." onOK="@command('doSearch')" >
+								tooltiptext="Gépelje be a keresendő kifejezést és nyomja meg az Enter-t." onOK="@command('doSearch')">
 								<template name="model">
 									<comboitem label="${each}" />
 								</template>
@@ -108,7 +100,7 @@
 							<button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" />
 							<button dir="reverse" image="/img/baseline_expand_more_black_18dp.png" popup="searchSettings, after_start" iconSclass="caret">
 							</button>
-							<menupopup id="searchSettings" >
+							<menupopup id="searchSettings">
 								<menuitem label="10 találat oldalanként" value="10" checked="true" onClick="@command('setPageSize', source=self)" />
 								<menuitem label="25 találat oldalanként" value="25" checked="true" onClick="@command('setPageSize', source=self)" />
 								<menuitem label="50 találat oldalanként" value="50" checked="true" onClick="@command('setPageSize', source=self)" />
@@ -137,8 +129,8 @@
 								<column hflex="min">
 									<checkbox checked="@bind(vm.allSelected)" />
 								</column>
-								<column label="ID" sort="auto" hflex="1" align="left"/>
-								<column label="Cím" sort="auto" hflex="2" align="left"/>
+								<column label="ID" sort="auto" hflex="1" align="left" />
+								<column label="Cím" sort="auto" hflex="2" align="left" />
 								<column label="Fájlnév" sort="auto" hflex="5" align="left" />
 								<column label="Hossz" sort="auto" hflex="2" align="right" />
 								<!-- 								<column width="20px" align="right" style="cursor: pointer" popup="sortOther" /> -->
@@ -160,7 +152,9 @@
 														<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>
@@ -205,62 +199,61 @@
 					</north>
 					<center border="none">
 						<div height="100%">
-								<toolbar width="100%" height="40px" style="font-size:8px">
-									<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" />
-										<toolbarbutton image="/img/ic_shopping_cart_black_18dp.png" autodisable="self" onClick="@command('downloadMedia')"
-											disabled="@load(not vm.hasTSMMediaFile)" label="Kosárba" />
-										<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" />
-									</div>
-								</toolbar>
-								<div id="mediaDetails" width="100%" vflex="true" style="padding: 4px; overflow:auto; background-color: white">
-									<div>
-										<label style="font-size:8pt; color: gray" value="Anyag azonosító" />
-										<div style="margin: 4px">
-											<label value="@load(vm.selectedObject.item.houseId)" />
-										</div>
-										<space bar="false" />
+							<toolbar width="100%" height="40px" style="font-size:8px">
+								<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" />
+									<toolbarbutton image="/img/ic_shopping_cart_black_18dp.png" autodisable="self" onClick="@command('downloadMedia')"
+										disabled="@load(not vm.hasTSMMediaFile)" label="Kosárba" />
+									<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" />
+								</div>
+							</toolbar>
+							<div id="mediaDetails" width="100%" vflex="true" style="padding: 4px; overflow:auto; background-color: white">
+								<div>
+									<label style="font-size:8pt; color: gray" value="Anyag azonosító" />
+									<div style="margin: 4px">
+										<label value="@load(vm.selectedObject.item.houseId)" />
 									</div>
-									<div>
-										<label style="font-size:8pt; color: gray" value="Anyag címe" />
-										<div style="margin: 4px">
-											<label value="@load(vm.selectedObject.item.title)" />
-										</div>
-										<space bar="false" />
+									<space bar="false" />
+								</div>
+								<div>
+									<label style="font-size:8pt; color: gray" value="Anyag címe" />
+									<div style="margin: 4px">
+										<label value="@load(vm.selectedObject.item.title)" />
 									</div>
-									<div>
-										<label style="font-size:8pt; color: gray" value="Anyag leírása" />
-										<div style="margin: 4px">
-											<label value="@load(vm.selectedObject.item.description)" />
-										</div>
-										<space bar="false" />
+									<space bar="false" />
+								</div>
+								<div>
+									<label style="font-size:8pt; color: gray" value="Anyag leírása" />
+									<div style="margin: 4px">
+										<label value="@load(vm.selectedObject.item.description)" />
 									</div>
-									<div>
-										<label style="font-size:8pt; color: gray" value="Média azonosító" />
-										<div style="margin: 4px">
-											<label value="@load(vm.selectedObject.media.houseId)" />
-										</div>
-										<space bar="false" />
+									<space bar="false" />
+								</div>
+								<div>
+									<label style="font-size:8pt; color: gray" value="Média azonosító" />
+									<div style="margin: 4px">
+										<label value="@load(vm.selectedObject.media.houseId)" />
 									</div>
-									<div>
-										<label style="font-size:8pt; color: gray" value="Média címe" />
-										<div style="margin: 4px">
-											<label value="@load(vm.selectedObject.media.title)" />
-										</div>
-										<space bar="false" />
+									<space bar="false" />
+								</div>
+								<div>
+									<label style="font-size:8pt; color: gray" value="Média címe" />
+									<div style="margin: 4px">
+										<label value="@load(vm.selectedObject.media.title)" />
 									</div>
-									<div>
-										<label style="font-size:8pt; color: gray" value="Média leírása" />
-										<div style="margin: 4px">
-											<label multiline="true" value="@load(vm.selectedObject.media.description)" />
-										</div>
+									<space bar="false" />
+								</div>
+								<div>
+									<label style="font-size:8pt; color: gray" value="Média leírása" />
+									<div style="margin: 4px">
+										<label multiline="true" value="@load(vm.selectedObject.media.description)" />
 									</div>
 								</div>
+							</div>
 						</div>
 						<!-- <groupbox closable="false" mold="3d" width="100%" height="98%">
 							<div width="100%" sclass="menuButtons">
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 43dd8d6c..581446a4 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
@@ -188,7 +188,8 @@ public class SearchModel extends AsyncBaseModel {
 			itemsGrid.setPageSize(SessionUtil.getUserPageSize());
 		setSettingsPageSize(itemsGrid.getPageSize());
 		if (!allChecked)
-			Clients.showNotification(String.format("Figyelem! A keresési paraméterek megváltoztak! "), "warning", searchFiltersMenu, "end_center", 3000);
+			Clients.showNotification(String.format("Figyelem!<br><br><span style='white-space:nowrap'> A keresési paraméterek megváltoztak! </span>"),
+					"warning", searchFiltersMenu, "end_center", 3000);
 	}
 
 	private void clearAllFilters() {