manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1788301 [10/16] - in /manifoldcf/trunk: ./ connectors/ connectors/activedirectory/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/activedirectory/tests/ connectors/alfresco-webscript/ connectors/alfresco-webscript/con...
Date Thu, 23 Mar 2017 18:49:55 GMT
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp Thu Mar 23 18:49:54 2017
@@ -39,42 +39,59 @@ try
   INotificationConnection[] connections = manager.getAllConnections();
 %>
 
-<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(),"listnotifications.ApacheManifoldCFListNotificationConnections")%>
+  </title>
+
+  <script type="text/javascript">
   <!--
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.ApacheManifoldCFListNotificationConnections")%>',
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.ListOfNotificationConnections")%>',
-      'repositories'
-  );
 
-  function Delete(connectionName)
+function Delete(connectionName)
+{
+  if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listnotifications.DeleteNotificationConnection")%> '"+connectionName+"'?"))
   {
-    if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listnotifications.DeleteNotificationConnection")%> '"+connectionName+"'?"))
-    {
-      document.listconnections.op.value="Delete";
-      document.listconnections.connname.value=connectionName;
-      $.ManifoldCF.submit(document.listconnections);
-    }
+    document.listconnections.op.value="Delete";
+    document.listconnections.connname.value=connectionName;
+    document.listconnections.submit();
   }
+}
 
   //-->
-</script>
-<div class="row">
-  <div class="col-md-12">
-    <div class="box box-primary">
-      <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="notification"/>
-        <input type="hidden" name="connname" value=""/>
+  </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(),"listnotifications.ListOfNotificationConnections")%></p>
+        <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="notification"/>
+          <input type="hidden" name="connname" value=""/>
 
-        <div class="box-body">
-          <table class="table table-bordered">
+          <table class="datatable">
             <tr>
-              <th>Action</th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Name")%></th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Description")%></th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ConnectionType")%></th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Max")%></th>
+              <td class="separator" colspan="5"><hr/></td>
+            </tr>
+            <tr class="headerrow">
+              <td class="columnheader"></td>
+              <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Name")%></nobr></td>
+              <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Description")%></nobr></td>
+              <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ConnectionType")%></nobr></td>
+              <td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Max")%></td>
             </tr>
 <%
   int i = 0;
@@ -89,40 +106,31 @@ try
     String className = connection.getClassName();
     String connectorName = connectorManager.getDescription(className);
     if (connectorName == null)
-      connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listnotifications.uninstalled");
+      connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listnotifications.uninstalled");;
     int maxCount = connection.getMaxConnections();
 
 %>
-            <tr>
-              <td>
-                <div class="btn-group">
-                  <a href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
-                          class="link btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-eye fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.View")%></a>
-                  <a href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
-                          class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Edit")%></a>
-                  <a href="javascript:void(0);"
-                          onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
-                          title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
-                          class="btn btn-danger btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Delete")%></a>
-                </div>
+            <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td class="columncell">
+                <nobr>
+                  <a href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.View")%></a>
+                  <a href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Edit")%></a>
+                  <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Delete")%></a>
+                </nobr>
               </td>
-              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
-              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
-              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
-              <td><%=Integer.toString(maxCount)%></td>
+              <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+              <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+              <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
+              <td class="columncell"><%=Integer.toString(maxCount)%></td>
             </tr>
 <%
   }
 %>
+            <tr>
+              <td class="separator" colspan="5"><hr/></td>
+            </tr>
+            <tr><td class="message" colspan="5"><a href="editnotification.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.AddANotificationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.AddaNewNotificationConnection")%></a></td></tr>
           </table>
-        </div>
-        <div class="box-footer clearfix">
-          <div class="btn-group">
-            <a href="editnotification.jsp" title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.AddANotificationConnection")%>"
-                    class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.AddaNewNotificationConnection")%></a>
-          </div>
 
 <%
 }
@@ -136,8 +144,11 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
+        </form>
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listoutputs.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listoutputs.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listoutputs.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listoutputs.jsp Thu Mar 23 18:49:54 2017
@@ -39,43 +39,59 @@ try
   IOutputConnection[] connections = manager.getAllConnections();
 %>
 
