Modified: 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp 
(original)
+++ 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp 
Thu Mar 23 18:49:54 2017
@@ -237,150 +237,163 @@ try
 
 %>
 
-<script type="text/javascript">
-  <!--
+<?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(),"maxbandwidthreport.ApacheManifoldCFMaximumBandwidthReport")%>
+  </title>
 
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"maxbandwidthreport.ApacheManifoldCFMaximumBandwidthReport")%>',
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"maxbandwidthreport.MaximumBandwidthReport")%>',
-      'historyreports'
-  );
+  <script type="text/javascript">
+  <!--
 
-  function Go()
+function Go()
+{
+  if (!isInteger(report.rowcount.value))
   {
-    if (!isInteger(report.rowcount.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EnterALegalNumberForRowsPerPage")%>");
-      report.rowcount.focus();
-      return;
-    }
-    if (!isInteger(report.reportinterval.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EnterALegalIntervalSizeInMinutes")%>");
-      report.reportinterval.focus();
-      return;
-    }
-    if (report.reportbucketdesc.value == "")
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionCannotBeEmpty")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportbucketdesc.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-    if (report.reportbucketdesc.value.indexOf("(") == -1 || 
report.reportbucketdesc.value.indexOf(")") == -1)
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportentitymatch.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EntityMatchMustBeAValidRegularExpression")%>");
-      report.reportentitymatch.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportresultcodematch.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
-      report.reportresultcodematch.focus();
-      return;
-    }
-
-    document.report.op.value="Report";
-    document.report.action=document.report.action + "#MainButton";
-    $.ManifoldCF.submit(document.report);
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EnterALegalNumberForRowsPerPage")%>");
+    report.rowcount.focus();
+    return;
   }
-
-  function Continue()
+  if (!isInteger(report.reportinterval.value))
   {
-    if (!isRegularExpression(report.reportentitymatch.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EntityMatchMustBeAValidRegularExpression")%>");
-      report.reportentitymatch.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportresultcodematch.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
-      report.reportresultcodematch.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportbucketdesc.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-    if (report.reportbucketdesc.value.indexOf("(") == -1 || 
report.reportbucketdesc.value.indexOf(")") == -1)
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-
-    document.report.op.value="Continue";
-    document.report.action=document.report.action + "#MainButton";
-    $.ManifoldCF.submit(document.report);
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EnterALegalIntervalSizeInMinutes")%>");
+    report.reportinterval.focus();
+    return;
   }
-
-  function ColumnClick(colname)
+  if (report.reportbucketdesc.value == "")
   {
-    document.report.clickcolumn.value=colname;
-    Go();
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionCannotBeEmpty")%>");
+    report.reportbucketdesc.focus();
+    return;
   }
-
-  function SetPosition(amt)
+  if (!isRegularExpression(report.reportbucketdesc.value))
   {
-    if (amt < 0)
-      amt=0;
-    document.report.startrow.value=amt;
-    Go();
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
+    report.reportbucketdesc.focus();
+    return;
   }
-
-  function isRegularExpression(value)
+  if (report.reportbucketdesc.value.indexOf("(") == -1 || 
report.reportbucketdesc.value.indexOf(")") == -1)
   {
-    try
-    {
-      var foo="teststring";
-      foo.search(value.replace(/\(\?i\)/,""));
-      return true;
-    }
-    catch (e)
-    {
-      return false;
-    }
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
+    report.reportbucketdesc.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportentitymatch.value))
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EntityMatchMustBeAValidRegularExpression")%>");
+    report.reportentitymatch.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportresultcodematch.value))
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
+    report.reportresultcodematch.focus();
+    return;
+  }
 
+  document.report.op.value="Report";
+  document.report.action = document.report.action + "#MainButton";
+  document.report.submit();
+}
+
+function Continue()
+{
+  if (!isRegularExpression(report.reportentitymatch.value))
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EntityMatchMustBeAValidRegularExpression")%>");
+    report.reportentitymatch.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportresultcodematch.value))
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
+    report.reportresultcodematch.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportbucketdesc.value))
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
+    report.reportbucketdesc.focus();
+    return;
+  }
+  if (report.reportbucketdesc.value.indexOf("(") == -1 || 
report.reportbucketdesc.value.indexOf(")") == -1)
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
+    report.reportbucketdesc.focus();
+    return;
   }
 
-  function isInteger(value)
+  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
   {
-    var anum=/(^\d+$)/;
-    return anum.test(value);
+    var foo = "teststring";
+    foo.search(value.replace(/\(\?i\)/,""));
+    return true;
   }
