manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1786972 [1/11] - in /manifoldcf/branches/CONNECTORS-1196-2: ./ framework/ framework/crawler-ui/src/main/webapp/ framework/crawler-ui/src/main/webapp/bootstrap-select/ framework/crawler-ui/src/main/webapp/bootstrap/ framework/crawler-ui/src...
Date Wed, 15 Mar 2017 00:43:26 GMT
Author: kwright
Date: Wed Mar 15 00:43:26 2017
New Revision: 1786972

URL: http://svn.apache.org/viewvc?rev=1786972&view=rev
Log:
Pull up UI changes from CONNECTORS-1196 branch.

Added:
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/bootstrap/
      - copied from r1786951, manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/bootstrap/
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/bootstrap-select/
      - copied from r1786951, manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/bootstrap-select/
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/css/
      - copied from r1786951, manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/css/
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/fonts/
      - copied from r1786951, manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/fonts/
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/javascript/
      - copied from r1786951, manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/javascript/
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/less/
      - copied from r1786951, manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/less/
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/sidebar.jsp
      - copied unchanged from r1786951, manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/sidebar.jsp
Modified:
    manifoldcf/branches/CONNECTORS-1196-2/   (props changed)
    manifoldcf/branches/CONNECTORS-1196-2/framework/build.xml
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/banner.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/documentstatus.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editauthority.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editconnection.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editgroup.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editjob.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editmapper.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editnotification.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editoutput.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/edittransformation.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/error.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/index.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listauthorities.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listconnections.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listgroups.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listjobs.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listmappers.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listnotifications.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listoutputs.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/listtransformations.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/login.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/logout.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxactivityreport.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maxbandwidthreport.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/queuestatus.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/resultreport.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/setupAdminProfile.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/showjobstatus.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/simplereport.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/unauthorized.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewauthority.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewconnection.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewgroup.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewjob.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewmapper.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewnotification.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewoutput.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/viewtransformation.jsp
    manifoldcf/branches/CONNECTORS-1196-2/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties

Propchange: manifoldcf/branches/CONNECTORS-1196-2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 15 00:43:26 2017
@@ -54,6 +54,7 @@
 /manifoldcf/branches/CONNECTORS-1162:1708552-1708691
 /manifoldcf/branches/CONNECTORS-1168:1666253-1668311
 /manifoldcf/branches/CONNECTORS-1177:1670213-1670613
+/manifoldcf/branches/CONNECTORS-1196:1783604-1786951
 /manifoldcf/branches/CONNECTORS-120:1406712-1407974,1407982-1411043,1411049-1416451
 /manifoldcf/branches/CONNECTORS-120-1:1416450-1417056
 /manifoldcf/branches/CONNECTORS-1204:1682204-1682409

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/build.xml?rev=1786972&r1=1786971&r2=1786972&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/build.xml Wed Mar 15 00:43:26 2017
@@ -647,7 +647,7 @@
             </fileset>
         </copy>
         <copy todir="build/webapp/crawler-ui">
-            <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
+            <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
         </copy>
         <jar destfile="build/webapp/crawler-ui/WEB-INF/lib/mcf-crawler-ui.jar" basedir="build/crawler-ui/classes"/>
     </target>
@@ -702,8 +702,8 @@
                 <include name="*.tld"/>
             </fileset>
         </copy>
-        <copy todir="build/webapp/crawler-ui-proprietary">
-            <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
+        <copy todir="build/webapp/crawler-ui-proprietary">            
+            <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
         </copy>
         <jar destfile="build/webapp/crawler-ui-proprietary/WEB-INF/lib/mcf-crawler-ui.jar" basedir="build/crawler-ui/classes"/>
     </target>
@@ -753,7 +753,7 @@
             </fileset>
         </copy>
         <copy todir="build/webapp/combined-service">
-            <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
+            <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
         </copy>
         <jar destfile="build/webapp/combined-service/WEB-INF/lib/mcf-combined-service.jar" basedir="build/combined-service/classes"/>
     </target>
@@ -811,7 +811,7 @@
             </fileset>
         </copy>
         <copy todir="build/webapp/combined-service-proprietary">
-            <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
+            <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
         </copy>
         <jar destfile="build/webapp/combined-service-proprietary/WEB-INF/lib/mcf-combined-service.jar" basedir="build/combined-service/classes"/>
     </target>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/adminHeaders.jsp?rev=1786972&r1=1786971&r2=1786972&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/adminHeaders.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/adminHeaders.jsp Wed Mar 15 00:43:26 2017
