manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kish...@apache.org
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 GMT
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.
-*/
-%>
-
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-	<title>
-		<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ApacheManifoldCFListNotificationConnections")%>
-	</title>
-
-	<script type="text/javascript">
-	<!--
-
-	function Delete(connectionName)
-	{
-		if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listnotifications.DeleteNotificationConnection")%> '"+connectionName+"'?"))
-		{
-			document.listconnections.op.value="Delete";
-			document.listconnections.connname.value=connectionName;
-			document.listconnections.submit();
-		}
-	}
-
-	//-->
-	</script>
-
-</head>
-
-<body class="standardbody">
-
-    <table class="page">
-      <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
-      <tr><td class="navigation"><jsp:include page="navigation.jsp" flush="true"/></td>
-       <td class="window">
-	<p class="windowtitle"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ListOfNotificationConnections")%></p>
-	<form class="standardform" name="listconnections" action="execute.jsp" method="POST">
-		<input type="hidden" name="op" value="Continue"/>
-		<input type="hidden" name="type" value="transformattion"/>
-		<input type="hidden" name="connname" value=""/>
-
-<%
-    try
-    {
-	// Get the notification connection manager handle
-	INotificationConnectionManager manager = NotificationConnectionManagerFactory.make(threadContext);
-	INotificationConnectorManager connectorManager = NotificationConnectorManagerFactory.make(threadContext);
-	INotificationConnection[] connections = manager.getAllConnections();
-%>
-		<table class="datatable">
-			<tr>
-				<td class="separator" colspan="5"><hr/></td>
-			</tr>
-			<tr class="headerrow">
-				<td class="columnheader"></td>
-				<td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Name")%></nobr></td>
-				<td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Description")%></nobr></td>
-				<td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.ConnectionType")%></nobr></td>
-				<td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Max")%></td>
-			</tr>
-<%
-	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();
-
-%>
-		<tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
-			<td class="columncell">
-				<nobr>
-					<a href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.View")%></a>
-					<a href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Edit")%></a>
-					<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.Delete")%></a>
-				</nobr>
-			</td>
-			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
-			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
-			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
-			<td class="columncell"><%=Integer.toString(maxCount)%></td>
-		</tr>
-<%
-	}
-%>
-			<tr>
-				<td class="separator" colspan="5"><hr/></td>
-			</tr>
-			<tr><td class="message" colspan="5"><a href="editnotification.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.AddANotificationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listnotifications.AddaNewNotificationConnection")%></a></td></tr>
-		</table>
-
-<%
-    }
-    catch (ManifoldCFException e)
-    {
-	e.printStackTrace();
-	variableContext.setParameter("text",e.getMessage());
-	variableContext.setParameter("target","index.jsp");
-%>
-	<jsp:forward page="error.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.
+ */
+%>
+<script type="text/javascript">
+  <!--
+  $.ManifoldCF.setTitle('<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.ApacheManifoldCFListNotificationConnections")%>',
+      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.ListOfNotificationConnections")%>',
+      'repositories'
+  );
+
+  function Delete(connectionName) {
+    if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listnotifications.DeleteNotificationConnection")%> '" + connectionName + "'?")) {
+      document.listconnections.op.value = "Delete";
+      document.listconnections.connname.value = connectionName;
+      $.ManifoldCF.submit(document.listconnections);
     }
-%>
-	    </form>
-       </td>
-      </tr>
-    </table>
-
-</body>
+  }
 
