Modified: manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/edittransformation.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/edittransformation.jsp?rev=1689005&r1=1689004&r2=1689005&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/edittransformation.jsp (original) +++ manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/edittransformation.jsp Fri Jul 3 12:15:29 2015 @@ -232,53 +232,54 @@ function isInteger(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="darkwindow"> + <table class="page"> + <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr> + <tr> + <td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td> + <td class="darkwindow"> <% // Get connector list; need this to decide what to do if (set.getRowCount() == 0) { %> - <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection2")%></p> - <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NoTransformationConnectorsRegistered")%></td></tr></table> + <p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection2")%></p> + <table class="displaytable"><tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NoTransformationConnectorsRegistered")%></td></tr></table> <% } else { %> - <form class="standardform" name="editconnection" action="execute.jsp" method="POST" enctype="multipart/form-data"> - <input type="hidden" name="op" value="Continue"/> - <input type="hidden" name="type" value="transformation"/> - <input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/> - <input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/> - <table class="tabtable"> - <tr class="tabspacerrow"> - <td class="spacertab" colspan="<%=tabsArray.size()%>"></td> - <td class="remaindertab" rowspan="3"> + <form class="standardform" name="editconnection" action="execute.jsp" method="POST" enctype="multipart/form-data"> + <input type="hidden" name="op" value="Continue"/> + <input type="hidden" name="type" value="transformation"/> + <input type="hidden" name="tabname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tabName)%>'/> + <input type="hidden" name="isnewconnection" value='<%=(isNew?"true":"false")%>'/> + <table class="tabtable"> + <tr class="tabspacerrow"> + <td class="spacertab" colspan="<%=tabsArray.size()%>"></td> + <td class="remaindertab" rowspan="3"> <% if (description.length() > 0) { %> - <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditTransformationConnection")%> '<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>'</nobr> <% } else { %> - <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditATransformationConnection")%></nobr> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.EditATransformationConnection")%></nobr> <% } %> - </td> - </tr> - <tr class="tabsequencerow"> - <td class="blanksequencetab" colspan="<%=tabsArray.size()%>"></td> - </tr> - <tr class="tabrow"> + </td> + </tr> + <tr class="tabsequencerow"> + <td class="blanksequencetab" colspan="<%=tabsArray.size()%>"></td> + </tr> + <tr class="tabrow"> <% int tabNum = 0; while (tabNum < tabsArray.size()) @@ -287,20 +288,20 @@ function isInteger(value) if (tab.equals(tabName)) { %> - <td class="activetab"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></nobr></td> + <td class="activetab"><nobr><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></nobr></td> <% } else { %> - <td class="passivetab"><nobr><a href="javascript:void(0);" alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" "+Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.tab")%>' onclick='<%="javascript:SelectTab(\""+tab+"\");return false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></nobr></td> + <td class="passivetab"><nobr><a href="javascript:void(0);" alt='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(tab)+" "+Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.tab")%>' onclick='<%="javascript:SelectTab(\""+tab+"\");return false;"%>'><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(tab)%></a></nobr></td> <% } } %> - </tr> - <tr class="tabbodyrow"> - <td class="tabbody" colspan='<%=Integer.toString(tabsArray.size()+1)%>'> + </tr> + <tr class="tabbodyrow"> + <td class="tabbody" colspan='<%=Integer.toString(tabsArray.size()+1)%>'> <% @@ -308,42 +309,45 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Name"))) { %> - <table class="displaytable"> - <tr><td class="separator" colspan="5"><hr/></td></tr> - <tr> - <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NameColon")%></nobr></td><td class="value" colspan="4"> + <table class="displaytable"> + <tr><td class="separator" colspan="5"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.NameColon")%></nobr></td><td class="value" colspan="4"> <% // If the connection doesn't exist yet, we are allowed to change the name. if (connection == null || connectionName.length() < 1) { %> - <input type="text" size="32" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <input type="text" size="32" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> - <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectionName)%> + <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> <% } %> - </td> - </tr> - <tr> - <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.DescriptionColon")%></nobr></td><td class="value" colspan="4"> - <input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> - </td> - </tr> - </table> + </td> + </tr> + <tr> + <td class="description"> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.DescriptionColon")%></nobr> + </td> + <td class="value" colspan="4"> + <input type="text" size="50" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> + </td> + </tr> + </table> <% } else { // Hiddens for the Name tab %> - <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> - <input type="hidden" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> + <input type="hidden" name="connname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(connectionName)%>'/> + <input type="hidden" name="description" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(description)%>'/> <% } @@ -352,10 +356,10 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Type"))) { %> - <table class="displaytable"> - <tr><td class="separator" colspan="5"><hr/></td></tr> - <tr> - <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.ConnectionTypeColon")%></nobr></td><td class="value" colspan="4"> + <table class="displaytable"> + <tr><td class="separator" colspan="5"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.ConnectionTypeColon")%></nobr></td><td class="value" colspan="4"> <% if (className.length() > 0) { @@ -363,24 +367,24 @@ function isInteger(value) if (value == null) { %> - <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr> + <nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.UNREGISTERED")%> <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(className)%></nobr> <% } else { %> - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(value)%> <% } %> - <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> + <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> <% } else { int i = 0; %> - <select name="classname" size="1"> + <select name="classname" size="1"> <% while (i < set.getRowCount()) { @@ -388,25 +392,26 @@ function isInteger(value) String thisClassName = row.getValue("classname").toString(); String thisDescription = row.getValue("description").toString(); %> - <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisClassName)%>' - <%=className.equals(thisClassName)?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%></option> + <option value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(thisClassName)%>' + <%=className.equals(thisClassName)?"selected=\"selected\"":""%>><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(thisDescription)%> + </option> <% } %> - </select> + </select> <% } %> - </td> - </tr> - </table> + </td> + </tr> + </table> <% } else { // Hiddens for the "Type" tab %> - <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> + <input type="hidden" name="classname" value='<%=org.apache.manifoldcf.ui.util.Encoder.attributeEscape(className)%>'/> <% } @@ -415,20 +420,20 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Throttling"))) { %> - <table class="displaytable"> - <tr><td class="separator" colspan="2"><hr/></td></tr> - <tr> - <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.MaxConnectionsColon")%></nobr></td> - <td class="value"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td> - </tr> - </table> + <table class="displaytable"> + <tr><td class="separator" colspan="2"><hr/></td></tr> + <tr> + <td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"edittransformation.MaxConnectionsColon")%></nobr></td> + <td class="value"><input type="text" size="6" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/></td> + </tr> + </table> <% } else { // Hiddens for "Throttling" tab %> - <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/> + <input type="hidden" name="maxconnections" value='<%=Integer.toString(maxConnections)%>'/> <% } @@ -436,14 +441,16 @@ function isInteger(value) TransformationConnectorFactory.outputConfigurationBody(threadContext,className,new org.apache.manifoldcf.ui.jsp.JspWrapper(out,adminprofile),pageContext.getRequest().getLocale(),parameters,tabName); %> - <table class="displaytable"> - <tr><td class="separator" colspan="4"><hr/></td></tr> - <tr><td class="message" colspan="4"><nobr> + <table class="displaytable"> + <tr><td class="separator" colspan="4"><hr/></td></tr> + <tr> + <td class="message" colspan="4"> + <nobr> <% if (className.length() > 0) { %> - <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.SaveThisTransformationConnection")%>"/> + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Save")%>" onClick="javascript:Save()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.SaveThisTransformationConnection")%>"/> <% } else @@ -451,26 +458,28 @@ function isInteger(value) if (tabName.equals(Messages.getString(pageContext.getRequest().getLocale(),"edittransformation.Type"))) { %> - <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.ContinueToNextPage")%>"/> + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Continue")%>" onClick="javascript:Continue()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.ContinueToNextPage")%>"/> <% } } %> - <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.CancelTransformationConnectionEditing")%>"/></nobr></td> - </tr> - </table> - </td> - </tr> - </table> - </form> + <input type="button" value="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.Cancel")%>" onClick="javascript:Cancel()" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"edittransformation.CancelTransformationConnectionEditing")%>"/> + </nobr> + </td> + </tr> + </table> + </td> + </tr> + </table> + </form> <% } %> - </td> - </tr> - </table> + </td> + </tr> + </table> </body>
Added: manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp?rev=1689005&view=auto ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp (added) +++ manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp Fri Jul 3 12:15:29 2015 @@ -0,0 +1,60 @@ +<%@ include file="adminHeaders.jsp" %> + +<% + +/* $Id$ */ + +/** +* Licensed to the Apache Software Foundation (ASF) under one or more +* contributor license agreements. See the NOTICE file distributed with +* this work for additional information regarding copyright ownership. +* The ASF licenses this file to You under the Apache License, Version 2.0 +* (the "License"); you may not use this file except in compliance with +* the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* 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> Propchange: manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp ------------------------------------------------------------------------------ svn:eol-style = native Propchange: manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp ------------------------------------------------------------------------------ svn:keywords = Id Modified: manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/showjobstatus.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/showjobstatus.jsp?rev=1689005&r1=1689004&r2=1689005&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/showjobstatus.jsp (original) +++ manifoldcf/branches/CONNECTORS-1131/framework/crawler-ui/src/main/webapp/showjobstatus.jsp Fri Jul 3 12:15:29 2015 @@ -20,8 +20,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -boolean maintenanceUnderway = org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway(); +%> +<% +try +{ + // Check if authorized + if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_RUN_JOBS)) + { + variableContext.setParameter("target","index.jsp"); +%> + <jsp:forward page="unauthorized.jsp"/> +<% + } + + if (org.apache.manifoldcf.crawler.system.ManifoldCF.checkMaintenanceUnderway()) + { +%> + <jsp:forward page="maintenanceunderway.jsp"/> +<% + } + + // Get the max count + int maxCount = LockManagerFactory.getIntProperty(threadContext,"org.apache.manifoldcf.ui.maxstatuscount",500000); + // Get the job manager handle + IJobManager manager = JobManagerFactory.make(threadContext); + JobStatus[] jobs = manager.getAllStatus(true,maxCount); %> <html xmlns="http://www.w3.org/1999/xhtml";> @@ -35,54 +59,54 @@ boolean maintenanceUnderway = org.apache <script type="text/javascript"> <!-- - function Start(jobID) - { - document.liststatuses.op.value="Start"; - document.liststatuses.jobid.value=jobID; - document.liststatuses.submit(); - } +function Start(jobID) +{ + document.liststatuses.op.value="Start"; + document.liststatuses.jobid.value=jobID; + document.liststatuses.submit(); +} - function StartMinimal(jobID) - { - document.liststatuses.op.value="StartMinimal"; - document.liststatuses.jobid.value=jobID; - document.liststatuses.submit(); - } +function StartMinimal(jobID) +{ + document.liststatuses.op.value="StartMinimal"; + document.liststatuses.jobid.value=jobID; + document.liststatuses.submit(); +} - function Abort(jobID) - { - document.liststatuses.op.value="Abort"; - document.liststatuses.jobid.value=jobID; - document.liststatuses.submit(); - } +function Abort(jobID) +{ + document.liststatuses.op.value="Abort"; + document.liststatuses.jobid.value=jobID; + document.liststatuses.submit(); +} - function Restart(jobID) - { - document.liststatuses.op.value="Restart"; - document.liststatuses.jobid.value=jobID; - document.liststatuses.submit(); - } +function Restart(jobID) +{ + document.liststatuses.op.value="Restart"; + document.liststatuses.jobid.value=jobID; + document.liststatuses.submit(); +} - function RestartMinimal(jobID) - { - document.liststatuses.op.value="RestartMinimal"; - document.liststatuses.jobid.value=jobID; - document.liststatuses.submit(); - } +function RestartMinimal(jobID) +{ + document.liststatuses.op.value="RestartMinimal"; + document.liststatuses.jobid.value=jobID; + document.liststatuses.submit(); +} - function Pause(jobID) - { - document.liststatuses.op.value="Pause"; - document.liststatuses.jobid.value=jobID; - document.liststatuses.submit(); - } +function Pause(jobID) +{ + document.liststatuses.op.value="Pause"; + document.liststatuses.jobid.value=jobID; + document.liststatuses.submit(); +} - function Resume(jobID) - { - document.liststatuses.op.value="Resume"; - document.liststatuses.jobid.value=jobID; - document.liststatuses.submit(); - } +function Resume(jobID) +{ + document.liststatuses.op.value="Resume"; + document.liststatuses.jobid.value=jobID; + document.liststatuses.submit(); +} //--> </script> @@ -91,36 +115,24 @@ boolean maintenanceUnderway = org.apache <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(),"showjobstatus.StatusOfJobs")%></p> -<% -if (maintenanceUnderway == false) -{ -%> - <form class="standardform" name="liststatuses" action="execute.jsp" method="POST"> - <input type="hidden" name="op" value="Continue"/> - <input type="hidden" name="type" value="jobstatus"/> - <input type="hidden" name="jobid" value=""/> - -<% - try - { - // Get the max count - int maxCount = LockManagerFactory.getIntProperty(threadContext,"org.apache.manifoldcf.ui.maxstatuscount",500000); - // Get the job manager handle - IJobManager manager = JobManagerFactory.make(threadContext); - JobStatus[] jobs = manager.getAllStatus(true,maxCount); -%> - <table class="datatable"> - <tr> - <td class="separator" colspan="8"><hr/></td> - </tr> - <tr class="headerrow"> - <td class="columnheader"></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%></td> - </tr> + <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(),"showjobstatus.StatusOfJobs")%></p> + <form class="standardform" name="liststatuses" action="execute.jsp" method="POST"> + <input type="hidden" name="op" value="Continue"/> + <input type="hidden" name="type" value="jobstatus"/> + <input type="hidden" name="jobid" value=""/> + + <table class="datatable"> + <tr> + <td class="separator" colspan="8"><hr/></td> + </tr> + <tr class="headerrow"> + <td class="columnheader"></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Name")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Status")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.StartTime")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.EndTime")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Documents")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Active")%></td><td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Processed")%></td> + </tr> <% int i = 0; while (i < jobs.length) @@ -198,17 +210,17 @@ if (maintenanceUnderway == false) endTime = new Date(js.getEndTime()).toString(); } %> - <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>> - <td class="columncell"> - <nobr> + <tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>> + <td class="columncell"> + <nobr> <% if (status == JobStatus.JOBSTATUS_NOTYETRUN || status == JobStatus.JOBSTATUS_COMPLETED || status == JobStatus.JOBSTATUS_ERROR) { %> - <a href='<%="javascript:Start(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%></a> - <a href='<%="javascript:StartMinimal(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%></a> + <a href='<%="javascript:Start(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Start")%></a> + <a href='<%="javascript:StartMinimal(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Startjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Startminimal")%></a> <% } if (status == JobStatus.JOBSTATUS_RUNNING || @@ -218,8 +230,8 @@ if (maintenanceUnderway == false) status == JobStatus.JOBSTATUS_STARTING) { %> - <a href='<%="javascript:Restart(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%></a> - <a href='<%="javascript:RestartMinimal(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%></a> + <a href='<%="javascript:Restart(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restart")%></a> + <a href='<%="javascript:RestartMinimal(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Restartjob")+" "+js.getJobID()+" "+Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.minimally")%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Restartminimal")%></a> <% } if (status == JobStatus.JOBSTATUS_RUNNING || @@ -227,7 +239,7 @@ if (maintenanceUnderway == false) status == JobStatus.JOBSTATUS_WINDOWWAIT) { %> - <a href='<%="javascript:Pause(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Pausejob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%></a> + <a href='<%="javascript:Pause(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Pausejob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Pause")%></a> <% } if (status == JobStatus.JOBSTATUS_RUNNING || @@ -240,58 +252,49 @@ if (maintenanceUnderway == false) status == JobStatus.JOBSTATUS_RESTARTING) { %> - <a href='<%="javascript:Abort(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Abortjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%></a> + <a href='<%="javascript:Abort(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Abortjob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Abort")%></a> <% } if (status == JobStatus.JOBSTATUS_PAUSED) { %> - <a href='<%="javascript:Resume(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Resumejob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%></a> + <a href='<%="javascript:Resume(\""+js.getJobID()+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.Resumejob")+" "+js.getJobID()%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Resume")%></a> <% } %> - </nobr> - </td> - <td class="columncell"><%="<!--jobid="+js.getJobID()+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%></td><td class="columncell"><%=statusName%></td><td class="columncell"><%=startTime%></td><td class="columncell"><%=endTime%></td> - <td class="columncell"><%=(js.getQueueCountExact()?"":"> ")%><%=new Long(js.getDocumentsInQueue()).toString()%></td> - <td class="columncell"><%=(js.getOutstandingCountExact()?"":"> ")%><%=new Long(js.getDocumentsOutstanding()).toString()%></td> - <td class="columncell"><%=(js.getProcessedCountExact()?"":"> ")%><%=new Long(js.getDocumentsProcessed()).toString()%></td> - </tr> + </nobr> + </td> + <td class="columncell"><%="<!--jobid="+js.getJobID()+"-->"%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(js.getDescription())%></td><td class="columncell"><%=statusName%></td><td class="columncell"><%=startTime%></td><td class="columncell"><%=endTime%></td> + <td class="columncell"><%=(js.getQueueCountExact()?"":"> ")%><%=new Long(js.getDocumentsInQueue()).toString()%></td> + <td class="columncell"><%=(js.getOutstandingCountExact()?"":"> ")%><%=new Long(js.getDocumentsOutstanding()).toString()%></td> + <td class="columncell"><%=(js.getProcessedCountExact()?"":"> ")%><%=new Long(js.getDocumentsProcessed()).toString()%></td> + </tr> <% } %> - <tr> - <td class="separator" colspan="8"><hr/></td> - </tr> - <tr><td class="message" colspan="8"><a href="showjobstatus.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.RefreshStatus")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%></a></td></tr> - </table> + <tr> + <td class="separator" colspan="8"><hr/></td> + </tr> + <tr><td class="message" colspan="8"><a href="showjobstatus.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"showjobstatus.RefreshStatus")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.Refresh")%></a></td></tr> + </table> <% - } - catch (ManifoldCFException e) - { - out.println("Error: "+e.getMessage()); - - e.printStackTrace(); - } -%> - </form> -<% } -else +catch (ManifoldCFException e) { + e.printStackTrace(); + variableContext.setParameter("text",e.getMessage()); + variableContext.setParameter("target","index.jsp"); %> - <table class="displaytable"> - <tr><td class="separator" colspan="1"><hr/></td></tr> - <tr><td class="message"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"showjobstatus.PleaseTryAgainLater")%></td></tr> - </table> + <jsp:forward page="error.jsp"/> <% } %> - </td> - </tr> - </table> + </form> + </td> + </tr> + </table> </body> Modified: manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1689005&r1=1689004&r2=1689005&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original) +++ manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Fri Jul 3 12:15:29 2015 @@ -528,7 +528,6 @@ showjobstatus.Active=Active showjobstatus.Processed=Processed showjobstatus.RefreshStatus=Refresh status showjobstatus.Refresh=Refresh -showjobstatus.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later. showjobstatus.StatusOfJobs=Status of Jobs showjobstatus.Notyetrun=Not yet run @@ -849,6 +848,9 @@ error.Error=Error! error.Return=Return error.Unauthorized=Apache ManifoldCF: Unauthorized activity error.UnauthorizedAccess=You do not have permissions to perform this activity +error.ApacheManifoldCFMaintenanceUnderway=Apache ManifoldCF: Maintenance underway +error.MaintenanceUnderway=Maintenance underway +error.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later. viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF: View Job viewjob.ViewAJob=View a Job Modified: manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1689005&r1=1689004&r2=1689005&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties (original) +++ manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties Fri Jul 3 12:15:29 2015 @@ -528,7 +528,6 @@ showjobstatus.Active=ã¢ã¯ã� showjobstatus.Processed=æ¸ã¿ showjobstatus.RefreshStatus=ç¶æ ä¸è¦§ãæ´æ° showjobstatus.Refresh=æ´æ° -showjobstatus.PleaseTryAgainLater=ä¿å®å¦çä¸ã§ããå°ã ãå¾ ã¡ãã ããã showjobstatus.StatusOfJobs=ã¸ã§ãã®ç¶æ showjobstatus.Notyetrun=æªå®è¡ @@ -850,6 +849,9 @@ error.Error=ã¨ã©ã¼ error.Return=æ»ã error.Unauthorized=Apache ManifoldCF: Unauthorized activity error.UnauthorizedAccess=You do not have permissions to perform this activity +error.ApacheManifoldCFMaintenanceUnderway=Apache ManifoldCF: Maintenance underway +error.MaintenanceUnderway=Maintenance underway +error.PleaseTryAgainLater=ä¿å®å¦çä¸ã§ããå°ã ãå¾ ã¡ãã ããã viewjob.ApacheManifoldCFViewJob=Apache ManifoldCFï¼ã¸ã§ãæ å ± viewjob.ViewAJob=ã¸ã§ãæ å ± Modified: manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties?rev=1689005&r1=1689004&r2=1689005&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties (original) +++ manifoldcf/branches/CONNECTORS-1131/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties Fri Jul 3 12:15:29 2015 @@ -528,7 +528,6 @@ showjobstatus.Active=ææ showjobstatus.Processed=å·²å¤ç showjobstatus.RefreshStatus=å·æ°ç¶æå表 showjobstatus.Refresh=å·æ° -showjobstatus.PleaseTryAgainLater=ç»´æ¤ä¸ã请ç¨çã showjobstatus.StatusOfJobs=ä½ä¸ç¶æ showjobstatus.Notyetrun=è¿æªæ§è¡ @@ -850,6 +849,9 @@ error.Error=é误 error.Return=è¿å error.Unauthorized=Apache ManifoldCF: Unauthorized activity error.UnauthorizedAccess=You do not have permissions to perform this activity +error.ApacheManifoldCFMaintenanceUnderway=Apache ManifoldCF: Maintenance underway +error.MaintenanceUnderway=Maintenance underway +error.PleaseTryAgainLater=ç»´æ¤ä¸ã请ç¨çã viewjob.ApacheManifoldCFViewJob=Apache ManifoldCF: ä½ä¸ä¿¡æ¯ viewjob.ViewAJob=ä½ä¸ä¿¡æ¯
