Merge branch 'master' of https://git.useribm.hu/mediacube.git master
authorVásáry Dániel <vasary@elgekko.net>
Thu, 11 Apr 2024 11:58:00 +0000 (13:58 +0200)
committerVásáry Dániel <vasary@elgekko.net>
Thu, 11 Apr 2024 11:58:00 +0000 (13:58 +0200)
1  2 
server/user.mediacube.gui/pages/searchitems/gridresults.zul

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