-</html>
+  //-->
+</script>
+<div class="row">
+  <div class="col-md-12">
+    <div class="box box-primary">
+      <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
+        <input type="hidden" name="op" value="Continue"/>
+        <input type="hidden" name="type" value="transformattion"/>
+        <input type="hidden" name="connname" value=""/>
+
+        <div class="box-body">
+          <%
+            try {
+              // Get the notification connection manager handle
+              INotificationConnectionManager manager = NotificationConnectionManagerFactory.make(threadContext);
+              INotificationConnectorManager connectorManager = NotificationConnectorManagerFactory.make(threadContext);
+              INotificationConnection[] connections = manager.getAllConnections();
+          %>
+          <table class="table table-bordered">
+            <tr>
+              <th>Action</th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.Name")%>
+              </th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.Description")%>
+              </th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.ConnectionType")%>
+              </th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.Max")%>
+              </th>
+            </tr>
+            <%
+              int i = 0;
+              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();
+
+            %>
+            <tr>
+              <td>
+                <div class="btn-group">
+                  <a href='<%="viewnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+                     title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+                     class="link btn btn-success btn-xs" role="button" data-toggle="tooltip">
+                    <span class="fa fa-eye" aria-hidden="true"></span>
+                  </a>
+                  <a href='<%="editnotification.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+                     title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+                     class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip">
+                    <span class="fa fa-pencil-square-o" aria-hidden="true"></span>
+                  </a>
+                  <a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
+                     title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+                     class="btn btn-danger btn-xs" role="button" data-toggle="tooltip">
+                    <span class="fa fa-trash" aria-hidden="true"></span>
+                  </a>
+                </div>
+              </td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%>
+              </td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>
+              </td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%>
+              </td>
+              <td><%=Integer.toString(maxCount)%>
+              </td>
+            </tr>
+            <%
+              }
+            %>
+          </table>
+        </div>
+        <div class="box-footer clearfix">
+          <div class="btn-group">
+            <a href="editnotification.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listnotifications.AddANotificationConnection")%>"
+               class="link btn btn-primary" role="button">
+              <span class="fa fa-plus-circle" aria-hidden="true"></span>
+              <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listnotifications.AddaNewNotificationConnection")%>
+            </a>
+          </div>
+
+          <%
+          } catch (ManifoldCFException e) {
+            e.printStackTrace();
+            variableContext.setParameter("text", e.getMessage());
+            variableContext.setParameter("target", "index.jsp");
+          %>
+          <jsp:forward page="error.jsp"/>
+          <%
+            }
+          %>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ 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.
-*/
-%>
-
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-	<title>
-		<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.ApacheManifoldCFListOutputConnections")%>
-	</title>
-
-	<script type="text/javascript">
-	<!--
-
-	function Delete(connectionName)
-	{
-		if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listoutputs.DeleteOutputConnection")%> '"+connectionName+"'?"))
-		{
-			document.listconnections.op.value="Delete";
-			document.listconnections.connname.value=connectionName;
-			document.listconnections.submit();
-		}
-	}
-
-	//-->
-	</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(),"listoutputs.ListOfOutputConnections")%></p>
-	<form class="standardform" name="listconnections" action="execute.jsp" method="POST">
-		<input type="hidden" name="op" value="Continue"/>
-		<input type="hidden" name="type" value="output"/>
-		<input type="hidden" name="connname" value=""/>
-
-<%
-    try
-    {
-	// Get the output connection manager handle
-	IOutputConnectionManager manager = OutputConnectionManagerFactory.make(threadContext);
-	IOutputConnectorManager connectorManager = OutputConnectorManagerFactory.make(threadContext);
-	IOutputConnection[] connections = manager.getAllConnections();
-%>
-		<table class="datatable">
-			<tr>
-				<td class="separator" colspan="5"><hr/></td>
-			</tr>
-			<tr class="headerrow">
-				<td class="columnheader"></td>
-				<td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Name")%></nobr></td>
-				<td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Description")%></nobr></td>
-				<td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.ConnectionType")%></nobr></td>
-				<td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Max")%></td>
-			</tr>
-<%
-	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();
-
-%>
-		<tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
-			<td class="columncell">
-				<nobr>
-					<a href='<%="viewoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.View")%></a>
-					<a href='<%="editoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Edit")%></a>
-					<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.Delete")%></a>
-				</nobr>
-			</td>
-			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
-			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
-			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
-			<td class="columncell"><%=Integer.toString(maxCount)%></td>
-		</tr>
-<%
-	}
-%>
-			<tr>
-				<td class="separator" colspan="5"><hr/></td>
-			</tr>
-			<tr><td class="message" colspan="5"><a href="editoutput.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.AddAnOutputConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listoutputs.AddaNewOutputConnection")%></a></td></tr>
-		</table>
-
-<%
-    }
-    catch (ManifoldCFException e)
-    {
-	e.printStackTrace();
-	variableContext.setParameter("text",e.getMessage());
-	variableContext.setParameter("target","index.jsp");
-%>
-	<jsp:forward page="error.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.
+ */
+%>
+
+<script type="text/javascript">
+  <!--
+  $.ManifoldCF.setTitle('<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.ApacheManifoldCFListOutputConnections")%>',
+      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.ListOfOutputConnections")%>',
+      'outputs'
+  );
+
+  function Delete(connectionName) {
+    if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listoutputs.DeleteOutputConnection")%> '" + connectionName + "'?")) {
+      document.listconnections.op.value = "Delete";
+      document.listconnections.connname.value = connectionName;
+      $.ManifoldCF.submit(document.listconnections);
+      //document.listconnections.submit();
     }
