Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 39E0718388 for ; Tue, 9 Jun 2015 01:30:39 +0000 (UTC) Received: (qmail 65740 invoked by uid 500); 9 Jun 2015 01:30:39 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 65627 invoked by uid 500); 9 Jun 2015 01:30:39 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 65270 invoked by uid 99); 9 Jun 2015 01:30:38 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2015 01:30:38 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id A297DAC081D for ; Tue, 9 Jun 2015 01:30:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1684303 [9/18] - in /manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp: ./ css/ javascript/ less/ Date: Tue, 09 Jun 2015 01:30:37 -0000 To: commits@manifoldcf.apache.org From: kishore@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150609013038.A297DAC081D@hades.apache.org> Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listnotifications.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listnotifications.jsp?rev=1684303&r1=1684302&r2=1684303&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listnotifications.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listnotifications.jsp Tue Jun 9 01:30:36 2015 @@ -2,143 +2,142 @@ <% -/* $Id$ */ + /* $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. -*/ -%> - - - - - - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ApacheManifoldCFListNotificationConnections")%> - - - - - - - - - - - -
-

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ListOfNotificationConnections")%>

-
- - - - -<% - try - { - // Get the notification connection manager handle - INotificationConnectionManager manager = NotificationConnectionManagerFactory.make(threadContext); - INotificationConnectorManager connectorManager = NotificationConnectorManagerFactory.make(threadContext); - INotificationConnection[] connections = manager.getAllConnections(); -%> - - - - - - - - - - - -<% - int i = 0; - while (i < connections.length) - { - INotificationConnection connection = connections[i++]; - - String name = connection.getName(); - String description = connection.getDescription(); - if (description == null) - description = ""; - String className = connection.getClassName(); - String connectorName = connectorManager.getDescription(className); - if (connectorName == null) - connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listnotifications.uninstalled");; - int maxCount = connection.getMaxConnections(); - -%> - > - - - - - - -<% - } -%> - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Name")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Description")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ConnectionType")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Max")%>
- - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.View")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Edit")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Delete")%> - - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%><%=Integer.toString(maxCount)%>
"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.AddaNewNotificationConnection")%>
- -<% - } - catch (ManifoldCFException e) - { - e.printStackTrace(); - variableContext.setParameter("text",e.getMessage()); - variableContext.setParameter("target","index.jsp"); -%> - -<% + * 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. + */ +%> + +
+
+
+ + + + + +
+ <% + try { + // Get the notification connection manager handle + INotificationConnectionManager manager = NotificationConnectionManagerFactory.make(threadContext); + INotificationConnectorManager connectorManager = NotificationConnectorManagerFactory.make(threadContext); + INotificationConnection[] connections = manager.getAllConnections(); + %> + + + + + + + + + <% + int i = 0; + while (i < connections.length) { + INotificationConnection connection = connections[i++]; + + String name = connection.getName(); + String description = connection.getDescription(); + if (description == null) + description = ""; + String className = connection.getClassName(); + String connectorName = connectorManager.getDescription(className); + if (connectorName == null) + connectorName = className + Messages.getString(pageContext.getRequest().getLocale(), "listnotifications.uninstalled"); + ; + int maxCount = connection.getMaxConnections(); + + %> + + + + + + + + <% + } + %> +
Action<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.Name")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.Description")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.ConnectionType")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.Max")%> +
+
+ + + + + + + + + +
+ 		<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%> + <%=Integer.toString(maxCount)%> +
+
+
+
+ " + class="link btn btn-primary" role="button"> + + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.AddaNewNotificationConnection")%> + +
+ + <% + } catch (ManifoldCFException e) { + e.printStackTrace(); + variableContext.setParameter("text", e.getMessage()); + variableContext.setParameter("target", "index.jsp"); + %> + + <% + } + %> +
+ +
+
+
\ No newline at end of file Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listoutputs.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listoutputs.jsp?rev=1684303&r1=1684302&r2=1684303&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listoutputs.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listoutputs.jsp Tue Jun 9 01:30:36 2015 @@ -2,143 +2,149 @@ <% -/* $Id$ */ + /* $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. -*/ -%> - - - - - - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.ApacheManifoldCFListOutputConnections")%> - - - - - - - - - - - -
-

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.ListOfOutputConnections")%>

