You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2017/03/23 18:56:27 UTC
svn commit: r1788305 [13/18] - in /manifoldcf/branches/CONNECTORS-1196-3: ./
connectors/
connectors/activedirectory/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/activedirectory/tests/
connectors/alfresco-webscript/ connectors/a...
Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/resultreport.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/resultreport.jsp?rev=1788305&r1=1788304&r2=1788305&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/resultreport.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/resultreport.jsp Thu Mar 23 18:56:26 2017
@@ -236,191 +236,179 @@ try
%>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
- <title>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ApacheManifoldCFActivityResultReport")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
-function Go()
-{
- if (!isInteger(report.rowcount.value))
- {
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EnterALegalNumberForRowsPerPage")%>");
- report.rowcount.focus();
- return;
- }
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "resultreport.ApacheManifoldCFActivityResultReport")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "resultreport.ActivityResultReport")%>',
+ 'historyreports'
+ );
- if (report.reportbucketdesc.value == "")
+ function Go()
{
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionCannotBeEmpty")%>");
- report.reportbucketdesc.focus();
- return;
- }
-
- if (report.reportresultdesc.value == "")
- {
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionCannotBeEmpty")%>");
- report.reportresultdesc.focus();
- return;
- }
+ if (!isInteger(report.rowcount.value))
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EnterALegalNumberForRowsPerPage")%>");
+ report.rowcount.focus();
+ return;
+ }
- if (!isRegularExpression(report.reportbucketdesc.value))
- {
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
- report.reportbucketdesc.focus();
- return;
- }
+ if (report.reportbucketdesc.value == "")
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionCannotBeEmpty")%>");
+ report.reportbucketdesc.focus();
+ return;
+ }
- if (!isRegularExpression(report.reportresultdesc.value))
- {
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustBeAValidRegularExpression")%>");
- report.reportresultdesc.focus();
- return;
- }
- if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1)
- {
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
- report.reportbucketdesc.focus();
- return;
- }
- if (report.reportresultdesc.value.indexOf("(") == -1 || report.reportresultdesc.value.indexOf(")") == -1)
- {
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustDelimitAClassWithParentheses")%>");
- report.reportresultdesc.focus();
- return;
- }
+ if (report.reportresultdesc.value == "")
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionCannotBeEmpty")%>");
+ report.reportresultdesc.focus();
+ return;
+ }
- if (!isRegularExpression(report.reportentitymatch.value))
- {
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EntityMatchMustBeAValidRegularExpression")%>");
- report.reportentitymatch.focus();
- return;
- }
- if (!isRegularExpression(report.reportresultcodematch.value))
- {
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
- report.reportresultcodematch.focus();
- return;
- }
+ if (!isRegularExpression(report.reportbucketdesc.value))
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
+ report.reportbucketdesc.focus();
+ return;
+ }
- document.report.op.value="Report";
- document.report.action = document.report.action + "#MainButton";
- document.report.submit();
-}
+ if (!isRegularExpression(report.reportresultdesc.value))
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustBeAValidRegularExpression")%>");
+ report.reportresultdesc.focus();
+ return;
+ }
+ if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1)
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
+ report.reportbucketdesc.focus();
+ return;
+ }
+ if (report.reportresultdesc.value.indexOf("(") == -1 || report.reportresultdesc.value.indexOf(")") == -1)
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustDelimitAClassWithParentheses")%>");
+ report.reportresultdesc.focus();
+ return;
+ }
-function Continue()
-{
- if (!isRegularExpression(report.reportentitymatch.value))
- {
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EntityMatchMustBeAValidRegularExpression")%>");
- report.reportentitymatch.focus();
- return;
- }
- if (!isRegularExpression(report.reportresultcodematch.value))
- {
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
- report.reportresultcodematch.focus();
- return;
- }
- if (!isRegularExpression(report.reportbucketdesc.value))
- {
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
- report.reportbucketdesc.focus();
- return;
+ if (!isRegularExpression(report.reportentitymatch.value))
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EntityMatchMustBeAValidRegularExpression")%>");
+ report.reportentitymatch.focus();
+ return;
+ }
+ if (!isRegularExpression(report.reportresultcodematch.value))
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
+ report.reportresultcodematch.focus();
+ return;
+ }
+
+ document.report.op.value="Report";
+ document.report.action=document.report.action + "#MainButton";
+ $.ManifoldCF.submit(document.report);
}
- if (!isRegularExpression(report.reportresultdesc.value))
+
+ function Continue()
{
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustBeAValidRegularExpression")%>");
- report.reportresultdesc.focus();
- return;
+ if (!isRegularExpression(report.reportentitymatch.value))
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.EntityMatchMustBeAValidRegularExpression")%>");
+ report.reportentitymatch.focus();
+ return;
+ }
+ if (!isRegularExpression(report.reportresultcodematch.value))
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
+ report.reportresultcodematch.focus();
+ return;
+ }
+ if (!isRegularExpression(report.reportbucketdesc.value))
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
+ report.reportbucketdesc.focus();
+ return;
+ }
+ if (!isRegularExpression(report.reportresultdesc.value))
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustBeAValidRegularExpression")%>");
+ report.reportresultdesc.focus();
+ return;
+ }
+ if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1)
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
+ report.reportbucketdesc.focus();
+ return;
+ }
+ if (report.reportresultdesc.value.indexOf("(") == -1 || report.reportresultdesc.value.indexOf(")") == -1)
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustDelimitAClassWithParentheses")%>");
+ report.reportresultdesc.focus();
+ return;
+ }
+
+ document.report.op.value="Continue";
+ document.report.action=document.report.action + "#MainButton";
+ $.ManifoldCF.submit(document.report);
}
- if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1)
+
+ function ColumnClick(colname)
{
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
- report.reportbucketdesc.focus();
- return;
+ document.report.clickcolumn.value=colname;
+ Go();
}
- if (report.reportresultdesc.value.indexOf("(") == -1 || report.reportresultdesc.value.indexOf(")") == -1)
+
+ function SetPosition(amt)
{
- alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"resultreport.ResultClassDescriptionMustDelimitAClassWithParentheses")%>");
- report.reportresultdesc.focus();
- return;
+ if (amt < 0)
+ amt=0;
+ document.report.startrow.value=amt;
+ Go();
}
- document.report.op.value="Continue";
- document.report.action = document.report.action + "#MainButton";
- document.report.submit();
-}
-
-function ColumnClick(colname)
-{
- document.report.clickcolumn.value = colname;
- Go();
-}
-
-function SetPosition(amt)
-{
- if (amt < 0)
- amt = 0;
- document.report.startrow.value = amt;
- Go();
-}
-
-function isRegularExpression(value)
-{
- try
+ function isRegularExpression(value)
{
- var foo = "teststring";
- foo.search(value.replace(/\(\?i\)/,""));
- return true;
+ try
+ {
+ var foo="teststring";
+ foo.search(value.replace(/\(\?i\)/,""));
+ return true;
+ }
+ catch (e)
+ {
+ return false;
+ }
+
}
- catch (e)
+
+ function isInteger(value)
{
- return false;
+ var anum=/(^\d+$)/;
+ return anum.test(value);
}
-}
-
-function isInteger(value)
-{
- var anum=/(^\d+$)/;
- return anum.test(value);
-}
//-->
- </script>
-
+</script>
-</head>
-<body class="standardbody">
-
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
- <tr>
- <td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
- <td class="window">
- <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ActivityResultReport")%></p>
- <form class="standardform" name="report" action="execute.jsp" method="POST">
- <input type="hidden" name="op" value="Continue"/>
- <input type="hidden" name="type" value="resultreport"/>
- <table class="displaytable">
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description" colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Connection")%></td><td class="value" colspan="1">
- <select name="reportconnection" size="3">
- <option <%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+<div class="row">
+ <div class="col-md-12">
+ <form class="standardform" name="report" action="execute.jsp" method="POST">
+ <input type="hidden" name="op" value="Continue"/>
+ <input type="hidden" name="type" value="resultreport"/>
+
+ <div class="box box-primary">
+ <div class="box-body">
+ <table class="table table-bordered">
+ <tr>
+ <th colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Connection")%></th>
+ <td colspan="1">
+ <select name="reportconnection" class="form-control">
+ <option <%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>--</option>
<%
int i = 0;
while (i < connList.length)
@@ -441,18 +429,19 @@ function isInteger(value)
if (reportConnection.length() > 0)
{
%>
- <td class="description" colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Activities")%></td><td class="value" colspan="1">
+ <th colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Activities")%></th>
+ <td colspan="1">
<input type="hidden" name="reportactivities_posted" value="true"/>
- <select multiple="true" name="reportactivities" size="3">
+ <select multiple="true" class="selectpicker" name="reportactivities">
<%
- i = 0;
- while (i < activityList.length)
- {
- String activity = activityList[i++];
+ i = 0;
+ while (i < activityList.length)
+ {
+ String activity = activityList[i++];
%>
- <option <%=((selectedActivities.get(activity)==null)?"":"selected=\"selected\"")%> value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(activity)%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(activity)%></option>
+ <option <%=((selectedActivities.get(activity) == null)?"":"selected=\"selected\"")%> value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(activity)%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(activity)%></option>
<%
- }
+ }
%>
</select>
</td>
@@ -461,20 +450,18 @@ function isInteger(value)
else
{
%>
- <td class="value" colspan="2"></td>
+ <td colspan="2"></td>
<%
}
%>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.StartTime")%></td>
- <td class="value" colspan="3">
- <select class="schedulepulldown" name='reportstarthour' size="3">
- <option value="" <%=(startHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.StartTime")%></th>
+ <td colspan="3">
+ <div class="input-group">
+ <select class="schedulepulldown" name='reportstarthour'>
+ <option value="" <%=(startHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 24)
@@ -492,42 +479,45 @@ function isInteger(value)
if (q == 0)
q = 12;
%>
- <option value='<%=k%>' <%=(startHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+" "+ampm%></option>
-<%
+ <option value='<%=k%>' <%=(startHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+" "+ampm%></option>
+<%
k++;
}
%>
- </select><nobr/>:<nobr/>
- <select class="schedulepulldown" name='reportstartminute' size="3">
- <option value="" <%=(startMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+ </select>
+ <span class="label">:</span>
+ <select class="schedulepulldown" name='reportstartminute'>
+ <option value="" <%=(startMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 60)
{
%>
- <option value='<%=k%>' <%=(startMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
+ <option value='<%=k%>' <%=(startMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
<%
k++;
}
%>
- </select> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%>
- <select class="schedulepulldown" name='reportstartmonth' size="3">
- <option value="" <%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
- <option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.January")%></option>
- <option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.February")%></option>
- <option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.March")%></option>
- <option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.April")%></option>
- <option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.May")%></option>
- <option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.June")%></option>
- <option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.July")%></option>
- <option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.August")%></option>
- <option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.September")%></option>
- <option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.October")%></option>
- <option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.November")%></option>
- <option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.December")%></option>
- </select><nobr/>
- <select class="schedulepulldown" name='reportstartday' size="3">
- <option value="" <%=(startDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+ </select>
+ <span class="label"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%></span>
+ <select class="schedulepulldown" name='reportstartmonth'>
+ <option value="" <%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>--</option>
+ <option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.January")%></option>
+ <option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.February")%></option>
+ <option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.March")%></option>
+ <option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.April")%></option>
+ <option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.May")%></option>
+ <option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.June")%></option>
+ <option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.July")%></option>
+ <option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.August")%></option>
+ <option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.September")%></option>
+ <option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.October")%></option>
+ <option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.November")%></option>
+ <option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.December")%></option>
+ </select>
+ <span class="label">-</span>
+ <select class="schedulepulldown" name='reportstartday'>
+ <option value="" <%=(startDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 31)
@@ -543,26 +533,34 @@ function isInteger(value)
else
suffix = "th";
%>
- <option value='<%=Integer.toString(k)%>' <%=(startDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
+ <option value='<%=Integer.toString(k)%>' <%=(startDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
<%
k++;
}
%>
- </select><nobr/>,<nobr/>
- <select class="schedulepulldown" name='reportstartyear' size="3">
- <option value="" <%=(startYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
- <% for(int year=2005; year <= java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
- String selected = (startYear.equals(""+year))?"selected=\"selected\"":""; %>
- <option value="<%= year %>" <%= selected %>><%= year %></option>
- <% } %>
- </select>
+ </select>
+ <span class="label">,</span>
+ <select class="schedulepulldown" name='reportstartyear'>
+ <option value="" <%=(startYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>--</option>
+<%
+ for(int year=2005; year <= java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++)
+ {
+ String selected = (startYear.equals(""+year))?"selected=\"selected\"":"";
+%>
+ <option value="<%= year %>" <%= selected %>><%= year %></option>
+<%
+ }
+%>
+ </select>
+ </div>
</td>
</tr>
<tr>
- <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EndTime")%></td>
- <td class="value" colspan="3">
- <select class="schedulepulldown" name='reportendhour' size="3">
- <option value="" <%=(endHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EndTime")%></th>
+ <td colspan="3">
+ <div class="input-group">
+ <select class="schedulepulldown" name='reportendhour'>
+ <option value="" <%=(endHour.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 24)
@@ -580,42 +578,45 @@ function isInteger(value)
if (q == 0)
q = 12;
%>
- <option value='<%=k%>' <%=(endHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+" "+ampm%></option>
-<%
+ <option value='<%=k%>' <%=(endHour.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(q)+" "+ampm%></option>
+<%
k++;
}
%>
- </select><nobr/>:<nobr/>
- <select class="schedulepulldown" name='reportendminute' size="3">
- <option value="" <%=(endMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+ </select>
+ <span class="label">:</span>
+ <select class="schedulepulldown" name='reportendminute'>
+ <option value="" <%=(endMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 60)
{
%>
- <option value='<%=k%>' <%=(endMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
+ <option value='<%=k%>' <%=(endMinute.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k)%></option>
<%
k++;
}
%>
- </select> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%>
- <select class="schedulepulldown" name='reportendmonth' size="3">
- <option value="" <%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
- <option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.January")%></option>
- <option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.February")%></option>
- <option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.March")%></option>
- <option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.April")%></option>
- <option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.May")%></option>
- <option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.June")%></option>
- <option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.July")%></option>
- <option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.August")%></option>
- <option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.September")%></option>
- <option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.October")%></option>
- <option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.November")%></option>
- <option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.December")%></option>
- </select><nobr/>
- <select class="schedulepulldown" name='reportendday' size="3">
- <option value="" <%=(endDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
+ </select>
+ <span class="label"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.on")%></span>
+ <select class="schedulepulldown" name='reportendmonth'>
+ <option value="" <%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>--</option>
+ <option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.January")%></option>
+ <option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.February")%></option>
+ <option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.March")%></option>
+ <option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.April")%></option>
+ <option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.May")%></option>
+ <option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.June")%></option>
+ <option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.July")%></option>
+ <option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.August")%></option>
+ <option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.September")%></option>
+ <option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.October")%></option>
+ <option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.November")%></option>
+ <option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.December")%></option>
+ </select>
+ <span class="label">-</span>
+ <select class="schedulepulldown" name='reportendday'>
+ <option value="" <%=(endDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>--</option>
<%
k = 0;
while (k < 31)
@@ -631,64 +632,63 @@ function isInteger(value)
else
suffix = "th";
%>
- <option value='<%=Integer.toString(k)%>' <%=(endDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
+ <option value='<%=Integer.toString(k)%>' <%=(endDay.equals(Integer.toString(k)))?"selected=\"selected\"":""%>><%=Integer.toString(k+1)+suffix%></option>
<%
k++;
}
%>
- </select><nobr/>,<nobr/>
- <select class="schedulepulldown" name='reportendyear' size="3">
- <option value="" <%=(endYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%> --</option>
- <% for(int year=2005; year <= java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++) {
- String selected = (endYear.equals(""+year))?"selected=\"selected\"":""; %>
- <option value="<%= year %>" <%= selected %>><%= year %></option>
- <% } %>
- </select>
+ </select>
+ <span class="label">,</span>
+ <select class="schedulepulldown" name='reportendyear'>
+ <option value="" <%=(endYear.length() == 0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.NotSpecified")%>--</option>
+<%
+ for(int year=2005; year <= java.util.Calendar.getInstance().get(java.util.Calendar.YEAR); year++)
+ {
+ String selected = (startYear.equals("" + year))?"selected=\"selected\"":"";
+%>
+ <option value="<%= year %>" <%= selected %>><%= year %></option>
+<%
+ }
+%>
+ </select>
+ </div>
</td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EntityMatch")%></nobr></td>
- <td class="value"><input type="text" name="reportentitymatch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(entityMatch)%>'/></td>
- <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatch")%></nobr></td>
- <td class="value"><input type="text" name="reportresultcodematch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(resultCodeMatch)%>'/></td>
+ <th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EntityMatch")%></nobr></td>
+ <td><input type="text" class="form-control" name="reportentitymatch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(entityMatch)%>'/></td>
+ <th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeMatch")%></nobr></td>
+ <td><input type="text" class="form-control" name="reportresultcodematch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(resultCodeMatch)%>'/></td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
+ <th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescription")%></nobr></td>
+ <td><input type="text" class="form-control" name="reportbucketdesc" size="20" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(reportBucketDesc)%>'/></td>
+ <th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeClassDescription")%></nobr></td>
+ <td><input type="text" class="form-control" name="reportresultdesc" size="20" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(reportResultDesc)%>'/></td>
</tr>
-
- <tr>
- <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClassDescription")%></nobr></td>
- <td class="value"><input type="text" name="reportbucketdesc" size="20" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(reportBucketDesc)%>'/></td>
- <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultCodeClassDescription")%></nobr></td>
- <td class="value"><input type="text" name="reportresultdesc" size="20" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(reportResultDesc)%>'/></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <td class="message" colspan="4">
+ </table>
+ </div>
+ <div class="box-footer clearfix">
+ <div class="btn-group">
<%
if (reportConnection.length() > 0)
{
%>
- <a name="MainButton"><input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Go")%>" onClick="javascript:Go()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.ExecuteThisQuery")%>"/></a>
+ <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Go()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.ExecuteThisQuery")%>"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Go")%></a>
<%
}
else
{
%>
- <a name="MainButton"><input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>"/></a>
-<%
- }
-%>
- </td>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
-
- </table>
+ <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Continue()"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%>"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.Continue")%></a>
+ <%
+ }
+ %>
+ </div>
+ </div>
+ </div>
<%
if (reportConnection.length() > 0)
{
@@ -741,15 +741,17 @@ function isInteger(value)
IResultSet set = connMgr.genHistoryResultCodes(reportConnection,criteria,sortOrder,resultBucket,idBucket,startRow,rowCount+1);
%>
- <input type="hidden" name="clickcolumn" value=""/>
- <input type="hidden" name="startrow" value='<%=Integer.toString(startRow)%>'/>
- <input type="hidden" name="sortorder" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sortOrder.toString())%>'/>
-
- <table class="displaytable">
- <tr class="headerrow">
- <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("idbucket");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClass")%></nobr></a></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("resultcodebucket");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultClass")%></nobr></a></td>
- <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("eventcount");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EventCount")%></nobr></a></td>
+ <input type="hidden" name="clickcolumn" value=""/>
+ <input type="hidden" name="startrow" value='<%=Integer.toString(startRow)%>'/>
+ <input type="hidden" name="sortorder" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sortOrder.toString())%>'/>
+
+ <div class="box box-primary">
+ <div class="box-body table-responsive">
+ <table class="table table-bordered">
+ <tr>
+ <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("idbucket");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.IdentifierClass")%></nobr></a></th>
+ <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("resultcodebucket");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.ResultClass")%></nobr></a></th>
+ <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("eventcount");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.EventCount")%></nobr></a></th>
</tr>
<%
zz = 0;
@@ -772,72 +774,69 @@ function isInteger(value)
resultCodeBucketString = resultCodeBucketObject.toString();
%>
<tr <%="class=\""+((zz%2==0)?"evendatarow":"odddatarow")+"\""%>>
- <td class="reportcolumncell"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idBucketString)%></nobr></td>
- <td class="reportcolumncell"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(resultCodeBucketString)%></nobr></td>
- <td class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("eventcount").toString())%></td>
+ <td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idBucketString)%></nobr></td>
+ <td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(resultCodeBucketString)%></nobr></td>
+ <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("eventcount").toString())%></td>
</tr>
<%
zz++;
}
%>
</table>
- <table class="reportfootertable">
- <tr class="reportfooterrow">
- <td class="reportfootercell">
- <nobr>
+ </div>
+ <div class="box-footer clearfix">
+ <ul class="pagination pagination-sm no-margin pull-left">
<%
if (startRow == 0)
{
%>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%>
+ <li><a href="#"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%></a></li>
<%
}
else
{
%>
- <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%></a>
+ <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.PreviousPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Previous")%></a></li>
<%
}
-%>
- </nobr>
- <nobr>
-<%
if (hasMoreRows == false)
{
%>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%>
+ <li><a href="#"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%></a></li>
<%
}
else
{
%>
- <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%></a>
+ <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"resultreport.NextPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Next")%></a></li>
<%
}
%>
- </nobr>
- </td>
- <td class="reportfootercell">
- <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Rows")%></nobr>
- <nobr><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></nobr>
- </td>
- <td class="reportfootercell">
- <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.RowsPerPage")%></nobr>
- <nobr><input type="text" name="rowcount" size="5" value='<%=Integer.toString(rowCount)%>'/></nobr>
- </td>
- </tr>
- </table>
-
+ </ul>
+ <ul class="pagination pagination-sm no-margin pull-right">
+ <li class="pad">
+ <span class="label label-primary"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.Rows")%><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></span>
+ </li>
+ <li class="form-inline">
+ <div class="input-group input-group-sm">
+ <span class="input-group-addon"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.RowsPerPage")%></span><input type="text" class="form-control" name="rowcount" size="5" value='<%=Integer.toString(rowCount)%>'/>
+ </div>
+ </li>
+ </ul>
+ </div>
+ </div>
<%
}
else
{
%>
- <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.PleaseSelectAConnection")%></td></tr></table>
+ <div class="callout callout-info"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"resultreport.PleaseSelectAConnection")%></div>
<%
}
%>
- </form>
+ </form>
<%
}
catch (ManifoldCFException e)
@@ -846,14 +845,9 @@ catch (ManifoldCFException e)
variableContext.setParameter("text",e.getMessage());
variableContext.setParameter("target","index.jsp");
%>
- <jsp:forward page="error.jsp"/>
+<jsp:forward page="error.jsp"/>
<%
}
%>
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
+ </div>
+</div>
Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp?rev=1788305&r1=1788304&r2=1788305&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp Thu Mar 23 18:56: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-3/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/showjobstatus.jsp?rev=1788305&r1=1788304&r2=1788305&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/showjobstatus.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/showjobstatus.jsp Thu Mar 23 18:56:26 2017
@@ -48,90 +48,84 @@ try
JobStatus[] jobs = manager.getAllStatus(true,maxCount);
%>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
- <title>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.ApacheManifoldCFStatusOfAllJobs")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "showjobstatus.ApacheManifoldCFStatusOfAllJobs")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "showjobstatus.StatusOfJobs")%>',
+ 'jobs'
+ );
-function Start(jobID)
-{
- document.liststatuses.op.value="Start";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function Start(jobID)
+ {
+ document.liststatuses.op.value="Start";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function StartMinimal(jobID)
-{
- document.liststatuses.op.value="StartMinimal";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function StartMinimal(jobID)
+ {
+ document.liststatuses.op.value="StartMinimal";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function Abort(jobID)
-{
- document.liststatuses.op.value="Abort";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function Abort(jobID)
+ {
+ document.liststatuses.op.value="Abort";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function Restart(jobID)
-{
- document.liststatuses.op.value="Restart";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function Restart(jobID)
+ {
+ document.liststatuses.op.value="Restart";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function RestartMinimal(jobID)
-{
- document.liststatuses.op.value="RestartMinimal";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function RestartMinimal(jobID)
+ {
+ document.liststatuses.op.value="RestartMinimal";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function Pause(jobID)
-{
- document.liststatuses.op.value="Pause";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function Pause(jobID)
+ {
+ document.liststatuses.op.value="Pause";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
-function Resume(jobID)
-{
- document.liststatuses.op.value="Resume";
- document.liststatuses.jobid.value=jobID;
- document.liststatuses.submit();
-}
+ function Resume(jobID)
+ {
+ document.liststatuses.op.value="Resume";
+ document.liststatuses.jobid.value=jobID;
+ $.ManifoldCF.submit(document.liststatuses);
+ }
//-->
- </script>
-
-</head>
-
-<body class="standardbody">
-
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
- <tr>
- <td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
- <td class="window">
- <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StatusOfJobs")%></p>
- <form class="standardform" name="liststatuses" action="execute.jsp" method="POST">
- <input type="hidden" name="op" value="Continue"/>
- <input type="hidden" name="type" value="jobstatus"/>
- <input type="hidden" name="jobid" value=""/>
+</script>
+<div class="row">
+ <div class="col-md-12">
+ <div class="box box-primary">
+ <form class="standardform" name="liststatuses" action="execute.jsp" method="POST">
+ <input type="hidden" name="op" value="Continue"/>
+ <input type="hidden" name="type" value="jobstatus"/>
+ <input type="hidden" name="jobid" value=""/>
- <table class="datatable">
+ <div class="box-body">
+ <table class="table table-bordered">
<tr>
- <td class="separator" colspan="8"><hr/></td>
- </tr>
- <tr class="headerrow">
- <td class="columnheader"></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%></td>
+ <th>Action</th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%></th>
</tr>
<%
int i = 0;
@@ -210,17 +204,21 @@ function Resume(jobID)
endTime = new Date(js.getEndTime()).toString();
}
%>
- <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
- <td class="columncell">
- <nobr>
+ <tr job-id="<%= js.getJobID() %>" job-status="<%= status %>" job-status-name="<%= statusName%>">
+ <td>
+
<%
if (status == JobStatus.JOBSTATUS_NOTYETRUN ||
status == JobStatus.JOBSTATUS_COMPLETED ||
status == JobStatus.JOBSTATUS_ERROR)
{
%>
- <a href='<%="javascript:Start(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%></a>
- <a href='<%="javascript:StartMinimal(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%></a>
+ <a href='<%="javascript:Start(\""+js.getJobID()+"\")"%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()%>'
+ class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-play fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%></a>
+ <a href='<%="javascript:StartMinimal(\""+js.getJobID()+"\")"%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'
+ class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-compress fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%></a>
<%
}
if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -230,8 +228,12 @@ function Resume(jobID)
status == JobStatus.JOBSTATUS_STARTING)
{
%>
- <a href='<%="javascript:Restart(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%></a>
- <a href='<%="javascript:RestartMinimal(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%></a>
+ <a href='<%="javascript:Restart(\""+js.getJobID()+"\")"%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()%>'
+ class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-play fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%></a>
+ <a href='<%="javascript:RestartMinimal(\""+js.getJobID()+"\")"%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'
+ class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-compress fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%></a>
<%
}
if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -239,7 +241,9 @@ function Resume(jobID)
status == JobStatus.JOBSTATUS_WINDOWWAIT)
{
%>
- <a href='<%="javascript:Pause(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Pausejob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%></a>
+ <a href='<%="javascript:Pause(\""+js.getJobID()+"\")"%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Pausejob")+" "+js.getJobID()%>'
+ class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-pause fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%></a>
<%
}
if (status == JobStatus.JOBSTATUS_RUNNING ||
@@ -252,33 +256,41 @@ function Resume(jobID)
status == JobStatus.JOBSTATUS_RESTARTING)
{
%>
- <a href='<%="javascript:Abort(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Abortjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%></a>
+ <a href='<%="javascript:Abort(\""+js.getJobID()+"\")"%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Abortjob")+" "+js.getJobID()%>'
+ class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-stop fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%></a>
<%
}
if (status == JobStatus.JOBSTATUS_PAUSED)
{
%>
- <a href='<%="javascript:Resume(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Resumejob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%></a>
+ <a href='<%="javascript:Resume(\""+js.getJobID()+"\")"%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Resumejob")+" "+js.getJobID()%>'
+ class="btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-play fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%></a>
<%
}
%>
- </nobr>
+
</td>
- <td class="columncell"><%="<!--jobid="+js.getJobID()+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%></td><td class="columncell"><%=statusName%></td><td class="columncell"><%=startTime%></td><td class="columncell"><%=endTime%></td>
- <td class="columncell"><%=(js.getQueueCountExact()?"":"> ")%><%=new Long(js.getDocumentsInQueue()).toString()%></td>
- <td class="columncell"><%=(js.getOutstandingCountExact()?"":"> ")%><%=new Long(js.getDocumentsOutstanding()).toString()%></td>
- <td class="columncell"><%=(js.getProcessedCountExact()?"":"> ")%><%=new Long(js.getDocumentsProcessed()).toString()%></td>
+ <td><%="<!--jobid=" + js.getJobID() + "-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%></td>
+ <td><%=statusName%></td>
+ <td><%=startTime%></td>
+ <td><%=endTime%></td>
+ <td><%=(js.getQueueCountExact()?"":"> ")%><%=new Long(js.getDocumentsInQueue()).toString()%></td>
+ <td><%=(js.getOutstandingCountExact()?"":"> ")%><%=new Long(js.getDocumentsOutstanding()).toString()%></td>
+ <td><%=(js.getProcessedCountExact()?"":"> ")%><%=new Long(js.getDocumentsProcessed()).toString()%></td>
</tr>
<%
}
%>
-
- <tr>
- <td class="separator" colspan="8"><hr/></td>
- </tr>
- <tr><td class="message" colspan="8"><a href="showjobstatus.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.RefreshStatus")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%></a></td></tr>
</table>
-
+ </div>
+ <div class="box-footer clearfix">
+ <a href="showjobstatus.jsp"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.RefreshStatus")%>"
+ class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-refresh fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%></a>
+ </div>
+
<%
}
catch (ManifoldCFException e)
@@ -287,16 +299,11 @@ catch (ManifoldCFException e)
variableContext.setParameter("text",e.getMessage());
variableContext.setParameter("target","index.jsp");
%>
- <jsp:forward page="error.jsp"/>
+<jsp:forward page="error.jsp"/>
<%
}
%>
- </form>
- </td>
- </tr>
- </table>
-
-
-</body>
-
-</html>
+ </form>
+ </div>
+ </div>
+</div>