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/24 19:02:47 UTC
svn commit: r1788531 [11/18] - in /manifoldcf/trunk: ./ connectors/
connectors/activedirectory/connector/src/test/java/org/apache/manifoldcf/authorities/authorities/activedirectory/tests/
connectors/alfresco-webscript/ connectors/alfresco-webscript/con...
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp?rev=1788531&r1=1788530&r2=1788531&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listnotifications.jsp Fri Mar 24 19:02:46 2017
@@ -39,59 +39,42 @@ try
INotificationConnection[] connections = manager.getAllConnections();
%>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
- <title>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ApacheManifoldCFListNotificationConnections")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.ApacheManifoldCFListNotificationConnections")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.ListOfNotificationConnections")%>',
+ 'repositories'
+ );
-function Delete(connectionName)
-{
- if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listnotifications.DeleteNotificationConnection")%> '"+connectionName+"'?"))
+ function Delete(connectionName)
{
- document.listconnections.op.value="Delete";
- document.listconnections.connname.value=connectionName;
- document.listconnections.submit();
+ if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listnotifications.DeleteNotificationConnection")%> '"+connectionName+"'?"))
+ {
+ document.listconnections.op.value="Delete";
+ document.listconnections.connname.value=connectionName;
+ $.ManifoldCF.submit(document.listconnections);
+ }
}
-}
//-->
- </script>
-
-</head>
-
-<body class="standardbody">
-
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
- <tr>
- <td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
- <td class="window">
- <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ListOfNotificationConnections")%></p>
- <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
- <input type="hidden" name="op" value="Continue"/>
- <input type="hidden" name="type" value="notification"/>
- <input type="hidden" name="connname" value=""/>
+</script>
+<div class="row">
+ <div class="col-md-12">
+ <div class="box box-primary">
+ <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
+ <input type="hidden" name="op" value="Continue"/>
+ <input type="hidden" name="type" value="notification"/>
+ <input type="hidden" name="connname" value=""/>
- <table class="datatable">
+ <div class="box-body">
+ <table class="table table-bordered">
<tr>
- <td class="separator" colspan="5"><hr/></td>
- </tr>
- <tr class="headerrow">
- <td class="columnheader"></td>
- <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Name")%></nobr></td>
- <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Description")%></nobr></td>
- <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ConnectionType")%></nobr></td>
- <td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Max")%></td>
+ <th>Action</th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Name")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Description")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ConnectionType")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Max")%></th>
</tr>
<%
int i = 0;
@@ -106,31 +89,40 @@ function Delete(connectionName)
String className = connection.getClassName();
String connectorName = connectorManager.getDescription(className);
if (connectorName == null)
- connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listnotifications.uninstalled");;
+ connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listnotifications.uninstalled");
int maxCount = connection.getMaxConnections();
%>
- <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
- <td class="columncell">
- <nobr>
- <a href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.View")%></a>
- <a href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Edit")%></a>
- <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Delete")%></a>
- </nobr>
+ <tr>
+ <td>
+ <div class="btn-group">
+ <a href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="link btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-eye fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.View")%></a>
+ <a href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Edit")%></a>
+ <a href="javascript:void(0);"
+ onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="btn btn-danger btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Delete")%></a>
+ </div>
</td>
- <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
- <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
- <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
- <td class="columncell"><%=Integer.toString(maxCount)%></td>
+ <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+ <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+ <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
+ <td><%=Integer.toString(maxCount)%></td>
</tr>
<%
}
%>
- <tr>
- <td class="separator" colspan="5"><hr/></td>
- </tr>
- <tr><td class="message" colspan="5"><a href="editnotification.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.AddANotificationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.AddaNewNotificationConnection")%></a></td></tr>
</table>
+ </div>
+ <div class="box-footer clearfix">
+ <div class="btn-group">
+ <a href="editnotification.jsp" title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.AddANotificationConnection")%>"
+ class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.AddaNewNotificationConnection")%></a>
+ </div>
<%
}
@@ -144,11 +136,8 @@ catch (ManifoldCFException e)
<%
}
%>
- </form>
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listoutputs.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listoutputs.jsp?rev=1788531&r1=1788530&r2=1788531&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listoutputs.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listoutputs.jsp Fri Mar 24 19:02:46 2017
@@ -39,59 +39,43 @@ try
IOutputConnection[] connections = manager.getAllConnections();
%>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
- <title>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.ApacheManifoldCFListOutputConnections")%>
- </title>
-
- <script type="text/javascript">
+<script type="text/javascript">
<!--
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.ApacheManifoldCFListOutputConnections")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.ListOfOutputConnections")%>',
+ 'outputs'
+ );
-function Delete(connectionName)
-{
- if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listoutputs.DeleteOutputConnection")%> '"+connectionName+"'?"))
+ function Delete(connectionName)
{
- document.listconnections.op.value="Delete";
- document.listconnections.connname.value=connectionName;
- document.listconnections.submit();
+ if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listoutputs.DeleteOutputConnection")%> '"+connectionName+"'?"))
+ {
+ document.listconnections.op.value="Delete";
+ document.listconnections.connname.value=connectionName;
+ $.ManifoldCF.submit(document.listconnections);
+ }
}
-}
-
//-->
- </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(),"listoutputs.ListOfOutputConnections")%></p>
- <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
- <input type="hidden" name="op" value="Continue"/>
- <input type="hidden" name="type" value="output"/>
- <input type="hidden" name="connname" value=""/>
+<div class="row">
+ <div class="col-md-12">
+ <div class="box box-primary">
+ <form name="listconnections" action="execute.jsp" method="POST">
+ <input type="hidden" name="op" value="Continue"/>
+ <input type="hidden" name="type" value="output"/>
+ <input type="hidden" name="connname" value=""/>
- <table class="datatable">
+ <div class="box-body">
+ <table class="table table-bordered">
<tr>
- <td class="separator" colspan="5"><hr/></td>
- </tr>
- <tr class="headerrow">
- <td class="columnheader"></td>
- <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Name")%></nobr></td>
- <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Description")%></nobr></td>
- <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.ConnectionType")%></nobr></td>
- <td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Max")%></td>
+ <th>Action</th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Name")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Description")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.ConnectionType")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Max")%></th>
</tr>
<%
int i = 0;
@@ -106,31 +90,40 @@ function Delete(connectionName)
String className = connection.getClassName();
String connectorName = connectorManager.getDescription(className);
if (connectorName == null)
- connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.uninstalled");;
+ connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.uninstalled");
int maxCount = connection.getMaxConnections();
%>
- <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
- <td class="columncell">
- <nobr>
- <a href='<%="viewoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.View")%></a>
- <a href='<%="editoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Edit")%></a>
- <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Delete")%></a>
- </nobr>
+ <tr>
+ <td>
+ <div class="btn-group">
+ <a href='<%="viewoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="link btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-eye fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")%></a>
+ <a href='<%="editoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")%></a>
+ <a href="javascript:void(0);"
+ onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="btn btn-danger btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")%></a>
+ </div>
</td>
- <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
- <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
- <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
- <td class="columncell"><%=Integer.toString(maxCount)%></td>
+ <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+ <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+ <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
+ <td><%=Integer.toString(maxCount)%></td>
</tr>
<%
}
%>
- <tr>
- <td class="separator" colspan="5"><hr/></td>
- </tr>
- <tr><td class="message" colspan="5"><a href="editoutput.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.AddAnOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.AddaNewOutputConnection")%></a></td></tr>
</table>
+ </div>
+ <div class="box-footer clearfix">
+ <div class="btn-group">
+ <a href="editoutput.jsp" title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.AddAnOutputConnection")%>"
+ class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.AddaNewOutputConnection")%></a>
+ </div>
<%
}
@@ -144,11 +137,8 @@ catch (ManifoldCFException e)
<%
}
%>
- </form>
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listtransformations.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listtransformations.jsp?rev=1788531&r1=1788530&r2=1788531&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listtransformations.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/listtransformations.jsp Fri Mar 24 19:02:46 2017
@@ -39,59 +39,45 @@ try
ITransformationConnection[] connections = manager.getAllConnections();
%>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
- <title>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.ApacheManifoldCFListTransformationConnections")%>
- </title>
- <script type="text/javascript">
+<script type="text/javascript">
+
<!--
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.ApacheManifoldCFListTransformationConnections")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.ListOfTransformationConnections")%>',
+ 'outputs'
+ );
-function Delete(connectionName)
-{
- if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listtransformations.DeleteTransformationConnection")%> '"+connectionName+"'?"))
+ function Delete(connectionName)
{
- document.listconnections.op.value="Delete";
- document.listconnections.connname.value=connectionName;
- document.listconnections.submit();
+ if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listtransformations.DeleteTransformationConnection")%> '"+connectionName+"'?"))
+ {
+ document.listconnections.op.value="Delete";
+ document.listconnections.connname.value=connectionName;
+ $.ManifoldCF.submit(document.listconnections);
+ }
}
-}
//-->
- </script>
+</script>
-</head>
+<div class="row">
+ <div class="col-md-12">
+ <div class="box box-primary">
+ <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
+ <input type="hidden" name="op" value="Continue"/>
+ <input type="hidden" name="type" value="transformation"/>
+ <input type="hidden" name="connname" value=""/>
-<body class="standardbody">
-
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
- <tr>
- <td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
- <td class="window">
- <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.ListOfTransformationConnections")%></p>
- <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
- <input type="hidden" name="op" value="Continue"/>
- <input type="hidden" name="type" value="transformation"/>
- <input type="hidden" name="connname" value=""/>
-
- <table class="datatable">
+ <div class="box-body">
+ <table class="table table-bordered">
<tr>
- <td class="separator" colspan="5"><hr/></td>
- </tr>
- <tr class="headerrow">
- <td class="columnheader"></td>
- <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Name")%></nobr></td>
- <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Description")%></nobr></td>
- <td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.ConnectionType")%></nobr></td>
- <td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Max")%></td>
+ <th>Action</th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Name")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Description")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.ConnectionType")%></th>
+ <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Max")%></th>
</tr>
<%
int i = 0;
@@ -106,32 +92,44 @@ function Delete(connectionName)
String className = connection.getClassName();
String connectorName = connectorManager.getDescription(className);
if (connectorName == null)
- connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listtransformations.uninstalled");;
+ connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listtransformations.uninstalled");
int maxCount = connection.getMaxConnections();
%>
- <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
- <td class="columncell">
- <nobr>
- <a href='<%="viewtransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.View")%></a>
- <a href='<%="edittransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Edit")%></a>
- <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Delete")%></a>
- </nobr>
+ <tr>
+ <td>
+ <div class="btn-group">
+ <a href='<%="viewtransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="link btn btn-success btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-eye fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.View")%></a>
+ <a href='<%="edittransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-pencil-square-o fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Edit")%></a>
+ <a href="javascript:void(0);"
+ onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+ class="btn btn-danger btn-xs" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Delete")%></a>
+ </div>
</td>
- <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
- <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
- <td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
- <td class="columncell"><%=Integer.toString(maxCount)%></td>
+ <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
+ <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
+ <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
+ <td><%=Integer.toString(maxCount)%></td>
</tr>
<%
}
%>
- <tr>
- <td class="separator" colspan="5"><hr/></td>
- </tr>
- <tr><td class="message" colspan="5"><a href="edittransformation.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.AddATransformationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.AddaNewTransformationConnection")%></a></td></tr>
</table>
-
+ </div>
+ <div class="box-footer clearfix">
+ <a href="edittransformation.jsp" class="link btn btn-primary" role="button"
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.AddATransformationConnection")%>"
+ data-toggle="tooltip"><i class="fa fa-plus-circle fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.AddaNewTransformationConnection")%></a>
+ </div>
+ </form>
+ </div>
+ </div>
+</div>
<%
}
catch (ManifoldCFException e)
@@ -144,11 +142,3 @@ catch (ManifoldCFException e)
<%
}
%>
- </form>
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp?rev=1788531&r1=1788530&r2=1788531&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/login.jsp Fri Mar 24 19:02:46 2017
@@ -31,11 +31,12 @@ response.setContentType("text/html;chars
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
- <title>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.ApacheManifoldCFLogin")%>
- </title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
+ <link href="css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
+ <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
+ <link rel="StyleSheet" href="css/style.css" type="text/css" media="screen"/>
+ <title><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.ApacheManifoldCFLogin")%></title>
<script type="text/javascript">
<!--
function login()
@@ -43,63 +44,69 @@ response.setContentType("text/html;chars
document.loginform.submit();
}
+ document.onkeypress = loginKeyPress;
+
function loginKeyPress(e)
{
- e = e || window.event;
- if (e.keyCode == 13)
- {
- document.getElementById('buttonLogin').click();
- return false;
- }
- return true;
+ e = e || window.event;
+ if (e.keyCode == 13)
+ {
+ document.getElementById('buttonLogin').click();
+ return false;
+ }
+ return true;
}
-
- document.onkeypress = loginKeyPress;
-
//-->
</script>
</head>
- <body class="standardbody">
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
- <tr>
- <td colspan="2" class="window">
+ <body class="login-page">
+ <div class="login-box">
+ <div class="login-logo">
+ <a href="/"><img src="ManifoldCF-logo.png"/></a>
+ </div>
+ <!-- /.login-logo -->
+ <div class="login-box-body">
+ <p class="login-box-msg">Sign in to start your session</p>
- <form class="standardform" name="loginform" action="setupAdminProfile.jsp" method="POST">
- <table class="displaytable">
+ <form class="standardform" name="loginform" action="setupAdminProfile.jsp" method="POST">
+<%
+if (request.getParameter("nextUrl") != null)
+{
+%>
+ <input type="hidden" name="nextUrl" value="<%=request.getParameter("nextUrl")%>">
+<%
+}
+%>
<%
String value = variableContext.getParameter("loginfailed");
if (value != null && value.equals("true"))
{
%>
- <tr><td class="message" colspan="2"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.LoginFailed")%></td></tr>
- <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <div class="callout callout-danger">
+ <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.LoginFailed")%></p>
+ </div>
+
<%
}
%>
- <tr>
- <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%></nobr></td>
- <td class="value">
- <input name="userID" type="text" size="32" value="" autofocus="autofocus"/>
- </td>
- </tr>
- <tr>
- <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.PasswordColon")%></nobr></td>
- <td class="value">
- <input name="password" type="password" size="32" value=""/>
- </td>
- </tr>
- <tr><td class="separator" colspan="2"><hr/></td></tr>
- <tr>
- <td class="message" colspan="2">
- <input id="buttonLogin" type="button" onclick='Javascript:login();' value='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'/>
- </td>
- </tr>
- </table>
- </form>
- </td>
- </tr>
- </table>
+ <div class="form-group has-feedback">
+ <input name="userID" type="text" class="form-control" autofocus="autofocus" placeholder="<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%>"/>
+ <span class="fa fa-user form-control-feedback"></span>
+ </div>
+ <div class="form-group has-feedback">
+ <input name="password" type="password" class="form-control" placeholder="<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.PasswordColon")%>"/>
+ <span class="fa fa-lock form-control-feedback"></span>
+ </div>
+ <div class="row">
+ <div class="col-xs-8">
+ </div>
+ <div class="col-xs-4">
+ <a href="#" id="buttonLogin" class="btn btn-primary btn-block" onclick='Javascript:login();'
+ title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'><i class="fa fa-sign-in fa-fw" aria-hidden="true"></i> <%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%></a>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
</body>
</html>
-
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/logout.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/logout.jsp?rev=1788531&r1=1788530&r2=1788531&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/logout.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/logout.jsp Fri Mar 24 19:02:46 2017
@@ -30,4 +30,3 @@ response.setContentType("text/html;chars
adminprofile.logout();
response.sendRedirect("login.jsp");
%>
-
Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp?rev=1788531&r1=1788530&r2=1788531&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp Fri Mar 24 19:02:46 2017
@@ -21,40 +21,27 @@
* limitations under the License.
*/
%>
-
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
- <title>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.ApacheManifoldCFMaintenanceUnderway")%>
- </title>
-
-</head>
-
-<body class="standardbody">
-
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
- <tr>
- <td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
- <td class="window">
- <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.MaintenanceUnderway")%></p>
-
- <table class="displaytable">
- <tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.PleaseTryAgainLater")%></td></tr>
- <tr><td class="separator"><hr/></td></tr>
- <tr><td class="message"><a href="index.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>">OK</a></td></tr>
- </table>
-
- </td>
- </tr>
- </table>
-
-</body>
-
-</html>
+<script type="text/javascript">
+ <!--
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "error.ApacheManifoldCFMaintenanceUnderway")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "error.ApacheManifoldCFMaintenanceUnderway")%>'
+ );
+ //-->
+</script>
+
+<div class="box box-error">
+ <div class="box-body">
+ <div class="alert alert-danger">
+ <h3><i class="icon fa fa-ban"></i> Error!</h3>
+ <h4><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.MaintenanceUnderway")%></h4>
+ <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.PleaseTryAgainLater")%></p>
+ </div>
+ </div>
+ <div class="box-footer with-border">
+ <a class="btn btn-primary" href='index.jsp'
+ title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>" data-toggle="tooltip">
+ <i class="fa fa-check fa-fw" aria-hidden="true"></i>OK
+ </a>
+ </div>
+</div>