-<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(),"listoutputs.ApacheManifoldCFListOutputConnections")%>
+  </title>
+
+  <script type="text/javascript">
   <!--
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.ApacheManifoldCFListOutputConnections")%>',
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.ListOfOutputConnections")%>',
-      'outputs'
-  );
 
-  function Delete(connectionName)
+function Delete(connectionName)
+{
+  if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listoutputs.DeleteOutputConnection")%> '"+connectionName+"'?"))
   {
-    if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listoutputs.DeleteOutputConnection")%> '"+connectionName+"'?"))
-    {
-      document.listconnections.op.value="Delete";
-      document.listconnections.connname.value=connectionName;
-      $.ManifoldCF.submit(document.listconnections);
-    }
+    document.listconnections.op.value="Delete";
+    document.listconnections.connname.value=connectionName;
+    document.listconnections.submit();
   }
+}
+
   //-->
-</script>
+  </script>
+
+</head>
 
+<body class="standardbody">
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="box box-primary">
-      <form name="listconnections" action="execute.jsp" method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="output"/>
-        <input type="hidden" name="connname" value=""/>
+  <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(),"listoutputs.ListOfOutputConnections")%></p>
+        <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="output"/>
+          <input type="hidden" name="connname" value=""/>
 
-        <div class="box-body">
-          <table class="table table-bordered">
+          <table class="datatable">
             <tr>
-              <th>Action</th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Name")%></th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Description")%></th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.ConnectionType")%></th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Max")%></th>
+              <td class="separator" colspan="5"><hr/></td>
+            </tr>
+            <tr class="headerrow">
+              <td class="columnheader"></td>
+              <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Name")%></nobr></td>
+              <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Description")%></nobr></td>
+              <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.ConnectionType")%></nobr></td>
+              <td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Max")%></td>
             </tr>
 <%
   int i = 0;
@@ -90,40 +106,31 @@ try
     String className = connection.getClassName();
     String connectorName = connectorManager.getDescription(className);
     if (connectorName == null)
-      connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.uninstalled");
+      connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.uninstalled");;
     int maxCount = connection.getMaxConnections();
 
 %>
-            <tr>
-              <td>
-                <div class="btn-group">
-                  <a href='<%="viewoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>' 
-                          class="link btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-eye fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")%></a>
-                  <a href='<%="editoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>' 
-                          class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")%></a>
-                  <a href="javascript:void(0);"
-                          onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
-                          title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>' 
-                          class="btn btn-danger btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")%></a>
-                </div>
+            <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td class="columncell">
+                <nobr>
+                  <a href='<%="viewoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.View")%></a>
+                  <a href='<%="editoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Edit")%></a>
+                  <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Delete")%></a>
+                </nobr>
               </td>
-              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
-              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
-              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
-              <td><%=Integer.toString(maxCount)%></td>
+              <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+              <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+              <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
+              <td class="columncell"><%=Integer.toString(maxCount)%></td>
             </tr>
 <%
   }
 %>
+            <tr>
+              <td class="separator" colspan="5"><hr/></td>
+            </tr>
+            <tr><td class="message" colspan="5"><a href="editoutput.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.AddAnOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.AddaNewOutputConnection")%></a></td></tr>
           </table>
-        </div>
-        <div class="box-footer clearfix">
-          <div class="btn-group">
-            <a href="editoutput.jsp" title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.AddAnOutputConnection")%>"
-                    class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.AddaNewOutputConnection")%></a>
-          </div>
 
 <%
 }
@@ -137,8 +144,11 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
+        </form>
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listtransformations.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listtransformations.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listtransformations.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listtransformations.jsp Thu Mar 23 18:49:54 2017
@@ -39,45 +39,59 @@ try
   ITransformationConnection[] connections = manager.getAllConnections();
 %>
 
+<?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(),"listtransformations.ApacheManifoldCFListTransformationConnections")%>
+  </title>
 
-<script type="text/javascript">
-
+  <script type="text/javascript">
   <!--
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.ApacheManifoldCFListTransformationConnections")%>',
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.ListOfTransformationConnections")%>',
-      'outputs'
-  );
 