+  catch (e)
+  {
+    return false;
+  }
+
+}
+
+function isInteger(value)
+{
+  var anum=/(^\d+$)/;
+  return anum.test(value);
+}
 
   //-->
-</script>
+  </script>
 
 
-<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="maxbandwidthreport"/>
-
-      <div class="box box-primary">
-        <div class="box-body">
-          <table class="table table-bordered">
-            <tr>
-              <th 
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Connection")%></th>
-              <td colspan="1">
-                <select name="reportconnection" class="form-control">
-                  <option 
<%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>--</option>
+</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(),"maxbandwidthreport.MaximumBandwidthReport")%></p>
+        <form class="standardform" name="report" action="execute.jsp" 
method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="maxbandwidthreport"/>
+          <table class="displaytable">
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td class="description" 
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Connection")%></td><td
 class="value" colspan="1">
+                <select name="reportconnection" size="3">
+                  <option 
<%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>
 --</option>
 <%
   int i = 0;
   while (i < connList.length)
@@ -401,17 +414,16 @@ try
   if (reportConnection.length() > 0)
   {
 %>
-              <th 
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Activities")%></th>
-              <td colspan="1">
+              <td class="description" 
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Activities")%></td><td
 class="value" colspan="1">
                 <input type="hidden" name="reportactivities_posted" 
value="true"/>
-                <select multiple="true" class="selectpicker" 
name="reportactivities">
+                <select multiple="true" name="reportactivities" size="3">
 <%
     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>
 <%
     }
 %>
@@ -422,18 +434,20 @@ try
   else
   {
 %>
-              <td colspan="2"></td>
+              <td class="value" colspan="2"></td>
 <%
   }
 %>
 
             </tr>
             <tr>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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(),"maxbandwidthreport.NotSpecified")%>--</option>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td 
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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(),"maxbandwidthreport.NotSpecified")%>
 --</option>
 <%
   k = 0;
   while (k < 24)
@@ -451,45 +465,42 @@ try
     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>
