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

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