Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 08458200C20 for ; Sun, 19 Feb 2017 20:36:19 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 06C47160B72; Sun, 19 Feb 2017 19:36:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3290D160B3F for ; Sun, 19 Feb 2017 20:36:17 +0100 (CET) Received: (qmail 43714 invoked by uid 500); 19 Feb 2017 19:36:16 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 43705 invoked by uid 99); 19 Feb 2017 19:36:16 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Feb 2017 19:36:16 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 959C13A0598 for ; Sun, 19 Feb 2017 19:36:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1783685 [1/3] - in /manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp: maxactivityreport.jsp maxbandwidthreport.jsp queuestatus.jsp resultreport.jsp Date: Sun, 19 Feb 2017 19:36:15 -0000 To: commits@manifoldcf.apache.org From: kishore@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170219193615.959C13A0598@svn01-us-west.apache.org> archived-at: Sun, 19 Feb 2017 19:36:19 -0000 Author: kishore Date: Sun Feb 19 19:36:14 2017 New Revision: 1783685 URL: http://svn.apache.org/viewvc?rev=1783685&view=rev Log: Updated reports to new UI Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/queuestatus.jsp manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/resultreport.jsp Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp?rev=1783685&r1=1783684&r2=1783685&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp Sun Feb 19 19:36:14 2017 @@ -237,162 +237,147 @@ try %> - - - - - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.ApacheManifoldCFMaximumActivityReport")%> - - - - + - - - - - - - - - -
-

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.MaximumActivityReport")%>

-
- - - - - - - - - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Connection")%> - + + +
+
+ + + + + @@ -434,20 +420,18 @@ function isInteger(value) else { %> - + <% } %> - - - - - + - - + - - - - - - - - - - - - - - - - - + + + + - + + + + -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Connection")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Activities")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Activities")%> - <% - i = 0; - while (i < activityList.length) - { - String activity = activityList[i++]; + i = 0; + while (i < activityList.length) + { + String activity = activityList[i++]; %> - + <% - } + } %>
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.StartTime")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.StartTime")%> +
+ : - + : + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.on")%> - - + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.on")%> + + - + , - + + , + +
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.EndTime")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.EndTime")%> +
+ : - + : + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.on")%> - - + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.on")%> + + - + , - + , + +
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.EntityMatch")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.ResultCodeMatch")%>
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescription")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.SlidingWindowSize")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.EntityMatch")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.ResultCodeMatch")%>
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescription")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.SlidingWindowSize")%>
+
+
+
+
<% if (reportConnection.length() > 0) { %> - " onClick="javascript:Go()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.ExecuteThisQuery")%>"/> + " + onClick="javascript:Go()" + alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.ExecuteThisQuery")%>"/> <% } else { %> - " onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Continue")%>"/> + " + onClick="javascript:Continue()" + alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Continue")%>"/> <% } %> -
+ + + <% if (reportConnection.length() > 0) { @@ -708,9 +708,9 @@ function isInteger(value) resultCodeMatchObject = new RegExpCriteria(resultCodeMatch,true); FilterCriteria criteria = new FilterCriteria(ourActivities,startTime,endTime,entityMatchObject,resultCodeMatchObject); %> - - - + + + <% long count = connMgr.countHistoryRows(reportConnection,criteria); long maxCount = connMgr.getMaxRows(); @@ -719,7 +719,9 @@ function isInteger(value) { hasMoreRows = false; %> -
You have selected <%=new Long(count).toString()%> rows. Maximum allowed is <%=new Long(maxCount).toString()%>.
+
+ You have selected <%=new Long(count).toString()%> rows. Maximum allowed is <%=new Long(maxCount).toString()%>. +
<% } else @@ -731,12 +733,14 @@ function isInteger(value) %> - - - - - - +
+
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClass")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.HighestActivityRate")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.StartTime")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.EndTime")%>
+ + + + + <% zz = 0; @@ -758,77 +762,82 @@ function isInteger(value) double activityRate = activityCount * 60000.0 / intervalMilliseconds; %> - > - - - - + + + + + <% zz++; } %>
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClass")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.HighestActivityRate")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.StartTime")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.EndTime")%>
<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idBucketString)%><%=new Double(activityRate).toString()%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(startTimeString)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(endTimeString)%>
<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idBucketString)%><%=new Double(activityRate).toString()%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(startTimeString)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(endTimeString)%>
-<% - } -%> - - - - - - -
- + + <% + } + %> +
+
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Rows")%> - <%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%> - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.RowsPerPage")%> - -
+ +
    +
  • + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Rows")%><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%> +
    • +
  • +
    + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.RowsPerPage")%> + +
    +
    • +
+ + <% } else { %> -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.PleaseSelectAConnection")%>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.PleaseSelectAConnection")%>
<% } %> -
+ <% } catch (ManifoldCFException e) @@ -841,10 +850,5 @@ catch (ManifoldCFException e) <% } %> -
- - - - + +