-                  <span class="label">:</span>
-                  <select class="schedulepulldown" name='reportstartminute'>
-                    <option value="" 
<%=(startMinute.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>--</option>
+                </select><nobr/>:<nobr/>
+                <select class="schedulepulldown" name='reportstartminute' 
size="3">
+                  <option value="" 
<%=(startMinute.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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>
-                  <span 
class="label"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.on")%></span>
-                  <select class="schedulepulldown" name='reportstartmonth'>
-                    <option value="" 
<%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>--</option>
-                    <option value="0" 
<%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.January")%></option>
-                    <option value="1" 
<%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.February")%></option>
-                    <option value="2" 
<%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.March")%></option>
-                    <option value="3" 
<%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.April")%></option>
-                    <option value="4" 
<%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.May")%></option>
-                    <option value="5" 
<%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.June")%></option>
-                    <option value="6" 
<%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.July")%></option>
-                    <option value="7" 
<%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.August")%></option>
-                    <option value="8" 
<%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.September")%></option>
-                    <option value="9" 
<%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.October")%></option>
-                    <option value="10" 
<%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.November")%></option>
-                    <option value="11" 
<%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.December")%></option>
-                  </select> 
-                  <span class="label">-</span>
-                  <select class="schedulepulldown" name='reportstartday'>
-                    <option value="" <%=(startDay.length() == 
0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>--</option>
+                </select> 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.on")%>
+                <select class="schedulepulldown" name='reportstartmonth' 
size="3">
+                  <option value="" 
<%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>
 --</option>
+                  <option value="0" 
<%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.January")%></option>
+                  <option value="1" 
<%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.February")%></option>
+                  <option value="2" 
<%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.March")%></option>
+                  <option value="3" 
<%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.April")%></option>
+                  <option value="4" 
<%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.May")%></option>
+                  <option value="5" 
<%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.June")%></option>
+                  <option value="6" 
<%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.July")%></option>
+                  <option value="7" 
<%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.August")%></option>
+                  <option value="8" 
<%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.September")%></option>
+                  <option value="9" 
<%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.October")%></option>
+                  <option value="10" 
<%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.November")%></option>
+                  <option value="11" 
<%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.December")%></option>
+                </select><nobr/>
+                <select class="schedulepulldown" name='reportstartday' 
size="3">
+                  <option value="" 
<%=(startDay.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>
 --</option>
 <%
   k = 0;
   while (k < 31)
@@ -505,34 +516,26 @@ try
     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>
-                  <span class="label">,</span>
-                  <select class="schedulepulldown" name='reportstartyear'>
-                    <option value="" 
<%=(startYear.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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>
+                </select><nobr/>,<nobr/>
+                <select class="schedulepulldown" name='reportstartyear' 
size="3">
+                  <option value="" 
<%=(startYear.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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>
               </td>
             </tr>
             <tr>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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(),"maxbandwidthreport.NotSpecified")%>--</option>
+              <td 
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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(),"maxbandwidthreport.NotSpecified")%>
 --</option>
 <%
   k = 0;
   while (k < 24)
@@ -550,45 +553,42 @@ try
     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>
-                  <span class="label">:</span>
-                  <select class="schedulepulldown" name='reportendminute'>
-                    <option value="" <%=(endMinute.length() == 
0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>--</option>
+                </select><nobr/>:<nobr/>
+                <select class="schedulepulldown" name='reportendminute' 
size="3">
+                  <option value="" 
<%=(endMinute.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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>
-                  <span 
class="label"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.on")%></span>
-                  <select class="schedulepulldown" name='reportendmonth'>
-                    <option value="" 
<%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>--</option>
-                    <option value="0" 
<%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.January")%></option>
-                    <option value="1" 
<%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.February")%></option>
-                    <option value="2" 
<%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.March")%></option>
-                    <option value="3" 
<%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.April")%></option>
-                    <option value="4" 
<%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.May")%></option>
-                    <option value="5" 
<%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.June")%></option>
-                    <option value="6" 
<%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.July")%></option>
-                    <option value="7" 
<%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.August")%></option>
-                    <option value="8" 
<%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.September")%></option>
-                    <option value="9" 
<%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.October")%></option>
-                    <option value="10" 
<%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.November")%></option>
-                    <option value="11" 
<%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.December")%></option>
-                  </select>
-                  <span class="label">-</span>
-                  <select class="schedulepulldown" name='reportendday'>
-                    <option value="" 
<%=(endDay.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>--</option>
+                </select> 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.on")%>
+                <select class="schedulepulldown" name='reportendmonth' 
size="3">
+                  <option value="" 
<%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>
 --</option>
+                  <option value="0" 
<%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.January")%></option>
+                  <option value="1" 
<%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.February")%></option>
+                  <option value="2" 
<%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.March")%></option>
+                  <option value="3" 
<%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.April")%></option>
+                  <option value="4" 
<%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.May")%></option>
+                  <option value="5" 
<%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.June")%></option>
+                  <option value="6" 
<%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.July")%></option>
+                  <option value="7" 
<%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.August")%></option>
+                  <option value="8" 
<%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.September")%></option>
+                  <option value="9" 
<%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.October")%></option>
+                  <option value="10" 
<%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.November")%></option>
+                  <option value="11" 
<%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.December")%></option>
+                </select><nobr/>
+                <select class="schedulepulldown" name='reportendday' size="3">
+                  <option value="" 
<%=(endDay.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NotSpecified")%>
 --</option>
 <%
   k = 0;
   while (k < 31)
@@ -604,63 +604,64 @@ try
     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>
-                  <span class="label">,</span>
-                  <select class="schedulepulldown" name='reportendyear'>
-                    <option value="" 
<%=(endYear.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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>
+                </select><nobr/>,<nobr/>
+                <select class="schedulepulldown" name='reportendyear' size="3">
+                  <option value="" 
<%=(endYear.length()==0)?"selected=\"selected\"":""%>>-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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>
               </td>
             </tr>
             <tr>
-              
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EntityMatch")%></nobr></th>
-              <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(),"maxbandwidthreport.ResultCodeMatch")%></nobr></th>
-              <td><input type="text" class="form-control" 
name="reportresultcodematch" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(resultCodeMatch)%>'/></td>
+              <td class="separator" colspan="4"><hr/></td>
             </tr>
             <tr>
-              
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClassDescription")%></nobr></th>
-              <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(),"maxbandwidthreport.SlidingWindowSize")%></nobr></th>
-              <td><input type="text" class="form-control" 
name="reportinterval" size="5" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(Integer.toString(interval))%>'/></td>
+              <td 
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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(),"maxbandwidthreport.ResultCodeMatch")%></nobr></td>
+              <td class="value"><input type="text" 
name="reportresultcodematch" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(resultCodeMatch)%>'/></td>
             </tr>
-          </table>
-        </div>
-        <div class="box-footer clearfix">
-          <div class="btn-group">
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+
+            <tr>
+              <td 
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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(),"maxbandwidthreport.SlidingWindowSize")%></nobr></td>
+              <td class="value"><input type="text" name="reportinterval" 
size="5" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(Integer.toString(interval))%>'/></td>
+            </tr>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+              <td class="message" colspan="4">
 <%
   if (reportConnection.length() > 0)
   {
 %>
-            <a name="MainButton" class="btn btn-primary" role="button" 
onClick="javascript:Go()"
-                    
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.ExecuteThisQuery")%>"
 data-toggle="tooltip"><i class="fa fa-play 
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Go")%></a>
+                <a name="MainButton"><input type="button" 
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Go")%>"
 onClick="javascript:Go()" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.ExecuteThisQuery")%>"/></a>
 <%
   }
   else
   {
 %>
-            <a name="MainButton" class="btn btn-primary" role="button" 
onClick="javascript:Continue()"
-                    
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Continue")%>"
 data-toggle="tooltip"><i class="fa fa-play 
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Continue")%></a>
+                <a name="MainButton"><input type="button" 
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Continue")%>"
 onClick="javascript:Continue()" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Continue")%>"/></a>
 <%
   }
 %>
-          </div>
-        </div>
-      </div>
+              </td>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+
+          </table>
 <%
   if (reportConnection.length() > 0)
   {
@@ -707,9 +708,9 @@ try
       resultCodeMatchObject = new RegExpCriteria(resultCodeMatch,true);
     FilterCriteria criteria = new 
FilterCriteria(ourActivities,startTime,endTime,entityMatchObject,resultCodeMatchObject);
 %>
-      <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())%>'/>
+          <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())%>'/>
 <%
     long count = connMgr.countHistoryRows(reportConnection,criteria);
     long maxCount = connMgr.getMaxRows();
@@ -718,7 +719,7 @@ try
     {
       hasMoreRows = false;
 %>
-      <div class="callout callout-warning">You have selected <%=new 
Long(count).toString()%> rows. Maximum allowed is <%=new 
Long(maxCount).toString()%>.</div>
+          <table class="displaytable"><tr><td class="message">You have 
selected <%=new Long(count).toString()%> rows.  Maximum allowed is <%=new 
Long(maxCount).toString()%>.</td></tr></table>
 <%
     }
     else
@@ -729,14 +730,13 @@ try
         intervalMilliseconds,startRow,rowCount+1);
 
 %>
-      <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");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClass")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("bytecount");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.HighestBandwidth")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("starttime");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.StartTime")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("endtime");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EndTime")%></a></th>
+
+          <table class="displaytable">
+            <tr class="headerrow">
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("idbucket");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.IdentifierClass")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("bytecount");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.HighestBandwidth")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("starttime");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.StartTime")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("endtime");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.EndTime")%></nobr></a></td>
             </tr>
 <%
       zz = 0;