-%>
-	    </form>
-       </td>
-      </tr>
-    </table>
+  }
+
+  //-->
+</script>
 
-</body>
 
-</html>
+<div class="row">
+  <div class="col-md-12">
+    <div class="box box-primary">
+      <form name="listconnections" action="execute.jsp" method="POST">
+        <input type="hidden" name="op" value="Continue"/>
+        <input type="hidden" name="type" value="output"/>
+        <input type="hidden" name="connname" value=""/>
+
+        <div class="box-body">
+
+          <%
+            try {
+              // Get the output connection manager handle
+              IOutputConnectionManager manager = OutputConnectionManagerFactory.make(threadContext);
+              IOutputConnectorManager connectorManager = OutputConnectorManagerFactory.make(threadContext);
+              IOutputConnection[] connections = manager.getAllConnections();
+          %>
+          <table class="table table-bordered">
+            <tr>
+              <th>Action</th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.Name")%>
+              </th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.Description")%>
+              </th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.ConnectionType")%>
+              </th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.Max")%>
+              </th>
+            </tr>
+            <%
+              int i = 0;
+              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();
+
+            %>
+            <tr>
+              <td>
+                <div class="btn-group">
+                  <a href='<%="viewoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+                     title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+                     class="link btn btn-success btn-xs" role="button" data-toggle="tooltip">
+                    <span class="fa fa-eye" aria-hidden="true"></span>
+                  </a>
+                  <a href='<%="editoutput.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+                     title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+                     class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip">
+                    <span class="fa fa-pencil-square-o" aria-hidden="true"></span>
+                  </a>
+                  <a href="javascript:void()"
+                     onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
+                     title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+                     class="btn btn-danger btn-xs" role="button" data-toggle="tooltip">
+                    <span class="fa fa-trash" aria-hidden="true"></span>
+                  </a>
+                </div>
+              </td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%>
+              </td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>
+              </td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%>
+              </td>
+              <td><%=Integer.toString(maxCount)%>
+              </td>
+            </tr>
+            <%
+              }
+            %>
+          </table>
+        </div>
+        <div class="box-footer clearfix">
+          <div class="btn-group">
+            <a href="editoutput.jsp"
+               alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listoutputs.AddAnOutputConnection")%>"
+               class="link btn btn-primary" role="button">
+              <span class="fa fa-plus-circle" aria-hidden="true"></span>
+              <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listoutputs.AddaNewOutputConnection")%>
+            </a>
+          </div>
+
+          <%
+          } catch (ManifoldCFException e) {
+            e.printStackTrace();
+            variableContext.setParameter("text", e.getMessage());
+            variableContext.setParameter("target", "index.jsp");
+          %>
+          <jsp:forward page="error.jsp"/>
+          <%
+            }
+          %>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ 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.
+ */
 %>
 
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
-	<title>
-		<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.ApacheManifoldCFListTransformationConnections")%>
-	</title>
-
-	<script type="text/javascript">
-	<!--
-
-	function Delete(connectionName)
-	{
-		if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listtransformations.DeleteTransformationConnection")%> '"+connectionName+"'?"))
-		{
-			document.listconnections.op.value="Delete";
-			document.listconnections.connname.value=connectionName;
-			document.listconnections.submit();
-		}
-	}
-
-	//-->
-	</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(),"listtransformations.ListOfTransformationConnections")%></p>
-	<form class="standardform" name="listconnections" action="execute.jsp" method="POST">
-		<input type="hidden" name="op" value="Continue"/>
-		<input type="hidden" name="type" value="transformation"/>
-		<input type="hidden" name="connname" value=""/>
 
