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

diff --git a/server/user.jobengine.osgi.server/pages/search_items.zul b/server/user.jobengine.osgi.server/pages/search_items.zul
index 7a8d822a6ac55de8e1ee097affd141a470b351f6..fdd004cf28c4f9562d7cda17a876da690d9b0a73 100644 (file)
--- 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"\r
                                                        sclass="listbox-normal-style">\r
                                                        <listhead sizable="true">\r
-                                                               <listheader label="ID" hflex="min" align="left" />\r
-                                                               <listheader label="Cím" align="left" />\r
+                                                               <listheader label="ID" hflex="1" align="left" />\r
+                                                               <listheader label="Cím" hflex="6" align="left" />\r
                                                        </listhead>\r
                                                        <template name="model">\r
                                                                <listitem>\r
@@ -44,10 +44,10 @@
 \r
                                                <listbox id="mediaList" sizedByContent="false" span="true" onSelect="@command('onSelectMedia', media=event.reference.value)" model="@load(svm.selectedItem.medias)"\r
                                                        multiple="false" vflex="true" selectedItem="@bind(svm.selectedMedia)" style="border: none; background: #e3e3e3 !important;"\r
-                                                       oddRowSclass="listbox-odd-style" sclass="listbox-normal-style">\r
+                                                       oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" >\r
                                                        <listhead sizable="true">\r
-                                                               <listheader label="ID" hflex="min" align="left" />\r
-                                                               <listheader label="Cím" align="left" />\r
+                                                               <listheader label="ID" hflex="1" align="left" />\r
+                                                               <listheader label="Cím" hflex="6" align="left" />\r
                                                        </listhead>\r
                                                        <template name="model">\r
                                                                <listitem>\r
@@ -63,27 +63,92 @@
                        <!-- media player -->\r
                        <center border="none">\r
 \r
-                               <borderlayout height="100%" width="100%">\r
-                                       <north border="none" size="60%" splittable="true">\r
-                                               <div align="center" height="100%" width="100%" visible="@load(svm.hasLowresMediaFile)">\r
-<!--                                                   <label value="@bind(svm.selectedMedia.description)" /> -->\r
+                               <borderlayout height="100%" width="100%" visible="@load(svm.hasLowresMediaFile)">\r
+                               \r
+                                       <north border="none" size="60%" splittable="true" minsize="250" collapsible="true">\r
+                                               <div align="center" height="100%" width="100%">\r
+<!--                                           <label value="@bind(svm.selectedMedia.description)" /> -->\r
                                                        <iframe id="mediaPlayer" height="100%" width="100%" autohide="false" src="@load(svm.lowresMediaFilePath)"></iframe>\r
                                                </div>\r
                                        </north>\r
-                                       <south border="none" size="40%" visible="@load(svm.hasLowresMediaFile)" >\r
-                                               <window title="@load(svm.selectedItem.title)" contentStyle="overflow:auto;">\r
-                                               <grid style="overflow: scroll;">\r
-                                                   <rows>\r
-                                                       <row visible="@load(svm.selectedItem.description)">\r
-                                                               <label style="font-size:8pt" value="Anyag leírása" />\r
-                                                               <label value="@load(svm.selectedItem.description)" />\r
-                                                       </row>\r
-                                                   </rows>\r
-                                               </grid>\r
-                                                       <button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not svm.hasTSMMediaFile)"\r
-                                                               sclass="buttonboldfont" />\r
-                                               </window>                                               \r
-                                       </south>\r
+                                       <center border="none" >\r
+                                               \r
+                                               <groupbox closable="false" mold="3d" width="100%" height="100%">\r
+                                                       <caption label="@load(svm.selectedItem.title)" />\r
+                                                       <button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self"\r
+                                                       disabled="@load(not svm.hasTSMMediaFile)" sclass="buttonboldfont" />\r
+                                                       <div width="100%" height="100%" style="border:1px solid black;overflow:auto;">\r
+                                                       \r
+                                                               <div if="${svm.selectedItem.description ne null}">\r
+                                                                       <label style="font-size:8pt" value="Anyag leírása" />\r
+                                                                       <div><label value="@load(svm.selectedItem.description)" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               <space bar="false" />\r
+                                                               <div if="${svm.selectedItem.description eq null}">\r
+                                                                       <label style="font-size:8pt; font-weight:bold;" value="Anyag leírása" />\r
+                                                                       <div><label value="fake description" /></div>\r
+                                                               </div>\r
+                                                               </div>\r
+                                                       </groupbox>\r
+                                               \r
+                                                                                               \r
+                                       </center>\r
                                </borderlayout>\r
 \r
                        </center>\r

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 4ef58c7ee29b151a8b51e057b807b21447578f0c..0f6f745b294de8342901a8e0128d5379a70a612b 100644 (file)
--- 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;\r
 \r
        @Command\r
-       @NotifyChange({ "mold", "paging", "searchResult" })\r
+       @NotifyChange({ "mold", "paging", "searchResult", "selectedItem", "selectedMedia", "hasLowresMediaFile" })\r
        public void doSearch() {\r
                try {\r
                        //do search ++++++++\r
-                       searchResult = new CachedListModel(searchValue);\r
+                       if(searchValue != null){\r
+                               if(searchValue.length() >= 3){\r
+                                       searchResult = new CachedListModel(searchValue);\r
+                                       if(searchResult.getSize() <= 0){\r
+                                               this.selectedItem = null;\r
+                                               this.selectedMedia = null;\r
+                                       }\r
+                               }\r
+                       }\r
                } catch (Exception exc) {\r
                        // Error during search dialog\r
                        Messagebox.show(Labels.getLabel("error.search"), Labels.getLabel("dialogger.warning"), Messagebox.OK, Messagebox.ERROR, defaultOKEventListener);\r