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="java.util.Vector,edu.ucsb.nceas.metacat.util.LDAPUtil"%>
2 2
<%
3 3
 /**
4 4
  *  '$RCSfile$'
......
32 32
%>
33 33
<%@ include file="PORTAL_SETTINGS.jsp"%>
34 34
<%@ include file="include_session_vars.jsp"%>
35
<%@ page import="edu.ucsb.nceas.metacat.MetaCatUtil" %>
35
<%@ page import="edu.ucsb.nceas.metacat.service.PropertyService" %>
36 36

  
37
<% 
38
	Vector<String> organizationList = LDAPUtil.getOrganizations();
39
%>
40

  
37 41
<%
38 42
///////////////////////////////////////////////////////////////////////////////
39 43
//
......
112 116
          <td class="text_plain"><%@ include file="include_searchbox.jsp" %></td>
113 117
        </tr>
114 118

  
115
	<% if ( MetaCatUtil.getOption("runSpatialOption").equals("true") ) { %>
119
	<% if ( PropertyService.getProperty("runSpatialOption").equals("true") ) { %>
116 120
        <tr>
117 121
          <td class="text_plain"><%@ include file="include_map.jsp" %></td>
118 122
        </tr>
......
163 167
                                <select name="organization" style="width:140px;" <%=loginEnabledDisabled%>>
164 168
                                  <option value=""       <%=((posted_organization.length()<1)?                 "selected":"")%>>&#8212;
165 169
                                  choose one &#8212;</option>
166
                                  <option value="NCEAS"        <%=((posted_organization.equalsIgnoreCase("NCEAS"))?        "selected":"")%>>NCEAS</option>
167
                                  <option value="LTER"         <%=((posted_organization.equalsIgnoreCase("LTER"))?         "selected":"")%>>LTER</option>
168
                                  <option value="UCNRS"          <%=((posted_organization.equalsIgnoreCase("UCNRS"))?          "selected":"")%>>UCNRS</option>
169
                                  <option value="PISCO"        <%=((posted_organization.equalsIgnoreCase("PISCO"))?        "selected":"")%>>PISCO</option>
170
                                  <option value="OBFS"         <%=((posted_organization.equalsIgnoreCase("OBFS"))?         "selected":"")%>>OBFS</option>
171
                                  <option value="SDSC"         <%=((posted_organization.equalsIgnoreCase("SDSC"))?         "selected":"")%>>SDSC</option>
172
                                  <option value="KU"         <%=((posted_organization.equalsIgnoreCase("KU"))?         "selected":"")%>>KU</option>
173
                                  <option value="unaffiliated" <%=((posted_organization.equalsIgnoreCase("unaffiliated"))? "selected":"")%>>unaffiliated</option>
170
<%
171
							for (String orgName : organizationList) {
172
%> 
173
                                  <option value="<%= orgName %>"        <%=((posted_organization.equalsIgnoreCase(orgName))?        "selected":"")%>><%= orgName %></option>
174
<%
175
							}
176
%> 
174 177
                                </select></td>
175 178
                            </tr>
176 179
                            <tr valign="middle">

Also available in: Unified diff