@@ -47,12 +47,28 @@ response.setContentType("text/html;chars
 
 
 <%
+  String queryString = request.getQueryString();
+  String requestURL = request.getRequestURI();
+  requestURL = requestURL.substring(requestURL.lastIndexOf("/") + 1);
+  requestURL += queryString == null ? "" : "?" + queryString;
   if (adminprofile.getLoggedOn() == false)
   {
-    response.sendRedirect("login.jsp");
+    if (queryString == null)
+    {
+      response.sendRedirect("login.jsp");
+    } else
+    {
+      if (!requestURL.startsWith("index.jsp"))
+      {
+        requestURL = "index.jsp?p=" + requestURL;
+      }
+      response.sendRedirect("login.jsp?nextUrl=" + URLEncoder.encode(requestURL));
+    }
     return;
   }
 
+  response.setHeader("page", requestURL);
+
   IThreadContext threadContext = thread.getThreadContext();
   org.apache.manifoldcf.ui.multipart.MultipartWrapper variableContext = (org.apache.manifoldcf.ui.multipart.MultipartWrapper)threadContext.get("__WRAPPER__");
   if (variableContext == null)
@@ -61,4 +77,3 @@ response.setContentType("text/html;chars
     threadContext.save("__WRAPPER__",variableContext);
   }
 %>
-

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/banner.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/banner.jsp?rev=1786972&r1=1786971&r2=1786972&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/banner.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/banner.jsp Wed Mar 15 00:43:26 2017
@@ -44,6 +44,3 @@
   </td>
     </tr>
 </table>
-
-
-

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/documentstatus.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/documentstatus.jsp?rev=1786972&r1=1786971&r2=1786972&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/documentstatus.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/documentstatus.jsp Wed Mar 15 00:43:26 2017
@@ -178,113 +178,103 @@ try
 
 %>
 
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.ApacheManifoldCFDocumentStatus")%>
-  </title>
-
-  <script type="text/javascript">
+<script type="text/javascript">
   <!--
+  $.ManifoldCF.setTitle(
+      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "documentstatus.ApacheManifoldCFDocumentStatus")%>',
+      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentStatus")%>',
+      'statusReports'
+  );
 
-function Go()
-{
-  if (!isInteger(report.rowcount.value))
+  function Go()
   {
-    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.EnterALegalNumberForRowsPerPage")%>");
-    report.rowcount.focus();
-    return;
+    if (!isInteger(report.rowcount.value))
+    {
+      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.EnterALegalNumberForRowsPerPage")%>");
+      report.rowcount.focus();
+      return;
+    }
+    if (!isRegularExpression(report.statusidentifiermatch.value))
+    {
+      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.IdentifierMatchMustBeAValidRegularExpression")%>");
+      report.statusidentifiermatch.focus();
+      return;
+    }
+
+    document.report.op.value="Status";
+    document.report.action = document.report.action + "#MainButton";
+    $.ManifoldCF.submit(document.report);
   }
-  if (!isRegularExpression(report.statusidentifiermatch.value))
+
+  function Continue()
   {
-    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.IdentifierMatchMustBeAValidRegularExpression")%>");
-    report.statusidentifiermatch.focus();
-    return;
+    if (!isRegularExpression(report.statusidentifiermatch.value))
+    {
+      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.IdentifierMatchMustBeAValidRegularExpression")%>");
+      report.statusidentifiermatch.focus();
+      return;
+    }
+    document.report.op.value = "Continue";
+    document.report.action = document.report.action + "#MainButton";
+    $.ManifoldCF.submit(document.report);
   }
 
-  document.report.op.value="Status";
-  document.report.action = document.report.action + "#MainButton";
-  document.report.submit();
-}
-
-function Continue()
-{
-  if (!isRegularExpression(report.statusidentifiermatch.value))
+  function ColumnClick(colname)
   {
-    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.IdentifierMatchMustBeAValidRegularExpression")%>");
-    report.statusidentifiermatch.focus();
-    return;
-  }
-  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();
-}
+    document.report.clickcolumn.value = colname;
+    Go();
+  }
 
-function isRegularExpression(value)
-{
-  try
+  function SetPosition(amt)
   {
-    var foo = "teststring";
-    foo.search(value.replace(/\(\?i\)/,""));
-    return true;
+    if (amt < 0)
+      amt = 0;
+    document.report.startrow.value = amt;
+    Go();
   }
-  catch (e)
+
+  function isRegularExpression(value)
   {
-    return false;
+    try
+    {
+      var foo = "teststring";
+      foo.search(value.replace(/\(\?i\)/,""));
+      return true;
+    }
+    catch (e)
+    {
+      return false;
+    }
+
   }
 
-}
+  function isInteger(value)
+  {
+    var anum=/(^\d+$)/;
+    return anum.test(value);
+  }
 
-function isInteger(value)
-{
-  var anum=/(^\d+$)/;
-  return anum.test(value);
-}
+  $(function ()
+  {
+    $('.selectpicker').selectpicker();
+  });
 
   //-->
-  </script>
-
-
-</head>
+</script>
 
