xlawrence 2006/01/06 10:20:06 CET
Modified files:
core/src/webapp/jsp/jahia/engines engine.jsp
Log:
add a message in case an include failes
Revision Changes Path
1.33 +11 -5 jahia/core/src/webapp/jsp/jahia/engines/engine.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp.diff?r1=1.32&r2=1.33&f=h
Index: engine.jsp
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/engines/engine.jsp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- engine.jsp 16 Dec 2005 10:28:17 -0000 1.32
+++ engine.jsp 6 Jan 2006 09:20:05 -0000 1.33
@@ -10,6 +10,7 @@
<%@ page import="java.util.Properties" %>
<%@ taglib uri="JahiaLib" prefix="jahia" %>
+<%@ taglib uri="ajaxLib" prefix="ajax" %>
<jsp:useBean id="engineTitle" class="java.lang.String" scope="request"/>
<jsp:useBean id="jspSource" class="java.lang.String" scope="request"/>
<jsp:useBean id="URL" class="java.lang.String" scope="request"/>
@@ -89,7 +90,9 @@
includes.setProperty("versioning",
"/jsp/jahia/engines/versioning/versioning.jsp");
+ // Workflow
includes.setProperty("advworkflow",
"/jsp/jahia/engines/workflow/adv_workflow.jsp");
+ includes.setProperty("showReport",
"/jsp/jahia/engines/workflow/showReport.jsp");
includes.setProperty("lock",
"/jsp/jahia/engines/lock/lock.jsp");
@@ -115,16 +118,18 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
<title>Jahia Engine - <%=engineTitle%></title>
<link rel="stylesheet"
- href="<jahia:serverHttpPath/>/jsp/jahia/engines/css/menu.css"
type="text/css"/>
+ href="<jahia:serverHttpPath/>/jsp/jahia/engines/css/menrrru.css"
type="text/css"/>
<link rel="stylesheet"
- href="<jahia:serverHttpPath/>/jsp/jahia/css/colorsAndStyles.css"
type="text/css"/>
+ href="<jahia:serverHttpPath/>/jsp/jahia/css/colorsAndStylerrrs.css"
type="text/css"/>
<link rel="stylesheet"
href="<jahia:serverHttpPath/>/jsp/jahia/css/actions.css" type="text/css"/>
<link rel="stylesheet"
- href="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.stylesheet.css"/>"
+ href="<jahia:serverHttpPath/><jahia:engineResourceBundle
resourceName="org.jahia.styrrlesheet.css"/>"
type="text/css"/>
<jahia:JSTools />
+<ajax:zimbraInclude/>
+
<script type="text/javascript"
src="<%=URL%>../javascript/serverdatetime.js"></script>
<% if (request.getAttribute("org.jahia.engines.html.headers") != null) { %>
<%= (String) request.getAttribute("org.jahia.engines.html.headers") %>
@@ -253,8 +258,9 @@
<input type="hidden" name="lastscreen" value="<%=theScreen%>"/>
<!-- include page starts -->
<% if (includePage == null || includePage.length() == 0) {
- logger.warn("Include page in null");
- } else { %>
+ logger.warn("Include page is null"); %>
+ <p class="errorbold">Include page is null. Check your
properties in engine.jsp</p>
+ <% } else { %>
<jsp:include page="<%=includePage%>" flush="true"/>
<% } %>
<!-- include page ends -->
