From: Vásáry Dániel <vasary@elgekko.net>
Date: Thu, 11 Apr 2024 11:58:00 +0000 (+0200)
Subject: Merge branch 'master' of https://git.useribm.hu/mediacube.git
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=de285b47efc60e7534dd4a29604c498c72c284dc;p=mediacube.git

Merge branch 'master' of https://git.useribm.hu/mediacube.git
---

de285b47efc60e7534dd4a29604c498c72c284dc
diff --cc server/user.mediacube.gui/pages/searchitems/gridresults.zul
index feaff652,feaff652..536412d4
--- a/server/user.mediacube.gui/pages/searchitems/gridresults.zul
+++ b/server/user.mediacube.gui/pages/searchitems/gridresults.zul
@@@ -1,20 -1,20 +1,12 @@@
  <!DOCTYPE xml>
  
--<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:c="client"
--	height="100%" width="100%">
++<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:c="client" height="100%" width="100%">
  	<grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" autopaging="false"
  		model="@load(vm.searchResult)" emptyMessage="Nincs találat!" pageSize="50" onAfterRender="@command('onAfterRenderGrid')"
--		style="border: none; background: white !important;" oddRowSclass="listbox-odd-style">
--		<attribute name="onAfterRender">
--			Clients.evalJavaScript("clearSelection();");
--		</attribute>
++		style="border: none;">
  		<columns id="orderColumns">
--			<column hflex="min">
--				<checkbox checked="@bind(vm.rowsExpanded)" />
--			</column>
--			<column hflex="min">
--				<checkbox checked="@bind(vm.allSelected)" />
--			</column>
++			<column hflex="min"><checkbox checked="@bind(vm.rowsExpanded)" /></column>
++			<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="Fájlnév" sort="auto" hflex="5" align="left" />
@@@ -23,74 -23,74 +15,44 @@@
  		</columns>
  		<rows id="rows" style="cursor: pointer;">
  			<template name="model">
--				<row onClick="@command('select', selectedObject=each)"
--					onMouseOver="@Command('rowMouseOver', evt=event)"
--					onMouseOut="@Command('rowMouseOut', evt=event)"
--					style="background: none;">
++				<row onClick="@command('select', selectedObject=each)" onMouseOver="@Command('rowMouseOver', evt=event)"
++					onMouseOut="@Command('rowMouseOut', evt=event)" style="background: none;">
++					<checkbox checked="@save(vm.itemSelected) @validator(vm.itemSelectedValidator, arg=each)" />
++					<label value="@load(each.media.houseId)" />
++					<label value="@load(each.media.title)" />
++					<label value="@load(each.media.mediaFilesName)" />
++					<label style="font-size: 10px;" value="@load(each.media.archived) @converter('user.jobengine.zk.model.ShortDateConverter')" />
++					<cell>
++						<vlayout>
++							<hlayout>
++								<label value="@load(each.media.length) @converter('user.jobengine.zk.model.TCConverter')" />
++								<a iconSclass="z-icon-eye" class="search-details-icon" visible="${each.media.fileCount gt 1}"/>
++								<a iconSclass="z-icon-eye-slash" class="search-details-icon" visible="${each.media.fileCount lt 2}"/>
++								<a iconSclass="z-icon-pencil" class="search-details-icon" visible="@load(!each.media.created.equals(each.media.modified))"/>
++							</hlayout>
++						</vlayout>
++					</cell>
++					
  					<detail open="@load(vm.rowsExpanded)">
--						<hlayout
--							style="border-bottom: 1px solid #ebebeb; width: 100%;">
--							<image
--								tooltiptext="Kattints a lejátszáshoz!" width="140px"
--								height="90px" sclass="myimg"
--								content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByToImageConverter')"
--								onClick="@command('select', selectedObject=each)" />
++						<hlayout style="border-bottom: 1px solid #808080; width: 100%;">
  							<div sclass="details">
  								<hlayout>
++									<image width="140px"
++										height="90px" sclass="myimg"
++										content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByteToImageConverter')"
++										onClick="@command('select', selectedObject=each)" />									
  									<div
  										class="${c:cat(vm.typeFilters[each.media.itemType.name].color,' type-inlist')}">
--										<label style="font-size: 10px;"
--											value="@load(each.media.itemType.name)" />
++										<label style="font-size: 10px; width: 100px; display: inline-block;" value="@load(each.media.itemType.name)" />
  									</div>
--									<label
--										style="font:20px Century Gothic; color:#008AC8;"
--										value="@load(each.item.title)" />
++									<label sclass="resultTitle" value="@load(each.item.title)" />
  								</hlayout>
  								<html sclass="relevant">
--									
--									<![CDATA[ <div style='width:
--									90%'>${each.relevant}</div> ]]>
--									
++									<![CDATA[ <div style='width:90%'>${each.relevant}</div> ]]>
  								</html>
  							</div>
  						</hlayout>
  					</detail>
--					<checkbox
--						checked="@save(vm.itemSelected) @validator(vm.itemSelectedValidator, arg=each)" />
--					<label value="@load(each.media.houseId)" />
--					<label value="@load(each.media.title)" />
--					<label value="@load(each.media.mediaFileRealName)" />
--					<label style="font-size: 10px;"
--						value="@load(each.media.archived) @converter('user.jobengine.zk.model.ShortDateConverter')" />
--					<cell>
--						<vlayout>
--							<hlayout>
--								<label style="font-size:14px"
--									value="@load(each.media.length) @converter('user.jobengine.zk.model.TCConverter')" />
--								<image
--									src="/img/ic_visibility_black_18dp.png"
--									style="margin-left:4px;margin-top:2px;vertical-align:top;">
--									<attribute name="visible"
--										if="${each.media.mediaFilesCount lt 2}">
--										false
--									</attribute>
--								</image>
--								<image
--									src="/img/ic_visibility_off_black_18dp.png"
--									style="margin-left:4px;margin-top:2px;vertical-align:top;">
--									<attribute name="visible"
--										if="${each.media.mediaFilesCount gt 1}">
--										false
--									</attribute>
--								</image>
--								<image
--									src="/img/baseline_arrow_back_black_18dp.png"
--									style="margin-left:4px;margin-top:2px;vertical-align:top;"
--									visible="@load(!each.media.created.equals(each.media.modified))">
--								</image>
--							</hlayout>
--						</vlayout>
--					</cell>
  				</row>
  			</template>
  		</rows>