From 5829fab92db5abf53f097926ad430139d2a3d08f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Casta=C3=B1o?= <xcastanho@igalia.com>
Date: Fri, 8 Jan 2010 17:10:58 +0100
Subject: [PATCH] ItEr41S07DocumentacionFormacionItEr40S07 : Links to help html
 pages points are now relative.

Now the help files are included inside navalplanner-webapp and the help links points at them.
---
 navalplanner-webapp/pom.xml                                 | 3 +--
 .../src/main/webapp/common/layout/_customMenu.zul           | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/navalplanner-webapp/pom.xml b/navalplanner-webapp/pom.xml
index 99adf6f55..39f3db11f 100644
--- a/navalplanner-webapp/pom.xml
+++ b/navalplanner-webapp/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"    
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <parent>
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul b/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
index e3c81ef3c..76a03cded 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
@@ -54,7 +54,7 @@
     </n:table></n:td>
     <n:td valign="top" align="right" class="help-link">
     <div tooltip="help-popup">
-    <n:a href="https://naval.igalia.com/fileadmin/templates/doc/${menuContainer.helpLink}" target="_blank">
+    <n:a href="/navalplanner-webapp/help/gl/${menuContainer.helpLink}" target="_blank">
         <n:span>${i18n:_('Help')}</n:span>
         <n:img src="/navalplanner-webapp/common/img/axuda.gif" alt="Axuda" width="23" height="24" border="0" style="margin-top:4px;"/>
     </n:a>
@@ -64,8 +64,8 @@
     </n:table>
 
     <popup id="help-popup" width="700px" style="position:relative;right:190px;padding:10px">
-        <iframe id="iframe" src="https://naval.igalia.com/fileadmin/templates/doc/${menuContainer.helpLink}" width="670px" height="450px"
+        <iframe id="iframe" src="/help/gl/${menuContainer.helpLink}" width="670px" height="450px"
             style="border: 1px solid gray" />
     </popup>
 
-</div>
\ No newline at end of file
+</div>