You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2017/03/23 18:49:55 UTC
svn commit: r1788301 [5/16] - in /manifoldcf/trunk: ./ connectors/
connectors/activedirectory/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/activedirectory/tests/
connectors/alfresco-webscript/ connectors/alfresco-webscript/conn...
Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Thu Mar 23 18:49:54 2017
@@ -57,10 +57,6 @@
<include name="xml-apis*.jar"/>
<include name="velocity*.jar"/>
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
- <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -68,8 +64,6 @@
</fileset>
<fileset dir="../lib">
<include name="junit*.jar"/>
- <include name="selenium*.jar"/>
- <include name="cglib-nodep*.jar"/>
<include name="hamcrest-core*.jar"/>
<include name="mockito-core*.jar"/>
<include name="wiremock*.jar"/>
@@ -105,9 +99,11 @@
<include name="plexus-utils*.jar"/>
<include name="regexp*.jar"/>
<include name="commons-csv*.jar"/>
+ <include name="commons-exec*.jar"/>
<include name="netcdf4*.jar"/>
<include name="httpservices*.jar"/>
<include name="grib*.jar"/>
+ <include name="jna*.jar"/>
<include name="cdm*.jar"/>
<include name="udunits*.jar"/>
<include name="jcommander*.jar"/>
@@ -460,10 +456,6 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
- <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -503,10 +495,6 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
- <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -552,10 +540,6 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
- <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -596,10 +580,6 @@
<include name="xml-apis*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
- <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -648,10 +628,6 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
- <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -671,7 +647,7 @@
</fileset>
</copy>
<copy todir="build/webapp/crawler-ui">
- <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
+ <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
</copy>
<jar destfile="build/webapp/crawler-ui/WEB-INF/lib/mcf-crawler-ui.jar" basedir="build/crawler-ui/classes"/>
</target>
@@ -700,10 +676,6 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
- <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -730,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,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
+ <copy todir="build/webapp/crawler-ui-proprietary">
+ <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
</copy>
<jar destfile="build/webapp/crawler-ui-proprietary/WEB-INF/lib/mcf-crawler-ui.jar" basedir="build/crawler-ui/classes"/>
</target>
@@ -760,10 +732,6 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
- <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -785,7 +753,7 @@
</fileset>
</copy>
<copy todir="build/webapp/combined-service">
- <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
+ <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
</copy>
<jar destfile="build/webapp/combined-service/WEB-INF/lib/mcf-combined-service.jar" basedir="build/combined-service/classes"/>
</target>
@@ -814,10 +782,6 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
- <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="postgresql*.jar"/>
@@ -847,7 +811,7 @@
</fileset>
</copy>
<copy todir="build/webapp/combined-service-proprietary">
- <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html,**/*.js,**/*.eot,**/*.svg,**/*.ttf,**/*.woff,**/*.woff2"/>
+ <fileset dir="crawler-ui/src/main/webapp" includes="**/*.jsp,**/*.css,**/*.png,**/*.html"/>
</copy>
<jar destfile="build/webapp/combined-service-proprietary/WEB-INF/lib/mcf-combined-service.jar" basedir="build/combined-service/classes"/>
</target>
@@ -938,10 +902,6 @@
<include name="velocity*.jar"/>
<include name="slf4j*.jar"/>
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
- <include name="jna*.jar"/>
</fileset>
<fileset dir="../lib">
<include name="jetty*.jar"/>
@@ -1186,10 +1146,6 @@
<include name="httpcore*.jar"/>
<include name="httpclient*.jar"/>
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="gson*.jar"/>
- <include name="guava*.jar"/>
- <include name="jna*.jar"/>
<include name="zookeeper*.jar"/>
</fileset>
</path>
@@ -1455,9 +1411,11 @@
<include name="plexus-utils*.jar"/>
<include name="regexp*.jar"/>
<include name="commons-csv*.jar"/>
+ <include name="commons-exec*.jar"/>
<include name="netcdf4*.jar"/>
<include name="httpservices*.jar"/>
<include name="grib*.jar"/>
+ <include name="jna*.jar"/>
<include name="jj2000*.jar"/>
<include name="cdm*.jar"/>
<include name="udunits*.jar"/>
@@ -1590,7 +1548,6 @@
<include name="properties.xml"/>
</fileset>
</copy>
- <replace file="dist/multiprocess-file-example/properties.xml" token="unknown version" value="${release-version}"/>
<mkdir dir="dist/multiprocess-file-example/logs"/>
<chmod dir="dist/multiprocess-file-example" perm="a+x" includes="**/*.sh"/>
@@ -1619,7 +1576,6 @@
<include name="properties.xml"/>
</fileset>
</copy>
- <replace file="dist/multiprocess-file-example-proprietary/properties.xml" token="unknown version" value="${release-version}"/>
<mkdir dir="dist/multiprocess-file-example-proprietary/logs"/>
<chmod dir="dist/multiprocess-file-example-proprietary" perm="a+x" includes="**/*.sh"/>
</target>
@@ -1652,7 +1608,6 @@
<include name="properties.xml"/>
</fileset>
</copy>
- <replace file="dist/multiprocess-zk-example/properties.xml" token="unknown version" value="${release-version}"/>
<mkdir dir="dist/multiprocess-zk-example/logs"/>
<chmod dir="dist/multiprocess-zk-example" perm="a+x" includes="**/*.sh"/>
</target>
@@ -1685,7 +1640,6 @@
<include name="properties.xml"/>
</fileset>
</copy>
- <replace file="dist/multiprocess-zk-example-proprietary/properties.xml" token="unknown version" value="${release-version}"/>
<mkdir dir="dist/multiprocess-zk-example-proprietary/logs"/>
<chmod dir="dist/multiprocess-zk-example-proprietary" perm="a+x" includes="**/*.sh"/>
</target>
@@ -1735,8 +1689,7 @@
<include name="properties.xml"/>
</fileset>
</copy>
- <replace file="dist/example/properties.xml" token="unknown version" value="${release-version}"/>
-
+
<chmod dir="dist/example" perm="a+x" includes="**/*.sh"/>
</target>
@@ -1769,8 +1722,7 @@
<include name="properties.xml"/>
</fileset>
</copy>
- <replace file="dist/example-proprietary/properties.xml" token="unknown version" value="${release-version}"/>
-
+
<chmod dir="dist/example-proprietary" perm="a+x" includes="**/*.sh"/>
</target>
@@ -1865,8 +1817,6 @@
<copy todir="dist/test-lib">
<fileset dir="../lib">
<include name="junit*.jar"/>
- <include name="selenium*.jar"/>
- <include name="cglib-nodep*.jar"/>
<include name="hamcrest-core*.jar"/>
<include name="mockito-core*.jar"/>
<include name="wiremock*.jar"/>
Modified: manifoldcf/trunk/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/buildfiles/connector-build.xml?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/trunk/framework/buildfiles/connector-build.xml Thu Mar 23 18:49:54 2017
@@ -116,10 +116,6 @@
</fileset>
<fileset dir="${mcf-dist}/lib">
<include name="mail*.jar"/>
- <include name="commons-exec*.jar"/>
- <include name="guava*.jar"/>
- <include name="gson*.jar"/>
- <include name="jna*.jar"/>
<include name="json*.jar"/>
<include name="commons-codec*.jar"/>
<include name="commons-collections*.jar"/>
@@ -137,8 +133,6 @@
<include name="jsp-2.1*.jar"/>
<include name="jsp-api*.jar"/>
<include name="junit*.jar"/>
- <include name="selenium*.jar"/>
- <include name="cglib-nodep*.jar"/>
<include name="hamcrest-core*.jar"/>
<include name="log4j*.jar"/>
<include name="serializer*.jar"/>
@@ -1161,10 +1155,6 @@
<target name="run-UI-postgresql" depends="compile-tests,pretest-check" if="canTest">
<mkdir dir="test-postgresql-output"/>
<junit fork="true" maxmemory="128m" dir="test-postgresql-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
- <jvmarg value="-Dwebdriver.chrome.driver=${env.SL_CHROME_DRIVER}"/>
- <jvmarg value="-Dwebdriver.safari.driver=${env.SL_SAFARI_DRIVER}"/>
- <jvmarg value="-Dwebdriver.firefox.driver=${env.SL_FIREFOX_DRIVER}"/>
- <jvmarg value="-Dwebdriver.ie.driver=${env.SL_IE_DRIVER}"/>
<jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
<jvmarg value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
<jvmarg value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
@@ -1188,10 +1178,6 @@
<target name="run-UI-HSQLDB" depends="compile-tests,pretest-check" if="canTest">
<mkdir dir="test-HSQLDB-output"/>
<junit fork="true" maxmemory="128m" dir="test-HSQLDB-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
- <jvmarg value="-Dwebdriver.chrome.driver=${env.SL_CHROME_DRIVER}"/>
- <jvmarg value="-Dwebdriver.safari.driver=${env.SL_SAFARI_DRIVER}"/>
- <jvmarg value="-Dwebdriver.firefox.driver=${env.SL_FIREFOX_DRIVER}"/>
- <jvmarg value="-Dwebdriver.ie.driver=${env.SL_IE_DRIVER}"/>
<jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
<jvmarg value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
<jvmarg value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
@@ -1215,10 +1201,6 @@
<target name="run-UI-HSQLDBext" depends="compile-tests,pretest-check" if="canTest">
<mkdir dir="test-HSQLDBext-output"/>
<junit fork="true" maxmemory="128m" dir="test-HSQLDBext-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
- <jvmarg value="-Dwebdriver.chrome.driver=${env.SL_CHROME_DRIVER}"/>
- <jvmarg value="-Dwebdriver.safari.driver=${env.SL_SAFARI_DRIVER}"/>
- <jvmarg value="-Dwebdriver.firefox.driver=${env.SL_FIREFOX_DRIVER}"/>
- <jvmarg value="-Dwebdriver.ie.driver=${env.SL_IE_DRIVER}"/>
<jvmarg value="-DcrawlerWarPath=${mcf-dist}/web/war/mcf-crawler-ui.war"/>
<jvmarg value="-DauthorityserviceWarPath=${mcf-dist}/web/war/mcf-authority-service.war"/>
<jvmarg value="-DapiWarPath=${mcf-dist}/web/war/mcf-api-service.war"/>
@@ -1242,10 +1224,6 @@
<target name="run-UI-mysql" depends="compile-tests,pretest-check" if="canTest">
<mkdir dir="test-mysql-output"/>
<junit fork="true" maxmemory="128m" dir="test-mysql-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
- <jvmarg value="-Dwebdriver.chrome.driver=${env.SL_CHROME_DRIVER}"/>
- <jvmarg value="-Dwebdriver.safari.driver=${env.SL_SAFARI_DRIVER}"/>
- <jvmarg value="-Dwebdriver.firefox.driver=${env.SL_FIREFOX_DRIVER}"/>
- <jvmarg value="-Dwebdriver.ie.driver=${env.SL_IE_DRIVER}"/>
<jvmarg value="-DcrawlerWarPath=${mcf-dist}/web-proprietary/war/mcf-crawler-ui.war"/>
<jvmarg value="-DauthorityserviceWarPath=${mcf-dist}/web-proprietary/war/mcf-authority-service.war"/>
<jvmarg value="-DapiWarPath=${mcf-dist}/web-proprietary/war/mcf-api-service.war"/>
Modified: manifoldcf/trunk/framework/core/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/pom.xml?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/pom.xml (original)
+++ manifoldcf/trunk/framework/core/pom.xml Thu Mar 23 18:49:54 2017
@@ -244,12 +244,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- <version>${selenium.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java (original)
+++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java Thu Mar 23 18:49:54 2017
@@ -106,7 +106,6 @@ public class ManifoldCF
protected static Integer initializeFlagLock = new Integer(0);
// Local member variables
- protected static String mcfVersion = null;
protected static String masterDatabaseName = null;
protected static String masterDatabaseUsername = null;
protected static String masterDatabasePassword = null;
@@ -121,10 +120,6 @@ public class ManifoldCF
// System property/config file property names
- // Version property
- /** The current ManifoldCF version string */
- public static final String versionProperty = "org.apache.manifoldcf.versionstring";
-
// Process ID property
/** Process ID - cannot exceed 16 characters */
public static final String processIDProperty = "org.apache.manifoldcf.processid";
@@ -194,7 +189,6 @@ public class ManifoldCF
// Clean up the system doing the same thing the shutdown thread would have if the process was killed
cleanUpEnvironment(threadContext);
processID = null;
- mcfVersion = null;
masterDatabaseName = null;
masterDatabaseUsername = null;
masterDatabasePassword = null;
@@ -285,7 +279,6 @@ public class ManifoldCF
Logging.initializeLoggers();
Logging.setLogLevels(threadContext);
- mcfVersion = LockManagerFactory.getStringProperty(threadContext,versionProperty,"unknown version");
masterDatabaseName = LockManagerFactory.getStringProperty(threadContext,masterDatabaseNameProperty,"dbname");
masterDatabaseUsername = LockManagerFactory.getStringProperty(threadContext,masterDatabaseUsernameProperty,"manifoldcf");
masterDatabasePassword = LockManagerFactory.getPossiblyObfuscatedStringProperty(threadContext,masterDatabasePasswordProperty,"local_pg_passwd");
@@ -593,14 +586,6 @@ public class ManifoldCF
return rval.toString();
}
- /** Get the mcf version.
- *@return the version string
- */
- public static String getMcfVersion()
- {
- return mcfVersion;
- }
-
/** Get the master database name.
*@return the master database name
*/
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/adminHeaders.jsp Thu Mar 23 18:49:54 2017
@@ -47,28 +47,12 @@ 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)
{
- 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));
- }
+ response.sendRedirect("login.jsp");
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)
@@ -77,3 +61,4 @@ response.setContentType("text/html;chars
threadContext.save("__WRAPPER__",variableContext);
}
%>
+
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/documentstatus.jsp Thu Mar 23 18:49:54 2017
@@ -178,103 +178,113 @@ 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(),"documentstatus.ApacheManifoldCFDocumentStatus")%>
+ </title>
+
+ <script type="text/javascript">
<!--
- $.ManifoldCF.setTitle(
- '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "documentstatus.ApacheManifoldCFDocumentStatus")%>',
- '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentStatus")%>',
- 'statusReports'
- );
- function Go()
+function Go()
+{
+ if (!isInteger(report.rowcount.value))
{
- 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);
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.EnterALegalNumberForRowsPerPage")%>");
+ report.rowcount.focus();
+ return;
}
-
- function Continue()
+ if (!isRegularExpression(report.statusidentifiermatch.value))
{
- 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);
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"documentstatus.IdentifierMatchMustBeAValidRegularExpression")%>");
+ report.statusidentifiermatch.focus();
+ return;
}
- function ColumnClick(colname)
- {
- document.report.clickcolumn.value = colname;
- Go();
- }
+ document.report.op.value="Status";
+ document.report.action = document.report.action + "#MainButton";
+ document.report.submit();
+}
- function SetPosition(amt)
+function Continue()
+{
+ if (!isRegularExpression(report.statusidentifiermatch.value))
{
- if (amt < 0)
- amt = 0;
- document.report.startrow.value = amt;
- Go();
- }
+ 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 isRegularExpression(value)
- {
- try
- {
- var foo = "teststring";
- foo.search(value.replace(/\(\?i\)/,""));
- return true;
- }
- catch (e)
- {
- return false;
- }
+function ColumnClick(colname)
+{
+ document.report.clickcolumn.value = colname;
+ Go();
+}
- }
+function SetPosition(amt)
+{
+ if (amt < 0)
+ amt = 0;
+ document.report.startrow.value = amt;
+ Go();
+}
- function isInteger(value)
+function isRegularExpression(value)
+{
+ try
{
- var anum=/(^\d+$)/;
- return anum.test(value);
+ var foo = "teststring";
+ foo.search(value.replace(/\(\?i\)/,""));
+ return true;
}
-
- $(function ()
+ catch (e)
{
- $('.selectpicker').selectpicker();
- });
+ return false;
+ }
+
+}
+
+function isInteger(value)
+{
+ var anum=/(^\d+$)/;
+ return anum.test(value);
+}
//-->
-</script>
+ </script>
+
+
+</head>
-<div class="row">
- <div class="col-md-12">
- <form class="standardform" name="report" action="execute.jsp" method="POST">
- <input type="hidden" name="op" value="Continue" />
- <input type="hidden" name="type" value="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">
+<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">
<option <%=(statusConnection.length()==0)?"selected=\"selected\"":""%> value="">-- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.NotSpecified")%> --</option>
<%
int i = 0;
@@ -296,9 +306,8 @@ try
if (eligibleList != null)
{
%>
- <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Jobs")%></th>
- <td>
- <select class="selectpicker" multiple="true" name="statusjobs">
+ <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">
<%
i = 0;
while (i < eligibleList.length)
@@ -318,23 +327,26 @@ try
else
{
%>
- <td colspan="2"></td>
+ <td class="value" colspan="2"></td>
<%
}
%>
</tr>
<tr>
- <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.TimeOffsetFromNowMinutes")%></th>
- <td colspan="3">
- <input name="statusscheduleoffset" type="text" size="6" value="" class="form-control" />
+ <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=""/>
</td>
</tr>
<tr>
- <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></th>
- <td colspan="3">
+ <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></td>
+ <td class="value" colspan="3">
<input name="statusdocumentstates_posted" type="hidden" value="true"/>
- <select class="selectpicker" name="statusdocumentstates" multiple="true">
+ <select name="statusdocumentstates" multiple="true" size="3">
<option <%=((matchingStatesHash.get(new Integer(IJobManager.DOCSTATE_NEVERPROCESSED))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATE_NEVERPROCESSED)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"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>
@@ -342,10 +354,10 @@ try
</td>
</tr>
<tr>
- <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></th>
- <td colspan="3">
+ <td class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.DocumentState")%></td>
+ <td class="value" colspan="3">
<input name="statusdocumentstatuses_posted" type="hidden" value="true"/>
- <select class="selectpicker" name="statusdocumentstatuses" multiple="true">
+ <select name="statusdocumentstatuses" multiple="true" size="3">
<option <%=((matchingStatusesHash.get(new Integer(IJobManager.DOCSTATUS_INACTIVE))==null)?"":"selected=\"selected\"")%> value='<%=Integer.toString(IJobManager.DOCSTATUS_INACTIVE)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"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>
@@ -360,35 +372,38 @@ try
</td>
</tr>
<tr>
- <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>
+ <td class="separator" colspan="4"><hr/></td>
</tr>
- </table>
- </div>
- <div class="box-footer clearfix">
- <div class="btn-group">
+ <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>
+ </tr>
+ <tr>
+ <td class="message" colspan="4">
<%
if (statusConnection.length() > 0 && statusJobIdentifiers.length > 0)
{
%>
- <a class="btn btn-primary" role="button" onClick="javascript:Go()"
- title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.ExecuteThisQuery")%></a>
+ <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>
<%
}
else
{
%>
- <a class="btn btn-primary" role="button" onClick="javascript:Continue()"
- title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%>" data-toggle="tooltip"><i class="fa fa-play fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"documentstatus.Continue")%></a>
+ <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>
<%
}
%>
- </div>
- </div>
- </div>
+ </td>
+ </tr>
+ <tr>
+ <td class="separator" colspan="4"><hr/></td>
+ </tr>
+ </table>
<%
if (statusConnection.length() > 0)
{
@@ -437,22 +452,20 @@ try
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())%>'/>
-
- <div class="box box-primary">
- <div class="box-body table-responsive">
- <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>
+ <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>
</tr>
<%
zz = 0;
@@ -484,102 +497,97 @@ try
retryLimitString = org.apache.manifoldcf.ui.util.Formatter.formatTime(retryLimit.longValue());
%>
- <tr>
- <td>
+ <tr <%="class=\""+((zz%2==0)?"evendatarow":"odddatarow")+"\""%>>
+ <td class="reportcolumncell">
<%
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><%=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>
+ <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>
</tr>
<%
zz++;
}
%>
</table>
- </div>
- <div class="box-footer">
- <ul class="pagination pagination-sm no-margin pull-left">
+ <table class="reportfootertable">
+ <tr class="reportfooterrow">
+ <td class="reportfootercell">
+ <nobr>
<%
if (startRow == 0)
{
%>
- <li><a href="#"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Previous")%></a></li>
+ <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Previous")%>
<%
}
else
{
%>
- <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' title="Previous page" data-toggle="tooltip"><i class="fa fa-arrow-circle-o-left fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Previous")%></a></li>
+ <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow-rowCount)+");"%>' alt="Previous page">Previous</a>
<%
}
%>
-
+ </nobr>
+ </td>
+ <td class="reportfootercell">
+ <nobr>
<%
if (hasMoreRows == false)
{
%>
- <li><a href="#"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Next")%></a></li>
+ <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Next")%>
<%
}
else
{
%>
- <li><a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' title="Next page"><i class="fa fa-arrow-circle-o-right fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.Next")%></a></li>
+ <a href="javascript:void(0);" onclick='<%="javascript:SetPosition("+Integer.toString(startRow+rowCount)+");"%>' alt="Next page">Next</a>
<%
}
%>
- </ul>
- <ul class="pagination pagination-sm no-margin pull-right">
- <li class="pad">
- <span class="label label-primary">
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"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>
+ </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>
<%
}
else
{
%>
- <div class="callout callout-info">
- <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectAtLeastOneJob")%></p>
- </div>
+ <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectAtLeastOneJob")%></td></tr></table>
<%
}
}
else
{
%>
- <div class="callout callout-info">
- <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectaConnection")%></p>
- </div>
+ <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"documentstatus.PleaseSelectaConnection")%></td></tr></table>
<%
}
%>
- </div>
- </form>
+ </form>
<%
}
catch (ManifoldCFException e)
@@ -592,5 +600,10 @@ catch (ManifoldCFException e)
<%
}
%>
- </div>
-</div>
+ </td>
+ </tr>
+ </table>
+
+</body>
+
+</html>
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp?rev=1788301&r1=1788300&r2=1788301&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/editauthority.jsp Thu Mar 23 18:49:54 2017
@@ -123,244 +123,264 @@ 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(),"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();
+ }
+}
-<%
- String title = null;
- if (description.length() > 0)
+// Use this method to repost the form,
+// and set the anchor request.
+function postFormSetAnchor(anchorValue)
+{
+ if (checkForm())
{
- title = Messages.getBodyString(pageContext.getRequest().getLocale(), "editauthority.EditAuthority") + " - " + org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description);
+ if (anchorValue != "")
+ document.editconnection.action = document.editconnection.action + "#" + anchorValue;
+ document.editconnection.submit();
}
- else
+}
+
+// Use this method to repost the form
+function postForm()
+{
+ if (checkForm())
{
- title = Messages.getBodyString(pageContext.getRequest().getLocale(), "editauthority.EditAnAuthority");
+ document.editconnection.submit();
}
-%>
+}
- $.ManifoldCF.setTitle('<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.ApacheManifoldCFEditAuthority")%>','<%=title%>','authorities');
+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.
- // Use this method to repost the form and pick a new tab
- function SelectTab(newtab)
+ // Check our part of the form, for save
+ if (editconnection.connname.value == "")
{
- if (checkForm())
- {
- document.editconnection.tabname.value = newtab;
- $.ManifoldCF.submit(document.editconnection);
- }
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.ConnectionMustHaveAName")%>");
+ SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.Name")%>");
+ document.editconnection.connname.focus();
+ return;
}
-
- // Use this method to repost the form,
- // and set the anchor request.
- function postFormSetAnchor(anchorValue)
+ if (editconnection.authoritygroup.value == "")
{
- if (checkForm())
- {
- if (anchorValue != "")
- document.editconnection.action = document.editconnection.action + "#" + anchorValue;
- $.ManifoldCF.submit(document.editconnection);
- }
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.ConnectionMustHaveAGroup")%>");
+ SelectTab("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.Type")%>");
+ document.editconnection.authoritygroup.focus();
+ return;
}
-
- // Use this method to repost the form
- function postForm()
+ if (window.checkConfigForSave)
{
- if (checkForm())
- {
- $.ManifoldCF.submit(document.editconnection);
- }
+ if (!checkConfigForSave())
+ return;
}
+ document.editconnection.op.value="Save";
+ document.editconnection.submit();
+ }
+}
- 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 Continue()
+{
+ document.editconnection.op.value="Continue";
+ postForm();
+}
- function Continue()
- {
- document.editconnection.op.value="Continue";
- postForm();
- }
+function Cancel()
+{
+ document.editconnection.op.value="Cancel";
+ document.editconnection.submit();
+}
- function Cancel()
- {
- document.editconnection.op.value="Cancel";
- $.ManifoldCF.submit(document.editconnection);
- }
+function checkForm()
+{
+ if (!checkConnectionCount())
+ return false;
+ if (window.checkConfig)
+ return checkConfig();
+ return true;
+}
- function checkForm()
- {
- if (!checkConnectionCount())
- return false;
- if (window.checkConfig)
- return checkConfig();
- return true;
- }
+function checkConnectionCount()
+{
+ if (!isInteger(editconnection.maxconnections.value))
+ {
+ alert("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"editauthority.TheMaximumNumberOfConnectionsMustBeAValidInteger")%>");
+ editconnection.maxconnections.focus();
+ return false;
+ }
+ return true;
+}
- 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 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);
%>
-<div class="row">
- <div class="col-md-12">
+</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">
<%
if (set2.length == 0)
{
%>
- <div class="callout callout-warning">
- <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoAuthorityGroupsDefinedCreateOneFirst")%></p>
- </div>
+ <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>
<%
}
else if (set.getRowCount() == 0)
{
%>
- <div class="callout callout-warning">
- <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoAuthorityConnectorsRegistered")%></p>
- </div>
+ <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>
<%
}
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="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">
+ <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">
<%
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(),"editauthority.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(),"editauthority.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)%>'>
+
<%
// Name tab
if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Name")))
{
%>
- <div class="tab-pane active" id="tab_<%=activeTab%>">
- <div class="form-group">
- <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NameColon")%></label>
+ <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">
<%
// If the connection doesn't exist yet, we are allowed to change the name.
if (isNew)
{
%>
- <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" 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)%>'/>
+ <%=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(),"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>
+ </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>
<%
}
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)%>'/>
<%
}
@@ -369,10 +389,11 @@ try
if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type")))
{
%>
- <div class="tab-pane active" id="tab_<%=activeTab%>">
- <div class="form-group">
- <label><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.ConnectionTypeColon")%></label>
-
+ <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">
<%
if (className.length() > 0)
{
@@ -380,24 +401,24 @@ try
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
{
%>
- <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" class="form-control">
+ <select name="classname" size="1">
<%
while (i < set.getRowCount())
{
@@ -405,19 +426,24 @@ 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 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>
+ </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>
<%
for (int i = 0; i < set2.length; i++)
{
@@ -427,16 +453,18 @@ try
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>
- </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>
+ </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>
<%
for (int i = 0; i < domainSet.getRowCount(); i++)
{
@@ -446,22 +474,25 @@ try
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>
- </div>
- </div>
+ </select>
+ </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="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)%>'/>
<%
}
@@ -469,24 +500,23 @@ try
if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Prerequisites")))
{
%>
- <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"/>
+ <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"/>
<%
if (prereq == null)
{
%>
- <input type="radio" name="prerequisites" value="" checked="true"/> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoPrerequisites")%><br/>
+ <input type="radio" name="prerequisites" value="" checked="true"/> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoPrerequisites")%><br/>
<%
}
else
{
%>
- <input type="radio" name="prerequisites" value=""/> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoPrerequisites")%><br/>
+ <input type="radio" name="prerequisites" value=""/> <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"editauthority.NoPrerequisites")%><br/>
<%
}
@@ -499,33 +529,32 @@ try
if (prereq != null && prereq.equals(mappingName))
{
%>
- <input type="radio" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mappingName)%>' checked="true"/> <%=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"/> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(mappingDescription)%><br/>
<%
}
else
{
%>
- <input type="radio" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mappingName)%>'/> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(mappingDescription)%><br/>
+ <input type="radio" name="prerequisites" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(mappingName)%>'/> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(mappingDescription)%><br/>
<%
}
}
%>
- </label>
- </div>
- </div>
- </div>
+ </td>
+ </tr>
+ </table>
<%
}
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)%>'/>
<%
}
}
@@ -534,36 +563,36 @@ try
if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Throttling")))
{
%>
- <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>
+ <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>
<%
}
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);
%>
- </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(),"editauthority.SaveThisAuthorityConnection")%>" data-toggle="tooltip"><i class="fa fa-save fa-fw"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Save")%></a>
+ <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.SaveThisAuthorityConnection")%>"/>
<%
}
else
@@ -571,21 +600,32 @@ try
if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"editauthority.Type")))
{
%>
- <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.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"editauthority.ContinueToNextPage")%>"/>
<%
}
}
%>
- <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>
+ <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>
+</html>
- </div>
- </div>
- </form>
<%
- }
}
catch (ManifoldCFException e)
{
@@ -597,6 +637,4 @@ catch (ManifoldCFException e)
<%
}
%>
- </div>
- </div>
-</div>
+