-<%
-    try
-    {
-	// Get the transformation connection manager handle
-	ITransformationConnectionManager manager = TransformationConnectionManagerFactory.make(threadContext);
-	ITransformationConnectorManager connectorManager = TransformationConnectorManagerFactory.make(threadContext);
-	ITransformationConnection[] connections = manager.getAllConnections();
-%>
-		<table class="datatable">
-			<tr>
-				<td class="separator" colspan="5"><hr/></td>
-			</tr>
-			<tr class="headerrow">
-				<td class="columnheader"></td>
-				<td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Name")%></nobr></td>
-				<td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Description")%></nobr></td>
-				<td class="columnheader"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.ConnectionType")%></nobr></td>
-				<td class="columnheader"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Max")%></td>
-			</tr>
-<%
-	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();
-
-%>
-		<tr <%="class=\""+((i%2==0)?"evendatarow":"odddatarow")+"\""%>>
-			<td class="columncell">
-				<nobr>
-					<a href='<%="viewtransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.View")%></a>
-					<a href='<%="edittransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Edit")%></a>
-					<a href="javascript:void()" onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.Delete")%></a>
-				</nobr>
-			</td>
-			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%></td>
-			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%></td>
-			<td class="columncell"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%></td>
-			<td class="columncell"><%=Integer.toString(maxCount)%></td>
-		</tr>
-<%
-	}
-%>
-			<tr>
-				<td class="separator" colspan="5"><hr/></td>
-			</tr>
-			<tr><td class="message" colspan="5"><a href="edittransformation.jsp" alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.AddATransformationConnection")%>"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"listtransformations.AddaNewTransformationConnection")%></a></td></tr>
-		</table>
-
-<%
-    }
-    catch (ManifoldCFException e)
-    {
-	e.printStackTrace();
-	variableContext.setParameter("text",e.getMessage());
-	variableContext.setParameter("target","index.jsp");
-%>
-	<jsp:forward page="error.jsp"/>
-<%
+<script type="text/javascript">
+
+  <!--
+  $.ManifoldCF.setTitle('<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.ApacheManifoldCFListTransformationConnections")%>',
+      '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.ListOfTransformationConnections")%>',
+      'outputs'
+  );
+
+  function Delete(connectionName) {
+    if (confirm("<%=Messages.getBodyJavascriptString(pageContext.getRequest().getLocale(),"listtransformations.DeleteTransformationConnection")%> '" + connectionName + "'?")) {
+      document.listconnections.op.value = "Delete";
+      document.listconnections.connname.value = connectionName;
+      $.ManifoldCF.submit(document.listconnections);
     }
-%>
-	    </form>
-       </td>
-      </tr>
-    </table>
+  }
 
-</body>
+  //-->
+</script>
 
-</html>
+<div class="row">
+  <div class="col-md-12">
+    <div class="box box-primary">
+      <form class="standardform" name="listconnections" action="execute.jsp" method="POST">
+        <input type="hidden" name="op" value="Continue"/>
+        <input type="hidden" name="type" value="transformation"/>
+        <input type="hidden" name="connname" value=""/>
+
+        <div class="box-body">
+          <%
+            try {
+              // Get the transformation connection manager handle
+              ITransformationConnectionManager manager = TransformationConnectionManagerFactory.make(threadContext);
+              ITransformationConnectorManager connectorManager = TransformationConnectorManagerFactory.make(threadContext);
+              ITransformationConnection[] connections = manager.getAllConnections();
+          %>
+          <table class="table table-bordered">
+            <tr>
+              <th>Action</th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.Name")%>
+              </th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.Description")%>
+              </th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.ConnectionType")%>
+              </th>
+              <th><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.Max")%>
+              </th>
+            </tr>
+            <%
+              int i = 0;
+              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();
+
+            %>
+            <tr>
+              <td>
+                <div class="btn-group">
+                  <a href='<%="viewtransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+                     title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.View")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+                     class="link btn btn-success btn-xs" role="button" data-toggle="tooltip">
+                    <span class="fa fa-eye" aria-hidden="true"></span>
+                  </a>
+                  <a href='<%="edittransformation.jsp?connname="+org.apache.manifoldcf.core.util.URLEncoder.encode(name)%>'
+                     title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Edit")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+                     class="link btn btn-primary btn-xs" role="button" data-toggle="tooltip">
+                    <span class="fa fa-pencil-square-o" aria-hidden="true"></span>
+                  </a>
+                  <a href="javascript:void()"
+                     onclick='<%="javascript:Delete(\""+org.apache.manifoldcf.ui.util.Encoder.attributeJavascriptEscape(name)+"\")"%>'
+                     title='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.Delete")+" "+org.apache.manifoldcf.ui.util.Encoder.attributeEscape(name)%>'
+                     class="btn btn-danger btn-xs" role="button" data-toggle="tooltip">
+                    <span class="fa fa-trash" aria-hidden="true"></span>
+                  </a>
+                </div>
+              </td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(name)%>
+              </td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(description)%>
+              </td>
+              <td><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(connectorName)%>
+              </td>
+              <td><%=Integer.toString(maxCount)%>
+              </td>
+            </tr>
+            <%
+              }
+            %>
+          </table>
+        </div>
+        <div class="box-footer clearfix">
+          <div class="btn-group">
+            <a href="edittransformation.jsp"
+               alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"listtransformations.AddATransformationConnection")%>"
+               class="link btn btn-primary" role="button">
+              <span class="fa fa-plus-circle" aria-hidden="true"></span>
+              <%=Messages.getBodyString(pageContext.getRequest().getLocale(), "listtransformations.AddaNewTransformationConnection")%>
+            </a>
+          </div>
+          <%
+          } catch (ManifoldCFException e) {
+            e.printStackTrace();
+            variableContext.setParameter("text", e.getMessage());
+            variableContext.setParameter("target", "index.jsp");
+          %>
+          <jsp:forward page="error.jsp"/>
+          <%
+            }
+          %>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
\ 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.
+ */
 %>
 <?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(),"index.ApacheManifoldCFLogin")%>
