Modified: 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/edittransformation.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/edittransformation.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/edittransformation.jsp 
(original)
+++ 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/edittransformation.jsp 
Thu Mar 23 18:49:54 2017
@@ -97,194 +97,211 @@ 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(),"edittransformation.ApacheManifoldCFEditTransformationConnection")%>
+  </title>
+
+  <script type="text/javascript">
   <!--
-<%
-  String heading = null;
-  if (description.length() > 0)
-  {
-    heading = 
Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection")
 + " " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description);
-  }
-  else
+
+// Use this method to repost the form and pick a new tab
+function SelectTab(newtab)
+{
+  if (checkForm())
   {
-    heading = 
Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditATransformationConnection");
+    document.editconnection.tabname.value = newtab;
+    document.editconnection.submit();
   }
-%>
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"edittransformation.ApacheManifoldCFEditTransformationConnection")%>',
-      '<%=heading%>',
-      'outputs'
-  );
-  // Use this method to repost the form and pick a new tab
-  function SelectTab(newtab)
+}
+
+// Use this method to repost the form,
+// and set the anchor request.
+function postFormSetAnchor(anchorValue)
+{
+  if (checkForm())
   {
-    if (checkForm())
-    {
-      document.editconnection.tabname.value=newtab;
-      $.ManifoldCF.submit(document.editconnection);
-    }
+    if (anchorValue != "")
+      document.editconnection.action = document.editconnection.action + "#" + 
anchorValue;
+    document.editconnection.submit();
   }
+}
 
-  // Use this method to repost the form,
-  // and set the anchor request.
-  function postFormSetAnchor(anchorValue)
+// Use this method to repost the form
+function postForm()
+{
+  if (checkForm())
   {
-    if (checkForm())
-    {
-      if (anchorValue != "")
-        document.editconnection.action=document.editconnection.action + "#" + 
anchorValue;
-      $.ManifoldCF.submit(document.editconnection);
-    }
+    document.editconnection.submit();
   }
+}
 
-  // Use this method to repost the form
-  function postForm()
+function Save()
+{
+  if (checkForm())
   {
-    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 == "")
     {
-      $.ManifoldCF.submit(document.editconnection);
+      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"edittransformation.ConnectionMustHaveAName")%>");
+      
SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"edittransformation.Name")%>");
+      document.editconnection.connname.focus();
+      return;
     }
-  }
-
-  function Save()
-  {
-    if (checkForm())
+    if (window.checkConfigForSave)
     {
-      // 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(),"edittransformation.ConnectionMustHaveAName")%>");
-        
SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"edittransformation.Name")%>");
-        document.editconnection.connname.focus();
+      if (!checkConfigForSave())
         return;
-      }
-      if (window.checkConfigForSave)
-      {
-        if (!checkConfigForSave())
-          return;
-      }
-      document.editconnection.op.value="Save";
-      $.ManifoldCF.submit(document.editconnection);
     }
+    document.editconnection.op.value="Save";
+    document.editconnection.submit();
   }
+}
 
-  function Continue()
-  {
-    document.editconnection.op.value="Continue";
-    postForm();
-  }
+function Continue()
+{
+  document.editconnection.op.value="Continue";
+  postForm();
+}
 
-  function Cancel()
-  {
-    document.editconnection.op.value="Cancel";
-    $.ManifoldCF.submit(document.editconnection);
-  }
+function Cancel()
+{
+  document.editconnection.op.value="Cancel";
+  document.editconnection.submit();
+}
 
-  function checkForm()
+function checkForm()
+{
+  if (!checkConnectionCount())
+    return false;
+  if (window.checkConfig)
+    return checkConfig();
+  return true;
+}
+
+function checkConnectionCount()
+{
+  if (!isInteger(editconnection.maxconnections.value))
   {
-    if (!checkConnectionCount())
-      return false;
-    if (window.checkConfig)
-      return checkConfig();
-    return true;
+    
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"edittransformation.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>");
+    editconnection.maxconnections.focus();
+    return false;
   }
+  return true;
+}
 
-  function checkConnectionCount()
+function isRegularExpression(value)
+{
+  try
   {
-    if (!isInteger(editconnection.maxconnections.value))
-    {
-      
alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"edittransformation.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>");
-      editconnection.maxconnections.focus();
-      return false;
-    }
+    var foo = "teststring";
+    foo.search(value.replace(/\(\?i\)/,""));
     return true;
   }