-<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(),"documentstatus.DocumentStatus")%></p>
-        <form class="standardform" name="report" action="execute.jsp" method="POST">
-          <input type="hidden" name="op" value="Continue"/>
-          <input type="hidden" name="type" value="documentstatus"/>
-          <table class="displaytable">
-            <tr>
-              <td class="separator" colspan="4"><hr/></td>
-            </tr>
-            <tr>
-              <td class="description" colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Connection")%></td><td class="value" colspan="1">
-                <select name="statusconnection" size="3">
+<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="documentstatus" />
+
+      <div class="box box-primary">
+        <div class="box-body">
+          <table class="table table-bordered">
+            <tr>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Connection")%></th>
+              <td>
+                <select class="selectpicker" name="statusconnection">
                   <option <%=(statusConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.NotSpecified")%> --</option>
 <%
   int i = 0;
@@ -306,8 +296,9 @@ function isInteger(value)
   if (eligibleList != null)
   {
 %>
-              <td class="description" colspan="1"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Jobs")%></td><td class="value" colspan="1">
-                <select multiple="true" name="statusjobs" size="3">
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Jobs")%></th>
+              <td>
+                <select class="selectpicker" multiple="true" name="statusjobs">
 <%
     i = 0;
     while (i < eligibleList.length)
@@ -327,26 +318,23 @@ function isInteger(value)
   else
   {
 %>
-              <td class="value" colspan="2"></td>
+              <td colspan="2"></td>
 <%
   }
 %>
 
             </tr>
             <tr>
-              <td class="separator" colspan="4"><hr/></td>
-            </tr>
-            <tr>
-              <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.TimeOffsetFromNowMinutes")%></td>
-              <td class="value" colspan="3">
-                <input name="statusscheduleoffset" type="text" size="6" value=""/>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.TimeOffsetFromNowMinutes")%></th>
+              <td colspan="3">
+                <input name="statusscheduleoffset" type="text" size="6" value="" class="form-control" />
               </td>
             </tr>
             <tr>
-              <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></td>
-              <td class="value" colspan="3">
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></th>
+              <td colspan="3">
                 <input name="statusdocumentstates_posted" type="hidden" value="true"/>
-                <select name="statusdocumentstates" multiple="true" size="3">
+                <select class="selectpicker" name="statusdocumentstates" multiple="true">
                   <option <%=((matchingStatesHash.get(new Integer(IJobManager.DOCSTATE_NEVERPROCESSED))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATE_NEVERPROCESSED)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsThatHaveNeverBeenProcessed")%></option>
                   <option <%=((matchingStatesHash.get(new Integer(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATE_PREVIOUSLYPROCESSED)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsProcessedAtLeastOnce")%></option>
                   <option <%=((matchingStatesHash.get(new Integer(IJobManager.DOCSTATE_OUTOFSCOPE))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATE_OUTOFSCOPE)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsOutOfScope")%></option>
@@ -354,10 +342,10 @@ function isInteger(value)
               </td>
             </tr>
             <tr>
-              <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></td>
-              <td class="value" colspan="3">
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></th>
+              <td colspan="3">
                 <input name="statusdocumentstatuses_posted" type="hidden" value="true"/>
-                <select name="statusdocumentstatuses" multiple="true" size="3">
+                <select class="selectpicker" name="statusdocumentstatuses" multiple="true">
                   <option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_INACTIVE))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_INACTIVE)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsThatAreNoLongerActive")%></option>
                   <option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_PROCESSING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_PROCESSING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyInProgress")%></option>
                   <option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_EXPIRING))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_EXPIRING)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentsCurrentlyBeingExpired")%></option>
@@ -372,38 +360,35 @@ function isInteger(value)
               </td>
             </tr>
             <tr>
-              <td class="separator" colspan="4"><hr/></td>
-            </tr>
-            <tr>
-              <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.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>
-            <tr>
-              <td class="separator" colspan="4"><hr/></td>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentIdentifierMatch")%></th>
+              <td colspan="3">
+                <input type="text" name="statusidentifiermatch" size="40" class="form-control" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(identifierMatch)%>'/>
+              </td>
             </tr>
-            <tr>
-              <td class="message" colspan="4">
+          </table>
+        </div>
+        <div class="box-footer clearfix">
+          <div class="btn-group">
 <%
   if (statusConnection.length() > 0 && statusJobIdentifiers.length > 0)
   {
 %>
-                <a name="MainButton"><input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Go")%>" onClick="javascript:Go()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%>"/></a>
+            <a class="btn btn-primary" type="button" onClick="javascript:Go()" 
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%>"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%></a>
 <%
   }
   else
   {
 %>
-                <a name="MainButton"><input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>"/></a>
+            <a class="btn btn-primary" type="button" onClick="javascript:Continue()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%></a>
 <%
   }
 %>
-              </td>
-            </tr>
-            <tr>
-              <td class="separator" colspan="4"><hr/></td>
-            </tr>
+          </div>
+        </div>
+      </div>
 
-          </table>
 <%
   if (statusConnection.length() > 0)
   {
@@ -452,20 +437,22 @@ function isInteger(value)
       IResultSet set = jobManager.genDocumentStatus(statusConnection,criteria,sortOrder,startRow,rowCount+1);
 
 %>
-          <input type="hidden" name="clickcolumn" value=""/>
-          <input type="hidden" name="startrow" value='<%=Integer.toString(startRow)%>'/>
-          <input type="hidden" name="sortorder" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sortOrder.toString())%>'/>
-
-          <table class="displaytable">
-            <tr class="headerrow">
-              <td class="reportcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Identifier")%></nobr></td>
-              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("job");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Job")%></nobr></a></td>
-              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("state");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.State")%></nobr></a></td>
-              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("status");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Status")%></nobr></a></td>
-              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("scheduled");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Scheduled")%></nobr></a></td>
-              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("action");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.ScheduledAction")%></nobr></a></td>
-              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("retrycount");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.RetryCount")%></nobr></a></td>
-              <td class="reportcolumnheader"><a href="javascript:void(0);" onclick='javascript:ColumnClick("retrylimit");'><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.RetryLimit")%></nobr></a></td>
+      <input type="hidden" name="clickcolumn" value=""/>
+      <input type="hidden" name="startrow" value='<%=Integer.toString(startRow)%>'/>
+      <input type="hidden" name="sortorder" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(sortOrder.toString())%>'/>
+
+      <div class="box box-primary">
+        <div class="box-body">
+          <table class="table table-bordered">
+            <tr>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Identifier")%></th>
+              <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("job");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Job")%></a></th>
+              <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("state");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.State")%></a></th>
+              <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("status");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Status")%></a></th>
+              <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("scheduled");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Scheduled")%></a></th>
+              <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("action");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.ScheduledAction")%></a></th>
+              <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("retrycount");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.RetryCount")%></a></th>
+              <th><a href="javascript:void(0);" onclick='javascript:ColumnClick("retrylimit");'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.RetryLimit")%></a></th>
             </tr>
 <%
       zz = 0;