@@ -757,80 +757,80 @@ try
         double bandwidth = byteCount * 1000.0 / intervalMilliseconds;
 
 %>
-            <tr>
-              
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idBucketString)%></nobr></td>
-              <td><%=new Double(bandwidth).toString()%></td>
-              
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(startTimeString)%></nobr></td>
-              
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(endTimeString)%></nobr></td>
+            <tr <%="class=\""+((zz%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td 
class="reportcolumncell"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idBucketString)%></nobr></td>
+              <td class="reportcolumncell"><%=new 
Double(bandwidth).toString()%></td>
+              <td 
class="reportcolumncell"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(startTimeString)%></nobr></td>
+              <td 
class="reportcolumncell"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(endTimeString)%></nobr></td>
             </tr>
 <%
         zz++;
       }
 %>
           </table>
-        </div>
 <%
     }
 %>
-        <div class="box-footer clearfix">
-          <ul class="pagination pagination-sm no-margin pull-left">
+          <table class="reportfootertable">
+            <tr class="reportfooterrow">
+              <td class="reportfootercell">
+                <nobr>
 <%
     if (startRow == 0)
     {
 %>
-            <li><a href="#"><i class="fa fa-arrow-circle-o-left fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Previous")%></a></li>
+                  
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Previous")%>
 <%
     }
     else
     {
 %>
-            <li><a href="javascript:void(0);" 
-                    
onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
-                    
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.PreviousPage")%>"
 data-toggle="tooltip"><i class="fa fa-arrow-circle-o-left fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Previous")%></a>
-            </li>
+                  <a href="javascript:void(0);" 
onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Previous")%></a>
 <%
     }
+%>
+                </nobr>
+                <nobr>
+<%
     if (hasMoreRows == false)
     {
 %>
-            <li><a href="#"><i class="fa fa-arrow-circle-o-right fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Next")%></a></li>
+          
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Next")%>
 <%
     }
     else
     {
 %>
-            <li><a href="javascript:void(0);" 
-                    
onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
-                    
titile="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NextPage")%>"
 data-toggle="tooltip"><i class="fa fa-arrow-circle-o-right fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Next")%></a></li>
