Project

General

Profile

« Previous | Next » 

Revision 4080

Added by daigle over 16 years ago

Merge 1.9 changes into Head

View differences:

index.jsp
1
<%@ page    language="java" %>
1
<%@ page    language="java" import="edu.ucsb.nceas.metacat.service.PropertyService"%>
2 2
<% 
3 3
 /**
4 4
  *  '$RCSfile$'
......
31 31
%>
32 32
<%@ include file="settings.jsp"%>
33 33
<%@ include file="session_vars.jsp"%>
34
<%@ page import="edu.ucsb.nceas.metacat.MetaCatUtil" %>
35 34
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
36 35
<html>
37 36
<head>
......
43 42
</head>
44 43
<body>
45 44
  <script language="javascript">
46
	  insertTemplateOpening("<%=SERVER_URL_WITH_CONTEXT%>");
47
	  insertSearchBox("<%=SERVER_URL_WITH_CONTEXT%>");
45
	  insertTemplateOpening("<%=CONTEXT_URL%>");
46
	  insertSearchBox("<%=CONTEXT_URL%>");
48 47
  </script>
49 48
  <br/>
50 49

  
51
  <% if ( MetaCatUtil.getOption("runSpatialOption").equals("true") ) { %>
50
  <% if ( PropertyService.getProperty("runSpatialOption").equals("true") ) { %>
52 51
  <script language="javascript">
53
	  insertMap("<%=SERVER_URL_WITH_CONTEXT%>");
52
	  insertMap("<%=CONTEXT_URL%>");
54 53
  </script>
55 54
  <br/>
56 55
  <% } %>
57 56

  
58 57
  <script language="javascript">
59
	  insertLoginBox("<%=SERVER_URL_WITH_CONTEXT%>");
58
	  insertLoginBox("<%=CONTEXT_URL%>");
60 59
  </script>
61 60
  <script language="javascript">
62
	  insertTemplateClosing("<%=SERVER_URL_WITH_CONTEXT%>");
61
	  insertTemplateClosing("<%=CONTEXT_URL%>");
63 62
  </script>
64 63
</body>
65 64
</html>

Also available in: Unified diff