Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkjsf.git into...

[mkjsf-moved-to-github.git] / src / META-INF / resources / pz2utils / pz2watch.xhtml

diff --git a/src/META-INF/resources/pz2utils/pz2watch.xhtml b/src/META-INF/resources/pz2utils/pz2watch.xhtml
index 9cbdda2..94ec94e 100644 (file)
--- a/src/META-INF/resources/pz2utils/pz2watch.xhtml
+++ b/src/META-INF/resources/pz2utils/pz2watch.xhtml
@@ -13,6 +13,7 @@
 \r
   <cc:interface>\r
     <cc:attribute name="renderWhileActiveclients"/>\r
+    <cc:attribute name="renderWhileActiveclientsRecord"/>\r
     <cc:attribute name="trackHistory"/>\r
     <cc:attribute name="renderOnHitoryChange"/> \r
     <cc:attribute name="debug"/>   \r
@@ -20,12 +21,13 @@
 \r
   <cc:implementation>\r
     <h:outputScript name="jsf.js" library="javax.faces" target="head" />\r
-    <h:outputScript name="fieldlisteners.js" library="pz2utils" target="head" />\r
+    <h:outputScript name="listeners.js" library="pz2utils" target="head" />\r
     \r
-    <!-- Initiate Ajax update listeners -->  \r
+    <!-- Initiate Ajax listeners -->  \r
     <script>\r
      //<![CDATA[\r
        var renderWhileActiveclients = "${cc.attrs.renderWhileActiveclients}";\r
+       var renderWhileActiveclientsRecord = "${cc.attrs.renderWhileActiveclientsRecord}";\r
        var renderOnHistoryChange = "${cc.attrs.renderOnHistoryChange}";\r
        var trackHistory = ("${cc.attrs.trackHistory}" == "true");  \r
        setUpListeners();\r
@@ -33,36 +35,16 @@
     </script>  \r
 \r
     <h:form id="activeclientsForm" prependId="false">\r
-      <h:outputText id="activeClientsLabel" value="Active clients: " style="${cc.attrs.debug == 'true' ? '' : 'display:none;'}"/> \r
+      <h:outputText id="activeClientsLabel" value="Active clients: show: " style="${cc.attrs.debug == 'true' ? '' : 'display:none;'}"/> \r
       <h:outputText id="activeclientsField" value="${pz2.update()}"  style="${cc.attrs.debug == 'true' ? '' : 'display:none;'}"/>\r
-      <h:panelGrid id="errorMessages" style="${pz2.hasErrors() ? 'display: block;' : 'display: none;'}">\r
-        <h:dataTable value="#{pz2.configurationErrors}" var="error" cellspace="0" cellpadding="0" style="${pz2.hasConfigurationErrors() ? 'display: block; vertical-align: top;' : 'display: none;'}">\r
-          <h:column valign="top">\r
-            <h:outputText value="#{error.message}" style="color: red;"/>\r
-            <h:dataTable value="#{error.suggestions}" var="suggestion" cellspacing="0" cellpadding="0">\r
-             <h:column>\r
-               #{suggestion}        \r
-             </h:column>      \r
-            </h:dataTable>                                        \r
-          </h:column>\r
-        </h:dataTable>\r
-        <h:panelGrid  style="${pz2.hasCommandErrors() ? 'display: block;' : 'display: none;'}">\r
-          <h:column>\r
-            <h:outputText id="messages" value="#{pz2.commandError.message}" style="color: red;"/>\r
-          </h:column>\r
-          <h:dataTable value="#{pz2.commandError.suggestions}" var="suggestion" cellspacing="0" cellpadding="0">                  \r
-           <h:column>\r
-             #{suggestion}        \r
-           </h:column>      \r
-          </h:dataTable>\r
-        </h:panelGrid>                \r
-      </h:panelGrid>                      \r
+      <h:outputText id="space" value=" - record: " style="${cc.attrs.debug == 'true' ? '' : 'display:none;'}"/>\r
+      <h:outputText id="activeclientsFieldRecord" value="${pzreq.record.run().getActiveClients()}" style="${cc.attrs.debug == 'true' ? '' : 'display:none;'}"/>      \r
     </h:form>\r
 \r
     <h:form id="stateForm" prependId="false" rendered="${cc.attrs.trackHistory == 'true'}" style="${cc.attrs.debug == 'true' ? '' : 'display:none;'}">\r
       State: \r
       <h:inputText id="windowlocationhash" value="#{pz2.currentStateKey}" size="100">\r
-        <f:ajax event="change" render="#{cc.attrs.renderOnHistoryChange} #{pz2watch.activeclients}"/>\r
+        <f:ajax event="change" render="#{cc.attrs.renderOnHistoryChange} #{pz2.watchActiveclients}"/>\r
       </h:inputText>\r
     </h:form>\r
   </cc:implementation>\r