+                  <a href="javascript:void(0);" 
onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxbandwidthreport.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Next")%></a>
 <%
     }
 %>
-          </ul>
-          <ul class="pagination pagination-sm no-margin pull-right">
-            <li class="pad">
-              <span class="label 
label-primary"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.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(),"maxbandwidthreport.RowsPerPage")%></span>
-                <input type="text" class="form-control" name="rowcount" 
size="5" value='<%=Integer.toString(rowCount)%>'/>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
+                </nobr>
+              </td>
+              <td class="reportfootercell">
+                
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.Rows")%></nobr>
+                
<nobr><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></nobr>
+              </td>
+              <td class="reportfootercell">
+                
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.RowsPerPage")%></nobr>
+                <nobr><input type="text" name="rowcount" size="5" 
value='<%=Integer.toString(rowCount)%>'/></nobr>
+              </td>
+            </tr>
+          </table>
+
 <%
   }
   else
   {
 %>
-      <div class="callout 
callout-info"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.PleaseSelectAConnection")%></div>
+          <table class="displaytable"><tr><td 
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxbandwidthreport.PleaseSelectAConnection")%></td></tr></table>
 <%
   }
 %>
-    </form>
+        </form>
 <%
-} catch (ManifoldCFException e)
+}
+catch (ManifoldCFException e)
 {
   e.printStackTrace();
   variableContext.setParameter("text",e.getMessage());
@@ -840,5 +840,10 @@ try
 <%
 }
 %>
-  </div>
-</div>
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/queuestatus.jsp Thu 
Mar 23 18:49:54 2017
@@ -181,140 +181,150 @@ try
 
 %>
 
-<script type="text/javascript">
+<?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(),"queuestatus.ApacheManifoldCFQueueStatus")%>
+  </title>
+
+  <script type="text/javascript">
   <!--
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"queuestatus.ApacheManifoldCFQueueStatus")%>',
-      
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.QueueStatus")%>',
-      'statusReports'
-  );
-  function Go()
-  {
-    if (report.statusbucketdesc.value == "")
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionCannotBeEmpty")%>");
-      report.statusbucketdesc.focus();
-      return;
-    }
-    if (!isRegularExpression(report.statusbucketdesc.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
-      report.statusbucketdesc.focus();
-      return;
-    }
-    if (report.statusbucketdesc.value.indexOf("(") == -1 || 
report.statusbucketdesc.value.indexOf(")") == -1)
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
-      report.statusbucketdesc.focus();
-      return;
-    }
-    if (!isInteger(report.rowcount.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.EnterALegalNumberForRowsPerPage")%>");
-      report.rowcount.focus();
-      return;
-    }
-    if (!isRegularExpression(report.statusidentifiermatch.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierMatchMustBeAValidRegularExpression")%>");
-      report.statusidentifiermatch.focus();
-      return;
-    }
 
-    document.report.op.value="Status";
-    document.report.action=document.report.action + "#MainButton";
-    $.ManifoldCF.submit(document.report);
+function Go()
+{
+  if (report.statusbucketdesc.value == "")
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionCannotBeEmpty")%>");
+    report.statusbucketdesc.focus();
+    return;
   }
-
-  function Continue()
+  if (!isRegularExpression(report.statusbucketdesc.value))
   {
-    if (report.statusbucketdesc.value == "")
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionCannotBeEmpty")%>");
-      report.statusbucketdesc.focus();
-      return;
-    }
-    if (!isRegularExpression(report.statusbucketdesc.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
-      report.statusbucketdesc.focus();
-      return;
-    }
-    if (report.statusbucketdesc.value.indexOf("(") == -1 || 
report.statusbucketdesc.value.indexOf(")") == -1)
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
-      report.statusbucketdesc.focus();
-      return;
-    }
-    if (!isRegularExpression(report.statusidentifiermatch.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierMatchMustBeAValidRegularExpression")%>");
-      report.statusidentifiermatch.focus();
-      return;
-    }
-    document.report.op.value="Continue";
-    document.report.action=document.report.action + "#MainButton";
-    $.ManifoldCF.submit(document.report);
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
+    report.statusbucketdesc.focus();
+    return;
   }
-
-  function ColumnClick(colname)
+  if (report.statusbucketdesc.value.indexOf("(") == -1 || 
report.statusbucketdesc.value.indexOf(")") == -1)
   {
-    document.report.clickcolumn.value=colname;
-    Go();
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
+    report.statusbucketdesc.focus();
+    return;
   }