-  function Delete(connectionName)
+function Delete(connectionName)
+{
+  if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listtransformations.DeleteTransformationConnection")%> '"+connectionName+"'?"))
   {
-    if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listtransformations.DeleteTransformationConnection")%> '"+connectionName+"'?"))
-    {
-      document.listconnections.op.value="Delete";
-      document.listconnections.connname.value=connectionName;
-      $.ManifoldCF.submit(document.listconnections);
-    }
+    document.listconnections.op.value="Delete";
+    document.listconnections.connname.value=connectionName;
+    document.listconnections.submit();
   }
+}
 
   //-->
-</script>
+  </script>
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="box box-primary">
-      <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="transformation"/>
-        <input type="hidden" name="connname" value=""/>
+</head>
 
-        <div class="box-body">
-          <table class="table table-bordered">
+<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(),"listtransformations.ListOfTransformationConnections")%></p>
+        <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="transformation"/>
+          <input type="hidden" name="connname" value=""/>
+
+          <table class="datatable">
             <tr>
-              <th>Action</th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Name")%></th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Description")%></th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.ConnectionType")%></th>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Max")%></th>
+              <td class="separator" colspan="5"><hr/></td>
+            </tr>
+            <tr class="headerrow">
+              <td class="columnheader"></td>
+              <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Name")%></nobr></td>
+              <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Description")%></nobr></td>
+              <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.ConnectionType")%></nobr></td>
+              <td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Max")%></td>
             </tr>
 <%
   int i = 0;
@@ -92,44 +106,32 @@ try
     String className = connection.getClassName();
     String connectorName = connectorManager.getDescription(className);
     if (connectorName == null)
-      connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listtransformations.uninstalled");
+      connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listtransformations.uninstalled");;
     int maxCount = connection.getMaxConnections();
 
 %>
-            <tr>
-              <td>
-                <div class="btn-group">
-                  <a href='<%="viewtransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
-                          class="link btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-eye fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.View")%></a>
-                  <a href='<%="edittransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
-                          class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Edit")%></a>
-                  <a href="javascript:void(0);"
-                          onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
-                          title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
-                          class="btn btn-danger btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Delete")%></a>
-                </div>
+            <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td class="columncell">
+                <nobr>
+                  <a href='<%="viewtransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.View")%></a>
+                  <a href='<%="edittransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Edit")%></a>
+                  <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Delete")%></a>
+                </nobr>
               </td>
-              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
-              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
-              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
-              <td><%=Integer.toString(maxCount)%></td>
+              <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+              <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+              <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
+              <td class="columncell"><%=Integer.toString(maxCount)%></td>
             </tr>
 <%
   }
 %>
+            <tr>
+              <td class="separator" colspan="5"><hr/></td>
+            </tr>
+            <tr><td class="message" colspan="5"><a href="edittransformation.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.AddATransformationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.AddaNewTransformationConnection")%></a></td></tr>
           </table>
-        </div>
-        <div class="box-footer clearfix">
-          <a href="edittransformation.jsp" class="link btn btn-primary" role="button" 
-                  title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.AddATransformationConnection")%>" 
-                  data-toggle="tooltip"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.AddaNewTransformationConnection")%></a>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>        
+
 <%
 }
 catch (ManifoldCFException e)
@@ -142,3 +144,11 @@ catch (ManifoldCFException e)
 <%
 }
 %>
+        </form>
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp Thu Mar 23 18:49:54 2017
@@ -31,12 +31,11 @@ response.setContentType("text/html;chars
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-    <link href="css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
-    <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
-    <link rel="StyleSheet" href="css/style.css" type="text/css" media="screen"/>
-    <title><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.ApacheManifoldCFLogin")%></title>
+    <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(),"index.ApacheManifoldCFLogin")%>
+    </title>
     <script type="text/javascript">
       <!--
       function login()
@@ -44,69 +43,63 @@ response.setContentType("text/html;chars
         document.loginform.submit();
       }
 
-      document.onkeypress = loginKeyPress;
-
       function loginKeyPress(e)
       {
-        e = e || window.event;
-        if (e.keyCode == 13)
-        {
-          document.getElementById('buttonLogin').click();
-          return false;
-        }
-        return true;
+          e = e || window.event;
+          if (e.keyCode == 13)
+          {
+              document.getElementById('buttonLogin').click();
+              return false;
+          }
+          return true;
       }
+      
+      document.onkeypress = loginKeyPress;
+
       //-->
     </script>
   </head>