@@ -497,97 +484,102 @@ function isInteger(value)
           retryLimitString = org.apache.manifoldcf.ui.util.Formatter.formatTime(retryLimit.longValue());
 
 %>
-            <tr <%="class=\""+((zz%2==0)?"evendatarow":"odddatarow")+"\""%>>
-              <td class="reportcolumncell">
+            <tr>
+              <td>
 <%
         int q = 0;
         while (q < identifierBreakdown.length)
         {
 %>
-                <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(identifierBreakdown[q++])%></nobr><br/>
+                <nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(identifierBreakdown[q++])%></nobr><br />
 <%
         }
 %>
               </td>
-              <td class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("job").toString())%></td>
-              <td class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("state").toString())%></td>
-              <td class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("status").toString())%></td> 
-              <td class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(scheduleTimeString)%></td>
-              <td class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(scheduledActionString)%></td>
-              <td class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(retryCountString)%></td>
-              <td class="reportcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(retryLimitString)%></td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("job").toString())%></td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("state").toString())%></td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(row.getValue("status").toString())%></td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(scheduleTimeString)%></td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(scheduledActionString)%></td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(retryCountString)%></td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(retryLimitString)%></td>
             </tr>
 <%
         zz++;
       }
 %>
           </table>
-          <table class="reportfootertable">
-            <tr class="reportfooterrow">
-              <td class="reportfootercell">
-                <nobr>
+        </div>
+        <div class="box-footer">
+          <ul class="pagination pagination-sm no-margin pull-left">
 <%
       if (startRow == 0)
       {
 %>
-                  <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Previous")%>
+            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Previous")%></a></li>
 <%
       }
       else
       {
 %>
-                  <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="Previous page">Previous</a>
+            <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="Previous page">Previous</a></li>
 <%
       }
 %>
-                </nobr>
-              </td>
-              <td class="reportfootercell">
-                <nobr>
+
 <%
       if (hasMoreRows == false)
       {
 %>
-                  <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Next")%>
+            <li><a href="#"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Next")%></a></li>
 <%
       }
       else
       {
 %>
-                  <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="Next page">Next</a>
+            <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="Next page">Next</a></li>
 <%
       }
 %>
-                </nobr>
-              </td>
-              <td class="reportfootercell">
-                <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Rows")%></nobr>
-                <nobr><%=Integer.toString(startRow)%>-<%=(hasMoreRows?Integer.toString(startRow+rowCount-1):"END")%></nobr>
-              </td>
-              <td class="reportfootercell">
-                <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.RowsPerPage")%></nobr>
-                <nobr><input type="text" name="rowcount" size="5" value='<%=Integer.toString(rowCount)%>'/></nobr>
-              </td>
-            </tr>
-          </table>
+          </ul>
+          <ul class="pagination pagination-sm no-margin pull-right">
+            <li class="pad">
+              <span class="label label-primary">
+                <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.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(),"documentstatus.RowsPerPage")%></span>
+                <input type="text" class="form-control" name="rowcount" size="5" class="form-control" value='<%=Integer.toString(rowCount)%>'/>
+              </div>
+            </li>
+          </ul>
+        </div>
 
 <%
     }
     else
     {
 %>
-          <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectAtLeastOneJob")%></td></tr></table>
+        <div class="callout callout-info">
+          <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectAtLeastOneJob")%></p>
+        </div>
 <%
     }
   }
   else
   {
 %>
-          <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectaConnection")%></td></tr></table>
+        <div class="callout callout-info">
+          <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectaConnection")%></p>
+        </div>
 <%
   }
 %>
-        </form>
+      </div>
+    </form>
 <%
 }
 catch (ManifoldCFException e)