-
-  function SetPosition(amt)
+  if (!isInteger(report.rowcount.value))
   {
-    if (amt < 0)
-      amt=0;
-    document.report.startrow.value=amt;
-    Go();
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.EnterALegalNumberForRowsPerPage")%>");
+    report.rowcount.focus();
+    return;
   }
-
-  function isRegularExpression(value)
+  if (!isRegularExpression(report.statusidentifiermatch.value))
   {
-    try
-    {
-      var foo="teststring";
-      foo.search(value.replace(/\(\?i\)/,""));
-      return true;
-    }
-    catch (e)
-    {
-      return false;
-    }
-
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierMatchMustBeAValidRegularExpression")%>");
+    report.statusidentifiermatch.focus();
+    return;
   }
 
-  function isInteger(value)
+  document.report.op.value="Status";
+  document.report.action = document.report.action + "#MainButton";
+  document.report.submit();
+}
+
+function Continue()
+{
+  if (report.statusbucketdesc.value == "")
   {
-    var anum=/(^\d+$)/;
-    return anum.test(value);
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionCannotBeEmpty")%>");
+    report.statusbucketdesc.focus();
+    return;
   }
+  if (!isRegularExpression(report.statusbucketdesc.value))
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
+    report.statusbucketdesc.focus();
+    return;
+  }
+  if (report.statusbucketdesc.value.indexOf("(") == -1 || 
report.statusbucketdesc.value.indexOf(")") == -1)
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
+    report.statusbucketdesc.focus();
+    return;
+  }
+  if (!isRegularExpression(report.statusidentifiermatch.value))
+  {
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierMatchMustBeAValidRegularExpression")%>");
+    report.statusidentifiermatch.focus();
+    return;
+  }
+  document.report.op.value="Continue";
+  document.report.action = document.report.action + "#MainButton";
+  document.report.submit();
+}
 
-  $(function ()
+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
   {
-    $('.selectpicker').selectpicker();
-  });
+    var foo = "teststring";
+    foo.search(value.replace(/\(\?i\)/,""));
+    return true;
+  }
+  catch (e)
+  {
+    return false;
+  }
+
+}
+
+function isInteger(value)
+{
+  var anum=/(^\d+$)/;
+  return anum.test(value);
+}
 
   //-->
-</script>
+  </script>
 
 
-<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="queuestatus"/>
-
-      <div class="box box-primary">
-        <div class="box-body">
-          <table class="table table-bordered">
-            <tr>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Connection")%></th>
-              <td>
-                <select class="selectpicker" name="statusconnection">
-                  <option <%=(statusConnection.length() == 
0)?"selected=\"selected\"":""%> value="">-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.NotSpecified")%>--</option>
+</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(),"queuestatus.QueueStatus")%></p>
+        <form class="standardform" name="report" action="execute.jsp" 
method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="queuestatus"/>
+          <table class="displaytable">
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td class="description" 
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Connection")%></td><td
 class="value" colspan="1">
+                <select name="statusconnection" size="3">
+                  <option 
<%=(statusConnection.length()==0)?"selected=\"selected\"":""%> value="">-- 
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.NotSpecified")%>
 --</option>
 <%
   int i = 0;
   while (i < connList.length)
@@ -335,9 +345,8 @@ try
   if (eligibleList != null)
   {
 %>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Jobs")%></th>
-              <th>
-                <select class="selectpicker" multiple="true" name="statusjobs">
+              <td class="description" 
colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Jobs")%></td><td
 class="value" colspan="1">
+                <select multiple="true" name="statusjobs" size="3">
 <%
     i = 0;
     while (i < eligibleList.length)
@@ -357,23 +366,26 @@ try
   else
   {
 %>
-              <td colspan="2"></td>
+              <td class="value" colspan="2"></td>
 <%
   }
 %>
 
             </tr>
             <tr>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.TimeOffsetFromNowMinutes")%></th>
-              <td colspan="3">
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td 
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.TimeOffsetFromNowMinutes")%></td>
+              <td class="value" colspan="3">
                 <input name="statusscheduleoffset" type="text" size="6" 
value=""/>
               </td>
             </tr>
             <tr>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentState")%></th>
-              <td colspan="3">
+              <td 
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentState")%></td>
+              <td class="value" colspan="3">
                 <input name="statusdocumentstates_posted" type="hidden" 
value="true"/>
-                <select class="selectpicker" name="statusdocumentstates" 
multiple="true">
+                <select name="statusdocumentstates" multiple="true" size="3">
                   <option <%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_NEVERPROCESSED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATE_NEVERPROCESSED)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsThatHaveNeverBeenProcessed")%></option>
                   <option <%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED))==null)?"":"selected=\"selected\"")%>
 