-
-  function isRegularExpression(value)
+  catch (e)
   {
-    try
-    {
-      var foo="teststring";
-      foo.search(value.replace(/\(\?i\)/,""));
-      return true;
-    }
-    catch (e)
-    {
-      return false;
-    }
-
+    return false;
   }
 
-  function isInteger(value)
-  {
-    var anum=/(^\d+$)/;
-    return anum.test(value);
-  }
+}
+
+function isInteger(value)
+{
+  var anum=/(^\d+$)/;
+  return anum.test(value);
+}
 
   //-->
-</script>
+  </script>
 <%
   
TransformationConnectorFactory.outputConfigurationHeader(threadContext,className,new
 
org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabsArray);
 %>
 
+</head>
 
-<div class="row">
-  <div class="col-md-12">
+<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">
 <%
   // Get connector list; need this to decide what to do
   if (set.getRowCount() == 0)
   {
 %>
-    <div class="callout callout-warning">
-      
<p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NoTransformationConnectorsRegistered")%></p>
-    </div>
+        <p 
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection2")%></p>
+        <table class="displaytable"><tr><td 
class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NoTransformationConnectorsRegistered")%></td></tr></table>
 <%
   }
   else
   {
 %>
-    <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="transformation"/>
-        <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">
+        <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="transformation"/>
+          <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(),"edittransformation.EditTransformationConnection")%>
 '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr>
+<%
+    }
+    else
+    {
+%>
+
+                
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditATransformationConnection")%></nobr>
+<%
+    }
+%>
+              </td>
+            </tr>
+            <tr class="tabsequencerow">
+              <td class="blanksequencetab" 
colspan="<%=tabsArray.size()%>"></td>
+            </tr>
+            <tr class="tabrow">
 <%
     int tabNum = 0;
-    int activeTab = 0;
     while (tabNum < tabsArray.size())
     {
       String tab = (String)tabsArray.get(tabNum++);
       if (tab.equals(tabName))
       {
 %>
-            <li class="active"><a href="#tab_<%=tabNum%>" 
data-toggle="tab"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></li>
+              <td 
class="activetab"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></nobr></td>
 <%
       }
       else
       {
 %>
-            <li>
-              <a href="#tab_<%=tabNum%>" data-toggle="tab"
-                      
alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" 
"+Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.tab")%>'
-                      onclick='<%="javascript:SelectTab(\""+tab+"\");return 
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a>
-            </li>
+              <td class="passivetab"><nobr><a href="javascript:void(0);" 
alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" 
"+Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.tab")%>'
 onclick='<%="javascript:SelectTab(\""+tab+"\");return 
false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></nobr></td>
 <%
       }
     }
 %>
-          </ul>
-        </div>
-        <div class="box-body">
-          <div class="tab-content">
+            </tr>
+            <tr class="tabbodyrow">
+              <td class="tabbody" 
colspan='<%=Integer.toString(tabsArray.size()+1)%>'>
 <%
 
 
@@ -292,39 +309,45 @@ try
     if 
(tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Name")))
     {
 %>
-            <div class="tab-pane active" id="tab_<%=activeTab%>">
-              <div class="form-group">
-                
<label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NameColon")%></label>
+                <table class="displaytable">
+                  <tr><td class="separator" colspan="5"><hr/></td></tr>
+                  <tr>
+                    <td 
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NameColon")%></nobr></td><td
 class="value" colspan="4">
 <%
       // If the connection doesn't exist yet, we are allowed to change the 
name.
       if (connection == null || connectionName.length() < 1)
       {
 %>
-                <input type="text" size="32" name="connname" 
class="form-control" placeholder="Name..." 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/>
+                      <input type="text" size="32" name="connname" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/>
 <%
       }
       else
       {
 %>
-                <input type="text" 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)%>'/>
+                      
<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%>
+                      <input type="hidden" name="connname" 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/>
 <%
       }
 %>
-              </div>
-              <div class="form-group">
-                <label 
for="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.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>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td class="description">
+                      
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.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>
 <%
     }
     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)%>'/>
 <%
     }
 
@@ -333,9 +356,10 @@ try
     if 
(tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Type")))
     {
 %>
-            <div class="tab-pane active" id="tab_<%=activeTab%>">
-              <div class="form-group">
-                
<label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.ConnectionTypeColon")%></label>
+                <table class="displaytable">
+                  <tr><td class="separator" colspan="5"><hr/></td></tr>
+                  <tr>
+                    <td 
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.ConnectionTypeColon")%></nobr></td><td
 class="value" colspan="4">
 <%
       if (className.length() > 0)
       {
@@ -343,24 +367,24 @@ try
         if (value == null)
         {
 %>
-                
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.UNREGISTERED")%>
 <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr>
+                      
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.UNREGISTERED")%>
 <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr>
 <%
         }
         else
         {
 %>
-                <input type="text" class="form-control" disabled 
value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(value)%>'/>
+                      
<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(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" clas="form-control">
+                      <select name="classname" size="1">
 <%
         while (i < set.getRowCount())
         {
@@ -368,23 +392,26 @@ try
           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>
 <%
       }
 %>
-              </div>
-            </div>
+                    </td>
+                  </tr>
+                </table>
 <%
     }
     else
     {
       // Hiddens for the "Type" tab
 %>
-              <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)%>'/>
 <%
     }
 
@@ -393,19 +420,20 @@ try
     if 
(tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Throttling")))
     {
 %>
-              <div class="tab-pane active" id="tab_<%=activeTab%>">
-                <div class="form-group">
-                  
<label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.MaxConnectionsColon")%></label>
-                  <input type="text" size="6" name="maxconnections" 
class="form-control" value='<%=Integer.toString(maxConnections)%>'/>
-                </div>
-              </div>
+                <table class="displaytable">
+                  <tr><td class="separator" colspan="2"><hr/></td></tr>
+                  <tr>
+                    <td 
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.MaxConnectionsColon")%></nobr></td>
+                    <td class="value"><input type="text" size="6" 
name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td>
+                  </tr>
+                </table>
 <%
     }
     else
     {
       // Hiddens for "Throttling" tab
 %>
-              <input type="hidden" name="maxconnections" 
value='<%=Integer.toString(maxConnections)%>'/>
+                <input type="hidden" name="maxconnections" 
value='<%=Integer.toString(maxConnections)%>'/>
 <%
     }
 
@@ -413,16 +441,16 @@ try
       
TransformationConnectorFactory.outputConfigurationBody(threadContext,className,new
 
org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabName);
 
 %>
-            </div>
-          </div>
-          <div class="box-footer clearfix">
-            <div class="btn-group">
+                <table class="displaytable">
+                  <tr><td class="separator" colspan="4"><hr/></td></tr>
+                  <tr>
+                    <td class="message" colspan="4">
+                      <nobr>
 <%
     if (className.length() > 0)
     {
 %>
-              <a class="btn btn-primary" onClick="javascript:Save()"
-                      
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.SaveThisTransformationConnection")%>"
 data-toggle="tooltip"><i class="fa fa-save 
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Save")%></a>
+                        <input type="button" 
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Save")%>"
 onClick="javascript:Save()" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.SaveThisTransformationConnection")%>"/>
 <%
     }
     else
@@ -430,26 +458,32 @@ try
       if 
(tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Type")))
       {
 %>
-              <a class="btn btn-primary" onClick="javascript:Continue()"
-                      
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.ContinueToNextPage")%>"
 data-toggle="tooltip"><i class="fa fa-play 
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Continue")%></a>
+                        <input type="button" 
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Continue")%>"
 onClick="javascript:Continue()" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.ContinueToNextPage")%>"/>
 <%
       }
     }
 %>
-              <a class="btn btn-primary" onClick="javascript:Cancel()"
-                      
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.CancelTransformationConnectionEditing")%>"
 data-toggle="tooltip"><i class="fa fa-times-circle-o 
fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Cancel")%></a>
-            </div>
-          </div>
-        </div>
-      </form>
+                        <input type="button" 
value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Cancel")%>"
 onClick="javascript:Cancel()" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.CancelTransformationConnectionEditing")%>"/>
+                      </nobr>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </form>
 
 <%
   }
 %>
 
-    </div>
-  </div>
-</div>
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>
 
 <%
 }
@@ -463,3 +497,4 @@ catch (ManifoldCFException e)
 <%
 }
 %>
+

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/error.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/error.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/error.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/error.jsp Thu Mar 23 
18:49:54 2017
@@ -22,14 +22,27 @@
 */
 %>
 
-<script type="text/javascript">
-  <!--
-  $.ManifoldCF.setTitle(
-      
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.ApacheManifoldCFError")%>',
-      
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.Error")%>'
-  );
-  //-->
-</script>
+<?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.ApacheManifoldCFError")%>
+  </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.Error")%></p>
 
 <%
   // These have to be fetched from request rather than variableContext since 
error
@@ -37,18 +50,16 @@
   String errorText = variableContext.getParameter("text");
   String target = variableContext.getParameter("target");
 %>
+  <table class="displaytable">
+    <tr><td 
class="message"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(errorText)%></td></tr>
+    <tr><td class="separator"><hr/></td></tr>
+    <tr><td class="message"><a 
href='<%=org.apache.manifoldcf.core.util.URLEncoder.encode(target)%>' 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>">OK</a></td></tr>
+  </table>
+
+       </td>
+      </tr>
+    </table>
+
+</body>
 
-<div class="box box-solid">
-  <div class="box-body">
-    <div class="alert alert-danger">
-      <h3><i class="icon fa fa-ban"></i> Error!</h3>
-      <h4><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(errorText)%></h4>
-    </div>
-  </div>
-  <div class="box-footer with-border">
-    <a class="link btn btn-primary" 
href='<%=org.apache.manifoldcf.core.util.URLEncoder.encode(target)%>' 
-            
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>
+</html>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/index.jsp Thu Mar 23 
18:49:54 2017
@@ -24,84 +24,28 @@
 
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport"
-            content="width=device-width, initial-scale=1, maximum-scale=1, 
user-scalable=no">
-    <!-- Bootstrap -->
-    <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" 
type="text/css"/>
-    <link href="bootstrap-select/css/bootstrap-select.min.css" 
rel="stylesheet" type="text/css"/>
-    <link href="css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
-    <link rel="stylesheet" href="css/style.css" type="text/css" 
media="screen"/>
-    <link rel="stylesheet" href="css/print.css" type="text/css" media="print"/>
-  </head>
-  <body class="fixed skin-black sidebar-mini">
-    <div class="wrapper">
-      <header class="main-header">
-        <nav class="navbar navbar-static-top" role="navigation">
-          <a class="logo">
-            <img src="ManifoldCF-logo.png"/>
-          </a>
-          <!-- Sidebar toggle button-->
-          <a href="/" class="sidebar-toggle" data-toggle="offcanvas" 
role="button">
-            <span class="sr-only">Toggle navigation</span>
-          </a>
-
-          <h1 
class="hidden-xs"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"banner.DocumentIngestion")%>
-          </h1>
-          <!-- Navbar Right Menu -->
-          <div class="navbar-custom-menu">
-            <div id="loader">Loading...</div>
-          </div>
-        </nav>
-      </header>
-      <aside class="main-sidebar">
-        <jsp:include page="sidebar.jsp" flush="true"/>
-      </aside>
-      <div class="content-wrapper">
-        <section class="content-header">
-          <h1 
class="visible-print-block"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.ApacheManifoldCF")%></h1>
-
-          <h1 
id="heading"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.WelcomeToApacheManifoldFC")%></h1>
-        </section>
-        <section id="content" class="content">
-        </section>
-      </div>
-      <footer class="main-footer">
-        <div class="pull-right hidden-xs"><b>Version</b>&nbsp;<%= 
org.apache.manifoldcf.core.system.ManifoldCF.getMcfVersion() %></div>
-        
<strong><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.Copyright")%>&nbsp;&nbsp;&nbsp;&nbsp;<a
 target="_blank" 