-  <body class="login-page">
-    <div class="login-box">
-      <div class="login-logo">
-        <a href="/"><img src="ManifoldCF-logo.png"/></a>
-      </div>
-      <!-- /.login-logo -->
-      <div class="login-box-body">
-        <p class="login-box-msg">Sign in to start your session</p>
+  <body class="standardbody">
+    <table class="page">
+      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
+      <tr>
+        <td colspan="2" class="window">
 
-        <form class="standardform" name="loginform" action="setupAdminProfile.jsp" method="POST">
-<%
-if (request.getParameter("nextUrl") != null)
-{
-%>
-          <input type="hidden" name="nextUrl" value="<%=request.getParameter("nextUrl")%>">
-<%
-}
-%>
+          <form class="standardform" name="loginform" action="setupAdminProfile.jsp" method="POST">
+            <table class="displaytable">
 <%
 String value = variableContext.getParameter("loginfailed");
 if (value != null && value.equals("true"))
 {
 %>
-          <div class="callout callout-danger">
-            <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.LoginFailed")%></p>
-          </div>
-
+              <tr><td class="message" colspan="2"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.LoginFailed")%></td></tr>
+              <tr><td class="separator" colspan="2"><hr/></td></tr>
 <%
 }
 %>
-          <div class="form-group has-feedback">
-            <input name="userID" type="text" class="form-control" autofocus="autofocus" placeholder="<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%>"/>
-            <span class="glyphicon glyphicon-user form-control-feedback"></span>
-          </div>
-          <div class="form-group has-feedback">
-            <input name="password" type="password" class="form-control" placeholder="<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.PasswordColon")%>"/>
-            <span class="glyphicon glyphicon-lock form-control-feedback"></span>
-          </div>
-          <div class="row">
-            <div class="col-xs-8">
-            </div>
-            <div class="col-xs-4">
-              <a id="buttonLogin" class="btn btn-primary btn-block" onclick='Javascript:login();'
-                      title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'><i class="fa fa-sign-in fa-fw" aria-hidden="true"></i>&nbsp;<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%></a>
-            </div>
-          </div>
-        </form>
-      </div>
-    </div>
+              <tr>
+                <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%></nobr></td>
+                <td class="value">
+                  <input name="userID" type="text" size="32" value="" autofocus="autofocus"/>
+                </td>
+              </tr>
+              <tr>
+                <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.PasswordColon")%></nobr></td>
+                <td class="value">
+                  <input name="password" type="password" size="32" value=""/>
+                </td>
+              </tr>
+              <tr><td class="separator" colspan="2"><hr/></td></tr>
+              <tr>
+                <td class="message" colspan="2">
+                  <input id="buttonLogin" type="button" onclick='Javascript:login();' value='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'/>
+                </td>
+              </tr>
+            </table>
+          </form>
+        </td>
+      </tr>
+    </table>
   </body>
 </html>
+

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/logout.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/logout.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/logout.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/logout.jsp Thu Mar 23 18:49:54 2017
@@ -30,3 +30,4 @@ response.setContentType("text/html;chars
 adminprofile.logout();
 response.sendRedirect("login.jsp");
 %>
+

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp Thu Mar 23 18:49:54 2017
@@ -21,27 +21,40 @@
 * limitations under the License.
 */
 %>
-<script type="text/javascript">
-  <!--
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "error.ApacheManifoldCFMaintenanceUnderway")%>',
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "error.ApacheManifoldCFMaintenanceUnderway")%>'
-  );
-  //-->
-</script>
-
-<div class="box box-error">
-  <div class="box-body">
-    <div class="alert alert-danger">
-      <h3><i class="icon fa fa-ban"></i> Error!</h3>
-      <h4><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.MaintenanceUnderway")%></h4>
-      <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.PleaseTryAgainLater")%></p>
-    </div>
-  </div>
-  <div class="box-footer with-border">
-    <a class="btn btn-primary" href='index.jsp' 
-            title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>" data-toggle="tooltip">
-      <i class="fa fa-check fa-fw" aria-hidden="true"></i>OK
-    </a>
-  </div>
-</div>
+
+<?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(),"error.ApacheManifoldCFMaintenanceUnderway")%>
+  </title>
+
+</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(),"error.MaintenanceUnderway")%></p>
+
+        <table class="displaytable">
+          <tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.PleaseTryAgainLater")%></td></tr>
+          <tr><td class="separator"><hr/></td></tr>
+          <tr><td class="message"><a href="index.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>">OK</a></td></tr>
+        </table>
+
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp Thu Mar 23 18:49:54 2017
@@ -237,147 +237,162 @@ 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(),"maxactivityreport.ApacheManifoldCFMaximumActivityReport")%>
+  </title>
+
+  <script type="text/javascript">
   <!--
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "maxactivityreport.ApacheManifoldCFMaximumActivityReport")%>',
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "maxactivityreport.MaximumActivityReport")%>',
-      'historyreports'
-  );
-  function Go()
-  {
-    if (!isInteger(report.rowcount.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.EnterALegalNumberForRowsPerPage")%>");
-      report.rowcount.focus();
-      return;
-    }
-    if (!isInteger(report.reportinterval.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.EnterALegalIntervalSizeInMinutes")%>");
-      report.reportinterval.focus();
-      return;
-    }
-    if (report.reportbucketdesc.value == "")
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescriptionCannotBeEmpty")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportbucketdesc.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-    if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1)
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportentitymatch.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.EntityMatchMustBeAValidRegularExpression")%>");
-      report.reportentitymatch.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportresultcodematch.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
-      report.reportresultcodematch.focus();
-      return;
-    }
 
