Author: kishore
Date: Sun Feb 19 22:22:44 2017
New Revision: 1783699
URL: http://svn.apache.org/viewvc?rev=1783699&view=rev
Log:
Updated view pages to new UI.
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewauthority.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewconnection.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewgroup.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewjob.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewmapper.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewnotification.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewoutput.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewtransformation.jsp
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewauthority.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewauthority.jsp?rev=1783699&r1=1783698&r2=1783699&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewauthority.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewauthority.jsp
Sun Feb 19 22:22:44 2017
@@ -92,130 +92,108 @@ try
connectionStatus =
Messages.getString(pageContext.getRequest().getLocale(),"viewauthority.Threwexception")+"
'"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
}
%>
-
-<?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(),"viewauthority.ApacheManifoldCFViewAuthorityConnectionStatus")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
-
-function Delete(connectionName)
-{
- if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewauthority.DeleteConnection")%>
'"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewauthority.qmark")%>"))
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewauthority.ApacheManifoldCFViewAuthorityConnectionStatus")%>',
+
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.ViewAuthorityConnectionStatus")
+ " - " + connectionName %>',
+ 'authorities'
+ );
+ function Delete(connectionName)
{
- document.viewconnection.op.value="Delete";
- document.viewconnection.connname.value=connectionName;
- document.viewconnection.submit();
+ if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewauthority.DeleteConnection")%>
'"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewauthority.qmark")%>"))
+ {
+ document.viewconnection.op.value="Delete";
+ document.viewconnection.connname.value=connectionName;
+ $.ManifoldCF.submit(document.viewconnection);
+ }
}
-}
//-->
- </script>
-
-</head>
+</script>
-<body class="standardbody">
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp"
flush="true"/></td></tr>
- <tr>
- <td class="navigation"><jsp:include page="navigation.jsp"
flush="true"/></td>
- <td class="window">
- <p
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.ViewAuthorityConnectionStatus")%></p>
- <form class="standardform" name="viewconnection" 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="displaytable">
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.NameColon")%></nobr></td>
- <td class="value"
colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.DescriptionColon")%></nobr></td>
- <td class="value"
colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorityTypeColon")%></nobr></td>
- <td class="value"
colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.MaxConnectionsColon")%></nobr></td>
- <td class="value"
colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
+<div class="row">
+ <div class="col-md-12">
+ <div class="box box-primary">
+ <form class="standardform" name="viewconnection" 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=""/>
+
+ <div class="box-body">
+ <table class="table table-bordered">
+ <tr>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.NameColon")%></nobr></th>
+ <td><%="<!--connection=" +
org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName) + "-->"%>
+
<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr>
+ </td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.DescriptionColon")%></nobr></th>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
</tr>
<tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorityGroupColon")%></nobr></td>
- <td class="value"
colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName)%></nobr></td>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorizationDomainColon")%></nobr></td>
- <td class="value"
colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authDomain)%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorityTypeColon")%></nobr></th>
+
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.MaxConnectionsColon")%></nobr></th>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorityGroupColon")%></nobr></th>
+
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName)%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.AuthorizationDomainColon")%></nobr></th>
+
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authDomain)%></nobr>
+ </td>
</tr>
<tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.PrerequisiteUserMappingColon")%></nobr></td>
- <td class="value" colspan="3">
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.PrerequisiteUserMappingColon")%></nobr></th>
+ <td colspan="3">
<%
- if (prereq != null)
- {
+ if (prereq != null)
+ {
%>
<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(prereq)%></nobr>
<%
- }
- else
- {
+ }
+ else
+ {
%>
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.NoPrerequisites")%></nobr>
<%
- }
+ }
%>
</td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
<td colspan="4">
<%
AuthorityConnectorFactory.viewConfiguration(threadContext,className,new
org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters);
%>
-
</td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.ConnectionStatusColon")%></nobr></td>
- <td class="value"
colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="message" colspan="4">
- <nobr><a
href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%></a></nobr>
- <nobr><a
href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.EditThisAuthorityConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Edit")%></a></nobr>
- <nobr><a href="javascript:void()"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.DeleteThisAuthorityConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Delete")%></a></nobr>
- </td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.ConnectionStatusColon")%></nobr></th>
+ <td
colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
</tr>
</table>
-
+ </div>
+ <div class="box-footer clearfix">
+ <div class="btn-group">
+ <a
href='<%="viewauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%>"
+ class="link btn btn-success" role="button"
data-toggle="tooltip"><span class="glyphicon glyphicon-refresh"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Refresh")%></a>
+ <a
href='<%="editauthority.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.EditThisAuthorityConnection")%>"
+ class="link btn btn-primary" role="button"
data-toggle="tooltip"><span class="glyphicon glyphicon-pencil"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Edit")%></a>
+ <a href="javascript:void(0);"
+
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewauthority.DeleteThisAuthorityConnection")%>"
+ class="btn btn-danger" role="button"
data-toggle="tooltip"><span class="glyphicon glyphicon-trash"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewauthority.Delete")%></a>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
<%
}
}
@@ -229,11 +207,3 @@ catch (ManifoldCFException e)
<%
}
%>
- </form>
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewconnection.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewconnection.jsp?rev=1783699&r1=1783698&r2=1783699&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewconnection.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewconnection.jsp
Sun Feb 19 22:22:44 2017
@@ -87,103 +87,82 @@ try
connectionStatus =
Messages.getString(pageContext.getRequest().getLocale(),"viewconnection.Threwexception")+"
'"+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(e.getMessage())+"'";
}
%>
-
-<?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(),"viewconnection.ApacheManifoldCFViewRepositoryConnectionStatus")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
-function Delete(connectionName)
-{
- if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.DeleteConnection")%>
'"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.qmark")%>"))
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewconnection.ApacheManifoldCFViewRepositoryConnectionStatus")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewconnection.ViewRepositoryConnectionStatus")%>',
+ 'repositories'
+ );
+
+ function Delete(connectionName)
{
- document.viewconnection.op.value="Delete";
- document.viewconnection.connname.value=connectionName;
- document.viewconnection.submit();
+ if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.DeleteConnection")%>
'"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.qmark")%>"))
+ {
+ document.viewconnection.op.value="Delete";
+ document.viewconnection.connname.value=connectionName;
+ $.ManifoldCF.submit(document.viewconnection);
+ }
}
-}
-function ClearHistory(connectionName)
-{
- if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.Thiscommandwillclearallhistoryrelatedto")%>
'"+connectionName+"'
<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.period")%>"))
+ function ClearHistory(connectionName)
{
- document.viewconnection.op.value="ClearHistory";
- document.viewconnection.connname.value=connectionName;
- document.viewconnection.submit();
+ if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.Thiscommandwillclearallhistoryrelatedto")%>
'"+connectionName+"'
<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewconnection.period")%>"))
+ {
+ document.viewconnection.op.value="ClearHistory";
+ document.viewconnection.connname.value=connectionName;
+ $.ManifoldCF.submit(document.viewconnection);
+ }
}
-}
//-->
- </script>
+</script>
-</head>
-
-<body class="standardbody">
-
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp"
flush="true"/></td></tr>
- <tr>
- <td class="navigation"><jsp:include page="navigation.jsp"
flush="true"/></td>
- <td class="window">
- <p
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ViewRepositoryConnectionStatus")%></p>
- <form class="standardform" name="viewconnection" 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="displaytable">
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.NameColon")%></nobr></td><td
class="value"
colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.DescriptionColon")%></nobr></td><td
class="value"
colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionTypeColon")%></nobr></td><td
class="value"
colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.MaxConnectionsColon")%></nobr></td><td
class="value"
colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.AuthorityGroupColon")%></nobr></td><td
class="value"
colspan="3"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName)%></nobr></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
+<div class="row">
+ <div class="col-md-12">
+ <div class="box box-primary">
+ <form class="standardform" name="viewconnection" 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><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.NameColon")%></nobr></th>
+ <td><%="<!--connection=" +
org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName) + "-->"%>
+
<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr>
+ </td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.DescriptionColon")%></nobr></th>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
</tr>
<tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ThrottlingColon")%></nobr></td>
- <td class="boxcell" colspan="3">
- <table class="formtable">
- <tr class="formheaderrow">
- <td
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Binregularexpression")%></nobr></td>
- <td
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Description")%></nobr></td>
- <td
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Maxavgfetches")%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionTypeColon")%></nobr></th>
+
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.MaxConnectionsColon")%></nobr></th>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td></tr>
+ <tr>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.AuthorityGroupColon")%></nobr></th>
+ <td
colspan="3"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(authorityName)%></nobr></td>
+ </tr>
+ <tr>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ThrottlingColon")%></nobr></th>
+ <td colspan="3">
+ <table class="table table-bordered">
+ <tr>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Binregularexpression")%></nobr></th>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Description")%></nobr></th>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Maxavgfetches")%></nobr></th>
</tr>
<%
int j = 0;
while (j < throttles.length)
{
%>
- <tr class='<%=((j % 2)==0)?"evenformrow":"oddformrow"%>'>
- <td class="formcolumncell">
-
<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(throttles[j])%></nobr>
- </td>
- <td class="formcolumncell">
+ <tr>
+
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(throttles[j])%></nobr></td>
+ <td>
<%
String tdescription = connection.getThrottleDescription(throttles[j]);
if (tdescription != null && tdescription.length() > 0)
@@ -194,9 +173,7 @@ function ClearHistory(connectionName)
}
%>
</td>
- <td class="formcolumncell">
- <%=new
Long((long)((double)connection.getThrottleValue(throttles[j])*(double)60000.0+0.5)).toString()%>
- </td>
+ <td><%=new
Long((long)((double)connection.getThrottleValue(throttles[j])*(double)60000.0+0.5)).toString()%></td>
</tr>
<%
j++;
@@ -204,7 +181,7 @@ function ClearHistory(connectionName)
if (j == 0)
{
%>
- <tr class="formrow"><td colspan="3"
class="formmessage"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.NoThrottles")%></nobr></td></tr>
+ <tr><td class="text-yellow"
colspan="3"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.NoThrottles")%></nobr></td></tr>
<%
}
%>
@@ -212,9 +189,6 @@ function ClearHistory(connectionName)
</td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
<td colspan="4">
<%
RepositoryConnectorFactory.viewConfiguration(threadContext,className,new
org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters);
@@ -222,24 +196,33 @@ function ClearHistory(connectionName)
</td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionStatusColon")%></nobr></td><td
class="value"
colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="message" colspan="4">
- <nobr><a
href='<%="viewconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%></a></nobr>
- <nobr><a
href='<%="editconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.EditThisConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Edit")%></a></nobr>
- <nobr><a href="javascript:void()"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Deletethisconnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Delete")%></a></nobr>
- <nobr><a href="javascript:void()"
onclick='<%="javascript:ClearHistory(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.ClearHistoryAssociatedWithThisConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ClearAllRelatedHistory")%></a></nobr>
- </td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ConnectionStatusColon")%></nobr></th>
+ <td
colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
</tr>
</table>
-
+ </div>
+ <div class="box-footer clearfix">
+ <div class="btn-group">
+ <a
href='<%="viewconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%>"
+ class="link btn btn-primary" role="button"><span
class="glyphicon glyphicon-refresh"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Refresh")%></a>
+ <a
href='<%="editconnection.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.EditThisConnection")%>"
+ class="link btn btn-primary" role="button"><span
class="glyphicon glyphicon-pencil"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Edit")%></a>
+ <a href="javascript:void(0);"
+
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.Deletethisconnection")%>"
+ class="btn btn-danger" role="button"><span
class="glyphicon glyphicon-trash"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.Delete")%></a>
+ <a href="javascript:void(0);"
+
onclick='<%="javascript:ClearHistory(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewconnection.ClearHistoryAssociatedWithThisConnection")%>"
+ class="btn btn-primary"
role="button"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewconnection.ClearAllRelatedHistory")%></a>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
<%
}
}
@@ -253,11 +236,3 @@ catch (ManifoldCFException e)
<%
}
%>
- </form>
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewgroup.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewgroup.jsp?rev=1783699&r1=1783698&r2=1783699&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewgroup.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewgroup.jsp
Sun Feb 19 22:22:44 2017
@@ -48,67 +48,63 @@ try
description = "";
%>
-<?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(),"viewgroup.ApacheManifoldCFViewGroup")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
-function Delete(groupName)
-{
- document.viewgroup.op.value="Delete";
- document.viewgroup.groupname.value=groupName;
- document.viewgroup.submit();
-}
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewgroup.ApacheManifoldCFViewGroup")%>',
+
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.ViewAuthorityGroup")
+ " - " + groupName %>',
+ 'authorities'
+ );
+
+ function Delete(groupName)
+ {
+ document.viewgroup.op.value="Delete";
+ document.viewgroup.groupname.value=groupName;
+ $.ManifoldCF.submit(document.viewgroup);
+ }
//-->
- </script>
+</script>
-</head>
-<body class="standardbody">
+<div class="row">
+ <div class="col-md-12">
+ <div class="box box-primary">
+ <form class="standardform" name="viewgroup" 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(),"viewgroup.ViewAuthorityGroup")%></p>
-
- <form class="standardform" name="viewgroup" 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="displaytable">
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
+ <div class="box-body">
+ <table class="table table-bordered">
<tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.NameColon")%></nobr></td>
- <td class="value"
colspan="1"><%="<!--group="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName)%></nobr></td>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.DescriptionColon")%></nobr></td>
- <td class="value"
colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.NameColon")%></nobr></th>
+ <td><%="<!--group=" +
org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName) + "-->"%>
+
<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(groupName)%></nobr>
+ </td>
</tr>
<tr>
- <td class="message" colspan="4">
- <a
href='<%="editgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(groupName)%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.EditThisAuthorityGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.Edit")%></a> <a
href="javascript:void()"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(groupName)+"\")"%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.DeleteThisAuthorityGroup")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.Delete")%></a>
- </td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewgroup.DescriptionColon")%></nobr></th>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
</tr>
</table>
-
+ </div>
+ <div class="box-footer clearfix">
+ <div class="btn-group">
+ <a
href='<%="editgroup.jsp?groupname="+org.apache.manifoldcf.core.util.URLEncoder.encode(groupName)%>'
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.EditThisAuthorityGroup")%>"
+ class="link btn btn-primary" role="button"
data-toggle="tooltip"><span class="glyphicon glyphicon-pencil"
aria-hidden="true"></span></a>
+ <a href="javascript:void(0);"
+
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(groupName)+"\")"%>'
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewgroup.DeleteThisAuthorityGroup")%>"
+ class="btn btn-danger" role="button"
data-toggle="tooltip"><span class="glyphicon glyphicon-trash"
aria-hidden="true"></span></a>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
<%
}
}
@@ -122,11 +118,3 @@ catch (ManifoldCFException e)
<%
}
%>
- </form>
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewjob.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1783699&r1=1783698&r2=1783699&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewjob.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewjob.jsp
Sun Feb 19 22:22:44 2017
@@ -116,99 +116,81 @@ try
%>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
- <title>
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ApacheManifoldCFViewJob")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
-function Delete(jobID)
-{
- if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewjob.DeleteJobConfirmation")%>"))
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewjob.ApacheManifoldCFViewJob")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewjob.ViewAJob")%>',
+ 'jobs'
+ );
+
+ function Delete(jobID)
{
- document.viewjob.op.value="Delete";
- document.viewjob.jobid.value=jobID;
- document.viewjob.submit();
+ if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewjob.DeleteJobConfirmation")%>"))
+ {
+ document.viewjob.op.value="Delete";
+ document.viewjob.jobid.value=jobID;
+ $.ManifoldCF.submit(document.viewjob);
+ }
}
-}
-function StartOver(jobID)
-{
- if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewjob.StartOverConfirmation")%>"))
+ function StartOver(jobID)
{
- document.viewjob.op.value="StartOver";
- document.viewjob.jobid.value=jobID;
- document.viewjob.submit();
+ if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewjob.StartOverConfirmation")%>"))
+ {
+ document.viewjob.op.value="StartOver";
+ document.viewjob.jobid.value=jobID;
+ $.ManifoldCF.submit(document.viewjob);
+ }
}
-}
//-->
- </script>
+</script>
-</head>
-
-<body class="standardbody">
-
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp"
flush="true"/></td></tr>
- <tr>
- <td class="navigation"><jsp:include page="navigation.jsp"
flush="true"/></td>
- <td class="window">
- <p
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ViewAJob")%></p>
-
- <form class="standardform" name="viewjob" 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="displaytable">
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NameColon")%></nobr></td>
- <td class="value" colspan="3"
><%="<!--jobid="+jobID+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getDescription())%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.PipelineColon")%></nobr></td>
- <td class="boxcell" colspan="3">
- <table class="formtable">
- <tr class="formheaderrow">
- <td
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageNumber")%></nobr></td>
- <td
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageType")%></nobr></td>
- <td
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StagePrecedent")%></nobr></td>
- <td
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageDescription")%></nobr></td>
- <td
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageConnectionName")%></nobr></td>
+<div class="row">
+ <div class="col-md-12">
+ <div class="box box-primary">
+
+ <form class="standardform" name="viewjob" 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=""/>
+
+ <div class="box-body">
+ <table class="table table-bordered">
+ <tr>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NameColon")%></nobr></th>
+ <td colspan="3"><%="<!--jobid=" + jobID + "-->"%><span id="job"
jobid="<%= jobID
%>"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getDescription())%></span></td>
+ </tr>
+ <tr>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.PipelineColon")%></nobr></th>
+ <td colspan="3">
+ <table class="table table-bordered">
+ <tr>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageNumber")%></nobr></th>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageType")%></nobr></th>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StagePrecedent")%></nobr></th>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageDescription")%></nobr></th>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageConnectionName")%></nobr></th>
</tr>
- <tr class="<%=((rowCounter++ %
2)==0)?"evenformrow":"oddformrow"%>">
- <td class="formcolumncell">1.</td>
- <td
class="formcolumncell"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Repository")%></td>
- <td class="formcolumncell"></td>
- <td class="formcolumncell"></td>
- <td
class="formcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></td>
+ <tr>
+ <td>1.</td>
+
<td><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Repository")%></td>
+ <td></td>
+ <td></td>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></td>
</tr>
<%
for (int j = 0; j < job.countPipelineStages(); j++)
{
%>
- <tr class="<%=((rowCounter++ %
2)==0)?"evenformrow":"oddformrow"%>">
- <td class="formcolumncell"><%=(j+2)%>.</td>
- <td
class="formcolumncell"><%=job.getPipelineStageIsOutputConnection(j)?Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Output"):Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Transformation")%></td>
- <td
class="formcolumncell"><%=(job.getPipelineStagePrerequisite(j)+2)%>.</td>
- <td
class="formcolumncell"><%=(job.getPipelineStageDescription(j)!=null)?org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getPipelineStageDescription(j)):""%></td>
- <td
class="formcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getPipelineStageConnectionName(j))%></td>
+ <tr>
+ <td><%=(j+2)%>.</td>
+
<td><%=job.getPipelineStageIsOutputConnection(j)?Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Output"):Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Transformation")%></td>
+ <td><%=(job.getPipelineStagePrerequisite(j)+2)%>.</td>
+
<td><%=(job.getPipelineStageDescription(j)!=null)?org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getPipelineStageDescription(j)):""%></td>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getPipelineStageConnectionName(j))%></td>
</tr>
<%
}
@@ -217,80 +199,73 @@ function StartOver(jobID)
</td>
</tr>
<tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NotificationsColon")%></nobr></td>
- <td class="boxcell" colspan="3">
- <table class="formtable">
- <tr class="formheaderrow">
- <td
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageNumber")%></nobr></td>
- <td
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NotificationDescription")%></nobr></td>
- <td
class="formcolumnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NotificationConnectionName")%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NotificationsColon")%></nobr></th>
+ <td colspan="3">
+ <table class="table table-bordered">
+ <tr>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StageNumber")%></th>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NotificationDescription")%></th>
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NotificationConnectionName")%></th>
</tr>
<%
for (int j = 0; j < job.countNotifications(); j++)
{
%>
- <tr class="<%=((rowCounter++ %
2)==0)?"evenformrow":"oddformrow"%>">
- <td
class="formcolumncell"><%=(j+job.countPipelineStages()+2)%>.</td>
- <td
class="formcolumncell"><%=(job.getNotificationDescription(j)!=null)?org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getNotificationDescription(j)):""%></td>
- <td
class="formcolumncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getNotificationConnectionName(j))%></td>
+ <tr>
+ <td><%=(j+job.countPipelineStages()+2)%>.</td>
+
<td><%=(job.getNotificationDescription(j)!=null)?org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getNotificationDescription(j)):""%></td>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(job.getNotificationConnectionName(j))%></td>
</tr>
<%
}
if (job.countNotifications() == 0)
{
%>
- <tr class="formrow"><td class="formcolumnmessage"
colspan="3"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NoNotificationConnections")%></td></tr>
+ <tr>
+ <td colspan="3">
+ <div class="callout
callout-info"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NoNotificationConnections")%></div>
<%
}
%>
</table>
</td>
</tr>
-
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
<tr>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.PriorityColon")%></nobr></td>
- <td class="value"><%=priority%></td>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StartMethodColon")%></nobr></td>
- <td class="value"><%=startMethod%></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.PriorityColon")%></nobr></th>
+ <td><%=priority%></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.StartMethodColon")%></nobr></th>
+ <td><%=startMethod%></td>
</tr>
<%
if (model != -1 && model != IRepositoryConnector.MODEL_ADD_CHANGE_DELETE)
{
%>
<tr>
- <td class="separator" colspan="4"><hr/></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ScheduleTypeColon")%></nobr></th>
+ <td colspan="3"><nobr><%=jobType%></nobr></td>
</tr>
<tr>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ScheduleTypeColon")%></nobr></td>
- <td class="value" colspan="3"><nobr><%=jobType%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.MinimumRecrawlIntervalColon")%></nobr></th>
+ <td><nobr><%=intervalString%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.MaximumRecrawlIntervalColon")%></nobr></th>
+ <td><nobr><%=maxIntervalString%></nobr></td>
</tr>
<tr>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.MinimumRecrawlIntervalColon")%></nobr></td>
- <td class="value"><nobr><%=intervalString%></nobr></td>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.MaximumRecrawlIntervalColon")%></nobr></td>
- <td class="value"><nobr><%=maxIntervalString%></nobr></td>
- </tr>
- <tr>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ExpirationIntervalColon")%></nobr></td>
- <td class="value"><nobr><%=expirationIntervalString%></nobr></td>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ReseedIntervalColon")%></nobr></td>
- <td class="value"><nobr><%=reseedIntervalString%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ExpirationIntervalColon")%></nobr></th>
+ <td><nobr><%=expirationIntervalString%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ReseedIntervalColon")%></nobr></th>
+ <td><nobr><%=reseedIntervalString%></nobr></td>
</tr>
<%
}
-%>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
-
-<%
if (job.getScheduleRecordCount() == 0)
{
%>
- <tr><td class="message"
colspan="4"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NoScheduledRunTimes")%></td></tr>
+ <tr>
+ <td colspan="4">
+ <div class="callout
callout-info"><p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.NoScheduledRunTimes")%></p></div>
+ </td>
+ </tr>
<%
}
else
@@ -309,18 +284,10 @@ function StartOver(jobID)
EnumeratedValues srHourOfDay = sr.getHourOfDay();
EnumeratedValues srMinutesOfHour = sr.getMinutesOfHour();
- if (j > 0)
- {
-%>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
-<%
- }
%>
<tr>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ScheduledTimeColon")%></nobr></td>
- <td class="value" colspan="3">
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ScheduledTimeColon")%></nobr></th>
+ <td colspan="3">
<%
if (srDayOfWeek == null)
out.println(Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Anydayoftheweek"));
@@ -599,10 +566,8 @@ function StartOver(jobID)
</td>
</tr>
<tr>
- <td class="description">
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.MaximumRunTimeColon")%>
- </td>
- <td class="value">
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.MaximumRunTimeColon")%></th>
+ <td>
<%
if (srDuration == null)
out.println(Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Nolimit"));
@@ -610,10 +575,8 @@ function StartOver(jobID)
out.println(new Long(srDuration.longValue()/60000L).toString() + "
"+Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.minutes"));
%>
</td>
- <td class="description">
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.JobInvocationColon")%>
- </td>
- <td class="value">
+
<th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.JobInvocationColon")%></th>
+ <td>
<%
if (srRequestMinimum)
out.println(Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Minimal"));
@@ -629,11 +592,6 @@ function StartOver(jobID)
if (relationshipTypes != null && relationshipTypes.length > 0)
{
-%>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
-<%
int k = 0;
while (k < relationshipTypes.length)
{
@@ -641,25 +599,16 @@ function StartOver(jobID)
Long value = (Long)hopCountFilters.get(relationshipType);
%>
<tr>
- <td class="description" colspan="1">
-
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.MaximumHopCountForLinkType")%>
'<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(relationshipType)%>':</nobr>
- </td>
- <td class="value" colspan="3">
-
<%=((value==null)?Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Unlimited"):value.toString())%>
- </td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.MaximumHopCountForLinkType")%>'<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(relationshipType)%>':</nobr></th>
+ <td
colspan="3"><%=((value==null)?Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Unlimited"):value.toString())%></td>
</tr>
<%
}
%>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description" colspan="1">
-
<nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.HopCountModeColon")%></nobr>
- </td>
- <td class="value" colspan="3">
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.HopCountModeColon")%></nobr></th>
+ <td colspan="3">
<nobr>
<%=(hopcountMode==IJobDescription.HOPCOUNT_ACCURATE)?Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Deleteunreachabledocuments"):""%>
<%=(hopcountMode==IJobDescription.HOPCOUNT_NODELETE)?Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Nodeletesfornow"):""%>
@@ -672,13 +621,8 @@ function StartOver(jobID)
}
%>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="message" colspan="4">1.</td>
- </tr>
- <tr>
<td colspan="4">
+ <span class="label label-primary pull-left">1.</span><br/>
<%
if (connection != null)
{
@@ -703,13 +647,8 @@ function StartOver(jobID)
{
%>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="message" colspan="4"><%=(j+2)%>.</td>
- </tr>
- <tr>
<td colspan="4">
+ <span class="label label-primary pull-left"><%=(j +
2)%>.</span><br/>
<%
Specification os = job.getPipelineStageSpecification(j);
if (job.getPipelineStageIsOutputConnection(j))
@@ -754,13 +693,8 @@ function StartOver(jobID)
{
%>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="message"
colspan="4"><%=(j+job.countPipelineStages()+2)%>.</td>
- </tr>
- <tr>
<td colspan="4">
+ <span class="label label-primary pull-left"><%=(j +
job.countPipelineStages() + 2)%>.</span><br/>
<%
Specification os = job.getNotificationSpecification(j);
INotificationConnection thisConnection =
notificationManager.load(job.getNotificationConnectionName(j));
@@ -783,21 +717,28 @@ function StartOver(jobID)
}
%>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="message" colspan="4">
- <nobr>
- <a href='<%="editjob.jsp?jobid="+jobID%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.EditThisJob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Edit")%></a>
- <a href='<%="javascript:Delete(\""+jobID+"\")"%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.DeleteThisJob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Delete")%></a>
- <a href='<%="editjob.jsp?origjobid="+jobID%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.CopyThisJob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Copy")%></a>
- <a href='<%="javascript:StartOver(\""+jobID+"\")"%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.ResetSeedingThisJob")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ResetSeeding")%></a>
- </nobr>
- </td>
- </tr>
</table>
-
+ </div>
+ <div class="box-footer clearfix">
+ <div class="btn-group">
+ <a href='<%="editjob.jsp?jobid="+jobID%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.EditThisJob")%>"
+ class="link btn btn-primary" role="button"><span
class="glyphicon glyphicon-pencil"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Edit")%></a>
+ <a href='<%="javascript:Delete(\""+jobID+"\")"%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.DeleteThisJob")%>"
+ class="btn btn-danger" role="button"><span
class="glyphicon glyphicon-trash"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Delete")%></a>
+ <a href='<%="editjob.jsp?origjobid="+jobID%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.CopyThisJob")%>"
+ class="link btn btn-primary" role="button"><span class="fa
fa-clipboard"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Copy")%></a>
+ <a href='<%="javascript:StartOver(\""+jobID+"\")"%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.ResetSeedingThisJob")%>"
+ class="link btn btn-primary"
role="button"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.ResetSeeding")%></a>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
<%
}
}
@@ -811,11 +752,3 @@ catch (ManifoldCFException e)
<%
}
%>
- </form>
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewmapper.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewmapper.jsp?rev=1783699&r1=1783698&r2=1783699&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewmapper.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewmapper.jsp
Sun Feb 19 22:22:44 2017
@@ -83,74 +83,51 @@ try
}
%>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
- <title>
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.ApacheManifoldCFViewMappingConnectionStatus")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewmapper.ApacheManifoldCFViewMappingConnectionStatus")%>',
+
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.ViewMappingConnectionStatus")
+ " - " + connectionName %>',
+ 'authorities'
+ );
-function Delete(connectionName)
-{
- if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewmapper.DeleteConnection")%>
'"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewmapper.qmark")%>"))
+ function Delete(connectionName)
{
- document.viewconnection.op.value="Delete";
- document.viewconnection.connname.value=connectionName;
- document.viewconnection.submit();
+ if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewmapper.DeleteConnection")%>
'"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewmapper.qmark")%>"))
+ {
+ document.viewconnection.op.value="Delete";
+ document.viewconnection.connname.value=connectionName;
+ $.ManifoldCF.submit(document.viewconnection);
+ }
}
-}
//-->
- </script>
-
-</head>
-
-<body class="standardbody">
-
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp"
flush="true"/></td></tr>
- <tr>
- <td class="navigation"><jsp:include page="navigation.jsp"
flush="true"/></td>
- <td class="window">
- <p
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.ViewMappingConnectionStatus")%></p>
- <form class="standardform" name="viewconnection" 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=""/>
+</script>
- <table class="displaytable">
+<div class="row">
+ <div class="col-md-12">
+ <div class="box box-primary">
+ <form class="standardform" name="viewconnection" 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">
+ <tr>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.NameColon")%></nobr></th>
+ <td><%="<!--connection=" +
org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName) +
"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.DescriptionColon")%></nobr></th>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+ </tr>
+ <tr>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.MapperTypeColon")%></nobr></th>
+
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.MaxConnectionsColon")%></nobr></th>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td></tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.NameColon")%></nobr></td>
- <td class="value"
colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.DescriptionColon")%></nobr></td>
- <td class="value"
colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.MapperTypeColon")%></nobr></td>
- <td class="value"
colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.MaxConnectionsColon")%></nobr></td>
- <td class="value"
colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.PrerequisiteUserMappingColon")%></nobr></td>
- <td class="value" colspan="3">
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.PrerequisiteUserMappingColon")%></nobr></th>
+ <td colspan="3">
<%
if (prereq != null)
{
@@ -168,9 +145,6 @@ function Delete(connectionName)
</td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
<td colspan="4">
<%
MappingConnectorFactory.viewConfiguration(threadContext,className,new
org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters);
@@ -179,24 +153,29 @@ function Delete(connectionName)
</td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.ConnectionStatusColon")%></nobr></td>
- <td class="value"
colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="message" colspan="4">
- <nobr><a
href='<%="viewmapper.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewmapper.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.Refresh")%></a></nobr>
- <nobr><a
href='<%="editmapper.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewmapper.EditThisMappingConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.Edit")%></a></nobr>
- <nobr><a href="javascript:void()"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewmapper.DeleteThisMappingConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.Delete")%></a></nobr>
- </td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.ConnectionStatusColon")%></nobr></th>
+ <td
colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
</tr>
</table>
-
+ </div>
+ <div class="box-footer clearfix">
+ <div class="btn-group">
+ <a
href='<%="viewmapper.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewmapper.Refresh")%>"
+ class="link btn btn-primary" role="button"
data-toggle="tooltip"><span class="glyphicon glyphicon-refresh"
aria-hidden="true"></span></a>
+ <a
href='<%="editmapper.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewmapper.EditThisMappingConnection")%>"
+ class="link btn btn-primary" role="button"
data-toggle="tooltip"><span class="glyphicon glyphicon-pencil"
aria-hidden="true"></span></a>
+ <a href="javascript:void(0);"
+
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewmapper.DeleteThisMappingConnection")%>"
+ class="btn btn-danger" role="button"
data-toggle="tooltip"><span class="glyphicon glyphicon-trash"
aria-hidden="true"></span></a>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
<%
}
}
@@ -210,11 +189,3 @@ catch (ManifoldCFException e)
<%
}
%>
- </form>
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewnotification.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewnotification.jsp?rev=1783699&r1=1783698&r2=1783699&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewnotification.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/viewnotification.jsp
Sun Feb 19 22:22:44 2017
@@ -85,65 +85,48 @@ try
}
%>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml";>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
- <title>
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.ApacheManifoldCFViewNotificationConnectionStatus")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
-
-function Delete(connectionName)
-{
- if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewnotification.Deletenotificationconnection")%>
'"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewnotification.qmark")%>"))
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewnotification.ApacheManifoldCFViewNotificationConnectionStatus")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"viewnotification.ViewNotificationConnectionStatus")%>',
+ 'repositories'
+ );
+ function Delete(connectionName)
{
- document.viewconnection.op.value="Delete";
- document.viewconnection.connname.value=connectionName;
- document.viewconnection.submit();
+ if
(confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewnotification.Deletenotificationconnection")%>
'"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewnotification.qmark")%>"))
+ {
+ document.viewconnection.op.value="Delete";
+ document.viewconnection.connname.value=connectionName;
+ $.ManifoldCF.submit(document.viewconnection);
+ }
}
-}
//-->
- </script>
-
-</head>
-
-<body class="standardbody">
-
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp"
flush="true"/></td></tr>
- <tr>
- <td class="navigation"><jsp:include page="navigation.jsp"
flush="true"/></td>
- <td class="window">
- <p
class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.ViewNotificationConnectionStatus")%></p>
- <form class="standardform" name="viewconnection" action="execute.jsp"
method="POST">
- <input type="hidden" name="op" value="Continue"/>
- <input type="hidden" name="type" value="notification"/>
- <input type="hidden" name="connname" value=""/>
- <table class="displaytable">
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.NameColon")%></nobr></td><td
class="value"
colspan="1"><%="<!--connection="+org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)+"-->"%><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr></td>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.DescriptionColon")%></nobr></td><td
class="value"
colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.ConnectionTypeColon")%></nobr></td><td
class="value"
colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.MaxConnectionsColon")%></nobr></td><td
class="value"
colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
+</script>
+<div class="row">
+ <div class="col-md-12">
+ <div class="box box-primary">
+ <form class="standardform" name="viewconnection" action="execute.jsp"
method="POST">
+ <input type="hidden" name="op" value="Continue"/>
+ <input type="hidden" name="type" value="notification"/>
+ <input type="hidden" name="connname" value=""/>
+
+ <div class="box-body">
+ <table class="table table-bordered">
+ <tr>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.NameColon")%></nobr></th>
+ <td><%="<!--connection=" +
org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName) + "-->"%>
+
<nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%></nobr>
+ </td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.DescriptionColon")%></nobr></th>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.ConnectionTypeColon")%></nobr></th>
+
<td><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.MaxConnectionsColon")%></nobr></th>
+
<td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td>
</tr>
<tr>
<td colspan="4">
@@ -153,23 +136,29 @@ function Delete(connectionName)
</td>
</tr>
<tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="description"
colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.ConnectionStatusColon")%></nobr></td><td
class="value"
colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
- </tr>
- <tr>
- <td class="separator" colspan="4"><hr/></td>
- </tr>
- <tr>
- <td class="message" colspan="4">
- <nobr><a
href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.Refresh")%></a></nobr>
- <nobr><a
href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.EditThisNotificationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.Edit")%></a></nobr>
- <nobr><a href="javascript:void()"
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.DeleteThisNotificationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.Delete")%></a></nobr>
- </td>
+
<th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.ConnectionStatusColon")%></nobr></th>
+ <td
colspan="3"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionStatus)%></td>
</tr>
</table>
-
+ </div>
+ <div class="box-footer clearfix">
+ <div class="btn-group">
+ <a
href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.Refresh")%>"
+ class="link btn btn-primary" role="button"><span
class="glyphicon glyphicon-refresh"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.Refresh")%></a>
+ <a
href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.EditThisNotificationConnection")%>"
+ class="link btn btn-primary" role="button"><span
class="glyphicon glyphicon-pencil"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.Edit")%></a>
+ <a href="javascript:void(0);"
+
onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.DeleteThisNotificationConnection")%>"
+ class="btn btn-danger" role="button"><span
class="glyphicon glyphicon-trash"
aria-hidden="true"></span><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.Delete")%></a>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
<%
}
}
@@ -183,11 +172,3 @@ catch (ManifoldCFException e)
<%
}
%>
- </form>
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