@@ -600,10 +592,5 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-      </td>
-    </tr>
-  </table>
-
-</body>
-
-</html>
+  </div>
+</div>

Modified: manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1786972&r1=1786971&r2=1786972&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editauthority.jsp (original)
+++ manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/editauthority.jsp Wed Mar 15 00:43:26 2017
@@ -123,264 +123,244 @@ try
 
 %>
 
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-  <title>
-    <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.ApacheManifoldCFEditAuthority")%>
-  </title>
-
-  <script type="text/javascript">
-  <!--
-// Use this method to repost the form and pick a new tab
-function SelectTab(newtab)
-{
-  if (checkForm())
-  {
-    document.editconnection.tabname.value = newtab;
-    document.editconnection.submit();
-  }
-}
+<script type="text/javascript">
+    <!--
 
-// Use this method to repost the form,
-// and set the anchor request.
-function postFormSetAnchor(anchorValue)
-{
-  if (checkForm())
+<%
+  String title = null;
+  if (description.length() > 0)
   {
-    if (anchorValue != "")
-      document.editconnection.action = document.editconnection.action + "#" + anchorValue;
-    document.editconnection.submit();
+    title = Messages.getBodyString(pageContext.getRequest().getLocale(), "editauthority.EditAuthority") + " - " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description);
   }
-}
-
-// Use this method to repost the form
-function postForm()
-{ 
-  if (checkForm())
+  else
   {
-    document.editconnection.submit();
+    title = Messages.getBodyString(pageContext.getRequest().getLocale(), "editauthority.EditAnAuthority");
   }
-}
+%>
 
-function Save()
-{
-  if (checkForm())
-  {
-    // Can't submit until all required fields have been set.
-    // Some of these don't live on the current tab, so don't set
-    // focus.
+    $.ManifoldCF.setTitle('<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.ApacheManifoldCFEditAuthority")%>','<%=title%>','authorities');
 
-    // Check our part of the form, for save
-    if (editconnection.connname.value == "")
+    // Use this method to repost the form and pick a new tab
+    function SelectTab(newtab)
     {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.ConnectionMustHaveAName")%>");
-      SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.Name")%>");
-      document.editconnection.connname.focus();
-      return;
+        if (checkForm())
+        {
+            document.editconnection.tabname.value = newtab;
+            $.ManifoldCF.submit(document.editconnection);
+        }
     }
-    if (editconnection.authoritygroup.value == "")
+
+    // Use this method to repost the form,
+    // and set the anchor request.
+    function postFormSetAnchor(anchorValue)
     {
-      alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.ConnectionMustHaveAGroup")%>");
-      SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.Type")%>");
-      document.editconnection.authoritygroup.focus();
-      return;
+        if (checkForm())
+        {
+            if (anchorValue != "")
+                document.editconnection.action = document.editconnection.action + "#" + anchorValue;
+            $.ManifoldCF.submit(document.editconnection);
+        }
     }
-    if (window.checkConfigForSave)
+
+    // Use this method to repost the form
+    function postForm()
     {
-      if (!checkConfigForSave())
-        return;
+        if (checkForm())
+        {
+            $.ManifoldCF.submit(document.editconnection);
+        }
     }
-    document.editconnection.op.value="Save";
-    document.editconnection.submit();
-  }
-}
 
-function Continue()
-{
-  document.editconnection.op.value="Continue";
-  postForm();
-}
+    function Save()
+    {
+        if (checkForm())
+        {
+            // Can't submit until all required fields have been set.
+            // Some of these don't live on the current tab, so don't set
+            // focus.
+
+            // Check our part of the form, for save
+            if (editconnection.connname.value == "")
+            {
+                alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.ConnectionMustHaveAName")%>");
+                SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.Name")%>");
+                document.editconnection.connname.focus();
+                return;
+            }
+            if (editconnection.authoritygroup.value == "")
+            {
+                alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.ConnectionMustHaveAGroup")%>");
+                SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.Type")%>");
+                document.editconnection.authoritygroup.focus();
+                return;
+            }
+            if (window.checkConfigForSave)
+            {
+                if (!checkConfigForSave())
+                    return;
+            }
+            document.editconnection.op.value="Save";
+            $.ManifoldCF.submit(document.editconnection);
+        }
+    }
 
-function Cancel()
-{
-  document.editconnection.op.value="Cancel";
-  document.editconnection.submit();
-}
+    function Continue()
+    {
+        document.editconnection.op.value="Continue";
+        postForm();
+    }
 
-function checkForm()
-{
-  if (!checkConnectionCount())
-    return false;
-  if (window.checkConfig)
-    return checkConfig();
-  return true;
-}
+    function Cancel()
+    {
+        document.editconnection.op.value="Cancel";
+        $.ManifoldCF.submit(document.editconnection);
+    }
 
-function checkConnectionCount()
-{
-  if (!isInteger(editconnection.maxconnections.value))
-  {
-    alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>");
-    editconnection.maxconnections.focus();
-    return false;
-  }
-  return true;
-}
+    function checkForm()
+    {
+        if (!checkConnectionCount())
+            return false;
+        if (window.checkConfig)
+            return checkConfig();
+        return true;
+    }
 
