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:

upload.jsp
24 24
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
25 25
*/
26 26
%>
27
<%@ include file="../../common/common-settings.jsp"%>
27
<%@ include file="settings.jsp"%>
28 28

  
29 29
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
30 30
<html>
31 31
    <head>
32 32
        <title>SAEON - South African Environmental Observation Network Repository</title>
33
        <link rel="stylesheet" href="../default/default.css" type="text/css"/>
34
        <link rel="stylesheet" type="text/css" href="saeon.css"/>
35
        <script language="JavaScript" type="text/JavaScript" src="saeon.js"></script>
36
        <script language="JavaScript" type="text/JavaScript" src="../../common/branding.js"></script>
33
        <link rel="stylesheet" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/default/default.css" type="text/css"/>
34
        <link rel="stylesheet" type="text/css" href="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/saeon.css"/>
35
        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/skins/saeon/saeon.js"></script>
36
        <script language="JavaScript" type="text/JavaScript" src="<%=SERVER_URL_WITH_CONTEXT%>/style/common/branding.js"></script>
37 37
    </head>
38 38
    <body>
39 39
        <script language="JavaScript">
40 40
            function getMapFrame() {
41 41
                return document.getElementById('mapFrame');
42 42
            }
43
            insertTemplateOpening();
43
            insertTemplateOpening("<%=SERVER_URL_WITH_CONTEXT%>");
44 44
        </script>
45 45
        
46 46
        <jsp:include page="SaeonUpload.jspx" />
47 47
        
48 48
        <script language="JavaScript">
49
            //insertLoginBox();
50
            //insertSearchBox();
51
            insertTemplateClosing();
49
            insertTemplateClosing("<%=SERVER_URL_WITH_CONTEXT%>");
52 50
        </script>
53 51
    </body>
54 52
</html>

Also available in: Unified diff