From e539fe6662c7a48a3651db9884b177f1a709f5af Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A1rk=20M=C3=A9r=C3=A9sz?= Date: Wed, 18 Jul 2018 08:05:41 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31189 --- .../pages/searchitems.zul | 174 ++++++++++++------ .../user/jobengine/zk/model/SearchModel.java | 18 +- 2 files changed, 117 insertions(+), 75 deletions(-) diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul index 3e1bd3b2..59d2e955 100644 --- a/server/user.jobengine.osgi.server/pages/searchitems.zul +++ b/server/user.jobengine.osgi.server/pages/searchitems.zul @@ -7,8 +7,8 @@ - - + +
@@ -97,8 +97,7 @@ @@ -152,9 +151,11 @@
]]> + @@ -200,67 +201,124 @@
- - -
- - - - - +
+ +
+ + + + +
-
- -
-
-
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 7dcefbad..46868864 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 @@ -414,22 +414,6 @@ public class SearchModel extends AsyncBaseModel { } } - private void highlight(int index, boolean highlight) { - if (index >= itemsGrid.getRows().getChildren().size()) - return; - List components = itemsGrid.getRows().getChildren(); - Row row = (Row) components.get(index); - Detail detail = (Detail) row.getChildren().get(0); - Hlayout hlayout = (Hlayout) detail.getChildren().get(0); - if (highlight) { - row.setStyle("background: #F1F8E9;"); - hlayout.setStyle("border-bottom: 1px solid #C5E1A5; background: #F1F8E9;"); - } else { - row.setStyle("background: none;"); - hlayout.setStyle("border-bottom: 1px solid #ebebeb; background: none;"); - } - } - public boolean isAllChecked() { return allChecked; } @@ -588,7 +572,7 @@ public class SearchModel extends AsyncBaseModel { return; int activePageIndex = selectedRowIndex / itemsGrid.getPageSize(); positionToScroll = selectedRowIndex - itemsGrid.getPageSize() * activePageIndex; - //preventAfterRender = true; + // preventAfterRender = true; if (activePageIndex != itemsGrid.getActivePage()) { itemsGrid.setActivePage(activePageIndex); logger.info("Selected media is shown in the results, which can be found on {} page and also it will be highlighted.", activePageIndex + 1); -- 2.54.0