From 6c57bbcdf7793f740bf133d5555ef13cb1d233d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Thu, 9 Dec 2010 18:14:52 +0100
Subject: [PATCH] Fix NPE when pressing change scenario button

The zscript declaration had ben moved causing templateCtrl to not be
defined when doing the apply for the div.

FEA : ItEr64S03BugFixing
---
 .../src/main/webapp/common/layout/template.zul        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 3bcf772de..d560d60b2 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -28,11 +28,6 @@
 
 
 <zk>
-<div xmlns:n="http://www.zkoss.org/2005/zk/native" apply="${templateCtrl}" height="100%">
-
-<borderlayout height="100%" width="100%" >
-<north border="none">
-<n:div>
 <zscript>
 <![CDATA[
     contextPath = Executions.getCurrent().getContextPath();
@@ -40,6 +35,12 @@
 ]]>
 </zscript>
 
+<div xmlns:n="http://www.zkoss.org/2005/zk/native" apply="${templateCtrl}" height="100%">
+
+<borderlayout height="100%" width="100%" >
+<north border="none">
+<n:div>
+
 <scripts />
 
 <n:table width="100%" border="0" cellpadding="0" cellspacing="0">