From: Rendek Róbert <robert.rendek@userrendszerhaz.hu>
Date: Wed, 11 Oct 2017 14:54:22 +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=6c65560ad12b6224a7af5b62f3bda8cbc886ab53;p=mediacube.git

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

diff --git a/server/user.jobengine.osgi.server/pages/search_items.zul b/server/user.jobengine.osgi.server/pages/search_items.zul
index 7a8d822a..fdd004cf 100644
--- a/server/user.jobengine.osgi.server/pages/search_items.zul
+++ b/server/user.jobengine.osgi.server/pages/search_items.zul
@@ -27,8 +27,8 @@
 							selectedItem="@bind(svm.selectedItem)" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style"
 							sclass="listbox-normal-style">
 							<listhead sizable="true">
-								<listheader label="ID" hflex="min" align="left" />
-								<listheader label="Cím" align="left" />
+								<listheader label="ID" hflex="1" align="left" />
+								<listheader label="Cím" hflex="6" align="left" />
 							</listhead>
 							<template name="model">
 								<listitem>
@@ -44,10 +44,10 @@
 
 						<listbox id="mediaList" sizedByContent="false" span="true" onSelect="@command('onSelectMedia', media=event.reference.value)" model="@load(svm.selectedItem.medias)"
 							multiple="false" vflex="true" selectedItem="@bind(svm.selectedMedia)" style="border: none; background: #e3e3e3 !important;"
-							oddRowSclass="listbox-odd-style" sclass="listbox-normal-style">
+							oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" >
 							<listhead sizable="true">
-								<listheader label="ID" hflex="min" align="left" />
-								<listheader label="Cím" align="left" />
+								<listheader label="ID" hflex="1" align="left" />
+								<listheader label="Cím" hflex="6" align="left" />
 							</listhead>
 							<template name="model">
 								<listitem>
@@ -63,27 +63,92 @@
 			<!-- media player -->
 			<center border="none">
 
-				<borderlayout height="100%" width="100%">
-					<north border="none" size="60%" splittable="true">
-						<div align="center" height="100%" width="100%" visible="@load(svm.hasLowresMediaFile)">
-<!-- 							<label value="@bind(svm.selectedMedia.description)" /> -->
+				<borderlayout height="100%" width="100%" visible="@load(svm.hasLowresMediaFile)">
+				
+					<north border="none" size="60%" splittable="true" minsize="250" collapsible="true">
+						<div align="center" height="100%" width="100%">
+<!-- 						<label value="@bind(svm.selectedMedia.description)" /> -->
 							<iframe id="mediaPlayer" height="100%" width="100%" autohide="false" src="@load(svm.lowresMediaFilePath)"></iframe>
 						</div>
 					</north>
-					<south border="none" size="40%" visible="@load(svm.hasLowresMediaFile)" >
-						<window title="@load(svm.selectedItem.title)" contentStyle="overflow:auto;">
-						<grid style="overflow: scroll;">
-						    <rows>
-						        <row visible="@load(svm.selectedItem.description)">
-						        	<label style="font-size:8pt" value="Anyag leírása" />
-						        	<label value="@load(svm.selectedItem.description)" />
-						        </row>
-						    </rows>
-						</grid>
-							<button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not svm.hasTSMMediaFile)"
-								sclass="buttonboldfont" />
-						</window>						
-					</south>
+					<center border="none" >
+						
+						<groupbox closable="false" mold="3d" width="100%" height="100%">
+							<caption label="@load(svm.selectedItem.title)" />
+							<button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self"
+							disabled="@load(not svm.hasTSMMediaFile)" sclass="buttonboldfont" />
+							<div width="100%" height="100%" style="border:1px solid black;overflow:auto;">
+							
+							        <div if="${svm.selectedItem.description ne null}">
+							        	<label style="font-size:8pt" value="Anyag leírása" />
+							        	<div><label value="@load(svm.selectedItem.description)" /></div>
+							        </div>
+							        <space bar="false" />
+
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+							        <space bar="false" />
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+							        <space bar="false" />
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+							        <space bar="false" />
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+							        <space bar="false" />
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+							        <space bar="false" />
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+							        <space bar="false" />
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+							        <space bar="false" />
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+							        <space bar="false" />
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+							        <space bar="false" />
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+							        <space bar="false" />
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+							        <space bar="false" />
+							        <div if="${svm.selectedItem.description eq null}">
+							        	<label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />
+							        	<div><label value="fake description" /></div>
+							        </div>
+								</div>
+							</groupbox>
+						
+												
+					</center>
 				</borderlayout>
 
 			</center>
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 4ef58c7e..0f6f745b 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
@@ -43,11 +43,19 @@ public class SearchModel extends BaseModel {
 	private Media selectedMedia = null;
 
 	@Command
-	@NotifyChange({ "mold", "paging", "searchResult" })
+	@NotifyChange({ "mold", "paging", "searchResult", "selectedItem", "selectedMedia", "hasLowresMediaFile" })
 	public void doSearch() {
 		try {
 			//do search ++++++++
-			searchResult = new CachedListModel(searchValue);
+			if(searchValue != null){
+				if(searchValue.length() >= 3){
+					searchResult = new CachedListModel(searchValue);
+					if(searchResult.getSize() <= 0){
+						this.selectedItem = null;
+						this.selectedMedia = null;
+					}
+				}
+			}
 		} catch (Exception exc) {
 			// Error during search dialog
 			Messagebox.show(Labels.getLabel("error.search"), Labels.getLabel("dialogger.warning"), Messagebox.OK, Messagebox.ERROR, defaultOKEventListener);