href="https://www.apache.org/";><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.TheApacheSoftwareFoundation")%></a></strong>
-      </footer>
-    </div>
-    <div class="overlay" style="display: none">
-      <div class="spinner">
-        <div class="bounce1"></div>
-        <div class="bounce2"></div>
-        <div class="bounce3"></div>
-      </div>
-    </div>
-    <script src="javascript/jquery.min.js"></script>
-    <!-- Bootstrap JS -->
-    <script src="bootstrap/js/bootstrap.min.js" 
type="text/javascript"></script>
-    <!-- Bootstrap Select -->
-    <script src="bootstrap-select/js/bootstrap-select.min.js" 
type="text/javascript"></script>
-    <script src="javascript/jquery.slimscroll.min.js" 
type="text/javascript"></script>
-    <!-- ManifoldCF -->
-    <script src="javascript/mcf.js" type="text/javascript"></script>
-<%
-  String reqPage = request.getParameter("p");
-  if (reqPage != null && reqPage.length() > 0)
-  {
-%>
-    <script type="application/javascript">
-      $(document).ready(function ()
-      {
-        $.ManifoldCF.loadContent('<%=URLEncoder.encode(reqPage)%>');
-      });
-    </script>
-<%
-  }
-%>
-  </body>
+<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(),"index.ApacheManifoldCF")%>
+  </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(),"index.WelcomeToApacheManifoldFC")%></p>
+       </td>
+      </tr>
+    </table>
+
+</body>
+
 </html>

