Project

General

Profile

« Previous | Next » 

Revision 3739

Get rid of the ant tokens and the relative paths by using the context url and cgi prefix provided by the settings.jsp.
Now the "short form" of urls will work with the iframe skins. sanparks and saeon can also be set as the "default" skin and the paths will resolve correctly.
Note: still an ant token in the .cfg file used with perl...

View differences:

header.jsp
24 24
	 */
25 25
%>
26 26
<!--____________________________max_width____________________________________-->
27

  
27
<%@ include file="settings.jsp"%>
28 28
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
29 29
<%@page import="edu.ucsb.nceas.metacat.clientview.ClientViewHelper"%>
30 30
<html>
31 31
<head>
32 32
<title>SAEON - South African Environmental Observation Network
33 33
Repository</title>
34
<link rel="stylesheet" type="text/css" href="saeon.css" />
34
<link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/saeon.css" />
35 35
</head>
36 36

  
37 37
<body
38
	style="background-image: url('images/bg.png'); background-repeat: repeat-x;"
38
	style="background-image: url('<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/images/bg.png'); background-repeat: repeat-x;"
39 39
	class="section-front-page" dir="ltr">
40 40

  
41 41
<table align="center" width="100%" cellpadding="0" cellspacing="0">
42 42
	<tr>
43
		<td background="images/banner_background_left.jpg">&nbsp;</td>
43
		<td background="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/images/banner_background_left.jpg">&nbsp;</td>
44 44
		<td height="255" width="760"
45
			style="background-image: url('images/logo.jpg'); background-position: top center; background-repeat: no-repeat;">
45
			style="background-image: url('<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/images/logo.jpg'); background-position: top center; background-repeat: no-repeat;">
46 46
		</td>
47
		<td background="images/banner_background_right.jpg">&nbsp;</td>
47
		<td background="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/images/banner_background_right.jpg">&nbsp;</td>
48 48
	</tr>
49 49
</table>
50 50
<div id="visual-portal-wrapper">
......
62 62

  
63 63
<ul id="portal-globalnav">
64 64
	<li class="plain">
65
		<a href="./" 
65
		<a href="http://www.saeon.ac.za/" 
66 66
		target="_top"
67 67
		style="background-color: White; font-weight: normal" 
68 68
		title="SAEON">SAEON</a></li>
......
73 73
		title="Data Repository">Repository</a></li>
74 74
	<!-- 	
75 75
	<li class="plain">
76
		<a href="@cgi-prefix@/register-dataset.cgi?cfg=saeon"
76
		<a href="<%=CGI_PREFIX%>/register-dataset.cgi?cfg=saeon"
77 77
		target="_top"
78 78
		style="background-color: White; font-weight: normal" 
79 79
		title="Register">Register</a></li>
......
102 102
<h5 class="hiddenStructure">Personal tools</h5>
103 103
<ul id="portal-personaltools">
104 104
	<li><%=loginHTML %></li>
105
	<li><a href="@cgi-prefix@/ldapweb.cgi?cfg=saeon" target="_top"> Join </a></li>
105
	<li><a href="<%=CGI_PREFIX%>/ldapweb.cgi?cfg=saeon" target="_top"> Join </a></li>
106 106
</ul>
107 107

  
108 108
</body>

Also available in: Unified diff