-function isRegularExpression(value)
-{
-  try
-  {
-    var foo = "teststring";
-    foo.search(value.replace(/\(\?i\)/,""));
-    return true;
-  }
-  catch (e)
-  {
-    return false;
-  }
+    function checkConnectionCount()
+    {
+        if (!isInteger(editconnection.maxconnections.value))
+        {
+            alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>");
+            editconnection.maxconnections.focus();
+            return false;
+        }
+        return true;
+    }
+    
+    function isRegularExpression(value)
+    {
+        try
+        {
+            var foo = "teststring";
+            foo.search(value.replace(/\(\?i\)/,""));
+            return true;
+        }
+        catch (e)
+        {
+            return false;
+        }
 
-}
+    }
 
-function isInteger(value)
-{
-  var anum=/(^\d+$)/;
-  return anum.test(value);
-}
+    function isInteger(value)
+    {
+        var anum=/(^\d+$)/;
+        return anum.test(value);
+    }
 
-  //-->
-  </script>
+    //-->
+</script>
 <%
   AuthorityConnectorFactory.outputConfigurationHeader(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray);
 %>
 
-</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="darkwindow">
+<div class="row">
+  <div class="col-md-12">
 <%
   if (set2.length == 0)
   {
 %>
-        <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.EditAuthorityConnection")%></p>
-        <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoAuthorityGroupsDefinedCreateOneFirst")%></td></tr></table>
+    <div class="callout callout-warning">
+      <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoAuthorityGroupsDefinedCreateOneFirst")%></p>
+    </div>
 <%
   }
   else if (set.getRowCount() == 0)
   {
 %>
-        <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.EditAuthorityConnection")%></p>
-        <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoAuthorityConnectorsRegistered")%></td></tr></table>
+    <div class="callout callout-warning">
+      <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoAuthorityConnectorsRegistered")%></p>
+    </div>
 <%
   }
   else
   {
 %>
-        <form class="standardform" name="editconnection" action="execute.jsp" method="POST" enctype="multipart/form-data">
-          <input type="hidden" name="op" value="Continue"/>
-          <input type="hidden" name="type" value="authority"/>
-          <input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/>
-          <input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/>
-          <table class="tabtable">
-            <tr class="tabspacerrow">
-              <td class="spacertab" colspan="<%=tabsArray.size()%>"></td>
-              <td class="remaindertab" rowspan="3">
-<%
-    if (description.length() > 0)
-    {
-%>
-                <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.EditAuthority")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
-<%
-    }
-    else
-    {
-%>
-                <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.EditAnAuthority")%></nobr>
-<%
-    }
-%>
-              </td>
-            </tr>
-            <tr class="tabsequencerow">
-              <td class="blanksequencetab" colspan="<%=tabsArray.size()%>"></td>
-            </tr>
-            <tr class="tabrow">
+    <div class="box box-primary">
+      <form class="standardform" name="editconnection" action="execute.jsp" method="POST" enctype="multipart/form-data">
+        <input type="hidden" name="op" value="Continue"/>
+        <input type="hidden" name="type" value="authority"/>
+        <input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/>
+        <input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/>
+
+        <div class="box-header">
+          <ul class="nav nav-tabs" role="tablist">
 <%
     int tabNum = 0;
+    int activeTab = 0;
     while (tabNum < tabsArray.size())
     {
       String tab = (String)tabsArray.get(tabNum++);
       if (tab.equals(tabName))
       {
 %>
-              <td class="activetab"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></nobr></td>
+            <li class="active"><a href="#tab_<%=tabNum%>" data-toggle="tab"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></li>
 <%
       }
       else
       {
 %>
-              <td class="passivetab"><nobr><a href="javascript:void(0);" alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" "+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.tab")%>' onclick='<%="javascript:SelectTab(\""+tab+"\");return false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></nobr></td>
+            <li>
+              <a href="#tab_<%=tabNum%>" data-toggle="tab"
+                 alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" "+Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.tab")%>'
+                 onclick='<%="javascript:SelectTab(\""+tab+"\");return false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
+            </li>
 <%
       }
     }
 %>
-            </tr>
-            <tr class="tabbodyrow">
-              <td class="tabbody" colspan='<%=Integer.toString(tabsArray.size()+1)%>'>
-
+          </ul>
+        </div>
+        <div class="box-body">
+          <div class="tab-content">
 <%
 
     // Name tab
     if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name")))
     {
 %>
-                <table class="displaytable">
-                  <tr><td class="separator" colspan="5"><hr/></td></tr>
-                  <tr>
-                    <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NameColon")%></nobr></td><td class="value" colspan="4">
+          <div class="tab-pane active" id="tab_<%=activeTab%>">
+            <div class="form-group">
+              <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NameColon")%></label>
 <%
       // If the connection doesn't exist yet, we are allowed to change the name.
       if (isNew)
       {
 %>
-                      <input type="text" size="32" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/>
+              <input type="text" size="32" name="connname" class="form-control" placeholder="Name..." value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/>
 <%
       }
       else
       {
 %>
-                      <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%>
-                      <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/>
+              <input type="text" size="32" class="form-control" disabled value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/>
+              <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/>
 <%
       }
 %>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.DescriptionColon")%></nobr></td><td class="value" colspan="4">
-                      <input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
-                    </td>
-                  </tr>
-                </table>
+            </div>
+            <div class="form-group">
+              <label for="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.DescriptionColon")%> </label>
+              <input type="text" size="50" class="form-control" name="description" id="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
+            </div>
+          </div>
 <%
     }
     else
     {
     // Hiddens for the Name tab
 %>
-                <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/>
-                <input type="hidden" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
+          <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/>
+          <input type="hidden" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/>
 <%
     }
 
@@ -389,11 +369,10 @@ function isInteger(value)
     if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type")))
     {
 %>
-                <table class="displaytable">
-                  <tr><td class="separator" colspan="5"><hr/></td></tr>
-                  <tr>
-                    <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.ConnectionTypeColon")%></nobr></td>
-                    <td class="value" colspan="4">
+          <div class="tab-pane active" id="tab_<%=activeTab%>">
+            <div class="form-group">
+              <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.ConnectionTypeColon")%></label>
+
 <%
       if (className.length() > 0)
       {
@@ -401,24 +380,24 @@ function isInteger(value)
         if (value == null)
         {
 %>
-                      <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr>
+              <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "editauthority.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr>
 <%
         }
         else
         {
 %>
-                      <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%>
+              <input type="text" class="form-control" disabled value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(value)%>'/>
 <%
         }
 %>
-                      <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/>
+              <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/>
 <%
       }
       else
       {
         int i = 0;
 %>
-                      <select name="classname" size="1">
+              <select name="classname" class="form-control">
 <%
         while (i < set.getRowCount())
         {
@@ -426,24 +405,19 @@ function isInteger(value)
           String thisClassName = row.getValue("classname").toString();
           String thisDescription = row.getValue("description").toString();
 %>
-                        <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisClassName)%>'
-                    <%=className.equals(thisClassName)?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%>
-                        </option>
+                <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisClassName)%>' <%=className.equals(thisClassName)?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option>
 <%
         }
 %>
-                      </select>
+              </select>
 <%
       }
 %>