-    document.report.op.value="Report";
-    document.report.action=document.report.action + "#MainButton";
-    $.ManifoldCF.submit(document.report);
+function Go()
+{
+  if (!isInteger(report.rowcount.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.EnterALegalNumberForRowsPerPage")%>");
+    report.rowcount.focus();
+    return;
   }
-
-  function Continue()
+  if (!isInteger(report.reportinterval.value))
   {
-    if (!isRegularExpression(report.reportentitymatch.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.EntityMatchMustBeAValidRegularExpression")%>");
-      report.reportentitymatch.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportresultcodematch.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
-      report.reportresultcodematch.focus();
-      return;
-    }
-    if (!isRegularExpression(report.reportbucketdesc.value))
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
-      report.reportbucketdesc.focus();
-      return;
-    }
-    if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1)
-    {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.EnterALegalIntervalSizeInMinutes")%>");
+    report.reportinterval.focus();
+    return;
   }
-
-  function ColumnClick(colname)
+  if (report.reportbucketdesc.value == "")
   {
-    document.report.clickcolumn.value=colname;
-    Go();
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.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(),"maxactivityreport.IdentifierClassDescriptionMustDelimitAClassWithParentheses")%>");
+    report.reportbucketdesc.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportentitymatch.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.EntityMatchMustBeAValidRegularExpression")%>");
+    report.reportentitymatch.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportresultcodematch.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.EntityMatchMustBeAValidRegularExpression")%>");
+    report.reportentitymatch.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportresultcodematch.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.ResultCodeMatchMustBeAValidRegularExpression")%>");
+    report.reportresultcodematch.focus();
+    return;
+  }
+  if (!isRegularExpression(report.reportbucketdesc.value))
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.IdentifierClassDescriptionMustBeAValidRegularExpression")%>");
+    report.reportbucketdesc.focus();
+    return;
+  }
+  if (report.reportbucketdesc.value.indexOf("(") == -1 || report.reportbucketdesc.value.indexOf(")") == -1)
+  {
+    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"maxactivityreport.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>
+
 
+</head>
 
-<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="maxactivityreport"/>
-
-      <div class="box box-primary">
-        <div class="box-body">
-          <table class="table table-bordered">
-            <tr>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Connection")%></th>
-              <td colspan="1">
-                <select name="reportconnection" class="form-control">
+<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(),"maxactivityreport.MaximumActivityReport")%></p>
+        <form class="standardform" name="report" action="execute.jsp" method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="maxactivityreport"/>
+          <table class="displaytable">
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td class="description" colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Connection")%></td><td class="value" colspan="1">
+                <select name="reportconnection" size="3">
                   <option <%=(reportConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.NotSpecified")%> --</option>
 <%
   int i = 0;
@@ -399,19 +414,18 @@ try
   if (reportConnection.length() > 0)
   {
 %>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Activities")%></th>
-              <td colspan="1">
+              <td class="description" colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.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++];
+    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>
@@ -420,18 +434,20 @@ try
   else
   {
 %>
-              <td colspan="2"></td>
+              <td class="value" colspan="2"></td>
 <%
   }
 %>
 
             </tr>
             <tr>
-              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.NotSpecified")%> --</option>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+            <tr>
+              <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.NotSpecified")%> --</option>
 <%
   k = 0;
   while (k < 24)
@@ -449,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(),"maxactivityreport.NotSpecified")%> --</option>
+                </select><nobr/>:<nobr/>
+                <select class="schedulepulldown" name='reportstartminute' size="3">
+                  <option value="" <%=(startMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.on")%></span>
-                  <select class="schedulepulldown" name='reportstartmonth'>
-                    <option value="" <%=(startMonth.length() == 0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.NotSpecified")%> --</option>
-                    <option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.January")%></option>
-                    <option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.February")%></option>
-                    <option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.March")%></option>
-                    <option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.April")%></option>
-                    <option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.May")%></option>
-                    <option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.June")%></option>
-                    <option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.July")%></option>
-                    <option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.August")%></option>
-                    <option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.September")%></option>
-                    <option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.October")%></option>
-                    <option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.November")%></option>
-                    <option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.December")%></option>
-                  </select>
-                  <span class="label">-</span>
-                  <select class="schedulepulldown" name='reportstartday'>
-                    <option value="" <%=(startDay.length() == 0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.NotSpecified")%> --</option>
+                </select> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.on")%>
+                <select class="schedulepulldown" name='reportstartmonth' size="3">
+                  <option value="" <%=(startMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.NotSpecified")%> --</option>
+                  <option value="0" <%=(startMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.January")%></option>
+                  <option value="1" <%=(startMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.February")%></option>
+                  <option value="2" <%=(startMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.March")%></option>
+                  <option value="3" <%=(startMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.April")%></option>
+                  <option value="4" <%=(startMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.May")%></option>
+                  <option value="5" <%=(startMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.June")%></option>
+                  <option value="6" <%=(startMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.July")%></option>
+                  <option value="7" <%=(startMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.August")%></option>
+                  <option value="8" <%=(startMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.September")%></option>
+                  <option value="9" <%=(startMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.October")%></option>
+                  <option value="10" <%=(startMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.November")%></option>
+                  <option value="11" <%=(startMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.December")%></option>
+                </select><nobr/>
+                <select class="schedulepulldown" name='reportstartday' size="3">
+                  <option value="" <%=(startDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.NotSpecified")%> --</option>
 <%
   k = 0;
   while (k < 31)
@@ -503,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(),"maxactivityreport.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(),"maxactivityreport.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(),"maxactivityreport.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(),"maxactivityreport.NotSpecified")%> --</option>
+              <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.NotSpecified")%> --</option>
 <%
   k = 0;
   while (k < 24)
@@ -548,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(),"maxactivityreport.NotSpecified")%>--</option>
+                </select><nobr/>:<nobr/>
+                <select class="schedulepulldown" name='reportendminute' size="3">
+                  <option value="" <%=(endMinute.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.on")%></span>
-                  <select class="schedulepulldown" name='reportendmonth'>
-                    <option value="" <%=(endMonth.length() == 0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.NotSpecified")%>--</option>
-                    <option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.January")%></option>
-                    <option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.February")%></option>
-                    <option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.March")%></option>
-                    <option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.April")%></option>
-                    <option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.May")%></option>
-                    <option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.June")%></option>
-                    <option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.July")%></option>
-                    <option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.August")%></option>
-                    <option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.September")%></option>
-                    <option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.October")%></option>
-                    <option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.November")%></option>
-                    <option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.December")%></option>
-                  </select>
-                  <span class="label">-</span>
-                  <select class="schedulepulldown" name='reportendday'>
-                    <option value="" <%=(endDay.length() == 0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.NotSpecified")%>--</option>
+                </select> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.on")%>
+                <select class="schedulepulldown" name='reportendmonth' size="3">
+                  <option value="" <%=(endMonth.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.NotSpecified")%> --</option>
+                  <option value="0" <%=(endMonth.equals("0"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.January")%></option>
+                  <option value="1" <%=(endMonth.equals("1"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.February")%></option>
+                  <option value="2" <%=(endMonth.equals("2"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.March")%></option>
+                  <option value="3" <%=(endMonth.equals("3"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.April")%></option>
+                  <option value="4" <%=(endMonth.equals("4"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.May")%></option>
+                  <option value="5" <%=(endMonth.equals("5"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.June")%></option>
+                  <option value="6" <%=(endMonth.equals("6"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.July")%></option>
+                  <option value="7" <%=(endMonth.equals("7"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.August")%></option>
+                  <option value="8" <%=(endMonth.equals("8"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.September")%></option>
+                  <option value="9" <%=(endMonth.equals("9"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.October")%></option>
+                  <option value="10" <%=(endMonth.equals("10"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.November")%></option>
+                  <option value="11" <%=(endMonth.equals("11"))?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.December")%></option>
+                </select><nobr/>
+                <select class="schedulepulldown" name='reportendday' size="3">
+                  <option value="" <%=(endDay.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.NotSpecified")%> --</option>
 <%
   k = 0;
   while (k < 31)
@@ -602,62 +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(),"maxactivityreport.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>
-                </div>
+                </select><nobr/>,<nobr/>
+                <select class="schedulepulldown" name='reportendyear' size="3">
+                  <option value="" <%=(endYear.length()==0)?"selected=\"selected\"":""%>>-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.EntityMatch")%></nobr></th>
-              <td><input type="text" class="form-control" name="reportentitymatch" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(entityMatch)%>'/></td>
-              <th class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.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(),"maxactivityreport.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(),"maxactivityreport.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(),"maxactivityreport.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(),"maxactivityreport.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(),"maxactivityreport.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(),"maxactivityreport.ExecuteThisQuery")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Go")%></a>
+                <a name="MainButton"><input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Go")%>" onClick="javascript:Go()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.ExecuteThisQuery")%>"/></a>
 <%
   }
   else
   {
 %>
-            <a name="MainButton" class="btn btn-primary" role="button" onClick="javascript:Continue()" 
-                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Continue")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Continue")%></a>
+                <a name="MainButton"><input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.Continue")%>"/></a>
 <%
   }
 %>
-          </div>
-        </div>
-      </div>
+              </td>
+            <tr>
+              <td class="separator" colspan="4"><hr/></td>
+            </tr>
+
+          </table>
 <%
   if (reportConnection.length() > 0)
   {
@@ -704,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();
@@ -715,9 +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 +731,12 @@ try
 
 %>
 
-      <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(),"maxactivityreport.IdentifierClass")%></nobr></a></th>
-              <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("activitycount");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.HighestActivityRate")%></nobr></a></th>
-              <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("starttime");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.StartTime")%></nobr></a></th>
-              <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("endtime");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.EndTime")%></nobr></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(),"maxactivityreport.IdentifierClass")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("activitycount");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.HighestActivityRate")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("starttime");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.StartTime")%></nobr></a></td>
+              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("endtime");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.EndTime")%></nobr></a></td>
             </tr>
 <%
       zz = 0;
@@ -758,82 +758,77 @@ try
         double activityRate = activityCount * 60000.0 / intervalMilliseconds;
 
 %>
-            <tr>
-              <td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(idBucketString)%></nobr></td>
-              <td><%=new Double(activityRate).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(activityRate).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(),"maxactivityreport.Previous")%></a></li>
+                  <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Previous")%>
 <%
     }
     else
     {
 %>
-            <li>
-              <a href="javascript:void(0);"
-                      onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>'
-                      title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.PreviousPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Previous")%></a>
-            </li>
+                  <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.PreviousPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.Next")%></a></li>
+                  <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Next")%>
 <%
     }
     else
     {
 %>
-            <li>
-              <a href="javascript:void(0);"
-                      onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>'
-                      title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.NextPage")%>" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.Next")%></a>
-            </li>
+                  <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"maxactivityreport.NextPage")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.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(),"maxactivityreport.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(),"maxactivityreport.Rows")%></nobr>
+                <nobr><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></nobr>
+              </td>
+              <td class="reportfootercell">
+                <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.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(),"maxactivityreport.PleaseSelectAConnection")%></div>
+          <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"maxactivityreport.PleaseSelectAConnection")%></td></tr></table>
 <%
   }
 %>
-    </form>
+        </form>
 <%
 }
 catch (ManifoldCFException e)
@@ -846,5 +841,10 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-  </div>
-</div>
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>



Mime
View raw message