Modified: 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listauthorities.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listauthorities.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listauthorities.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listauthorities.jsp 
Thu Mar 23 18:49:54 2017
@@ -39,44 +39,57 @@ try
   IAuthorityConnection[] 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(),"listauthorities.ApacheManifoldCFListAuthorities")%>
+  </title>
+
+  <script type="text/javascript">
   <!--
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listauthorities.ApacheManifoldCFListAuthorities")%>',
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listauthorities.ListOfAuthorityConnections")%>',
-      'authorities'
-  );
 
-  function Delete(connectionName)
+function Delete(connectionName)
+{
+  if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listauthorities.DeleteAuthority")%>
 '"+connectionName+"'?"))
   {
-    if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listauthorities.DeleteAuthority")%>
 '"+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>
 
+</head>
 
-<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="authority"/>
-        <input type="hidden" name="connname" value=""/>
+<body class="standardbody">
 
-        <div class="box-body">
-          <table class="table table-bordered">
+  <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(),"listauthorities.ListOfAuthorityConnections")%></p>
+        <form class="standardform" name="listconnections" action="execute.jsp" 
method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="authority"/>
+          <input type="hidden" name="connname" value=""/>
+
+          <table class="datatable">
             <tr>
-              <th>Action</th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Name")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Description")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.AuthorityType")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Max")%></th>
+              <td class="separator" colspan="5"><hr/></td>
+            </tr>
+            <tr class="headerrow">
+              <td class="columnheader"></td>
+              <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Name")%></td><td
 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Description")%></td><td
 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.AuthorityType")%></td>
+              <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Max")%></td>
             </tr>
 <%
   int i = 0;
@@ -95,40 +108,27 @@ try
       connectorName = className + "(uninstalled)";
 
 %>
-            <tr>
-              <td>
-                <div class="btn-group">
-                  <a 
href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.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(),"listauthorities.View")%></a>
-                  <a 
href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.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(),"listauthorities.Edit")%></a>
-                  <a href="javascript:void(0);"
-                          
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.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(),"listauthorities.Delete")%></a>
-                </div>
+            <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td class="columncell">
+                <nobr>
+                  <a 
href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 alt='<%="View 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.View")%></a>
+                  <a 
href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.Edit")%></a>
+                  <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.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="editauthority.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.AddNewConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.AddaNewConnection")%></a></td></tr>
           </table>
-        </div>
-        <div class="box-footer clearfix">
-          <div class="btn-group">
-            <a href="editauthority.jsp" 
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listauthorities.AddNewConnection")%>"
-                    class="link btn btn-primary" role="button">
-              <i class="fa fa-plus-circle fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listauthorities.AddaNewConnection")%></a>
-          </div>
 
 <%
 }
@@ -142,8 +142,11 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
+        </form>
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>

Modified: 
manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listconnections.jsp 
Thu Mar 23 18:49:54 2017
@@ -39,46 +39,61 @@ try
   IRepositoryConnection[] 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(),"listconnections.ApacheManifoldCFListConnections")%>
+  </title>
 
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listconnections.ApacheManifoldCFListConnections")%>',
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listconnections.ListOfRepositoryConnections")%>',
-      'repositories'
-  );
+  <script type="text/javascript">
+  <!--
 
-  function Delete(connectionName)
+function Delete(connectionName)
+{
+  if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listconnections.DeleteConnection")%>
 '"+connectionName+"'?"))
   {
-    if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listconnections.DeleteConnection")%>
 '"+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>
 
-<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="connection"/>
-        <input type="hidden" name="connname" value=""/>
-
-        <div class="box-body">
-          <table class="table table-bordered">
-            <tr>
-              <th>Action</th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Name")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Description")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.ConnectionType")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.AuthorityGroup")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Max")%></th>
-            </tr>
+<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(),"listconnections.ListOfRepositoryConnections")%></p>
+          <form class="standardform" name="listconnections" 
action="execute.jsp" method="POST">
+            <input type="hidden" name="op" value="Continue"/>
+            <input type="hidden" name="type" value="connection"/>
+            <input type="hidden" name="connname" value=""/>
+
+            <table class="datatable">
+              <tr>
+                <td class="separator" colspan="6"><hr/></td>
+              </tr>
+              <tr class="headerrow">
+                <td class="columnheader"></td>
+                <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Name")%></td>
+                <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Description")%></td>
+                <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.ConnectionType")%></td>
+                <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.AuthorityGroup")%></td>
+                <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Max")%></td>
+              </tr>
 <%
   int i = 0;
   while (i < connections.length)
@@ -97,38 +112,28 @@ try
     int maxCount = connection.getMaxConnections();
 
 %>