-                    </td>
-                  </tr>
-                  <tr><td class="separator" colspan="5"><hr/></td></tr>
-                  <tr>
-                    <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.AuthorityGroupColon")%></nobr></td>
-                    <td class="value" colspan="1">
-                      <select name="authoritygroup" size="1">
-                        <option value=""><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.SelectAGroup")%></option>
+            </div>
+            <div class="form-group">
+              <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.AuthorityGroupColon")%></label>
+              <select name="authoritygroup" class="form-control">
+                <option value=""><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.SelectAGroup")%></option>
 <%
       for (int i = 0; i < set2.length; i++)
       {
@@ -453,18 +427,16 @@ function isInteger(value)
         if (thisDescription == null || thisDescription.length() == 0)
           thisDescription = thisAuthorityName;
 %>
-                        <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisAuthorityName)%>'
-                    <%=(groupName.equals(thisAuthorityName))?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%>
-                        </option>
+                <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisAuthorityName)%>'<%=(groupName.equals(thisAuthorityName))?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option>
 <%
       }
 %>
-                      </select>
-                    </td>
-                    <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.AuthorizationDomainColon")%></nobr></td>
-                    <td class="value" colspan="1">
-                      <select name="authdomain" size="1">
-                        <option value="" <%=(authDomain == null || authDomain.length() == 0)?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.DefaultDomainNone")%></option>
+              </select>
+            </div>
+            <div class="form-group">
+              <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.AuthorizationDomainColon")%></label>
+              <select name="authdomain" class="form-control">
+                <option value="" <%=(authDomain == null || authDomain.length() == 0)?"selected=\"selected\"":""%>><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.DefaultDomainNone")%></option>
 <%
       for (int i = 0; i < domainSet.getRowCount(); i++)
       {
@@ -474,25 +446,22 @@ function isInteger(value)
         if (thisDescription == null || thisDescription.length() == 0)
           thisDescription = domainName;
 %>
-                        <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(domainName)%>'
-                    <%=(authDomain!=null && domainName.equals(authDomain))?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%>
-                        </option>
+                <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(domainName)%>'<%=(authDomain!=null && domainName.equals(authDomain))?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option>
 <%
       }
 %>
-                      </select>
-                    </td>
-                  </tr>
-                </table>
+              </select>
+            </div>
+          </div>
 <%
     }
     else
     {
     // Hiddens for the "Type" tab
 %>
-                <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/>
-                <input type="hidden" name="authdomain" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(authDomain)%>'/>
-                <input type="hidden" name="authoritygroup" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(groupName)%>'/>
+          <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/>
+          <input type="hidden" name="authdomain" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(authDomain)%>'/>
+          <input type="hidden" name="authoritygroup" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(groupName)%>'/>
 <%
     }
 