-
- - - - -<% - try - { - // Get the output connection manager handle - IOutputConnectionManager manager = OutputConnectionManagerFactory.make(threadContext); - IOutputConnectorManager connectorManager = OutputConnectorManagerFactory.make(threadContext); - IOutputConnection[] connections = manager.getAllConnections(); -%> - - - - - - - - - - - -<% - int i = 0; - while (i < connections.length) - { - IOutputConnection connection = connections[i++]; - - String name = connection.getName(); - String description = connection.getDescription(); - if (description == null) - description = ""; - String className = connection.getClassName(); - String connectorName = connectorManager.getDescription(className); - if (connectorName == null) - connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listoutputs.uninstalled");; - int maxCount = connection.getMaxConnections(); - -%> - > - - - - - - -<% - } -%> - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Name")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Description")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.ConnectionType")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Max")%>
- - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.View")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Edit")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Delete")%> - - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%><%=Integer.toString(maxCount)%>
"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.AddaNewOutputConnection")%>
- -<% - } - catch (ManifoldCFException e) - { - e.printStackTrace(); - variableContext.setParameter("text",e.getMessage()); - variableContext.setParameter("target","index.jsp"); -%> - -<% + * 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. + */ +%> + + - - +
+
+
+ + + + + +
+ + <% + try { + // Get the output connection manager handle + IOutputConnectionManager manager = OutputConnectionManagerFactory.make(threadContext); + IOutputConnectorManager connectorManager = OutputConnectorManagerFactory.make(threadContext); + IOutputConnection[] connections = manager.getAllConnections(); + %> + + + + + + + + + <% + int i = 0; + while (i < connections.length) { + IOutputConnection connection = connections[i++]; + + String name = connection.getName(); + String description = connection.getDescription(); + if (description == null) + description = ""; + String className = connection.getClassName(); + String connectorName = connectorManager.getDescription(className); + if (connectorName == null) + connectorName = className + Messages.getString(pageContext.getRequest().getLocale(), "listoutputs.uninstalled"); + ; + int maxCount = connection.getMaxConnections(); + + %> + + + + + + + + <% + } + %> +
Action<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.Name")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.Description")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.ConnectionType")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.Max")%> +
+
+ + + + + + + + + +
+ 		<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%> + <%=Integer.toString(maxCount)%> +
+
+
+
+ " + class="link btn btn-primary" role="button"> + + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.AddaNewOutputConnection")%> + +
+ + <% + } catch (ManifoldCFException e) { + e.printStackTrace(); + variableContext.setParameter("text", e.getMessage()); + variableContext.setParameter("target", "index.jsp"); + %> + + <% + } + %> +
+ +
+
+
\ No newline at end of file Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listtransformations.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listtransformations.jsp?rev=1684303&r1=1684302&r2=1684303&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listtransformations.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/listtransformations.jsp Tue Jun 9 01:30:36 2015 @@ -2,143 +2,146 @@ <% -/* $Id$ */ + /* $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. -*/ + * 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. + */ %> - - - - - - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.ApacheManifoldCFListTransformationConnections")%> - - - - - - - - - - - -
-

<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.ListOfTransformationConnections")%>