-            <tr>
-              <td>
-                <div class="btn-group">
-                  <a 
href='<%="viewconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.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(),"listconnections.View")%></a>
-                  <a 
href='<%="editconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.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(),"listconnections.Edit")%></a>
-                  <a href="javascript:void(0);"
-                          
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.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(),"listconnections.Delete")%></a>
-                </div>
-              </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><%=((authorityName == 
null)?Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.GlobalAuthority"):org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName))%></td>
-              <td><%=Integer.toString(maxCount)%></td>
-            </tr>
+              <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+                <td class="columncell">
+                  <nobr>
+                    <a 
href='<%="viewconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.View")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.View")%></a>
+                    <a 
href='<%="editconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Edit")%></a>
+                    <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.Delete")%></a>
+                  </nobr>
+                </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"><%=((authorityName==null)?Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.GlobalAuthority"):org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName))%></td>
+                <td class="columncell"><%=Integer.toString(maxCount)%></td>
+              </tr>
 <%
   }
 %>
-          </table>
-        </div>
-        <div class="box-footer clearfix">
-          <div class="btn-group">
-            <a href="editconnection.jsp" class="link btn btn-primary" 
role="button" 
-                    
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.AddAConnection")%>"
-                    data-toggle="tooltip"><i class="fa fa-plus-circle fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.AddNewConnection")%></a>
-          </div>
+              <tr>
+                <td class="separator" colspan="6"><hr/></td>
+              </tr>
+              <tr><td class="message" colspan="6"><a href="editconnection.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listconnections.AddAConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listconnections.AddNewConnection")%></a></td></tr>
+            </table>
 
 <%
 }
@@ -142,8 +147,12 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
+        </form>
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>
+

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listgroups.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listgroups.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listgroups.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listgroups.jsp Thu 
Mar 23 18:49:54 2017
@@ -38,41 +38,57 @@ try
   IAuthorityGroup[] groups = manager.getAllGroups();
 %>
 
-<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(),"listgroups.ApacheManifoldCFListAuthorityGroups")%>
+  </title>
 
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listgroups.ApacheManifoldCFListAuthorityGroups")%>',
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listgroups.ListOfAuthorityGroups")%>',
-      'authorities'
-  );
+  <script type="text/javascript">
+  <!--
 
-  function Delete(groupName)
+function Delete(groupName)
+{
+  if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listgroups.DeleteAuthorityGroup")%>
 '"+groupName+"'?"))
   {
-    if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listgroups.DeleteAuthorityGroup")%>
 '"+groupName+"'?"))
-    {
-      document.listgroups.op.value="Delete";
-      document.listgroups.groupname.value=groupName;
-      $.ManifoldCF.submit(document.listgroups);
-    }
+    document.listgroups.op.value="Delete";
+    document.listgroups.groupname.value=groupName;
+    document.listgroups.submit();
   }
+}
+
   //-->
-</script>
+  </script>
+
+</head>
+
+<body class="standardbody">
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="box box-primary">
-      <form class="standardform" name="listgroups" action="execute.jsp" 
method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="group"/>
-        <input type="hidden" name="groupname" 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(),"listgroups.ListOfAuthorityGroups")%></p>
+        <form class="standardform" name="listgroups" action="execute.jsp" 
method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="group"/>
+          <input type="hidden" name="groupname" value=""/>
 
-        <div class="box-body">
-          <table class="table table-bordered">
+          <table class="datatable">
             <tr>
-              <th>Action</th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.Name")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.Description")%></th>
+              <td class="separator" colspan="5"><hr/></td>
+            </tr>
+            <tr class="headerrow">
+              <td class="columnheader"></td>
+              <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.Name")%></td>
+              <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.Description")%></td>
             </tr>
 <%
   int i = 0;
@@ -86,38 +102,29 @@ try
       description = "";
 
 %>
-            <tr>
-              <td>
-                <div class="btn-group">
-                  <a 
href='<%="viewgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.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(),"listgroups.View")%></a>
-                  <a 
href='<%="editgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.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(),"listgroups.Edit")%></a>
-                  <a href="javascript:void(0);"
-                          
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.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(),"listgroups.Delete")%></a>
-                </div>
+            <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td class="columncell">
+                <nobr>
+                  <a 
href='<%="viewgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.View")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.View")%></a>
+                  <a 
href='<%="editgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.Edit")%></a>
+                  <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.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 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+              <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
             </tr>
 <%
   }
 %>
