Project

General

Profile

« Previous | Next » 

Revision 3428

use jsp page includes rather than a content area iframe for the main content.
this plays better with the left nav and also the default resultset xsl

View differences:

lib/style/skins/sanparks/upload.jsp
1
<%@ page    language="java" %>
2
<%
3
/*
4
*  '$RCSfile$'
5
*    Copyright: 2006 Regents of the University of California and the
6
*               National Center for Ecological Analysis and Synthesis
7
*
8
*   '$Author$'
9
*     '$Date$'
10
* '$Revision$'
11
*
12
* This program is free software; you can redistribute it and/or modify
13
* it under the terms of the GNU General Public License as published by
14
* the Free Software Foundation; either version 2 of the License, or
15
* (at your option) any later version.
16
*
17
* This program is distributed in the hope that it will be useful,
18
* but WITHOUT ANY WARRANTY; without even the implied warranty of
19
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
20
* GNU General Public License for more details.
21
*
22
* You should have received a copy of the GNU General Public License
23
* along with this program; if not, write to the Free Software
24
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
25
*/
26
%>
27
<%@ include file="../../common/common-settings.jsp"%>
28

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

  
lib/style/skins/sanparks/SaeonLogin.jspx
56 56

  
57 57
</head>
58 58
	
59
<body style="background: #FFFFFF;">
59
<body>
60
<!-- <body style="background: #FFFFFF;">-->
60 61
	<div class="templatecontentareaclass">
61 62
		<jsp:useBean id="clientViewBean" scope="session" class="edu.ucsb.nceas.metacat.clientview.ClientView" /> 
62 63
		<jsp:setProperty name="clientViewBean" property="*" /> 
......
158 159
			<span class="regtext"> (request an account...)</span>
159 160
		</a>
160 161
	</h3>
161
	<form name="loginForm" method="post" action="SaeonLogin.jspx"
162
	<form name="loginForm" method="post" action="./"
162 163
		onsubmit="return allowSubmit(this)">
163 164
		<input name="qformat" type="hidden" value="sanparks" />
164 165
	<table>
......
201 202
		Welcome,
202 203
		<jsp:expression>clientViewBean.getUsername()</jsp:expression>  
203 204
	</h3>
204
	<form name="logoutForm" method="post" action="SaeonLogin.jspx">
205
	<form name="logoutForm" method="post" action="./">
205 206
	<input name="qformat" value="sanparks" type="hidden" />
206 207
	<table>
207 208
		<tr valign="top">
......
261 262
	<jsp:scriptlet>
262 263
		if (clientViewHelper.isLoggedIn()) {
263 264
	</jsp:scriptlet>
264
	<form action="SaeonUpload.jspx">
265
	<form action="./upload.jsp" method="post">
265 266
		<input name="action" type="submit" value="Go" class="button_login" />
266 267
	</form>
267 268
	<jsp:scriptlet>
lib/style/skins/sanparks/leftnav.jsp
14 14
	<tr class="leftnav" valign="top">
15 15
		<td>
16 16
			
17
			<form action="./SaeonLogin.jspx" method="get" target="iframeloginboxclass" name="orgForm">
17
			<form action="./index.jsp" method="post" target="_top" name="orgForm">
18 18
				<input name="organizationScope" type="hidden" value="%">
19 19
				<table>
20 20
					<tr>
lib/style/skins/sanparks/SaeonUpload.jspx
37 37
            </jsp:scriptlet>
38 38
            <link href="sanparks.css" rel="stylesheet" type="text/css" />
39 39
        </head>    
40
        <body style="background: #FFFFFF;">
40
        <body>
41 41
            <jsp:useBean id="clientViewBean" scope="session" class="edu.ucsb.nceas.metacat.clientview.ClientView"/>
42 42
            <jsp:setProperty name="clientViewBean" property="*"/>
43 43
            
......
64 64
					}
65 65
				</jsp:scriptlet>	
66 66
	                
67
                <form name="uploadForm" method="post" action="SaeonUpload.jspx" enctype="multipart/form-data" onsubmit="return allowUploadSubmit(this)">
67
                <form name="uploadForm" method="post" action="./upload.jsp" enctype="multipart/form-data" onsubmit="return allowUploadSubmit(this)">
68 68
                    <input name="returnfield" type="hidden" value="distinfo/stdorder/digform/digtopt/onlinopt/computer/networka/networkr"/>
69 69
                    <input name="pathExpr" type="hidden" value="/metadata/distinfo/resdesc"/>
70 70
                    
......
179 179
                </jsp:scriptlet>
180 180
                
181 181
                <p class="regtext">
182
                    <form action="SaeonLogin.jspx">
182
                    <form action="./index.jsp" method="post">
183 183
                        <button name="action" type="submit" class="button_login">
184 184
                            &lt; Back
185 185
                        </button>
lib/style/skins/sanparks/index.jsp
41 41
                return document.getElementById('mapFrame');
42 42
            }
43 43
            insertTemplateOpening();
44
            insertLoginBox();
44
        </script>
45
        
46
        <jsp:include page="SaeonLogin.jspx" />
47
        
48
        <script language="JavaScript">
49
            //insertLoginBox();
45 50
            //insertSearchBox();
46 51
            insertTemplateClosing();
47 52
        </script>

Also available in: Unified diff