-
- - - -<% - try - { - // Get the transformation connection manager handle - ITransformationConnectionManager manager = TransformationConnectionManagerFactory.make(threadContext); - ITransformationConnectorManager connectorManager = TransformationConnectorManagerFactory.make(threadContext); - ITransformationConnection[] connections = manager.getAllConnections(); -%> - - - - - - - - - - - -<% - int i = 0; - while (i < connections.length) - { - ITransformationConnection connection = connections[i++]; - - String name = connection.getName(); - String description = connection.getDescription(); - if (description == null) - description = ""; - String className = connection.getClassName(); - String connectorName = connectorManager.getDescription(className); - if (connectorName == null) - connectorName = className + Messages.getString(pageContext.getRequest().getLocale(),"listtransformations.uninstalled");; - int maxCount = connection.getMaxConnections(); - -%> - > - - - - - - -<% - } -%> - - - - -
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Name")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Description")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.ConnectionType")%><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Max")%>
- - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.View")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Edit")%> - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Delete")%> - - <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%><%=Integer.toString(maxCount)%>
"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.AddaNewTransformationConnection")%>
- -<% - } - catch (ManifoldCFException e) - { - e.printStackTrace(); - variableContext.setParameter("text",e.getMessage()); - variableContext.setParameter("target","index.jsp"); -%> - -<% + - +
+
+
+ + + + + +
+ <% + try { + // Get the transformation connection manager handle + ITransformationConnectionManager manager = TransformationConnectionManagerFactory.make(threadContext); + ITransformationConnectorManager connectorManager = TransformationConnectorManagerFactory.make(threadContext); + ITransformationConnection[] connections = manager.getAllConnections(); + %> + + + + + + + + + <% + int i = 0; + while (i < connections.length) { + ITransformationConnection connection = connections[i++]; + + String name = connection.getName(); + String description = connection.getDescription(); + if (description == null) + description = ""; + String className = connection.getClassName(); + String connectorName = connectorManager.getDescription(className); + if (connectorName == null) + connectorName = className + Messages.getString(pageContext.getRequest().getLocale(), "listtransformations.uninstalled"); + int maxCount = connection.getMaxConnections(); + + %> + + + + + + + + <% + } + %> +
Action<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.Name")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.Description")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.ConnectionType")%> + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.Max")%> +
+
+ + + + + + + + + +
+ 		<%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%> + <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%> + <%=Integer.toString(maxCount)%> +
+
+
+
+ " + class="link btn btn-primary" role="button"> + + <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.AddaNewTransformationConnection")%> + +
+ <% + } catch (ManifoldCFException e) { + e.printStackTrace(); + variableContext.setParameter("text", e.getMessage()); + variableContext.setParameter("target", "index.jsp"); + %> + + <% + } + %> +
+ +
+
+
\ No newline at end of file Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/login.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/login.jsp?rev=1684303&r1=1684302&r2=1684303&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/login.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/login.jsp Tue Jun 9 01:30:36 2015 @@ -1,91 +1,108 @@ -<% response.setHeader("Pragma","No-cache"); -response.setDateHeader("Expires",0); -response.setHeader("Cache-Control", "no-cache"); -response.setDateHeader("max-age", 0); -response.setContentType("text/html;charset=utf-8"); -%><%@ include file="adminDefaults.jsp" %> +<% response.setHeader("Pragma", "No-cache"); + response.setDateHeader("Expires", 0); + response.setHeader("Cache-Control", "no-cache"); + response.setDateHeader("max-age", 0); + response.setContentType("text/html;charset=utf-8"); +%> +<%@ include file="adminDefaults.jsp" %> <% -/* $Id$ */ + /* $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. -*/ + * 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. + */ %> - - - - - <%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.ApacheManifoldCFLogin")%> - - - - - - - - - -
+ + + + + + + + + + + + +
- - +
+ <% + if (request.getParameter("nextUrl") != null) { + %> + "> + <%}%> + <% + String value = variableContext.getParameter("loginfailed"); + if (value != null && value.equals("true")) { + %> +
+

<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "index.LoginFailed")%> +

+
+ + <% + } + %> +
+ "/> + +
+
+ "/> + +
+
+
+
+ +
+ +
+ +
+
+ + + + \ No newline at end of file Modified: manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/logout.jsp URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/logout.jsp?rev=1684303&r1=1684302&r2=1684303&view=diff ============================================================================== --- manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/logout.jsp (original) +++ manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/logout.jsp Tue Jun 9 01:30:36 2015 @@ -1,33 +1,34 @@ -<% response.setHeader("Pragma","No-cache"); -response.setDateHeader("Expires",0); -response.setHeader("Cache-Control", "no-cache"); -response.setDateHeader("max-age", 0); -response.setContentType("text/html;charset=utf-8"); -%><%@ include file="adminDefaults.jsp" %> +<% response.setHeader("Pragma", "No-cache"); + response.setDateHeader("Expires", 0); + response.setHeader("Cache-Control", "no-cache"); + response.setDateHeader("max-age", 0); + response.setContentType("text/html;charset=utf-8"); +%> +<%@ include file="adminDefaults.jsp" %> <% -/* $Id$ */ + /* $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. -*/ + * 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. + */ %> <% -adminprofile.logout(); -response.sendRedirect("login.jsp"); + adminprofile.logout(); + response.sendRedirect("login.jsp"); %>