Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewjob.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewjob.jsp?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewjob.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewjob.jsp Thu Mar 23 18:56:26 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?origjobid="+jobID%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.CopyThisJob")%>" + class="link btn btn-success" role="button" data-toggle="tooltip"><i class="fa fa-clipboard fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Copy")%></a> + <a href='<%="editjob.jsp?jobid="+jobID%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.EditThisJob")%>" + class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Edit")%></a> + <a href='<%="javascript:Delete(\""+jobID+"\")"%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.DeleteThisJob")%>" + class="btn btn-danger" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewjob.Delete")%></a> + <a href='<%="javascript:StartOver(\""+jobID+"\")"%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewjob.ResetSeedingThisJob")%>" + class="link btn btn-warning" role="button" data-toggle="tooltip"><i class="fa fa-recycle fa-fw" aria-hidden="true"></i><%=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-3/framework/crawler-ui/src/main/webapp/viewmapper.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewmapper.jsp?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewmapper.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewmapper.jsp Thu Mar 23 18:56:26 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-success" role="button" data-toggle="tooltip"><i class="fa fa-refresh fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.Refresh")%></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"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.Edit")%></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"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewmapper.Delete")%></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-3/framework/crawler-ui/src/main/webapp/viewnotification.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewnotification.jsp?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewnotification.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewnotification.jsp Thu Mar 23 18:56:26 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)%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.Refresh")%>" + class="link btn btn-success" role="button" data-toggle="tooltip"><i class="fa fa-refresh fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.Refresh")%></a> + <a href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.EditThisNotificationConnection")%>" + class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewnotification.Edit")%></a> + <a href="javascript:void(0);" + onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewnotification.DeleteThisNotificationConnection")%>" + class="btn btn-danger" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=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> Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewoutput.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewoutput.jsp?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewoutput.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewoutput.jsp Thu Mar 23 18:56:26 2017 @@ -85,86 +85,70 @@ 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(),"viewoutput.ApacheManifoldCFViewOutputConnectionStatus")%> - </title> - - <script type="text/javascript"> +<script type="text/javascript"> <!-- + $.ManifoldCF.setTitle( + '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewoutput.ApacheManifoldCFViewOutputConnectionStatus")%>', + '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.ViewOutputConnectionStatus") + " - " + connectionName %>', + 'outputs' + ); -function Delete(connectionName) -{ - if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.Deleteoutputconnection")%> '"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.qmark")%>")) + function Delete(connectionName) { - document.viewconnection.op.value="Delete"; - document.viewconnection.connname.value=connectionName; - document.viewconnection.submit(); + if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.Deleteoutputconnection")%> '"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.qmark")%>")) + { + document.viewconnection.op.value="Delete"; + document.viewconnection.connname.value=connectionName; + $.ManifoldCF.submit(document.viewconnection); + } } -} -function ReingestAll(connectionName) -{ - if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.Thiscommandwillforce")%> '"+connectionName+"' <%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.toberecrawled")%>")) + function ReingestAll(connectionName) { - document.viewconnection.op.value="ReingestAll"; - document.viewconnection.connname.value=connectionName; - document.viewconnection.submit(); + if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.Thiscommandwillforce")%> '"+connectionName+"' <%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.toberecrawled")%>")) + { + document.viewconnection.op.value="ReingestAll"; + document.viewconnection.connname.value=connectionName; + $.ManifoldCF.submit(document.viewconnection); + } } -} -function RemoveAll(connectionName) -{ - if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.Thiscommandwillcause")%> '"+connectionName+"' <%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.tobeforgotten")%>")) + function RemoveAll(connectionName) { - document.viewconnection.op.value="RemoveAll"; - document.viewconnection.connname.value=connectionName; - document.viewconnection.submit(); + if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.Thiscommandwillcause")%> '"+connectionName+"' <%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewoutput.tobeforgotten")%>")) + { + document.viewconnection.op.value="RemoveAll"; + document.viewconnection.connname.value=connectionName; + $.ManifoldCF.submit(document.viewconnection); + } } -} //--> - </script> - -</head> - -<body class="standardbody"> +</script> - <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(),"viewoutput.ViewOutputConnectionStatus")%></p> - <form class="standardform" name="viewconnection" 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="displaytable"> - <tr> - <td class="separator" colspan="4"><hr/></td> - </tr> - <tr> - <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.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(),"viewoutput.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(),"viewoutput.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(),"viewoutput.MaxConnectionsColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></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="output"/> + <input type="hidden" name="connname" value=""/> + + <div class="box-body"> + <table class="table table-bordered"> + <tr> + <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.NameColon")%></th> + <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> + <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.DescriptionColon")%></th> + <td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td> </tr> <tr> - <td class="separator" colspan="4"><hr/></td> + <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.ConnectionTypeColon")%></th> + <td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td> + <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.MaxConnectionsColon")%></th> + <td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td> </tr> <tr> <td colspan="4"> @@ -174,25 +158,37 @@ function RemoveAll(connectionName) </td> </tr> <tr> - <td class="separator" colspan="4"><hr/></td> - </tr> - <tr> - <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.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='<%="viewoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%></a></nobr> - <nobr><a href='<%="editoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.EditThisOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.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(),"viewoutput.DeleteThisOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.Delete")%></a></nobr> - <nobr><a href="javascript:void()" onclick='<%="javascript:ReingestAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.ReIngestAllDocumentsAssociatedWithThisOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.ReIngestAllAssociatedDocuments")%></a></nobr> - <nobr><a href="javascript:void()" onclick='<%="javascript:RemoveAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.RemoveAllDocumentsAssociatedWithThisOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.RemoveAllAssociatedDocuments")%></a></nobr> - </td> + <th><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewoutput.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='<%="viewoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%>" + class="link btn btn-success" role="button" data-toggle="tooltip"><i class="fa fa-refresh fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.Refresh")%></a> + <a href='<%="editoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.EditThisOutputConnection")%>" + class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.Edit")%></a> + <a href="javascript:void(0);" + onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.DeleteThisOutputConnection")%>" + class="btn btn-danger" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.Delete")%></a> + <a href="javascript:void(0);" + onclick='<%="javascript:ReingestAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.ReIngestAllDocumentsAssociatedWithThisOutputConnection")%>" + class="btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-repeat fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.ReIngestAllAssociatedDocuments")%></a> + <a href="javascript:void(0)" + onclick='<%="javascript:RemoveAll(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.RemoveAllDocumentsAssociatedWithThisOutputConnection")%>" + class="btn btn-warning" role="button" data-toggle="tooltip"><i class="fa fa-remove fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewoutput.RemoveAllAssociatedDocuments")%></a> + </div> + </div> + </form> + </div> + </div> +</div> <% } } @@ -206,11 +202,3 @@ catch (ManifoldCFException e) <% } %> - </form> - </td> - </tr> - </table> - -</body> - -</html> Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewtransformation.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewtransformation.jsp?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewtransformation.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/crawler-ui/src/main/webapp/viewtransformation.jsp Thu Mar 23 18:56:26 2017 @@ -85,66 +85,52 @@ 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(),"viewtransformation.ApacheManifoldCFViewTransformationConnectionStatus")%> - </title> - - <script type="text/javascript"> +<script type="text/javascript"> <!-- -function Delete(connectionName) -{ - if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewtransformation.Deletetransformationconnection")%> '"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewtransformation.qmark")%>")) + $.ManifoldCF.setTitle( + '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewtransformation.ApacheManifoldCFViewTransformationConnectionStatus")%>', + '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "viewtransformation.ViewTransformationConnectionStatus") + " - " + connectionName%>', + 'outputs' + ); + + function Delete(connectionName) { - document.viewconnection.op.value="Delete"; - document.viewconnection.connname.value=connectionName; - document.viewconnection.submit(); + if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewtransformation.Deletetransformationconnection")%> '"+connectionName+"'<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"viewtransformation.qmark")%>")) + { + document.viewconnection.op.value="Delete"; + document.viewconnection.connname.value=connectionName; + $.ManifoldCF.submit(document.viewconnection); + } } -} //--> - </script> - -</head> - -<body class="standardbody"> +</script> - <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(),"viewtransformation.ViewTransformationConnectionStatus")%></p> - <form class="standardform" name="viewconnection" 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="displaytable"> - <tr> - <td class="separator" colspan="4"><hr/></td> - </tr> - <tr> - <td class="description" colspan="1"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewtransformation.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(),"viewtransformation.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(),"viewtransformation.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(),"viewtransformation.MaxConnectionsColon")%></nobr></td><td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></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="transformation"/> + <input type="hidden" name="connname" value=""/> + + <div class="box-body"> + <table class="table table-bordered"> + <tr> + <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewtransformation.NameColon")%></th> + <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> + <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewtransformation.DescriptionColon")%></th> + <td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td> </tr> <tr> - <td class="separator" colspan="4"><hr/></td> + <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewtransformation.ConnectionTypeColon")%></th> + <td class="value" colspan="1"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></nobr></td> + <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewtransformation.MaxConnectionsColon")%></th> + <td class="value" colspan="1"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(Integer.toString(maxCount))%></td> </tr> <tr> <td colspan="4"> @@ -154,23 +140,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(),"viewtransformation.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='<%="viewtransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.Refresh")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewtransformation.Refresh")%></a></nobr> - <nobr><a href='<%="edittransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.EditThisTransformationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewtransformation.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(),"viewtransformation.DeleteThisTransformationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewtransformation.Delete")%></a></nobr> - </td> + <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"viewtransformation.ConnectionStatusColon")%></th> + <td class="value" 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='<%="viewtransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.Refresh")%>" + class="link btn btn-success" role="button" data-toggle="tooltip"><i class="fa fa-refresh fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.Refresh")%></a> + <a href='<%="edittransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(connectionName)%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.EditThisTransformationConnection")%>" + class="link btn btn-primary" role="button" data-toggle="tooltip"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.Edit")%></a> + <a href="javascript:void(0);" + onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(connectionName)+"\")"%>' + title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.DeleteThisTransformationConnection")%>" + class="btn btn-danger" role="button" data-toggle="tooltip"><i class="fa fa-trash fa-fw" aria-hidden="true"></i><%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"viewtransformation.Delete")%></a> + </div> + </div> + </form> + </div> + </div> +</div> <% } } @@ -184,11 +176,3 @@ catch (ManifoldCFException e) <% } %> - </form> - </td> - </tr> - </table> - -</body> - -</html> Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-file-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-file-proprietary/properties.xml?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-file-proprietary/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-file-proprietary/properties.xml Thu Mar 23 18:56:26 2017 @@ -17,6 +17,8 @@ --> <configuration> + <!-- Version string for UI --> + <property name="org.apache.manifoldcf.versionstring" value="unknown version"/> <!-- Point to the wars and configure Jetty --> <property name="org.apache.manifoldcf.crawleruiwarpath" value="../web-proprietary/war/mcf-crawler-ui.war"/> <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web-proprietary/war/mcf-authority-service.war"/> Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-file/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-file/properties.xml?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-file/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-file/properties.xml Thu Mar 23 18:56:26 2017 @@ -17,6 +17,8 @@ --> <configuration> + <!-- Version string for UI --> + <property name="org.apache.manifoldcf.versionstring" value="unknown version"/> <!-- Point to the wars and configure Jetty --> <property name="org.apache.manifoldcf.crawleruiwarpath" value="../web/war/mcf-crawler-ui.war"/> <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web/war/mcf-authority-service.war"/> Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-zk-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-zk-proprietary/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-zk-proprietary/properties.xml Thu Mar 23 18:56:26 2017 @@ -19,6 +19,8 @@ <!-- This configuration file contains only non-global configuration information, which is basically limited to file paths and ZooKeeper configuration --> <configuration> + <!-- Version string for UI --> + <property name="org.apache.manifoldcf.versionstring" value="unknown version"/> <!-- Point to the wars and configure Jetty --> <property name="org.apache.manifoldcf.crawleruiwarpath" value="../web-proprietary/war/mcf-crawler-ui.war"/> <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web-proprietary/war/mcf-authority-service.war"/> Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-zk/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-zk/properties.xml?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-zk/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/example-multiprocess-zk/properties.xml Thu Mar 23 18:56:26 2017 @@ -19,6 +19,8 @@ <!-- This configuration file contains only non-global configuration information, which is basically limited to file paths and ZooKeeper configuration --> <configuration> + <!-- Version string for UI --> + <property name="org.apache.manifoldcf.versionstring" value="unknown version"/> <!-- Point to the wars and configure Jetty --> <property name="org.apache.manifoldcf.crawleruiwarpath" value="../web/war/mcf-crawler-ui.war"/> <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web/war/mcf-authority-service.war"/> Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/example-singleprocess-proprietary/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/example-singleprocess-proprietary/properties.xml?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/example-singleprocess-proprietary/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/example-singleprocess-proprietary/properties.xml Thu Mar 23 18:56:26 2017 @@ -17,6 +17,8 @@ --> <configuration> + <!-- Version string for UI --> + <property name="org.apache.manifoldcf.versionstring" value="unknown version"/> <!-- Point to the wars and configure Jetty --> <property name="org.apache.manifoldcf.crawleruiwarpath" value="../web-proprietary/war/mcf-crawler-ui.war"/> <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web-proprietary/war/mcf-authority-service.war"/> Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/example-singleprocess/properties.xml URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/example-singleprocess/properties.xml?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/example-singleprocess/properties.xml (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/example-singleprocess/properties.xml Thu Mar 23 18:56:26 2017 @@ -17,6 +17,8 @@ --> <configuration> + <!-- Version string for UI --> + <property name="org.apache.manifoldcf.versionstring" value="unknown version"/> <!-- Point to the wars and configure Jetty --> <property name="org.apache.manifoldcf.crawleruiwarpath" value="../web/war/mcf-crawler-ui.war"/> <property name="org.apache.manifoldcf.authorityservicewarpath" value="../web/war/mcf-authority-service.war"/> Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIHSQLDB.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIHSQLDB.java?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIHSQLDB.java (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIHSQLDB.java Thu Mar 23 18:56:26 2017 @@ -27,12 +27,12 @@ import java.io.*; import java.util.*; import org.junit.*; -import org.apache.manifoldcf.core.tests.HTMLTester; +import org.apache.manifoldcf.core.tests.SeleniumTester; /** Tests that run the "agents daemon" should be derived from this */ public class ConnectorBaseUIHSQLDB extends BaseITHSQLDB { - protected HTMLTester testerInstance = null; + protected SeleniumTester testerInstance = null; public ConnectorBaseUIHSQLDB() { @@ -48,7 +48,7 @@ public class ConnectorBaseUIHSQLDB exten public void setupHTMLTester() throws Exception { - testerInstance = new HTMLTester(); + testerInstance = new SeleniumTester(); testerInstance.setup(); } Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIMySQL.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIMySQL.java?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIMySQL.java (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIMySQL.java Thu Mar 23 18:56:26 2017 @@ -27,12 +27,12 @@ import java.io.*; import java.util.*; import org.junit.*; -import org.apache.manifoldcf.core.tests.HTMLTester; +import org.apache.manifoldcf.core.tests.SeleniumTester; /** Tests that run the "agents daemon" should be derived from this */ public class ConnectorBaseUIMySQL extends BaseITMySQL { - protected HTMLTester testerInstance = null; + protected SeleniumTester testerInstance = null; public ConnectorBaseUIMySQL() { @@ -48,7 +48,7 @@ public class ConnectorBaseUIMySQL extend public void setupHTMLTester() throws Exception { - testerInstance = new HTMLTester(); + testerInstance = new SeleniumTester(); testerInstance.setup(); } Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIPostgresql.java URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIPostgresql.java?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIPostgresql.java (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/pull-agent/src/test/java/org/apache/manifoldcf/crawler/tests/ConnectorBaseUIPostgresql.java Thu Mar 23 18:56:26 2017 @@ -27,12 +27,12 @@ import java.io.*; import java.util.*; import org.junit.*; -import org.apache.manifoldcf.core.tests.HTMLTester; +import org.apache.manifoldcf.core.tests.SeleniumTester; /** Tests that run the "agents daemon" should be derived from this */ public class ConnectorBaseUIPostgresql extends BaseITPostgresql { - protected HTMLTester testerInstance = null; + protected SeleniumTester testerInstance = null; public ConnectorBaseUIPostgresql() { @@ -48,7 +48,7 @@ public class ConnectorBaseUIPostgresql e public void setupHTMLTester() throws Exception { - testerInstance = new HTMLTester(); + testerInstance = new SeleniumTester(); testerInstance.setup(); } Modified: manifoldcf/branches/CONNECTORS-1196-3/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-3/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1788305&r1=1788304&r2=1788305&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196-3/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original) +++ manifoldcf/branches/CONNECTORS-1196-3/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Thu Mar 23 18:56:26 2017 @@ -33,9 +33,11 @@ editjob.HopFilters=Hop Filters editjob.am=am editjob.pm=pm -index.ApacheManifoldCF=Apache ManifoldCF -index.WelcomeToApacheManifoldFC=Welcome to Apache ManifoldCF -index.ApacheManifoldCFLogin=Apache ManifoldCF Login +index.TheApacheSoftwareFoundation=The Apache® Software Foundation +index.Copyright=Copyright© 2010-2017 +index.ApacheManifoldCF=Apache ManifoldCF⢠+index.WelcomeToApacheManifoldFC=Welcome to Apache ManifoldCF⢠+index.ApacheManifoldCFLogin=Apache ManifoldCF⢠Login index.UserIDColon=User ID: index.PasswordColon=Password: index.Login=Login @@ -1064,4 +1066,4 @@ editjob.AddANotification=Add a notificat viewjob.NotificationsColon=Notifications: viewjob.NotificationDescription=Description viewjob.NotificationConnectionName=Connection name -viewjob.NoNotificationConnections=No notification connections \ No newline at end of file +viewjob.NoNotificationConnections=No notification connections