+            <tr>
+              <td class="separator" colspan="5"><hr/></td>
+            </tr>
+            <tr><td class="message" colspan="5"><a href="editgroup.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.AddNewGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.AddaNewGroup")%></a></td></tr>
           </table>
-        </div>
-        <div class="box-footer clearfix">
-          <div class="btn-group">
-            <a href="editgroup.jsp"
-                    
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listgroups.AddNewGroup")%>"
-                    class="link btn btn-primary" role="button"><i class="fa 
fa-plus-circle fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listgroups.AddaNewGroup")%></a>
-          </div>
+
 <%
 }
-catch (ManifoldCFException e)
+  catch (ManifoldCFException e)
 {
   e.printStackTrace();
   variableContext.setParameter("text",e.getMessage());
@@ -127,8 +134,11 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
+        </form>
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listjobs.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listjobs.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listjobs.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listjobs.jsp Thu Mar 
23 18:49:54 2017
@@ -38,44 +38,60 @@ try
   IJobDescription[] jobs = manager.getAllJobs();
 %>
 
-<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(),"listjobs.ApacheManifoldCFListJobDescriptions")%>
+  </title>
 
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listjobs.ApacheManifoldCFListJobDescriptions")%>',
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listjobs.JobList")%>',
-      'jobs'
-  );
+  <script type="text/javascript">
+  <!--
 
-  function Delete(jobID)
+function Delete(jobID)
+{
+  if (confirm("Warning: Deleting this job will remove all\nassociated 
documents from the index.\nDo you want to proceed?"))
   {
-    if (confirm("Warning: Deleting this job will remove all\nassociated 
documents from the index.\nDo you want to proceed?"))
-    {
-      document.listjobs.op.value="Delete";
-      document.listjobs.jobid.value=jobID;
-      $.ManifoldCF.submit(document.listjobs);
-    }
+    document.listjobs.op.value="Delete";
+    document.listjobs.jobid.value=jobID;
+    document.listjobs.submit();
   }
+}
 
   //-->
-</script>
+  </script>
+
 
-<div class="row">
-  <div class="col-md-12">
-    <div class="box box-primary">
-      <form class="standardform" name="listjobs" action="execute.jsp" 
method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="job"/>
-        <input type="hidden" name="jobid" 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(),"listjobs.JobList")%></p>
+        <form class="standardform" name="listjobs" action="execute.jsp" 
method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="job"/>
+          <input type="hidden" name="jobid" value=""/>
+
+          <table class="datatable">
             <tr>
-              <th>Action</th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Name")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.OutputConnection")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.RepositoryConnection")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.ScheduleType")%></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(),"listjobs.Name")%></nobr></td>
+              <td 
class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.OutputConnection")%></nobr></td>
+              <td 
class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.RepositoryConnection")%></nobr></td>
+              <td 
class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.ScheduleType")%></nobr></td>
             </tr>
 <%
   for (int i = 0; i < jobs.length; i++)
@@ -107,38 +123,28 @@ try
     }
 
 %>
-            <tr job-id="<%= jd.getID() %>">
-              <td>
-                <div class="btn-group">
-                  <a href='<%="viewjob.jsp?jobid="+jd.getID()%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Viewjob")+"
 "+jd.getID()%>'
-                          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(),"listjobs.View")%></a>
-                  <a href='<%="editjob.jsp?jobid="+jd.getID()%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Editjob")+"
 "+jd.getID()%>'
-                          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(),"listjobs.Edit")%></a>
-                  <a href='<%="javascript:Delete(\""+jd.getID()+"\")"%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.DeleteJob")+"
 "+jd.getID()%>'
-                          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(),"listjobs.Delete")%></a>
-                  <a href='<%="editjob.jsp?origjobid="+jd.getID()%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.CopyJob")+"
 "+jd.getID()%>'
-                          class="link btn btn-primary btn-xs" role="button" 
data-toggle="tooltip"><i class="fa fa-clipboard fa-fw" 
aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Copy")%></a>
-                </div>
+            <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td class="columncell">
+                <nobr>
+                  <a href='<%="viewjob.jsp?jobid="+jd.getID()%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Viewjob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.View")%></a>
+                  <a href='<%="editjob.jsp?jobid="+jd.getID()%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Editjob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Edit")%></a>
+                  <a href='<%="javascript:Delete(\""+jd.getID()+"\")"%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.DeleteJob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Delete")%></a>
+                  <a href='<%="editjob.jsp?origjobid="+jd.getID()%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.CopyJob")+"
 
"+jd.getID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.Copy")%></a>
+                </nobr>
               </td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(jd.getDescription())%></td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(outputConnectionNames)%></td>
