shuber 2004/10/13 14:31:09 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/views/html/startup launch_admin.html launch_jahia.html
launchbrowser.html loadingjahia.html
loadingserver.html
src/views/jsp index.jsp
Log:
JAHIA-190 : Add "/" at the end of the default Jahia url when launching
Startup URL is now of the form :
http://localhost:8080/jahia/
Revision Changes Path
1.2.4.1 +2 -2 jahia/src/views/html/startup/launch_admin.html
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/html/startup/launch_admin.html.diff?r1=1.2&r2=1.2.4.1&f=h
1.3.4.1 +2 -2 jahia/src/views/html/startup/launch_jahia.html
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/html/startup/launch_jahia.html.diff?r1=1.3&r2=1.3.4.1&f=h
1.2.4.1 +2 -2 jahia/src/views/html/startup/launchbrowser.html
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/html/startup/launchbrowser.html.diff?r1=1.2&r2=1.2.4.1&f=h
1.5.4.1 +1 -1 jahia/src/views/html/startup/loadingjahia.html
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/html/startup/loadingjahia.html.diff?r1=1.5&r2=1.5.4.1&f=h
1.4.4.1 +13 -13 jahia/src/views/html/startup/loadingserver.html
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/html/startup/loadingserver.html.diff?r1=1.4&r2=1.4.4.1&f=h
1.1.4.1 +1 -1 jahia/src/views/jsp/index.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/index.jsp.diff?r1=1.1&r2=1.1.4.1&f=h
Index: launch_admin.html
===================================================================
RCS file: /home/cvs/repository/jahia/src/views/html/startup/Attic/launch_admin.html,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- launch_admin.html 19 Mar 2002 22:18:29 -0000 1.2
+++ launch_admin.html 13 Oct 2004 12:31:08 -0000 1.2.4.1
@@ -3,9 +3,9 @@
<title>Jahia Administration</title>
</head>
<body bgcolor="#FFFFFF">
- <p>If you are not automatically redirected to Jahia Administration, click <a
href="http://localhost:8080/jahia/JahiaAdministration"; target="_top">here</a>.
+ <p>If you are not automatically redirected to Jahia Administration, click <a
href="http://localhost:8080/jahia/administration/"; target="_top">here</a>.
<script language="javascript">
- eval("top.location = 'http://localhost:8080/jahia/JahiaAdministration'");
+ eval("top.location = 'http://localhost:8080/jahia/administration/'");
</script>
</body>
</html>
\ No newline at end of file
Index: launch_jahia.html
===================================================================
RCS file: /home/cvs/repository/jahia/src/views/html/startup/Attic/launch_jahia.html,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- launch_jahia.html 19 Mar 2002 22:21:46 -0000 1.3
+++ launch_jahia.html 13 Oct 2004 12:31:08 -0000 1.3.4.1
@@ -3,9 +3,9 @@
<title>Jahia</title>
</head>
<body bgcolor="#FFFFFF">
- <p>If you are not automatically redirected to Jahia's welcome page, click <a
href="http://localhost:8080/jahia/Jahia"; target="_top">here</a>.
+ <p>If you are not automatically redirected to Jahia's welcome page, click <a
href="http://localhost:8080/jahia/"; target="_top">here</a>.
<script language="javascript">
- eval("top.location = 'http://localhost:8080/jahia/Jahia'");
+ eval("top.location = 'http://localhost:8080/jahia/'");
</script>
</body>
</html>
\ No newline at end of file
Index: launchbrowser.html
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/html/startup/Attic/launchbrowser.html,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- launchbrowser.html 19 Mar 2002 22:21:46 -0000 1.2
+++ launchbrowser.html 13 Oct 2004 12:31:08 -0000 1.2.4.1
@@ -3,9 +3,9 @@
<title>Welcome to Jahia</title>
</head>
<body>
- <p>If you are not automatically redirected to Jahia's welcome page, click <a
href="http://localhost:8080/jahia/Jahia"; target="_top">here</a>
+ <p>If you are not automatically redirected to Jahia's welcome page, click <a
href="http://localhost:8080/jahia/"; target="_top">here</a>
<script language="javascript">
- eval("top.location = 'http://localhost:8080/jahia/Jahia'");
+ eval("top.location = 'http://localhost:8080/jahia/'");
</script>
</body>
</html>
\ No newline at end of file
Index: loadingjahia.html
===================================================================
RCS file: /home/cvs/repository/jahia/src/views/html/startup/Attic/loadingjahia.html,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- loadingjahia.html 27 May 2002 14:10:35 -0000 1.5
+++ loadingjahia.html 13 Oct 2004 12:31:08 -0000 1.5.4.1
@@ -1,6 +1,6 @@
<html>
<head>
- <meta http-equiv="Refresh" content="10;url=/jahia/Jahia">
+ <meta http-equiv="Refresh" content="10;url=/jahia/">
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title>Loading Server...</title>
<link rel="stylesheet" href="jahia.css" type="text/css">
Index: loadingserver.html
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/html/startup/Attic/loadingserver.html,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- loadingserver.html 7 Oct 2003 11:43:35 -0000 1.4
+++ loadingserver.html 13 Oct 2004 12:31:08 -0000 1.4.4.1
@@ -1,17 +1,17 @@
<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<title>Loading Server...</title>
-<link rel="stylesheet" href="jahia.css" type="text/css">
-</head>
-<body class="text" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
-<table width="100%" height="63" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td width="126" height="63"><img src="images/header.gif" width="126"
height="63"></td>
- <td height="63" width="100%" background="images/header_bg.gif"> </td>
- </tr>
-</table>
-<center>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>Loading Server...</title>
+ <link rel="stylesheet" href="jahia.css" type="text/css">
+ </head>
+ <body class="text" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+ <table width="100%" height="63" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td width="126" height="63"><img src="images/header.gif" width="126"
height="63"></td>
+ <td height="63" width="100%" background="images/header_bg.gif"> </td>
+ </tr>
+ </table>
+ <center>
<b class="text"><Font size="4">Welcome to Jahia.</font></b>
<br><br>
<table width="100%" border="0" cellspacing="0" cellpadding="0" align="center">
Index: index.jsp
===================================================================
RCS file: /home/cvs/repository/jahia/src/views/jsp/Attic/index.jsp,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- index.jsp 31 Jan 2003 13:54:42 -0000 1.1
+++ index.jsp 13 Oct 2004 12:31:09 -0000 1.1.4.1
@@ -1,2 +1,2 @@
<%@ page language="java" %>
-<jsp:forward page="/Jahia" />
+<jsp:forward page="/Jahia/" />
