Code Review / controller.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 86a8fcb)
Branding support for the newly added error page. 23/123/1
authorMadhu Venugopal <vmadhu@cisco.com>
Sat, 6 Apr 2013 16:40:44 +0000 (09:40 -0700)
committerMadhu Venugopal <vmadhu@cisco.com>
Sat, 6 Apr 2013 16:40:44 +0000 (09:40 -0700)
Change-Id: I49f0a4641bc7f6522006fa0794f6448997d0f9bd
Signed-off-by: Madhu Venugopal <vmadhu@cisco.com>
opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp [new file with mode: 0644] patch | blob
opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp patch | blob | history

diff --git a/opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp b/opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp
new file mode 100644 (file)
index 0000000..47de972
--- /dev/null
+++ b/opendaylight/web/brandfragment/src/main/resources/WEB-INF/jsp/customerror.jsp
@@ -0,0 +1,3 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<c:set var="title" value="Open Daylight - Error" scope="application"/>
+<link rel="stylesheet/less" type="text/css" href="/css/customlogin.less">
diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp
index 86625854d1e09d1ec1d392854566bb98b2b91fa4..7b0915ae1d00786782fb5660a46922f5a9e4faf7 100644 (file)
--- a/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp
+++ b/opendaylight/web/root/src/main/resources/WEB-INF/jsp/error.jsp
@@ -1,18 +1,27 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page import="java.net.URL" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <!DOCTYPE html>
 <html>
   <head>
     <meta charset="utf-8">
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
 <!DOCTYPE html>
 <html>
   <head>
     <meta charset="utf-8">
-    <title>OpenDaylight - Error</title>
 
     <!-- Bootstrap CSS - 1 -->
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     
     <!-- Login CSS - 2 -->
     <link rel="stylesheet/less" type="text/css" href="/css/login.less">
 
     <!-- Bootstrap CSS - 1 -->
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     
     <!-- Login CSS - 2 -->
     <link rel="stylesheet/less" type="text/css" href="/css/login.less">
-    
+
+<c:set var="title" value="OpenDaylight login error" scope="application"/>
+<%
+    String filePath = "/WEB-INF/jsp/customerror.jsp"; 
+       URL fileURL = pageContext.getServletContext().getResource(filePath);
+       if(fileURL!=null) {
+%>
+         <jsp:include page="<%=filePath%>" flush="true"/>
+<% } %>
+       <title>${title}</title>
     <!-- Bootstrap JS - 1 -->
     <script src="/js/bootstrap.min.js"></script>
     
     <!-- Bootstrap JS - 1 -->
     <script src="/js/bootstrap.min.js"></script>
     
@@ -32,7 +41,7 @@
        <div class="login-form">
          <div id="logo"></div>
            <fieldset>
        <div class="login-form">
          <div id="logo"></div>
            <fieldset>
-            <p>Your session has timed out or there was an error.<p>
+            <p>Authentication failed or session might have timed out.<p>
             <p>Please go back to the login page and try again.</p>
             <br/>
              <button class="btn btn-primary" type="submit" value="Log In" >Go To Login Page</button>
             <p>Please go back to the login page and try again.</p>
             <br/>
              <button class="btn btn-primary" type="submit" value="Log In" >Go To Login Page</button>
@@ -42,4 +51,4 @@
   </div> 
   </form>
 </body>
   </div> 
   </form>
 </body>
-</html>
\ No newline at end of file
+</html>
OpenDaylight controller