-              
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(jd.getConnectionName())%></td>
-              <td><%=jobType%></td>
+              <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(jd.getDescription())%></td>
+              <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(outputConnectionNames)%></td>
+              <td 
class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(jd.getConnectionName())%></td>
+              <td class="columncell"><%=jobType%></td>
             </tr>
 <%
   }
 %>
+            <tr>
+              <td class="separator" colspan="5"><hr/></td>
+            </tr>
+            <tr><td class="message" colspan="5"><a href="editjob.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Addajob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listjobs.AddaNewJob")%></a></td></tr>
           </table>
-        </div>
-        <div class="box-footer clearfix">
-          <div class="btn-group">
-            <a href="editjob.jsp" 
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listjobs.Addajob")%>"
-                    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(),"listjobs.AddaNewJob")%></a>
-          </div>
 
 <%
 }
@@ -152,8 +158,11 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
+        </form>
+      </td>
+    </tr>
+  </table>
+
+</body>
+
+</html>

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listmappers.jsp
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listmappers.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listmappers.jsp 
(original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listmappers.jsp Thu 
Mar 23 18:49:54 2017
@@ -39,42 +39,60 @@ try
   IMappingConnection[] 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(),"listmappers.ApacheManifoldCFListMappers")%>
+  </title>
+
+  <script type="text/javascript">
   <!--
-  $.ManifoldCF.setTitle(
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listmappers.ApacheManifoldCFListMappers")%>',
-      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), 
"listmappers.ListOfMappingConnections")%>',
-      'authorities'
-  );
 
-  function Delete(connectionName)
+function Delete(connectionName)
+{
+  if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listmappers.DeleteMapper")%>
 '"+connectionName+"'?"))
   {
-    if 
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listmappers.DeleteMapper")%>
 '"+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 class="standardform" name="listconnections" action="execute.jsp" 
method="POST">
-        <input type="hidden" name="op" value="Continue"/>
-        <input type="hidden" name="type" value="mapper"/>
-        <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(),"listmappers.ListOfMappingConnections")%></p>
+        <form class="standardform" name="listconnections" action="execute.jsp" 
method="POST">
+          <input type="hidden" name="op" value="Continue"/>
+          <input type="hidden" name="type" value="mapper"/>
+          <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(),"listmappers.Name")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.Description")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.MapperType")%></th>
-              
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.Max")%></th>
+              <td class="separator" colspan="5"><hr/></td>
+            </tr>
+            <tr class="headerrow">
+              <td class="columnheader"></td>
+              <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.Name")%></td>
+              <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.Description")%></td>
+              <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.MapperType")%></td>
+              <td 
class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.Max")%></td>
             </tr>
 <%
   int i = 0;
@@ -93,37 +111,27 @@ try
       connectorName = className + 
Messages.getString(pageContext.getRequest().getLocale(),"listmappers.uninstalled");
 
 %>
-            <tr>
-              <td>
-                <div class="btn-group">
-                  <a 
href='<%="viewmapper.jsp?connname="+URLEncoder.encode(name)%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.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(),"listmappers.View")%></a>
-                  <a 
href='<%="editmapper.jsp?connname="+URLEncoder.encode(name)%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.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(),"listmappers.Edit")%></a>
-                  <a href="javascript:void(0);"
-                          
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
-                          
title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.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(),"listmappers.Delete")%></a>
-                </div>
+            <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
+              <td class="columncell">
+                <nobr>
+                  <a 
href='<%="viewmapper.jsp?connname="+URLEncoder.encode(name)%>' alt='<%="View 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.View")%></a>
+                  <a 
href='<%="editmapper.jsp?connname="+URLEncoder.encode(name)%>' 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.Edit")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.Edit")%></a>
+                  <a href="javascript:void()" 
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
 
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.Delete")+"
 
"+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.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="editmapper.jsp" 
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.AddNewConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listmappers.AddaNewConnection")%></a></td></tr>
           </table>
-        </div>
-        <div class="box-footer clearfix">
-          <div class="btn-group">
-            <a href="editmapper.jsp"
-                    
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listmappers.AddNewConnection")%>"
-                    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(),"listmappers.AddaNewConnection")%></a>
-          </div>
 
 <%
 }
@@ -137,8 +145,10 @@ catch (ManifoldCFException e)
 <%
 }
 %>
-        </div>
-      </form>
-    </div>
-  </div>
-</div>
+        </form>
+      </td>
+    </tr>
+  </table>
+</body>
+
+</html>


Reply via email to