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 63F9B200C5E for ; Wed, 15 Mar 2017 01:43:32 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 62933160B7E; Wed, 15 Mar 2017 00:43:32 +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 3F47B160B94 for ; Wed, 15 Mar 2017 01:43:30 +0100 (CET) Received: (qmail 47306 invoked by uid 500); 15 Mar 2017 00:43:29 -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 47272 invoked by uid 99); 15 Mar 2017 00:43:29 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Mar 2017 00:43:29 +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 E1DC53A2A2B for ; Wed, 15 Mar 2017 00:43:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1786972 [9/11] - in /manifoldcf/branches/CONNECTORS-1196-2: ./ framework/ framework/crawler-ui/src/main/webapp/ framework/crawler-ui/src/main/webapp/bootstrap-select/ framework/crawler-ui/src/main/webapp/bootstrap/ framework/crawler-ui/src... Date: Wed, 15 Mar 2017 00:43:26 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170315004327.E1DC53A2A2B@svn01-us-west.apache.org> archived-at: Wed, 15 Mar 2017 00:43:32 -0000 Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/resultreport.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=1786972&r1=1786971&r2=1786972&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/resultreport.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/resultreport.jsp Wed Mar 15 00:43:26 2017 @@ -236,191 +236,179 @@ try %> - - - - - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ApacheManifoldCFActivityResultReport")%> - - - - + - - - - - - - - - -
-

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ActivityResultReport")%>

-
- - - - - - - - - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Connection")%> - + + +
+
+ + + + + @@ -461,20 +450,18 @@ function isInteger(value) else { %> - + <% } %> - - - - - + - - + - - - - - - - + + - + + - - - - - - - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Connection")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Activities")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.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(),"resultreport.StartTime")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.StartTime")%> +
+ : - + : + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%> - - + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%> + + - + , - + + , + +
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EndTime")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EndTime")%> +
+ : - + : + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%> - - + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%> + + - + , - + + , + +
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EntityMatch")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatch")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EntityMatch")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatch")%> +
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescription")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeClassDescription")%> +
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescription")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeClassDescription")%>
+
+
+
+
<% if (reportConnection.length() > 0) { %> - " onClick="javascript:Go()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.ExecuteThisQuery")%>"/> + " + onClick="javascript:Go()" + alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.ExecuteThisQuery")%>"/> <% } else { %> - " onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>"/> -<% - } -%> -
+ " + onClick="javascript:Continue()" + alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>"/> + <% + } + %> + + + <% if (reportConnection.length() > 0) { @@ -741,15 +745,17 @@ function isInteger(value) IResultSet set = connMgr.genHistoryResultCodes(reportConnection,criteria,sortOrder,resultBucket,idBucket,startRow,rowCount+1); %> - - - - - - - - - + + + + +
+
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClass")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultClass")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EventCount")%>
+ + + + <% zz = 0; @@ -772,72 +778,67 @@ function isInteger(value) resultCodeBucketString = resultCodeBucketObject.toString(); %> > - - - + + + <% zz++; } %>
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClass")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultClass")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EventCount")%>
<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idBucketString)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(resultCodeBucketString)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("eventcount").toString())%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idBucketString)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(resultCodeBucketString)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("eventcount").toString())%>
- - - - - - -
- + +
+
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Rows")%> - <%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%> - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.RowsPerPage")%> - -
- + +
    +
  • + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Rows")%><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%> +
    • +
  • +
    + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.RowsPerPage")%> +
    +
    • +
+ + <% } else { %> -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.PleaseSelectAConnection")%>
+
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.PleaseSelectAConnection")%>
<% } %> -
+ <% } catch (ManifoldCFException e) @@ -846,14 +847,9 @@ catch (ManifoldCFException e) variableContext.setParameter("text",e.getMessage()); variableContext.setParameter("target","index.jsp"); %> - + <% } %> -
- - - - + + Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp?rev=1786972&r1=1786971&r2=1786972&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp Wed Mar 15 00:43:26 2017 @@ -1,3 +1,4 @@ +<%@ page import="org.apache.manifoldcf.core.util.URLDecoder" %> <% response.setHeader("Pragma","No-cache"); response.setDateHeader("Expires",0); response.setHeader("Cache-Control", "no-cache"); @@ -36,7 +37,17 @@ if (password == null) adminprofile.login(threadContext,userID,password); if (adminprofile.getLoggedOn()) - response.sendRedirect("index.jsp"); +{ + String nextUri = request.getParameter("nextUrl"); + if (nextUri == null) + { + response.sendRedirect("index.jsp"); + } + else + { + response.sendRedirect(URLDecoder.decode(nextUri)); + } +} else { // Go back to login page, but with signal that login failed Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/showjobstatus.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/showjobstatus.jsp?rev=1786972&r1=1786971&r2=1786972&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/showjobstatus.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/showjobstatus.jsp Wed Mar 15 00:43:26 2017 @@ -48,90 +48,84 @@ try JobStatus[] jobs = manager.getAllStatus(true,maxCount); %> - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.ApacheManifoldCFStatusOfAllJobs")%> - - - - - - - + +
+
+
+
+ + + - - - - - - -
-

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StatusOfJobs")%>

- - - - - - +
+
- - - - + + + + + + + + <% int i = 0; @@ -210,17 +204,21 @@ function Resume(jobID) endTime = new Date(js.getEndTime()).toString(); } %> - > - + - - - - + + + + + + + <% } %> - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%>Action<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%>
- +
+ <% if (status == JobStatus.JOBSTATUS_NOTYETRUN || status == JobStatus.JOBSTATUS_COMPLETED || status == JobStatus.JOBSTATUS_ERROR) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%> <% } if (status == JobStatus.JOBSTATUS_RUNNING || @@ -230,8 +228,12 @@ function Resume(jobID) status == JobStatus.JOBSTATUS_STARTING) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%> <% } if (status == JobStatus.JOBSTATUS_RUNNING || @@ -239,7 +241,9 @@ function Resume(jobID) status == JobStatus.JOBSTATUS_WINDOWWAIT) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%> <% } if (status == JobStatus.JOBSTATUS_RUNNING || @@ -252,33 +256,42 @@ function Resume(jobID) status == JobStatus.JOBSTATUS_RESTARTING) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%> <% } if (status == JobStatus.JOBSTATUS_PAUSED) { %> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%> <% } %> - + <%=""%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%><%=statusName%><%=startTime%><%=endTime%><%=(js.getQueueCountExact()?"":"> ")%><%=new Long(js.getDocumentsInQueue()).toString()%><%=(js.getOutstandingCountExact()?"":"> ")%><%=new Long(js.getDocumentsOutstanding()).toString()%><%=(js.getProcessedCountExact()?"":"> ")%><%=new Long(js.getDocumentsProcessed()).toString()%><%=""%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%><%=statusName%><%=startTime%><%=endTime%><%=(js.getQueueCountExact()?"":"> ")%><%=new Long(js.getDocumentsInQueue()).toString()%><%=(js.getOutstandingCountExact()?"":"> ")%><%=new Long(js.getDocumentsOutstanding()).toString()%><%=(js.getProcessedCountExact()?"":"> ")%><%=new Long(js.getDocumentsProcessed()).toString()%>
"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%>
- + +
+
+ " + class="link btn btn-primary" role="button" data-toggle="tooltip"> +
+ <% } catch (ManifoldCFException e) @@ -287,16 +300,12 @@ catch (ManifoldCFException e) variableContext.setParameter("text",e.getMessage()); variableContext.setParameter("target","index.jsp"); %> - + <% } %> - -
- - - - - +
+ +
+
+