Author: kishore
Date: Sun Feb 19 16:29:20 2017
New Revision: 1783669
URL: http://svn.apache.org/viewvc?rev=1783669&view=rev
Log:
Updated index.jsp, login.jsp, error.jsp to new UI
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/error.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/execute.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/index.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/login.jsp
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/logout.jsp
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/error.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/error.jsp?rev=1783669&r1=1783668&r2=1783669&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/error.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/error.jsp
Sun Feb 19 16:29:20 2017
@@ -22,27 +22,14 @@
*/
%>
-<?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.ApacheManifoldCFError")%>
- </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.Error")%></p>
+<script type="text/javascript">
+ <!--
+ $.ManifoldCF.setTitle(
+
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.ApacheManifoldCFError")%>',
+
'<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.Error")%>'
+ );
+ //-->
+</script>
<%
// These have to be fetched from request rather than variableContext since
error
@@ -50,16 +37,12 @@
String errorText = variableContext.getParameter("text");
String target = variableContext.getParameter("target");
%>
- <table class="displaytable">
- <tr><td
class="message"><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(errorText)%></td></tr>
- <tr><td class="separator"><hr/></td></tr>
- <tr><td class="message"><a
href='<%=org.apache.manifoldcf.core.util.URLEncoder.encode(target)%>'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>">OK</a></td></tr>
- </table>
-
- </td>
- </tr>
- </table>
-</body>
-</html>
+<div class="alert alert-danger">
+ <h4><i class="icon fa fa-ban"></i> Error!</h4>
+ <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(errorText)%>
+</div>
+<a class="btn btn-primary btn-sm"
+ href='<%=org.apache.manifoldcf.core.util.URLEncoder.encode(target)%>'
+
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>">OK</a>
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/execute.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/execute.jsp?rev=1783669&r1=1783668&r2=1783669&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/execute.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/execute.jsp
Sun Feb 19 16:29:20 2017
@@ -1735,4 +1735,4 @@
<jsp:forward page="error.jsp"/>
<%
}
-%>
+%>
\ No newline at end of file
Modified:
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/index.jsp?rev=1783669&r1=1783668&r2=1783669&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/index.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196/framework/crawler-ui/src/main/webapp/index.jsp
Sun Feb 19 16:29:20 2017
@@ -24,28 +24,89 @@
<?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.ApacheManifoldCF")%>
- </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(),"index.WelcomeToApacheManifoldFC")%></p>
- </td>
- </tr>
- </table>
-
-</body>
-
+<html lang="en">
+ <head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge">
+ <meta name="viewport"
+ content="width=device-width, initial-scale=1, maximum-scale=1,
user-scalable=no">
+ <!-- Bootstrap -->
+ <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet"
type="text/css"/>
+ <link href="bootstrap-select/css/bootstrap-select.min.css"
rel="stylesheet" type="text/css"/>
+ <link href="css/font-awesome.min.css" rel="stylesheet" type="text/css"/>
+ <link rel="stylesheet" href="css/style.css" type="text/css"
media="screen"/>
+ <link rel="stylesheet" href="css/print.css" type="text/css" media="print"/>
+ <!-- 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]-->
+ </head>
+ <body class="fixed skin-black sidebar-mini">
+ <div class="wrapper">
+ <header class="main-header">
+ <nav class="navbar navbar-static-top" role="navigation">
+ <a class="logo">
+ <img src="ManifoldCF-logo.png"/>
+ </a>
+ <!-- Sidebar toggle button-->
+ <a href="/" class="sidebar-toggle" data-toggle="offcanvas"
role="button">
+ <span class="sr-only">Toggle navigation</span>
+ </a>
+
+ <h1
class="hidden-xs"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"banner.DocumentIngestion")%>
+ </h1>
+ <!-- Navbar Right Menu -->
+ <div class="navbar-custom-menu">
+ <div id="loader">Loading...</div>
+ <div class="spinner">
+ <div class="bounce1"></div>
+ <div class="bounce2"></div>
+ <div class="bounce3"></div>
+ </div>
+ </div>
+ </nav>
+ </header>
+ <aside class="main-sidebar">
+ <jsp:include page="sidebar.jsp" flush="true"/>
+ </aside>
+ <div class="content-wrapper">
+ <section class="content-header">
+ <h1 class="visible-print-block">Apache ManifoldCF™</h1>
+
+ <h1 id="heading">Welcome to Apache ManifoldCF™</h1>
+ </section>
+ <section id="content" class="content">
+ </section>
+ </div>
+ <footer class="main-footer">
+ <div class="pull-right hidden-xs"><b>Version</b> 2.2</div>
+ <strong>Copyright © 2009-2015 <a
target="_blank" href="http://manifoldcf.apache.org/";>Apache
ManifoldCF™</a>.</strong>
+ </footer>
+ </div>
+ <script src="javascript/jquery.min.js"></script>
+ <!-- Bootstrap JS -->
+ <script src="bootstrap/js/bootstrap.min.js"
type="text/javascript"></script>
+ <!-- Bootstrap Select -->
+ <script src="bootstrap-select/js/bootstrap-select.min.js"
type="text/javascript"></script>
+ <script src="javascript/jquery.slimscroll.min.js"
type="text/javascript"></script>
+ <script src="javascript/jquery.history.js" type="text/javascript"></script>
+ <!-- ManifoldCF -->
+ <script src="javascript/app.js" type="text/javascript"></script>
+<%
+ String reqPage = request.getParameter("p");
+ if (reqPage != null && reqPage.length() > 0)
+ {
+%>
+ <script type="application/javascript">
+ $(document).ready(function ()
+ {
+ $.ManifoldCF.loadContent('<%=URLEncoder.encode(reqPage)%>');
+ });
+ </script>
+<%
+ }
+%>
+ </body>
</html>
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=1783669&r1=1783668&r2=1783669&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
Sun Feb 19 16:29:20 2017
@@ -31,11 +31,17 @@ response.setContentType("text/html;chars
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="StyleSheet" href="style.css" type="text/css" media="screen"/>
- <title>
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.ApacheManifoldCFLogin")%>
- </title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <meta content='width=device-width, initial-scale=1, maximum-scale=1,
user-scalable=no' name='viewport'>
+ <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet"
type="text/css"/>
+ <link rel="StyleSheet" href="css/style.css" type="text/css"
media="screen"/>
+
<title><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.ApacheManifoldCFLogin")%></title>
+ <!-- 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">
<!--
function login()
@@ -47,58 +53,66 @@ response.setContentType("text/html;chars
function loginKeyPress(e)
{
- e = e || window.event;
- if (e.keyCode == 13)
- {
- document.getElementById('buttonLogin').click();
- return false;
- }
- return true;
+ e = e || window.event;
+ if (e.keyCode == 13)
+ {
+ document.getElementById('buttonLogin').click();
+ return false;
+ }
+ return true;
}
//-->
</script>
</head>
- <body class="standardbody">
- <table class="page">
- <tr><td colspan="2" class="banner"><jsp:include page="banner.jsp"
flush="true"/></td></tr>
- <tr>
- <td colspan="2" class="window">
+ <body class="login-page">
+ <div class="login-box">
+ <div class="login-logo">
+ <a href="/"><img src="ManifoldCF-logo.png"/></a>
+ </div>
+ <!-- /.login-logo -->
+ <div class="login-box-body">
+ <p class="login-box-msg">Sign in to start your session</p>
- <form class="standardform" name="loginform"
action="setupAdminProfile.jsp" method="POST">
- <table class="displaytable">
+ <form class="standardform" name="loginform"
action="setupAdminProfile.jsp" method="POST">
+<%
+if (request.getParameter("nextUrl") != null)
+{
+%>
+ <input type="hidden" name="nextUrl"
value="<%=request.getParameter("nextUrl")%>">
+<%
+}
+%>
<%
String value = variableContext.getParameter("loginfailed");
if (value != null && value.equals("true"))
{
%>
- <tr><td class="message"
colspan="2"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.LoginFailed")%></td></tr>
- <tr><td class="separator" colspan="2"><hr/></td></tr>
+ <div class="callout callout-danger">
+
<p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.LoginFailed")%></p>
+ </div>
+
<%
}
%>
- <tr>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%></nobr></td>
- <td class="value">
- <input name="userID" type="text" size="32" value=""/>
- </td>
- </tr>
- <tr>
- <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.PasswordColon")%></nobr></td>
- <td class="value">
- <input name="password" type="password" size="32" value=""/>
- </td>
- </tr>
- <tr><td class="separator" colspan="2"><hr/></td></tr>
- <tr>
- <td class="message" colspan="2">
- <input id="buttonLogin" type="button"
onclick='Javascript:login();'
value='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'
alt='<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"index.Login")%>'/>
- </td>
- </tr>
- </table>
- </form>
- </td>
- </tr>
- </table>
+ <div class="form-group has-feedback">
+ <input name="userID" type="text" class="form-control"
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>
+ <div class="col-xs-4">
+ <input id="buttonLogin" 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>
+ </div>
+ </form>
+ </div>
+ </div>
</body>
</html>
-
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=1783669&r1=1783668&r2=1783669&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
Sun Feb 19 16:29:20 2017
@@ -30,4 +30,3 @@ response.setContentType("text/html;chars
adminprofile.logout();
response.sendRedirect("login.jsp");
%>
-
