roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r645145 - in /roller/trunk/apps/weblogger/web/roller-ui/errors: 403.jsp 404.jsp denied.jsp error.jsp
Date Sat, 05 Apr 2008 17:48:13 GMT
Author: snoopdave
Date: Sat Apr  5 10:48:10 2008
New Revision: 645145

URL: http://svn.apache.org/viewvc?rev=645145&view=rev
Log:
Fix for ROL-1688:
    https://issues.apache.org/roller/browse/ROL-1688



Modified:
    roller/trunk/apps/weblogger/web/roller-ui/errors/403.jsp
    roller/trunk/apps/weblogger/web/roller-ui/errors/404.jsp
    roller/trunk/apps/weblogger/web/roller-ui/errors/denied.jsp
    roller/trunk/apps/weblogger/web/roller-ui/errors/error.jsp

Modified: roller/trunk/apps/weblogger/web/roller-ui/errors/403.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/roller-ui/errors/403.jsp?rev=645145&r1=645144&r2=645145&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/roller-ui/errors/403.jsp (original)
+++ roller/trunk/apps/weblogger/web/roller-ui/errors/403.jsp Sat Apr  5 10:48:10 2008
@@ -15,16 +15,17 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 --%>
-<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
-        <title><s:text name="error.title.403" /></title>
+        <title><fmt:message key="error.title.403" /></title>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     </head>
     <body>
         
-        <h2 class="error"><s:text name="error.title.403" /></h2>
+        <h2 class="error"><fmt:message key="error.title.403" /></h2>
         
         <c:set var="status_code" value="${requestScope['javax.servlet.error.status_code']}"
/>
         <c:set var="message"     value="${requestScope['javax.servlet.error.message']}"
/>
@@ -45,7 +46,7 @@
             </tr>
             <tr>
                 <td width="20%">Exception</td>
-                <td><s:text name="error.text.403" /></td>
+                <td><fmt:message key="error.text.403" /></td>
             </tr>
         </table>
         

Modified: roller/trunk/apps/weblogger/web/roller-ui/errors/404.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/roller-ui/errors/404.jsp?rev=645145&r1=645144&r2=645145&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/roller-ui/errors/404.jsp (original)
+++ roller/trunk/apps/weblogger/web/roller-ui/errors/404.jsp Sat Apr  5 10:48:10 2008
@@ -15,7 +15,8 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 --%>
-<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
 <fmt:setBundle basename="ApplicationResources" />
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">

Modified: roller/trunk/apps/weblogger/web/roller-ui/errors/denied.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/roller-ui/errors/denied.jsp?rev=645145&r1=645144&r2=645145&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/roller-ui/errors/denied.jsp (original)
+++ roller/trunk/apps/weblogger/web/roller-ui/errors/denied.jsp Sat Apr  5 10:48:10 2008
@@ -15,16 +15,17 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 --%>
-<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
 <%@ page isErrorPage="true" %>
 
-<h2><s:text name="error.permissionDenied.title" /></h2>
+<h2><fmt:message key="error.permissionDenied.title" /></h2>
 
-<s:text name="error.permissionDenied.prompt" />
+<fmt:message key="error.permissionDenied.prompt" />
 
 <ul>
-    <li><s:text name="error.permissionDenied.reason0" /></li>
-    <li><s:text name="error.permissionDenied.reason1" /></li>
-    <li><s:text name="error.permissionDenied.reason2" /></li>
-    <li><s:text name="error.permissionDenied.reason3" /></li>
+    <li><fmt:message key="error.permissionDenied.reason0" /></li>
+    <li><fmt:message key="error.permissionDenied.reason1" /></li>
+    <li><fmt:message key="error.permissionDenied.reason2" /></li>
+    <li><fmt:message key="error.permissionDenied.reason3" /></li>
 </ul>

Modified: roller/trunk/apps/weblogger/web/roller-ui/errors/error.jsp
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/roller-ui/errors/error.jsp?rev=645145&r1=645144&r2=645145&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/web/roller-ui/errors/error.jsp (original)
+++ roller/trunk/apps/weblogger/web/roller-ui/errors/error.jsp Sat Apr  5 10:48:10 2008
@@ -15,7 +15,8 @@
   copyright in this work, please see the NOTICE file in the top level
   directory of this distribution.
 --%>
-<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"  prefix="fmt" %>
 <fmt:setBundle basename="ApplicationResources" />
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">



Mime
View raw message