70 |
70 |
<tr>
|
71 |
71 |
<td class="configured-tag">[configured] </td>
|
72 |
72 |
<td class="property-title"> Metacat Global Properties </td>
|
73 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=properties">Reconfigure Now</a> </td>
|
|
73 |
<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=properties">Reconfigure Now</a> </td>
|
74 |
74 |
</tr>
|
75 |
75 |
<%
|
76 |
76 |
} else {
|
... | ... | |
78 |
78 |
<tr>
|
79 |
79 |
<td class="unconfigured-tag">[unconfigured] </td>
|
80 |
80 |
<td class="property-title"> Metacat Global Properties </td>
|
81 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=properties">Configure Now</a> </td>
|
|
81 |
<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=properties">Configure Now</a> </td>
|
82 |
82 |
</tr>
|
83 |
83 |
<%
|
84 |
84 |
}
|
... | ... | |
88 |
88 |
<tr>
|
89 |
89 |
<td class="configured-tag">[configured] </td>
|
90 |
90 |
<td class="property-title"> Authentication Configuration </td>
|
91 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=auth">Reconfigure Now</a> </td>
|
|
91 |
<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=auth">Reconfigure Now</a> </td>
|
92 |
92 |
</tr>
|
93 |
93 |
<%
|
94 |
94 |
} else {
|
... | ... | |
96 |
96 |
<tr>
|
97 |
97 |
<td class=unconfigured-tag>[unconfigured] </td>
|
98 |
98 |
<td class=property-title> Authentication Configuration </td>
|
99 |
|
<td class=configure-link> <a href="<%= request.getContextPath() %>/admin?configureType=auth">Configure Now</a> </td>
|
|
99 |
<td class=configure-link> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=auth">Configure Now</a> </td>
|
100 |
100 |
</tr>
|
101 |
101 |
<%
|
102 |
102 |
}
|
... | ... | |
106 |
106 |
<tr>
|
107 |
107 |
<td class="configured-tag">[configured] </td>
|
108 |
108 |
<td class="property-title"> Skins Specific Properties </td>
|
109 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=skins">Reconfigure Now</a> </td>
|
|
109 |
<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=skins">Reconfigure Now</a> </td>
|
110 |
110 |
</tr>
|
111 |
111 |
<%
|
112 |
112 |
} else {
|
... | ... | |
114 |
114 |
<tr>
|
115 |
115 |
<td class="unconfigured-tag">[unconfigured] </td>
|
116 |
116 |
<td class="property-title"> Skins Specific Properties </td>
|
117 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=skins">Configure Now</a> </td>
|
|
117 |
<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=skins">Configure Now</a> </td>
|
118 |
118 |
</tr>
|
119 |
119 |
<%
|
120 |
120 |
}
|
... | ... | |
126 |
126 |
<tr>
|
127 |
127 |
<td class="configured-tag">[configured] </td>
|
128 |
128 |
<td class="property-title"> Database Installation/Upgrade </td>
|
129 |
|
<td class="configure-link"> Version: <%=databaseVersion.getVersionString()%> </td>
|
|
129 |
<td class="configure-link inactive"> Version: <%=databaseVersion.getVersionString()%> </td>
|
130 |
130 |
</tr>
|
131 |
131 |
<%
|
132 |
132 |
} else {
|
... | ... | |
138 |
138 |
if (propsConfigured != null && propsConfigured) {
|
139 |
139 |
%>
|
140 |
140 |
|
141 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=database">Configure Now</a> </td>
|
|
141 |
<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=database">Configure Now</a> </td>
|
142 |
142 |
|
143 |
143 |
<%
|
144 |
144 |
} else {
|
145 |
145 |
%>
|
146 |
|
<td class="configure-link"> Configure Global Properties First </td>
|
|
146 |
<td class="configure-link inactive"> Configure Global Properties First </td>
|
147 |
147 |
<%
|
148 |
148 |
}
|
149 |
149 |
%>
|
... | ... | |
156 |
156 |
<tr>
|
157 |
157 |
<td class="configured-tag">[configured] </td>
|
158 |
158 |
<td class="property-title"> Geoserver Configuration </td>
|
159 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Reconfigure Now</a> </td>
|
|
159 |
<td class="configure-link"> <i class="icon-cogs"></i> <a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Reconfigure Now</a> </td>
|
160 |
160 |
</tr>
|
161 |
161 |
<%
|
162 |
162 |
} else if (geoserverConfigured != null && geoserverConfigured.equals(PropertyService.BYPASSED)){
|
... | ... | |
168 |
168 |
if (propsConfigured != null && propsConfigured) {
|
169 |
169 |
%>
|
170 |
170 |
|
171 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Reconfigure Now</a> </td>
|
|
171 |
<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Reconfigure Now</a> </td>
|
172 |
172 |
<%
|
173 |
173 |
} else {
|
174 |
174 |
%>
|
175 |
|
<td class="configure-link"> Configure Global Properties First </td>
|
|
175 |
<td class="configure-link inactive"> Configure Global Properties First </td>
|
176 |
176 |
<%
|
177 |
177 |
}
|
178 |
178 |
%>
|
... | ... | |
187 |
187 |
if (propsConfigured != null && propsConfigured) {
|
188 |
188 |
%>
|
189 |
189 |
|
190 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Configure Now</a> </td>
|
|
190 |
<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=geoserver">Configure Now</a> </td>
|
191 |
191 |
|
192 |
192 |
<%
|
193 |
193 |
} else {
|
194 |
194 |
%>
|
195 |
|
<td class="configure-link"> Configure Global Properties First </td>
|
|
195 |
<td class="configure-link inactive"> Configure Global Properties First </td>
|
196 |
196 |
<%
|
197 |
197 |
}
|
198 |
198 |
%>
|
... | ... | |
208 |
208 |
<tr>
|
209 |
209 |
<td class="configured-tag">[configured] </td>
|
210 |
210 |
<td class="property-title"> Dataone Configuration </td>
|
211 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=dataone">Reconfigure Now</a> </td>
|
|
211 |
<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=dataone">Reconfigure Now</a> </td>
|
212 |
212 |
</tr>
|
213 |
213 |
<%
|
214 |
214 |
} else if (dataoneConfigured != null && dataoneConfigured.equals(PropertyService.BYPASSED)){
|
... | ... | |
220 |
220 |
if (propsConfigured != null && propsConfigured) {
|
221 |
221 |
%>
|
222 |
222 |
|
223 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=dataone">Reconfigure Now</a> </td>
|
|
223 |
<td class="configure-link"> <i class="icon-cogs"></i> <a href="<%= request.getContextPath() %>/admin?configureType=dataone">Reconfigure Now</a> </td>
|
224 |
224 |
<%
|
225 |
225 |
} else {
|
226 |
226 |
%>
|
227 |
|
<td class="configure-link"> Configure Global Properties First </td>
|
|
227 |
<td class="configure-link inactive"> Configure Global Properties First </td>
|
228 |
228 |
<%
|
229 |
229 |
}
|
230 |
230 |
%>
|
... | ... | |
239 |
239 |
if (propsConfigured != null && propsConfigured) {
|
240 |
240 |
%>
|
241 |
241 |
|
242 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=dataone">Configure Now</a> </td>
|
|
242 |
<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=dataone">Configure Now</a> </td>
|
243 |
243 |
|
244 |
244 |
<%
|
245 |
245 |
} else {
|
246 |
246 |
%>
|
247 |
|
<td class="configure-link"> Configure Global Properties First </td>
|
|
247 |
<td class="configure-link inactive"> Configure Global Properties First </td>
|
248 |
248 |
<%
|
249 |
249 |
}
|
250 |
250 |
%>
|
... | ... | |
261 |
261 |
if (propsConfigured != null && propsConfigured) {
|
262 |
262 |
%>
|
263 |
263 |
|
264 |
|
<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=replication">Reconfigure Now</a> </td>
|
|
264 |
<td class="configure-link"> <i class="icon-cogs"></i><a href="<%= request.getContextPath() %>/admin?configureType=replication">Reconfigure Now</a> </td>
|
265 |
265 |
|
266 |
266 |
<%
|
267 |
267 |
} else {
|
268 |
268 |
%>
|
269 |
|
<td class="configure-link"> Configure Global Properties First </td>
|
|
269 |
<td class="configure-link inactive"> Configure Global Properties First </td>
|
270 |
270 |
<%
|
271 |
271 |
}
|
272 |
272 |
%>
|
... | ... | |
296 |
296 |
<%
|
297 |
297 |
} else {
|
298 |
298 |
%>
|
299 |
|
<div class="alert alert-success">Configuration of Metacat is complete. You can <a href="<%= request.getContextPath() %>">go to metacat</a>
|
|
299 |
<div class="alert alert-success"><i class="icon-thumbs-up"></i>Configuration of Metacat is complete. You can <a href="<%= request.getContextPath() %>">go to metacat</a>
|
300 |
300 |
now. Note that this may take some time while the system initializes with the new configuration values.</div>
|
301 |
301 |
<%
|
302 |
302 |
}
|
Made some CSS changes to the "Go" button in the docs because it was off by a few pixels in three different browsers. Also changed the admin config landing page links to look like buttons