@@ -500,23 +469,24 @@ function isInteger(value)
     if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Prerequisites")))
     {
 %>
-                <table class="displaytable">
-                  <tr><td class="separator" colspan="5"><hr/></td></tr>
-                  <tr>
-                    <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.PrerequisiteUserMappingColon")%></nobr></td>
-                    <td class="value" colspan="4">
-                      <input type="hidden" name="prerequisites_present" value="true"/>
+          <div class="tab-pane active" id="tab_<%=activeTab%>">
+            <div class="form-group">
+              <strong><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.PrerequisiteUserMappingColon")%></strong>
+
+              <div class="radio">
+                <label>
+                  <input type="hidden" name="prerequisites_present" value="true"/>
 <%
       if (prereq == null)
       {
 %>
-                      <input type="radio" name="prerequisites" value="" checked="true"/>&nbsp;<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoPrerequisites")%><br/>
+                  <input type="radio" name="prerequisites" value="" checked="true"/>&nbsp;<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoPrerequisites")%><br/>
 <%
       }
       else
       {
 %>
-                      <input type="radio" name="prerequisites" value=""/>&nbsp;<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoPrerequisites")%><br/>
+                  <input type="radio" name="prerequisites" value=""/>&nbsp;<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoPrerequisites")%><br/>
 <%
       }
 
@@ -529,32 +499,33 @@ function isInteger(value)
         if (prereq != null && prereq.equals(mappingName))
         {
 %>
-                      <input type="radio" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mappingName)%>' checked="true"/>&nbsp;<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(mappingDescription)%><br/>
+                  <input type="radio" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mappingName)%>' checked="true"/>&nbsp;<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(mappingDescription)%><br/>
 <%
         }
         else
         {
 %>
-                      <input type="radio" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mappingName)%>'/>&nbsp;<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(mappingDescription)%><br/>
+                  <input type="radio" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mappingName)%>'/>&nbsp;<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(mappingDescription)%><br/>
 <%
         }
       }
 %>
-                    </td>
-                  </tr>
-                </table>
+                </label>
+              </div>
+            </div>
+          </div>
 <%
     }
     else
     {
-      // Hiddens for Prerequisites tab
+    // Hiddens for Prerequisites tab
 %>
-                <input type="hidden" name="prerequisites_present" value="true"/>
+          <input type="hidden" name="prerequisites_present" value="true"/>
 <%
       if (prereq != null)
       {
 %>
-                <input type="hidden" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(prereq)%>'/>
+          <input type="hidden" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(prereq)%>'/>
 <%
       }
     }
@@ -563,36 +534,36 @@ function isInteger(value)
     if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Throttling")))
     {
 %>
-                <table class="displaytable">
-                  <tr><td class="separator" colspan="5"><hr/></td></tr>
-                  <tr>
-                    <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.MaxConnectionsColon")%></nobr></td>
-                    <td class="value" colspan="4"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
-                  </tr>
-                </table>
+          <div class="tab-pane active" id="tab_<%=activeTab%>">
+            <div class="form-group">
+              <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.MaxConnectionsColon")%></label>
+              <input type="text" size="6" name="maxconnections" class="form-control" value='<%=Integer.toString(maxConnections)%>'/>
+            </div>
+          </div>
 <%
     }
     else
     {
     // Hiddens for "Throttling" tab
 %>
-                <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/>
+          <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/>
 <%
     }
 
     if (className.length() > 0)
       AuthorityConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabName);
 %>
-                <table class="displaytable">
-                  <tr><td class="separator" colspan="4"><hr/></td></tr>
-                  <tr>
-                    <td class="message" colspan="4">
-                      <nobr>
+          </div>
+        </div>
+
+        <div class="box-footer clearfix">
+          <div class="btn-group">
 <%
     if (className.length() > 0)
     {
 %>
-                        <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.SaveThisAuthorityConnection")%>"/>
+            <a class="btn btn-primary" onClick="javascript:Save()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.SaveThisAuthorityConnection")%>" data-toggle="tooltip"><i class="fa fa-save fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Save")%></a>
 <%
     }
     else
@@ -600,32 +571,21 @@ function isInteger(value)
       if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type")))
       {
 %>
-                        <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.ContinueToNextPage")%>"/>
+            <a class="btn btn-primary" onClick="javascript:Continue()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.ContinueToNextPage")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Continue")%></a>
 <%
       }
     }
 %>
-                        <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.CancelAuthorityEditing")%>"/>
-                      </nobr>
-                    </td>
-                  </tr>
-                </table>
-              </td>
-            </tr>
-          </table>
-        </form>
-<%
-  }
-%>
-      </td>
-    </tr>
-  </table>
-
-</body>
+            <a class="btn btn-primary" onClick="javascript:Cancel()"
+                    title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.CancelAuthorityEditing")%>" data-toggle="tooltip"><i class="fa fa-times-circle-o fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Cancel")%></a>
 
-</html>
 
+          </div>
+        </div>
+      </form>
 <%
+  }
 }
 catch (ManifoldCFException e)
 {
@@ -637,4 +597,6 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-
+    </div>
+  </div>
+</div>



Mime
View raw message