Author: kishore
Date: Sat Mar 18 01:07:36 2017
New Revision: 1787519
URL: http://svn.apache.org/viewvc?rev=1787519&view=rev
Log:
Updated UI for error, maintenance, unauthorized pages.
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/error.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/sidebar.jsp
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/unauthorized.jsp
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/error.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/error.jsp?rev=1787519&r1=1787518&r2=1787519&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/error.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/error.jsp
Sat Mar 18 01:07:36 2017
@@ -38,11 +38,17 @@
String target = variableContext.getParameter("target");
%>
-
-<div class="alert alert-danger">
- <h4><i class="icon fa fa-ban"></i> Error!</h4>
- <%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(errorText)%>
+<div class="box box-solid">
+ <div class="box-body">
+ <div class="alert alert-danger">
+ <h3><i class="icon fa fa-ban"></i> Error!</h3>
+ <h4><%=org.apache.manifoldcf.ui.util.Encoder.bodyEscape(errorText)%></h4>
+ </div>
+ </div>
+ <div class="box-footer with-border">
+ <a class="link btn btn-primary"
href='<%=org.apache.manifoldcf.core.util.URLEncoder.encode(target)%>'
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>"
data-toggle="tooltip">
+ <i class="fa fa-check fa-fw" aria-hidden="true"></i>OK
+ </a>
+ </div>
</div>
-<a class="link btn btn-primary btn-sm"
- href='<%=org.apache.manifoldcf.core.util.URLEncoder.encode(target)%>'
-
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>"
data-toggle="tooltip"><i class="fa fa-check fa-fw"
aria-hidden="true"></i>OK</a>
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp?rev=1787519&r1=1787518&r2=1787519&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/maintenanceunderway.jsp
Sat Mar 18 01:07:36 2017
@@ -21,53 +21,27 @@
* 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"/>
- <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">
- <!--
- $.ManifoldCF.setTitle(
- '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.ApacheManifoldCFMaintenanceUnderway")%>',
- '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.ApacheManifoldCFMaintenanceUnderway")%>'
- );
- //-->
- </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">
-
- <div class="alert alert-danger">
- <h4><i class="icon fa fa-ban"></i> Error!</h4>
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.MaintenanceUnderway")%><br/>
-
<%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.PleaseTryAgainLater")%>
- </div>
-
- <a class="btn btn-primary btn-sm" href='index.jsp'
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>">OK</a>
-
- </div>
- </div>
+<script type="text/javascript">
+ <!--
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.ApacheManifoldCFMaintenanceUnderway")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.ApacheManifoldCFMaintenanceUnderway")%>'
+ );
+ //-->
+</script>
+
+<div class="box box-error">
+ <div class="box-body">
+ <div class="alert alert-danger">
+ <h3><i class="icon fa fa-ban"></i> Error!</h3>
+
<h4><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.MaintenanceUnderway")%></h4>
+
<p><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"error.PleaseTryAgainLater")%></p>
</div>
- </body>
-</html>
+ </div>
+ <div class="box-footer with-border">
+ <a class="btn btn-primary" href='index.jsp'
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>"
data-toggle="tooltip">
+ <i class="fa fa-check fa-fw" aria-hidden="true"></i>OK
+ </a>
+ </div>
+</div>
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/sidebar.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/sidebar.jsp?rev=1787519&r1=1787518&r2=1787519&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/sidebar.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/sidebar.jsp
Sat Mar 18 01:07:36 2017
@@ -177,7 +177,7 @@
</a>
<ul class="treeview-menu">
<li>
- <a
href="<%="http://manifoldcf.apache.org/"+Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.Locale")+"/release-documentation.html"%>"
+ <a
href="<%="http://manifoldcf.apache.org/"+Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.Locale")+"/release-documentation.html"%>"
target="_blank"
alt="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"navigation.Help")%>"><i
class="fa
fa-book"></i><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"navigation.Help")%></a>
</li>
<li>
Modified:
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/unauthorized.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/unauthorized.jsp?rev=1787519&r1=1787518&r2=1787519&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/unauthorized.jsp
(original)
+++
manifoldcf/branches/CONNECTORS-1196-2/framework/crawler-ui/src/main/webapp/unauthorized.jsp
Sat Mar 18 01:07:36 2017
@@ -23,12 +23,12 @@
%>
<script type="text/javascript">
- <!--
- $.ManifoldCF.setTitle(
- '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.Unauthorized")%>',
- '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.Unauthorized")%>'
- );
- //-->
+ <!--
+ $.ManifoldCF.setTitle(
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.Unauthorized")%>',
+ '<%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.Unauthorized")%>'
+ );
+ //-->
</script>
<%
@@ -37,11 +37,17 @@
String target = variableContext.getParameter("target");
%>
-
-<div class="alert alert-danger">
- <h4><i class="icon fa fa-ban"></i> Error!</h4>
- <%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.Unauthorized")%>
+<div class="box box-danger">
+ <div class="box-body">
+ <div class="alert alert-danger">
+ <h3><i class="icon fa fa-ban"></i> Error!</h3>
+ <h4><%=Messages.getBodyString(pageContext.getRequest().getLocale(),
"error.Unauthorized")%></h4>
+ </div>
+ </div>
+ <div class="box-footer with-border">
+ <a class="btn btn-primary"
href='<%=org.apache.manifoldcf.core.util.URLEncoder.encode(target)%>'
+
title="<%=Messages.getAttributeString(pageContext.getRequest().getLocale(),"error.Return")%>"
data-toggle="tooltip">
+ <i class="fa fa-check fa-fw" aria-hidden="true"></i>OK
+ </a>
+ </div>
</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>