value='<%=Integer.toString(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsProcessedAtLeastOnce")%></option>
                   <option <%=((matchingStatesHash.get(new 
Integer(IJobManager.DOCSTATE_OUTOFSCOPE))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATE_OUTOFSCOPE)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsOutOfScope")%></option>
@@ -381,10 +393,10 @@ try
               </td>
             </tr>
             <tr>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentState")%></th>
-              <td colspan="3">
+              <td 
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentState")%></td>
+              <td class="value" colspan="3">
                 <input name="statusdocumentstatuses_posted" type="hidden" 
value="true"/>
-                <select class="selectpicker" name="statusdocumentstatuses" 
multiple="true">
+                <select name="statusdocumentstatuses" multiple="true" size="3">
                   <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_INACTIVE))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATUS_INACTIVE)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsThatAreNoLongerActive")%></option>
                   <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_PROCESSING))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATUS_PROCESSING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsCurrentlyInProgress")%></option>
                   <option <%=((matchingStatusesHash.get(new 
Integer(IJobManager.DOCSTATUS_EXPIRING))==null)?"":"selected=\"selected\"")%> 
value='<%=Integer.toString(IJobManager.DOCSTATUS_EXPIRING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentsCurrentlyBeingExpired")%></option>
@@ -399,40 +411,42 @@ try
               </td>
             </tr>
             <tr>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentIdentifierMatch")%></th>
-              <td colspan="3">
-                <input type="text" name="statusidentifiermatch" size="40" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(identifierMatch)%>'/>
-              </td>
+              <td class="separator" colspan="4"><hr/></td>
             </tr>
             <tr>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescription")%></th>
-              <td colspan="3">
-                <input type="text" name="statusbucketdesc" size="40" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(statusBucketDesc)%>'/>
-              </td>
+              <td 
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.DocumentIdentifierMatch")%></nobr></td>
+              <td class="value" colspan="3"><input type="text" 
name="statusidentifiermatch" size="40" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(identifierMatch)%>'/></td>
             </tr>
-          </table>
-        </div>
-        <div class="box-footer clearfix">
-          <div class="btn-group">
+            <tr>
+              <td 
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClassDescription")%></nobr></td>
+              <td class="value" colspan="3"><input type="text" 
name="statusbucketdesc" size="40" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(statusBucketDesc)%>'/></td>
+            </tr>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td class="message" colspan="4">
 <%
   if (statusConnection.length() > 0 && statusJobIdentifiers.length > 0)
   {
 %>
-            <a name="MainButton" class="btn btn-primary" role="button" 
onClick="javascript:Go()"
-                    
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.ExecuteThisQuery")%>"
 data-toggle="tooltip"><i class="fa fa-play 
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.Go")%></a>
+                <a name="MainButton"><input type="button" 
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.Go")%>"
 onClick="javascript:Go()" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.ExecuteThisQuery")%>"/></a>
 <%
   }
   else
   {
 %>
-            <a name="MainButton" class="btn btn-primary" role="button" 
onClick="javascript:Continue()"
-                    
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.Continue")%>"
 data-toggle="tooltip"><i class="fa fa-play 
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.Continue")%></a>
+                <a name="MainButton"><input type="button" 
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.Continue")%>"
 onClick="javascript:Continue()" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.Continue")%>"/></a>
 <%
   }
 %>
-          </div>
-        </div>
-      </div>
+              </td>
+            </tr>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+
+          </table>
 <%
   if (statusConnection.length() > 0)
   {
@@ -486,22 +500,20 @@ try
           <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 no-padding">
-          <table class="table table-bordered">
-            <tr>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("idbucket");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClass")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("inactive");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Inactive")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("processing");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Processing")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("expiring");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Expiring")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("deleting");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Deleting")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("processready");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.AboutToProcess")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("expireready");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.AboutToExpire")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("processwaiting");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.WaitingForProcessing")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("expirewaiting");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.WaitingForExpiration")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("waitingforever");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.WaitingForever")%></a></th>
-              <th><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("hopcountexceeded");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.HopcountExceeded")%></a></th>
-</tr>
+          <table class="displaytable">
+            <tr class="headerrow">
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("idbucket");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.IdentifierClass")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("inactive");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Inactive")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("processing");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Processing")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("expiring");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Expiring")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("deleting");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Deleting")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("processready");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.AboutToProcess")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("expireready");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.AboutToExpire")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("processwaiting");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.WaitingForProcessing")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("expirewaiting");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.WaitingForExpiration")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("waitingforever");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.WaitingForever")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" 
onclick='javascript:ColumnClick("hopcountexceeded");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.HopcountExceeded")%></nobr></a></td>
+            </tr>
 <%
       zz = 0;
       boolean hasMoreRows = (set.getRowCount() > rowCount);
