demo videó nem betöltése, visszaállás GridSearchModel-re

diff --git a/server/user.mediacube.gui/pages/jobeditor2.zul b/server/user.mediacube.gui/pages/jobeditor2.zul
index 1ad0bd68e25a6043d5c062115b9c42508c1ff419..89db33a7fba51c48852a56938a1d8e00ec080667 100644 (file)
--- a/server/user.mediacube.gui/pages/jobeditor2.zul
+++ b/server/user.mediacube.gui/pages/jobeditor2.zul
@@ -118,8 +118,8 @@
                                                                <label height="100%" ca:data-syntax-highlight="true" multiline="true" pre="true" \r
                                                                        value="@bind(jem2.editingJob['xml'])" />\r
                                                        </tabpanel>\r
-                                                       <tabpanel>\r
-                                                               <include src="/pages/processVisualizer2.zul" />\r
+                                                       <tabpanel>                                                              \r
+                                                               <include src="/pages/processVisualizer2.zul" />                 \r
                                                        </tabpanel>\r
                                                </tabpanels>\r
                                        </tabbox>\r

diff --git a/server/user.mediacube.gui/pages/jobs.zul b/server/user.mediacube.gui/pages/jobs.zul
index e1e9bcb11b309e2d29dc3d01153b22780a5c18fa..97d559b94e54d51bb5f9ff1372b522f5473a4c7d 100644 (file)
--- a/server/user.mediacube.gui/pages/jobs.zul
+++ b/server/user.mediacube.gui/pages/jobs.zul
@@ -15,9 +15,9 @@
                        <tabpanel>\r
                                <include src="/pages/jobeditor.zul"/>\r
                        </tabpanel>\r
-                       <tabpanel>\r
-                               <include src="/pages/jobeditor2.zul" />\r
-                       </tabpanel>\r
+<!--                   <tabpanel> -->\r
+<!--                           <include src="/pages/jobeditor2.zul" /> -->\r
+<!--                   </tabpanel> -->\r
                </tabpanels>\r
        </tabbox>\r
 </zk>
\ No newline at end of file

diff --git a/server/user.mediacube.gui/pages/searchitems.zul b/server/user.mediacube.gui/pages/searchitems.zul
index 2e575a1b5a881bebf968f87be3157d0ed8590d8c..bc238a1b3b79702616b980a5d945de42896c66fa 100644 (file)
--- a/server/user.mediacube.gui/pages/searchitems.zul
+++ b/server/user.mediacube.gui/pages/searchitems.zul
@@ -3,7 +3,7 @@
 \r
 <!-- tag deklarációja -->\r
 <?component name="search-filters" inline="true" macroURI="searchitems/filters.zul"?>\r
-<?component name="search-results" if inline="true" macroURI="searchitems/listresults.zul"?>\r
+<?component name="search-results" if inline="true" macroURI="searchitems/gridresults.zul"?>\r
 <?component name="item-details" inline="true" macroURI="searchitems/details.zul"?>\r
 \r
 <!DOCTYPE xml>\r
@@ -36,7 +36,7 @@
 \r
        <!-- csak igy jo a list sebessege -->\r
 \r
-       <div id="scdiv" width="100%" height="100%" viewModel="@id('vm') @init('user.jobengine.zk.model.ListSearchModel')">\r
+       <div id="scdiv" width="100%" height="100%" viewModel="@id('vm') @init('user.jobengine.zk.model.GridSearchModel')">\r
                <timer id="timer" delay="500" repeats="false" onTimer="@command('uiTick')" />\r
                <div id="tagListener" onChange="@command('onTagChanged')" />\r
 \r

diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java
index b1df74ac66bf2761eff554b4746963bc064903fe..4391d7e99cd7904f1b7b40755c10b0c2639606fb 100644 (file)
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java
@@ -215,7 +215,7 @@ public class ListSearchModel extends AsyncBaseModel {
                // Clients.evalJavaScript("setSource('http://localhost:9080/services/proxy/20209535_1-20205617.mp4',\r
                // 'video/mp4')");\r
                logger.info("afterCompose");\r
-               Clients.evalJavaScript("setSource('https://d2zihajmogu5jn.cloudfront.net/bipbop-advanced/bipbop_16x9_variant.m3u8', 'application/x-mpegURL', 100)");\r
+//             Clients.evalJavaScript("setSource('https://d2zihajmogu5jn.cloudfront.net/bipbop-advanced/bipbop_16x9_variant.m3u8', 'application/x-mpegURL', 100)");\r
 \r
                try {\r
                        Selectors.wireComponents(view, this, false);\r