-		</title>
-		<script type="text/javascript">
-			<!--
-			function login()
-			{
-				document.loginform.submit();
-			}
-			//-->
-		</script>
-	</head>
-	<body class="standardbody">
-		<table class="page">
-			<tr><td colspan="2" class="banner"><jsp:include page="banner.jsp" flush="true"/></td></tr>
-			<tr>
-				<td colspan="2" class="window">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
+  <!-- Bootstrap 3.3.2 -->
+  <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css"/>
+  <link rel="StyleSheet" href="css/style.css" type="text/css" media="screen"/>
+  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+  <script src=javascript/html5shiv.min.js"></script>
+  <script src="javascript/respond.min.js"></script>
+  <![endif]-->
+  <script type="text/javascript">
+    <!--
+    document.title = '<%=Messages.getBodyString(pageContext.getRequest().getLocale(), "index.ApacheManifoldCFLogin")%>';
+    function login() {
+      document.loginform.submit();
+    }
+    //-->
+  </script>
+</head>
+<body class="login-page">
+<div class="login-box">
+  <div class="login-logo">
+    <a href="/"><img src="ManifoldCF-logo.png"/></a>
+  </div>
+  <!-- /.login-logo -->
+  <div class="login-box-body">
+    <p class="login-box-msg">Sign in to start your session</p>
 
-					<form class="standardform" name="loginform" action="setupAdminProfile.jsp" method="POST">
-						<table class="displaytable">
-<%
-String value = variableContext.getParameter("loginfailed");
-if (value != null && value.equals("true"))
-{
-%>
-							<tr><td class="message" colspan="2"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.LoginFailed")%></td></tr>
-							<tr><td class="separator" colspan="2"><hr/></td></tr>
-<%
-}
-%>
-							<tr>
-								<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%></nobr></td>
-								<td class="value">
-									<input name="userID" type="text" size="32" value=""/>
-								</td>
-							</tr>
-							<tr>
-								<td class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.PasswordColon")%></nobr></td>
-								<td class="value">
-									<input name="password" type="password" size="32" value=""/>
-								</td>
-							</tr>
-							<tr><td class="separator" colspan="2"><hr/></td></tr>
-							<tr>
-								<td class="message" colspan="2">
-									<input type="button" onclick='Javascript:login();' value='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>' alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'/>
-								</td>
-							</tr>
-						</table>
-					</form>
-				</td>
-			</tr>
-		</table>
-	</body>
-</html>
+    <form class="standardform" name="loginform" action="setupAdminProfile.jsp" method="POST">
+      <%
+        if (request.getParameter("nextUrl") != null) {
+      %>
+      <input type="hidden" name="nextUrl" value="<%=request.getParameter("nextUrl")%>">
+      <%}%>
+      <%
+        String value = variableContext.getParameter("loginfailed");
+        if (value != null && value.equals("true")) {
+      %>
+      <div class="callout callout-danger">
+        <p><%=Messages.getBodyString(pageContext.getRequest().getLocale(), "index.LoginFailed")%>
+        </p>
+      </div>
+
+      <%
+        }
+      %>
+      <div class="form-group has-feedback">
+        <input name="userID" type="text" class="form-control"
+               placeholder="<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%>"/>
+        <span class="glyphicon glyphicon-user form-control-feedback"></span>
+      </div>
+      <div class="form-group has-feedback">
+        <input name="password" type="password" class="form-control"
+               placeholder="<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.PasswordColon")%>"/>
+        <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+      </div>
+      <div class="row">
+        <div class="col-xs-8">
 
+        </div>
+        <!-- /.col -->
+        <div class="col-xs-4">
+          <input type="button" class="btn btn-primary btn-block" onclick='Javascript:login();'
+                 value='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'
+                 alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'/>
+        </div>
+        <!-- /.col -->
+      </div>
+    </form>
+  </div>
+</div>
+</body>
+</html>
\ 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");
 %>
 



Mime
View raw message