@@ -520,8 +532,8 @@ try
         String[] identifierBreakdown = 
org.apache.manifoldcf.ui.util.Formatter.formatString(idBucketValue,64,true,true);
 
 %>
-            <tr>
-              <td>
+            <tr <%="class=\""+((zz%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td class="reportcolumncell">
 <%
         int q = 0;
         while (q < identifierBreakdown.length)
@@ -532,94 +544,86 @@ try
         }
 %>
               </td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("inactive").toString())%></td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("processing").toString())%></td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("expiring").toString())%></td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("deleting").toString())%></td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("processready").toString())%></td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("expireready").toString())%></td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("processwaiting").toString())%></td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("expirewaiting").toString())%></td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("waitingforever").toString())%></td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("hopcountexceeded").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("inactive").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("processing").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("expiring").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("deleting").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("processready").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("expireready").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("processwaiting").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("expirewaiting").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("waitingforever").toString())%></td>
+              <td 
class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("hopcountexceeded").toString())%></td>
             </tr>
 <%
         zz++;
       }
 %>
           </table>
-        </div>
-        <div class="box-footer">
-          <div class="row">
-            <div class="col-md-7">
-              <ul class="pagination pagination-sm no-margin pull-left">
+          <table class="reportfootertable">
+            <tr class="reportfooterrow">
+              <td class="reportfootercell">
+                <nobr>
 <%
       if (startRow == 0)
       {
 %>
-                <li><a hred="#"><i class="fa fa-arrow-circle-o-left fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Previous")%></a></li>
+                  
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Previous")%>
 <%
       }
       else
       {
 %>
-                <li>
-                  <a href="javascript:void(0);"
-                          
onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
-                          
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.PreviousPage")%>"
 data-toggle="tooltip"><i class="fa fa-arrow-circle-o-left fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Previous")%></a>
-                </li>
+                  <a href="javascript:void(0);" 
onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Previous")%></a>
 <%
       }
+%>
+                </nobr>
+                <nobr>
+<%
       if (hasMoreRows == false)
       {
 %>
-                <li><a href="#"><i class="fa fa-arrow-circle-o-right fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Next")%></a></li>
+                  
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Next")%>
 <%
       }
       else
       {
 %>
-                <li>
-                  <a href="javascript:void(0);"
-                          
onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
-                          
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.NextPage")%>"
 data-toggle="title"><i class="fa fa-arrow-circle-o-right fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Next")%></a>
-                </li>
+                  <a href="javascript:void(0);" 
onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"queuestatus.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Next")%></a>
 <%
       }
 %>
-              </ul>
-            </div>
-            <div class="col-md-2">
-              <span class="label 
label-primary"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Rows")%></span>
-              <span class="label 
label-primary"><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></span>
-            </div>
-            <div class="col-md-3">
-              <div class="input-group input-group-sm">
-                <span 
class="input-group-addon"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.RowsPerPage")%></span>
-                <input type="text" class="form-control" name="rowcount" 
size="5" value='<%=Integer.toString(rowCount)%>'/>
-              </div>
-            </div>
-          </div>
-        </div>
+                </nobr>
+              </td>
+              <td class="reportfootercell">
+                
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.Rows")%></nobr>
+                
<nobr><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></nobr>
+              </td>
+              <td class="reportfootercell">
+                
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.RowsPerPage")%></nobr>
+                <nobr><input type="text" name="rowcount" size="5" 
value='<%=Integer.toString(rowCount)%>'/></nobr>
+              </td>
+            </tr>
+          </table>
 
 <%
     }
     else
     {
 %>
-        <div class="callout 
callout-info"><p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.PleaseSelectAtLeastOneJob")%></p></div>
+          <table class="displaytable"><tr><td 
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.PleaseSelectAtLeastOneJob")%></td></tr></table>
 <%
     }
   }
   else
   {
 %>
-        <div class="callout 
callout-info"><p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.PleaseSelectaConnection")%></p></div>
+          <table class="displaytable"><tr><td 
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"queuestatus.PleaseSelectaConnection")%></td></tr></table>
 <%
   }
 %>
-      </div>
-    </form>
+        </form>
 <%
 }
 catch (ManifoldCFException e)
@@ -632,5 +636,11 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-  </div>
-</div>
+
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>


Reply via email to