Project

General

Profile

« Previous | Next » 

Revision 8203

Redesigned the /admin configuration pages to better match our new MetacatUI design. Looks good in both /context/admin view and the #external view using metacatUI

View differences:

lib/admin/admin.css
26 26
  * along with this program; if not, write to the Free Software
27 27
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
28 28
  */
29
body {
30
	font-family: Arial, sans-serif;
31
	font-size: 11pt;
32
	margin-left: 30px;
33
	margin-right: 30px;
34
	width: 700px;
29

  
30
/* Import font families */
31
@import url(http://fonts.googleapis.com/css?family=Oswald:400,300,700);
32
/* Oswald weights:
33
Light 300
34
Normal 400
35
Bold 700
36
*/
37
@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,400italic);
38
/* Source Sans Pro weights:
39
Light 300
40
Normal 400
41
Normal italic 400
42
Semi-bold 600
43
Bold 700
44
*/
45

  
46

  
47
/* THE BASICS
48
-------------------------------------------------- */
49
html{
50
	margin: 0;
51
	padding: 0;
52
	width: 100%;
53
	height: 100%;
35 54
}
55
body{
56
	font: 400 1em/1em "Source Sans Pro", Arial, sans-serif;
57
	color: #333333;
58
	margin: 20px 20px 20px 40px;
59
	padding: 0px;
60
	width: 90%;
61
}
36 62

  
63
a{
64
	color: #166194;
65
	text-decoration: none;
66
}
67

  
68
a:hover{
69
	color: #3399CC;
70
	text-decoration: none;
71
}
72

  
73
h1{
74
	font: 400 3em/3em "Oswald", Arial, sans-serif;
75
	-webkit-margin-before: 0.2em;
76
	-webkit-margin-after: 0.2em;
77
	display: block;
78
	clear: both;
79
}
80

  
37 81
h2 {
38
	margin-top: 30px;
39
	margin-bottom: 10px;
82
	font: 400 2.5em/2.5em "Oswald", Arial, sans-serif;
83
	-webkit-margin-before: 0.2em;
84
	-webkit-margin-after: 0.2em;
85
	display: block;
86
	clear: both;
40 87
}
41 88

  
42 89
h3 {
43
	margin-top: 8px;
44
	margin-bottom: 8px;
90
	font: 400 1.5em/1.5em "Oswald", Arial, sans-serif;
91
	-webkit-margin-before: 0.2em;
92
	-webkit-margin-after: 0.2em;
93
	display: block;
94
	clear: both;
95
	margin-top: 20px;
45 96
}
46 97

  
47 98
input {
48 99
	padding-left: 4px;
49 100
	width: 400px;
101
	border: 1px solid #AAAAAA;
102
	font: 400 1em/1em Source Sans Pro, Arial, sans-serif;
103
	background-color:#FFFFFF;
104
	color: #333333;
105
	border-radius: 5px;
106
	-moz-border-radius: 5px;
107
	-webkit-border-radius: 5px;
50 108
}
51 109

  
110
select{
111
	border: 1px solid #AAAAAA;
112
	font: 400 1em/1em Source Sans Pro, Arial, sans-serif;
113
	height: 2em;
114
}
115

  
52 116
input[type="submit"] {
53 117
	width: 100px;
54 118
	margin-right: 5px;
55 119
	margin-top: 20px;
120
	cursor: pointer;
56 121
}
57 122

  
58 123
input[type="radio"] {
59 124
	margin-bottom: 4px;
60
	width: 13px;
125
	width: 15px;
126
	height: 15px;
61 127
}
62 128

  
63 129
input[type="checkbox"] {
64
	width: 13px;
130
	width: 15px;
131
	height: 15px;
132
	float: left;
65 133
}
66 134

  
67 135
label {
68
	font-size: 12pt;
136
	font-size: 1.1em;
137
	line-height: 1.1em;
138
	display: block;
139
	margin-top: 10px;
69 140
}
70 141

  
71
table {
72
	margin-left: auto;
73
	margin-right: auto;
74
}
75 142

  
76
.config-line {
77
	color: #dddddd;
78
	background-color: #dddddd;
79
	height: 1px;
80
}
81 143

  
82
.username-input {
83
	width: 500px;
144
/* NAVIGATION AND HEADER
145
------------------------------------- */
146
.small-message{
147
	margin-top: 20px;
148
	float: right;
84 149
}
85 150

  
86
.login-input {
87
	width: 300px;
151
.small-message a{
152
	font: 400 20px/20px Oswald;
153
	color: #166194;
154
	text-transform: uppercase;
155
	margin: 0 10px;
156
	text-decoration: none;
88 157
}
89 158

  
90
br {
91
	clear: left;
159
body > img {
160
	float: right;
161
	max-height: 70px;
162
	width: auto;
92 163
}
93 164

  
94
br.auth-header {
95
	margin-bottom: 80px;
165
/* FORMS
166
----------------------------------------*/
167
.textinput {
168
	margin-left: 1em;
169
	vertical-align: middle;
170
	width: 30em;
171
	height: 2.2em;
172
	font: 400 1em/2em Source Sans Pro;
173
	border-radius: 5px;
174
	-moz-border-radius: 5px;
175
	-webkit-border-radius: 5px;
176
	border: 1px solid #aaa;
96 177
}
97 178

  
98
br.main-header {
99
	margin-bottom: 70px;
179
.textinput-label {
180
	text-align: right;
181
	float: left;
182
	width: 200px;
100 183
}
101 184

  
102
br.skins-header {
103
	margin-bottom: 50px;
185
.textinput-description {
186
	margin-left: 215px;
187
	color: #777777;
188
	font-size: 0.8em;
189
	margin-top: 5px;
190
	clear: both;
104 191
}
105 192

  
106
.button {
193
.button, input[type="submit"] {
107 194
	width: 100px;
108 195
	margin-right: 5px;
109 196
	margin-top: 20px;
197
	font: 400 1.2em/1.5em Oswald, Arial;
198
	cursor: pointer;
110 199
}
111 200

  
112
.left-button {
113
	width: 100px;
114
	margin-left: 275px;
115
	margin-right: 5px;
116
	margin-top: 20px;
201

  
202
.checkradio-label-inline {
203
 	display: inline;
204
 	
205
	vertical-align: middle;
117 206
}
118 207

  
119
.warning {
120
	color: red;
208
.checkradio-description {
209
	margin-left: 4.25em;
210
	color: gray;
211
	font-size: 11;
121 212
}
122 213

  
123
.heading-comment {
124
	margin-bottom: 0px;
214
.question-mark {
215
	float: left;
216
	vertical-align: middle;
217
	margin-left: 10px;
218
	height: 20px;
219
	cursor: pointer;
125 220
}
126 221

  
127
.small-message {
128
	margin-top: 10px;
129
	font-size: 11px;
222
.form-row {
223
	margin-top: .5em;
224
	clear: both;
130 225
}
131 226

  
227
.form-row input,
228
.form-row select,
229
.form-row span{
230
	float: left;
231
}
232

  
233

  
234
/* MESSAGES
235
----------------------------------------*/
236

  
132 237
.message-text {
133
	font-size: 9pt;
134
	font-weight: bold;
135
	color: blue;
136
	margin-bottom: 5px;
238
	font: 400 1em/1em Source Sans Pro, Arial, sans-serif;
239
	color: #003366;
240
	margin: 10px 0px;
241
	background-color: #B4C6CC;
242
	border: 1px solid #003366;
243
	padding: 10px;
137 244
}
138 245

  
139 246
.success-text {
140
	font-size: 9pt;
141
	font-weight: bold;
142
	color: green;
143
	margin-bottom: 5px;
247
	font: 400 1em/1em Source Sans Pro, Arial, sans-serif;
248
	color: #003300;
249
	margin: 10px 0px;
250
	padding: 10px;
251
	background-color: #99CC99;
252
	border: 1px solid #003300;
144 253
}
145 254

  
146
.error-text {
147
	font-size: 9pt;
148
	color: red;
149
	margin-bottom: 5px;
255
.error-text,
256
.formfield-error-text {
257
	font: 400 1em/1em Source Sans Pro, Arial, sans-serif;
258
	color: #660000;
259
	margin: 10px 0px;
260
	padding: 10px;
261
	background-color: #CC9999;
262
	border: 1px solid #660000;
150 263
}
151 264

  
152
.error-header {
153
	font-size: 9pt;
154
	font-weight: bold;
155
	color: red;
265
.formfield-error-header {
266
	font: 400 1em/1em Source Sans Pro, Arial, sans-serif;
267
	color: #A52A2A;
156 268
}
157 269

  
158
.formfield-error-text {
159
	font-size: 9pt;
270
.warning {
160 271
	color: red;
161
	margin-bottom: 5px;
162 272
}
163 273

  
164
.formfield-error-header {
274

  
275
/* OTHER
276
----------------------------------------*/
277

  
278
.clear{
279
	clear: both;
280
}
281

  
282
.username-input {
283
	width: 500px;
284
}
285

  
286
.login-input {
287
	width: 300px;
288
}
289

  
290
.buttons-wrapper{
291
	clear:both;
292
	margin-top: 20px;
293
}
294
.heading-comment {
295
	margin-bottom: 0px;
296
}
297

  
298

  
299
.error-header {
165 300
	font-size: 9pt;
166 301
	font-weight: bold;
167 302
	color: red;
168 303
}
169 304

  
305

  
170 306
.configured-tag {
171 307
	color: green;
172 308
	width: 115px;
......
191 327
}
192 328

  
193 329
.smaller-text {
194
	font-size: smaller;
330
	font-size: 0.5em;
195 331
	display: inline;
196 332
}
197 333

  
......
205 341
	margin-left: 2em;
206 342
}
207 343

  
208
.checkradio {
209
	text-align: left;
210
	vertical-align: middle;
211
	width: 3em;
212
}
213 344

  
214
.checkradio-label {
215
	text-align: left;
216
	vertical-align: middle;
217
	margin-left: 1em;
218
}
219

  
220
.checkradio-label-inline {
221
 	display: inline;
222
	vertical-align: middle;
223
}
224

  
225
.checkradio-description {
226
	margin-left: 4.25em;
227
	color: gray;
228
	font-size: 11;
229
}
230

  
231
.textinput {
232
	margin-left: 1em;
233
	vertical-align: middle;
234
	width: 30em;
235
}
236

  
237
.textinput-label {
238
	text-align: right;
239
	vertical-align: middle;
240
	float: left;
241
	width: 200px;
242
}
243

  
244
.textinput-description {
245
	margin-left: 210px;
246
	color: gray;
247
	font-size: 11;
248
}
249

  
250
.question-mark {
251
	float: right;
252
	vertical-align: middle;
253
	margin-right: 5px;
254
}
255

  
256
.form-row {
257
	margin-top: .5em;
258
}
259

  
lib/admin/header-section.jsp
30 30
if( request.getSession().getAttribute("userId") != null) {  
31 31
%>
32 32
  <div class=small-message>
33
    <a href="<%= request.getContextPath() %>/admin?configureType=login">log in as different user</a> |
34
    <a href="<%= request.getContextPath() %>/metacat?action=logout">logout</a> |
35
    <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">view metacat user documentation</a>
33
    <a href="<%= request.getContextPath() %>/admin?configureType=login">log in as different user</a>
34
    <a href="<%= request.getContextPath() %>/metacat?action=logout">logout</a>
35
    <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">metacat user documentation</a>
36 36
  </div>
37 37
<% 
38 38
} else {
39 39
%>
40 40
  <div class=small-message>
41
    <a href="<%= request.getContextPath() %>/admin?configureType=login">log in</a> |
42
    <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">view metacat user documentation</a>
41
    <a href="<%= request.getContextPath() %>/admin?configureType=login">log in</a>
42
    <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">metacat user documentation</a>
43 43
  </div>
44 44
<%
45 45
}
46 46
%>
47

  
48
<hr class="config-line">
lib/admin/skins-configuration.jsp
46 46
<body>
47 47
<%@ include file="./header-section.jsp"%>
48 48

  
49
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/> 
49
<img src="<%= request.getContextPath() %>/metacat-logo-darkgray.png" width="100px" align="right"/> 
50 50
<h2>Skins Configuration</h2>
51 51

  
52 52
<br class="skins-header">
......
58 58

  
59 59

  
60 60
<h3>Skins Configuration</h3>
61
<hr class="config-line">
62 61
<div class="heading-comment message-text">
63 62
	NOTE: Metacat v2.2.0 includes a new mechanism for customizing the look and feel of your  
64 63
	Metacat deployment. MetacatUI themes can be deployed separately from the Metacat server
......
142 141
				if (fieldType.equals("select")) {
143 142
%>
144 143
				<div class="form-row"> 
145
					<img class="question-mark" src="style/images/help.png" 
146
						 onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')""/>
147 144
					<div class="textinput-label"><label for="<%= metaDataProperty.getKey() %>" title="<%= metaDataProperty.getDescription() %>"><%= metaDataProperty.getLabel() %></label>  		
148 145
					<select class="textinput" name="<%= skinName %>.<%= metaDataProperty.getKey() %>">
149 146

  
......
157 154
					}
158 155
%>
159 156
					</select>
157
					<img class="question-mark" src="style/images/help.png" 
158
						 onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')""/>
160 159
				</div>
161 160
<%
162 161
					if (metaDataProperty.getDescription() != null) {
......
167 166
				} else if (fieldType.equals("password")) {
168 167
%>	
169 168
				<div class="form-row">
170
					<img class="question-mark" src="style/images/help.png" 
171
						 onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
172 169
					<div class="textinput-label"><label for="<%= metaDataProperty.getKey() %>" title="<%= metaDataProperty.getDescription() %>"><%= metaDataProperty.getLabel() %></label></div>
173 170
					<input class="textinput" id="<%= skinName %>.<%= metaDataProperty.getKey() %>" name="<%= skinName %>.<%= metaDataProperty.getKey() %>" 	             		    	    	           		    	             			
174 171
							type="<%= fieldType %>"/> 
172
					<img class="question-mark" src="style/images/help.png" 
173
						 onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
175 174
				</div>
176 175
<%
177 176
					if (metaDataProperty.getDescription() != null) {
......
182 181
				} else if (fieldType.equals("checkbox")) {
183 182
%>
184 183
				<div class="form-row">
185
					<img class="question-mark" src="style/images/help.png" 
186
						 alt="<%= metaDataProperty.getDescription() %>" 
187
						 onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
188 184
					<input class="checkradio" id="<%= skinName %>.<%= metaDataProperty.getKey() %>" name="<%= skinName %>.<%= metaDataProperty.getKey() %>" 	             		    	    	           		    	             			
189 185
						   type="<%= fieldType %>"
190 186
<%
......
196 192
%>
197 193
						   /> 
198 194
					<label class="checkradio-label" for="<%= metaDataProperty.getKey() %>" title="<%= metaDataProperty.getDescription() %>"><%= metaDataProperty.getLabel() %></label>
195
					<img class="question-mark" src="style/images/help.png" 
196
						 alt="<%= metaDataProperty.getDescription() %>" 
197
						 onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
199 198
				</div>
200 199
<%
201 200
					if (metaDataProperty.getDescription() != null) {
......
206 205
				} else {
207 206
%>
208 207
				<div class="form-row">
209
					<img class="question-mark" src="style/images/help.png" 
210
						 onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
211 208
					<label class="textinput-label" for="<%= metaDataProperty.getKey() %>" title="<%= metaDataProperty.getDescription() %>"><%= metaDataProperty.getLabel() %></label>
212 209
					<input class="textinput" id="<%= skinName %>.<%= metaDataProperty.getKey() %>" name="<%= skinName %>.<%= metaDataProperty.getKey() %>" 
213 210
							value="<%= skinProperties.get(metaDataProperty.getKey()) %>"	             		    	    	           		    	             			
214 211
							type="<%= fieldType %>"/>	
212
					<img class="question-mark" src="style/images/help.png" 
213
						 onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
215 214
				</div>  
216 215
<%
217 216
					if (metaDataProperty.getDescription() != null) {
lib/admin/admin-login.jsp
41 41

  
42 42
</head>
43 43
<body>
44
<img src="<%= request.getContextPath() %>/metacat-logo.png"
44
<img src="<%= request.getContextPath() %>/metacat-logo-darkgray.png"
45 45
	width="100px" align="right" />
46 46
<h2>Administrator Login</h2>
47 47

  
......
49 49
<br class="auth-header">
50 50

  
51 51
<%@ include file="./page-message-section.jsp"%>
52
<hr class="config-line">
53
<br>
54 52

  
55 53
<form name="loginform" method="post" action="<%= request.getContextPath() %>/admin"
56 54
	target="_top" onsubmit="return validateAndSubmitForm(this);" id="loginform">
......
85 83
	</tr>
86 84
</table>
87 85

  
88
<br>
89
<hr class="config-line">
90 86

  
91 87
	<input class="left-button" input type="submit" name="loginAction" value="Login" class="button_login"></td>
92 88
	<input class="button" type="button" value="Cancel" onClick="forward('<%= request.getContextPath() %>')"> 
lib/admin/replication-configuration-include.jsp
39 39
<body>
40 40
<%@ include file="./header-section.jsp"%>
41 41

  
42
<img src="<%=request.getContextPath()%>/metacat-logo.png"
42
<img src="<%=request.getContextPath()%>/metacat-logo-darkgray.png"
43 43
	width="100px" align="right" />
44 44
<h2>Replication Configuration</h2>
45 45

  
46 46
<p>Manage Metacat Replication</p>
47 47

  
48 48
<h3>Timed Replication</h3>
49
<hr class="config-line">
50 49

  
51 50
<form action="<%=request.getContextPath()%>/admin" method="POST" target="bottom">
52 51

  
53 52
	<div class="form-row">
54
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
55
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
56 53
		<div class="textinput-label">
57 54
			<label for="rate" title="Rate">Delta T (milliseconds)</label>
58 55
		</div>
......
60 57
			id="rate" 
61 58
			name="rate" 	             		    	    	           		    	             			
62 59
			value="172800000"/> 
60
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
61
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
63 62
	</div>
64 63
	<div class="form-row">
65
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
66
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
67 64
		<div class="textinput-label">
68 65
			<label for="firsttime" title="First Time (The format should be 10:00 AM)">First Time</label>
69 66
		</div>
......
71 68
			id="firsttime" 
72 69
			name="firsttime" 	             		    	    	           		    	             			
73 70
			value="10:00 PM"/> 
71
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
72
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
74 73
	</div>
74
	<div class="clear"></div>
75 75
	<div class="form-row">
76
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
77
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
78 76
		<div class="textinput-label">
79 77
			<label for="action" title="Action">Timer</label>
80 78
		</div>
81
		<input 
82
			type= radio 
83
			class="textinput" 
84
			id="action" 
85
			name="action" 	             		    	    	           		    	             			
86
			value="start"/>Start
87
		<input 
88
			type= radio 
89
			class="textinput" 
90
			id="action" 
91
			name="action" 	             		    	    	           		    	             			
92
			value="stop"/>Stop
79
		<div class="radio-wrapper">
80
			<input 
81
				type= radio 
82
				class="textinput" 
83
				id="action" 
84
				name="action" 	             		    	    	           		    	             			
85
				value="start"/>
86
				<span>Start</span>
87
		</div>
88
		<div class="radio-wrapper">
89
			<input 
90
				type= radio 
91
				class="textinput" 
92
				id="action" 
93
				name="action" 	             		    	    	           		    	             			
94
				value="stop"/>
95
				<span>Stop</span>
96
		</div>
97
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
98
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
93 99
	</div>
94

  
95
	<input type="hidden" name="configureType" value="replication">
96
	<input type="submit" value="Submit" target="bottom">
97
	
100
	<div class="buttons-wrapper">
101
		<input type="hidden" name="configureType" value="replication">
102
		<input type="submit" value="Submit" target="bottom">
103
	</div>
98 104
</form>
99 105

  
100 106
<h3>Replicate Now</h3>
101
<hr class="config-line">
102 107

  
103 108
<table border="0" cellpadding="4" cellspacing="0" width="100%" class="tablepanel">
104 109
	<tr>
......
114 119
</table>
115 120

  
116 121
<h3>Servers</h3>
117
<hr class="config-line">
118 122

  
119 123
<form action="<%=request.getContextPath()%>/admin" method="POST" target="bottom">
124
	<div class="clear"></div>
120 125
	<div class="form-row">
121
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
122
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
123 126
		<div class="textinput-label">
124 127
			<label for="subaction" title="Action">&nbsp;</label>
125 128
		</div>
126
		<input 
127
			type= radio 
128
			class="textinput" 
129
			id="subaction" 
130
			name="subaction" 	             		    	    	           		    	             			
131
			value="add"/>Add
132
		<input 
133
			type= radio 
134
			class="textinput" 
135
			id="subaction" 
136
			name="subaction" 	             		    	    	           		    	             			
137
			value="delete"/>Remove
129
		<div class="radio-wrapper">
130
			<input 
131
				type= radio 
132
				class="textinput" 
133
				id="subaction" 
134
				name="subaction" 	             		    	    	           		    	             			
135
				value="add"/>
136
				<span>Add</span>
137
		</div>
138
		<div class="radio-wrapper">
139
			<input 
140
				type= radio 
141
				class="textinput" 
142
				id="subaction" 
143
				name="subaction" 	             		    	    	           		    	             			
144
				value="delete"/>
145
				<span>Remove</span>
146
		</div>
147
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
148
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
138 149
	</div>
139 150
	<div class="form-row">
140
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
141
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
142 151
		<div class="textinput-label">
143 152
			<label for="server" title="Server">Server</label>
144 153
		</div>
......
146 155
			id="server" 
147 156
			name="server" 	             		    	    	           		    	             			
148 157
			value=""/> 
158
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
159
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
149 160
	</div>
161
	<div class="clear"></div>
150 162
	<div class="form-row">
151
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
152
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
153 163
		<div class="textinput-label">
154 164
			<label for="replicate" title="Replicate">Replicate metadata?</label>
155 165
		</div>
156
		<input 
157
			type= radio 
158
			class="textinput" 
159
			id="replicate" 
160
			name="replicate" 	             		    	    	           		    	             			
161
			value="1"/>Yes
162
		<input 
163
			type= radio 
164
			class="textinput" 
165
			id="replicate" 
166
			name="replicate" 	             		    	    	           		    	             			
167
			value="0"/>No
166
		<div class="radio-wrapper">
167
			<input 
168
				type= radio 
169
				class="textinput" 
170
				id="replicate" 
171
				name="replicate" 	             		    	    	           		    	             			
172
				value="1"/>
173
				<span>Yes</span>
174
		</div>
175
		<div class="radio-wrapper">
176
			<input 
177
				type= radio 
178
				class="textinput" 
179
				id="replicate" 
180
				name="replicate" 	             		    	    	           		    	             			
181
				value="0"/>
182
				<span>No</span>
183
		</div>
184
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
185
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
168 186
	</div>
187
	<div class="clear"></div>
169 188
	<div class="form-row">
170
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
171
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
172 189
		<div class="textinput-label">
173 190
			<label for="datareplicate" title="Replicate data">Replicate data?</label>
174 191
		</div>
175
		<input 
176
			type= radio 
177
			class="textinput" 
178
			id="datareplicate" 
179
			name="datareplicate" 	             		    	    	           		    	             			
180
			value="1"/>Yes
181
		<input 
182
			type= radio 
183
			class="textinput" 
184
			id="datareplicate" 
185
			name="datareplicate" 	             		    	    	           		    	             			
186
			value="0"/>No 
192
		<div class="radio-wrapper">
193
			<input 
194
				type= radio 
195
				class="textinput" 
196
				id="datareplicate" 
197
				name="datareplicate" 	             		    	    	           		    	             			
198
				value="1"/>
199
				<span>Yes</span>
200
		</div>
201
		<div class="radio-wrapper">
202
			<input 
203
				type= radio 
204
				class="textinput" 
205
				id="datareplicate" 
206
				name="datareplicate" 	             		    	    	           		    	             			
207
				value="0"/>
208
				<span>No</span> 
209
		</div>
210
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
211
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
187 212
	</div>
213
	<div class="clear"></div>
188 214
	<div class="form-row">
189
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
190
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
191 215
		<div class="textinput-label">
192 216
			<label for="hub" title="Hub">Localhost is a hub?</label>
193 217
		</div>
194
		<input 
195
			type= radio 
196
			class="textinput" 
197
			id="hub" 
198
			name="hub" 	             		    	    	           		    	             			
199
			value="1"/>Yes
200
		<input 
201
			type= radio 
202
			class="textinput" 
203
			id="hub" 
204
			name="hub" 	             		    	    	           		    	             			
205
			value="0"/>No
218
		<div class="radio-wrapper">
219
			<input 
220
				type= radio 
221
				class="textinput" 
222
				id="hub" 
223
				name="hub" 	             		    	    	           		    	             			
224
				value="1"/>
225
				<span>Yes</span>
226
		</div>
227
		<div class="radio-wrapper">
228
			<input 
229
				type= radio 
230
				class="textinput" 
231
				id="hub" 
232
				name="hub" 	             		    	    	           		    	             			
233
				value="0"/>
234
				<span>No</span>
235
		</div>
236
		<img class="question-mark" src="<%=request.getContextPath()%>/style/images/help.png" 
237
			onClick="helpWindow('<%= request.getContextPath() %>','docs/replication.html')"/>
206 238
	</div>
207

  
208
	<input type="hidden" name="configureType" value="replication">
209
	<input type="hidden" name="action" value="servercontrol">
210
	<input type="submit" value="Submit" target="bottom">
211

  
239
	<div class="buttons-wrapper">
240
		<input type="hidden" name="configureType" value="replication">
241
		<input type="hidden" name="action" value="servercontrol">
242
		<input type="submit" value="Submit" target="bottom">
243
	</div>
212 244
</form>
213 245

  
214 246
<h3>Hazelcast Synchronization</h3>
215
<hr class="config-line">
216 247

  
217 248
<table border="0" cellpadding="4" cellspacing="0" width="100%" class="tablepanel">
218 249
	<tr>
lib/admin/footer-section.jsp
26 26
 */
27 27
%>
28 28

  
29
<hr class="config-line">
30 29

  
31 30
<%
32 31
if( request.getSession().getAttribute("userId") != null) {  
33 32
%>
34 33
  <div class=small-message>
35 34
    <p>You are logged in as: <%= request.getSession().getAttribute("userId") %></p>
36
    <a href="<%= request.getContextPath() %>/admin?configureType=login">log in as different user</a> |
37
    <a href="<%= request.getContextPath() %>/metacat?action=logout">logout</a> |
38
    <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">view metacat user documentation</a>
35
    <a href="<%= request.getContextPath() %>/admin?configureType=login">log in as different user</a>
36
    <a href="<%= request.getContextPath() %>/metacat?action=logout">logout</a>
37
    <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">metacat user documentation</a>
39 38
  </div>
40 39
<% 
41 40
} else {
42 41
%>
43 42
  <div class=small-message>
44 43
    <p>You are not logged in.</p>
45
    <a href="<%= request.getContextPath() %>/admin?configureType=login">log in</a> |
46
    <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">view metacat user documentation</a>
44
    <a href="<%= request.getContextPath() %>/admin?configureType=login">log in</a>
45
    <a href="<%= request.getContextPath() %>/docs/user/index.html" target="_blank">metacat user documentation</a>
47 46
  </div>
48 47
<%
49 48
}
lib/admin/page-message-section.jsp
34 34
      Vector<String> processingSuccesses = (Vector<String>)request.getAttribute("processingSuccess");
35 35
      for (String processingSuccess : processingSuccesses) { 
36 36
%>
37
    	  -- &nbsp;<%= processingSuccess %> <br> 
37
    	  <%= processingSuccess %> <br> 
38 38
<%     
39 39
       }   
40 40
%>
......
49 49
      Vector<String> processingMessages = (Vector<String>)request.getAttribute("processingMessage");
50 50
      for (String processingMessage : processingMessages) { 
51 51
%>
52
    	   -- &nbsp;<%= processingMessage %> <br> 
52
    	   <%= processingMessage %> <br> 
53 53
<%     
54 54
       } 
55 55
%>
......
67 67
      Vector<String> formErrors = (Vector<String>)request.getAttribute("formFieldErrors");
68 68
      for (String formError : formErrors) { 
69 69
%>
70
    	  -- &nbsp;<%= formError %> <br> 
70
    	  <%= formError %> <br> 
71 71
<%     
72 72
       }     
73 73
%>      
......
83 83
      Vector<String> processingErrors = (Vector<String>)request.getAttribute("processingErrors");
84 84
      for (String processingError : processingErrors) { 
85 85
%>
86
    	  -- &nbsp;<%= processingError %> <br> 
86
    	  <%= processingError %> <br> 
87 87
<%     
88 88
       }     
89 89
%>      
lib/admin/properties-configuration.jsp
40 40
<body>
41 41
<%@ include file="./header-section.jsp"%>
42 42

  
43
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/> 
43
<img src="<%= request.getContextPath() %>/metacat-logo-darkgray.png" width="100px" align="right"/> 
44 44
<h2>Metacat Properties Configuration</h2>
45 45

  
46 46
<p>Enter Metacat System properties here.  All Fields must be filled in before saving.
......
83 83
			} else {		
84 84
%>
85 85
		<h3><%= metaDataGroup.getName()  %></h3>
86
		<hr class="config-line">
87 86
<%
88 87
			// get all the properties in this group
89 88
			Map<Integer, MetaDataProperty> propertyMap = 
......
96 95
    			if (fieldType.equals("select")) {
97 96
%> 
98 97
				<div class="form-row">
99
					<img class="question-mark" src="style/images/help.png"  
100
							onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
101
     				<div class="textinput-label"><label for="<%= metaDataProperty.getKey() %>"><%= metaDataProperty.getLabel() %></label></div>
98
   				<div class="textinput-label"><label for="<%= metaDataProperty.getKey() %>"><%= metaDataProperty.getLabel() %></label></div>
102 99
					<select class="textinput" name="<%= metaDataProperty.getKey() %>">
103 100
<%
104 101
					Vector<String> fieldOptionValues = metaDataProperty.getFieldOptionValues();
......
118 115
				}
119 116
%>
120 117
					</select>
118
					<img class="question-mark" src="style/images/help.png"  
119
							onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
121 120
				</div>
122 121
<%		
123 122
				} else if (fieldType.equals("password")) {
124 123
%>
125 124
				<div class="form-row">
126
					<img class="question-mark" src="style/images/help.png"  
127
	           		       onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
128 125
					<div class="textinput-label"><label for="<%= metaDataProperty.getKey() %>" ><%= metaDataProperty.getLabel() %></label></div>
129 126
					<input class="textinput" id="<%= metaDataProperty.getKey() %>" 
130 127
							name="<%= metaDataProperty.getKey() %>" 	             		    	    	           		    	             			
131 128
	           		    	value="<%= request.getAttribute(metaDataProperty.getKey()) %>"
132 129
	           		    	type="<%= fieldType %>"/> 
130
					<img class="question-mark" src="style/images/help.png"  
131
	           		       onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
133 132
				</div>
134 133
<%
135 134
				} else if (fieldType.equals("hidden")) {
......
142 141
				} else {
143 142
%>
144 143
				<div class="form-row">
145
					<img class="question-mark" class=question-mark 
146
					     src="style/images/help.png" 
147
					     onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
148 144
					<div class="textinput-label"><label for="<%= metaDataProperty.getKey() %> "><%= metaDataProperty.getLabel() %></label>	</div>					
149 145
					<input class="textinput" id="<%= metaDataProperty.getKey() %>" 
150 146
							name="<%= metaDataProperty.getKey() %>" 
151 147
	    			        value="<%= request.getAttribute(metaDataProperty.getKey()) %>"	             		    	    	           		    	             			
152 148
	           		    	type="<%= fieldType %> "/>	
149
					<img class="question-mark" class=question-mark 
150
					     src="style/images/help.png" 
151
					     onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
153 152
				</div>          		    
154 153
<%   			
155 154
				}
lib/admin/configure-restart.jsp
44 44
</style>
45 45
</head>
46 46
<body>
47
<p><img src="metacat-logo.png" width="100px" align="right"/> 
47
<p><img src="metacat-logo-darkgray.png" width="100px" align="right"/> 
48 48
<h2>Metacat Configuration Succeeded</h2>
49 49
</p>
50 50

  
lib/admin/auth-configuration.jsp
46 46
<body>
47 47
<%@ include file="./header-section.jsp"%>
48 48

  
49
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/> 
49
<img src="<%= request.getContextPath() %>/metacat-logo-darkgray.png" width="100px" align="right"/> 
50 50
<h2>Authentication Configuration</h2>
51 51
Enter authentication service properties here. 
52 52
<br class="auth-header">
......
72 72
%>
73 73
		<h3><%= metaDataGroup.getName()  %></h3>
74 74
		<%= metaDataGroup.getDescription()  %>
75
		<hr class="config-line">
76 75
<%
77 76
			// get all the properties in this group
78 77
			Map<Integer, MetaDataProperty> propertyMap = 
......
94 93
    			if (fieldType.equals("select")) {
95 94
%> 
96 95
				<div class="form-row">
97
					<img class="question-mark" src="style/images/help.png" 
98
	           		       onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
99 96
     				<div class="textinput-label"><label for="<%= metaDataProperty.getKey() %>"><%= metaDataProperty.getLabel() %></label></div>	   	
100 97
					<select class="textinput" name="<%= metaDataProperty.getKey() %>">
101 98
<%
......
108 105
					}
109 106
%>
110 107
					</select>
108
					<img class="question-mark" src="style/images/help.png" 
109
	           		       onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
111 110
				</div> 
112 111
<%
113 112
					if (metaDataProperty.getDescription() != null) {
......
118 117
				} else if (fieldType.equals("password")) {
119 118
%>
120 119
				<div class="form-row">
121
					<img class="question-mark" src="style/images/help.png"  
122
	           		     onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
123 120
					<div class="textinput-label"><label for="<%= metaDataProperty.getKey() %>"><%= metaDataProperty.getLabel() %></label></div>	
124 121
					<input class="textinput" id="<%= metaDataProperty.getKey() %>" name="<%= metaDataProperty.getKey() %>" 	             		    	    	           		    	             			
125 122
	           		    	value="<%= request.getAttribute(metaDataProperty.getKey()) %>"
126 123
	           		    	type="<%= fieldType %>"/> 
124
	           		<img class="question-mark" src="style/images/help.png"  
125
	           		     onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
127 126
				</div> 
128 127
<%
129 128
					if (metaDataProperty.getDescription() != null) {
......
134 133
				} else {
135 134
%>
136 135
				<div class="form-row">
137
					<img class="question-mark" src="style/images/help.png"  
138
					     onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
139 136
					<div class="textinput-label"><label for="<%= metaDataProperty.getKey() %>"><%= metaDataProperty.getLabel() %></label></div>					
140 137
					<input class="textinput" id="<%= metaDataProperty.getKey() %>" name="<%= metaDataProperty.getKey() %>" 
141 138
	    			        value="<%= request.getAttribute(metaDataProperty.getKey()) %>"	             		    	    	           		    	             			
142 139
	           		    	type="<%= fieldType %>	"/>	
140
	           		<img class="question-mark" src="style/images/help.png"  
141
					     onClick="helpWindow('<%= request.getContextPath() %>','<%= metaDataProperty.getHelpFile() %>')"/>
143 142
				</div>    		    
144 143
<%
145 144
					if (metaDataProperty.getDescription() != null) {
lib/admin/geoserver-configuration.jsp
40 40
<body>
41 41
<%@ include file="./header-section.jsp"%>
42 42

  
43
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/> 
43
<img src="<%= request.getContextPath() %>/metacat-logo-darkgray.png" width="100px" align="right"/> 
44 44
<h2>Geoserver Configuration</h2>
45 45

  
46 46
<p>
......
58 58
                                        onsubmit="return submitForm(this);">
59 59

  
60 60
	<h3>Geoserver Password Configuration</h3>
61
	<hr class="config-line">
62 61
	
63 62
	<div class="form-row">
64
		<img class="question-mark" src="style/images/help.png" 
65
			onClick="helpWindow('<%= request.getContextPath() %>','docs/geoserver.html#GEOSERVER_DATA_DIR')"/>
66 63
		<div class="textinput-label"><label for="geoserver.context" title="Geoserver data directory">Geoserver Data Directory</label></div>
67 64
		<input class="textinput" id="geoserver.GEOSERVER_DATA_DIR" 
68 65
				name="geoserver.GEOSERVER_DATA_DIR" 	             		    	    	           		    	             			
69 66
				value="<%= request.getAttribute("geoserver.GEOSERVER_DATA_DIR") %>"/> 
67
		<img class="question-mark" src="style/images/help.png" 
68
			onClick="helpWindow('<%= request.getContextPath() %>','docs/geoserver.html#GEOSERVER_DATA_DIR')"/>
70 69
	</div>
71 70
	<div class="form-row">
72
		<img class="question-mark" src="style/images/help.png" 
73
			onClick="helpWindow('<%= request.getContextPath() %>','docs/geoserver.html#GEOSERVER_REGENERATE_CACHE')"/>
74 71
		<div class="textinput-label"><label for="spatial.regenerateCacheOnRestart" title="Regenerate spatial cache">Regenerate spatial cache</label></div>
75 72

  
76 73
		<%
......
86 83
				name="spatial.regenerateCacheOnRestart" 	             		    	    	           		    	             			
87 84
				value="true"/>
88 85
		<% } %>
89

  
86
		<img class="question-mark" src="style/images/help.png" 
87
			onClick="helpWindow('<%= request.getContextPath() %>','docs/geoserver.html#GEOSERVER_REGENERATE_CACHE')"/>
90 88
	</div>
91 89
	<div class="form-row">
92
		<img class="question-mark" src="style/images/help.png" 
93
			onClick="helpWindow('<%= request.getContextPath() %>','docs/geoserver.html#GeoserverContext')"/>
94 90
		<div class="textinput-label"><label for="geoserver.context" title="Geoserver context">Context</label></div>
95 91
		<input class="textinput" id="geoserver.context" 
96 92
				name="geoserver.context" 	             		    	    	           		    	             			
97 93
				value="<%= request.getAttribute("geoserver.context") %>"/> 
94
		<img class="question-mark" src="style/images/help.png" 
95
			onClick="helpWindow('<%= request.getContextPath() %>','docs/geoserver.html#GeoserverContext')"/>
98 96
	</div>
99
	<hr class="config-line">
97

  
100 98
	<div class="form-row">
101
				<img class="question-mark" src="style/images/help.png" 
102
	           		 onClick="helpWindow('<%= request.getContextPath() %>','docs/geoserver.html#GeoserverUpdatePassword')"/>
103 99
				<div class="textinput-label"><label for="geoserver.username" title="Geoserver user name">User Name</label></div>
104 100
				<input class="textinput" id="geoserver.username" 
105 101
					   name="geoserver.username" readonly="readonly" 		    	    	           		    	             			
106 102
	           		   value="<%= request.getAttribute("geoserver.username") %>"/> 
103
				<img class="question-mark" src="style/images/help.png" 
104
	           		 onClick="helpWindow('<%= request.getContextPath() %>','docs/geoserver.html#GeoserverUpdatePassword')"/>
107 105
	</div>
108 106
	<div class="form-row">
109
				<img class="question-mark" src="style/images/help.png" 
110
	           		 onClick="helpWindow('<%= request.getContextPath() %>','docs/geoserver.html#GeoserverUpdatePassword')"/>
111 107
				<div class="textinput-label"><label for="geoserver.password" title="Geoserver user name">Password</label></div>
112 108
				<input class="textinput"  id="geoserver.password" 
113 109
					   name="geoserver.password" 
114 110
					   type="password"	             		    	    	           		    	             			
115 111
	           		   value="<%= request.getAttribute("geoserver.password") %>"/> 
112
				<img class="question-mark" src="style/images/help.png" 
113
	           		 onClick="helpWindow('<%= request.getContextPath() %>','docs/geoserver.html#GeoserverUpdatePassword')"/>
116 114
	</div>
117

  
118
	<input type="hidden" name="configureType" value="geoserver"/>
119
	<input type="hidden" name="processForm" value="true"/>
120
	<input class=left-button type="submit" value="Update"/>
121
	<input class=button type="button" value="Bypass" onClick="forward('./admin?configureType=geoserver&bypass=true&processForm=true')">
122
	<input class=button type="button" value="Cancel" onClick="forward('./admin')"> 
123

  
115
	<div class="buttons-wrapper">
116
		<input type="hidden" name="configureType" value="geoserver"/>
117
		<input type="hidden" name="processForm" value="true"/>
118
		<input class=left-button type="submit" value="Update"/>
119
		<input class=button type="button" value="Bypass" onClick="forward('./admin?configureType=geoserver&bypass=true&processForm=true')">
120
		<input class=button type="button" value="Cancel" onClick="forward('./admin')"> 
121
	</div>
124 122
</form>
125 123

  
126 124
<%@ include file="./footer-section.jsp"%>
lib/admin/database-configuration.jsp
47 47
<body>
48 48
<%@ include file="./header-section.jsp"%>
49 49

  
50
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/> 
50
<img src="<%= request.getContextPath() %>/metacat-logo-darkgray.png" width="100px" align="right"/> 
51 51
<h2>Database Install/Upgrade Utility</h2>
52 52

  
53 53
<%@ include file="page-message-section.jsp"%>
......
91 91
        }
92 92
%>
93 93
        </ul>
94
		<input class="left-button" type="button" value="Continue" onClick="forward('./admin?configureType=database&processForm=true')">
95
		<input class="button" type="button" value="Cancel" onClick="forward('./admin?configureType=configure&processForm=false')"> 
94
        <div class="buttons-wrapper">
95
			<input class="left-button" type="button" value="Continue" onClick="forward('./admin?configureType=database&processForm=true')">
96
			<input class="button" type="button" value="Cancel" onClick="forward('./admin?configureType=configure&processForm=false')"> 
97
		</div>
96 98
<%
97 99
} else {
98 100
%>
99
	<input class="left-button" disabled type="button" value="Continue" onClick="forward('./admin?configureType=database&processForm=true')">
100
	<input class="button" type="button" value="Cancel" onClick="forward('./admin?configureType=configure&processForm=false')"> 
101
        <div class="buttons-wrapper">
102
			<input class="left-button" disabled type="button" value="Continue" onClick="forward('./admin?configureType=database&processForm=true')">
103
			<input class="button" type="button" value="Cancel" onClick="forward('./admin?configureType=configure&processForm=false')"> 
104
		</div>
101 105
<%
102 106
} 
103 107
%>
lib/admin/organization-configuration.jsp
43 43

  
44 44
</head>
45 45
<body>
46
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/> 
46
<img src="<%= request.getContextPath() %>/metacat-logo-darkgray.png" width="100px" align="right"/> 
47 47
<h2>Organization Configuration</h2>
48 48
Enter organization specific properties here. 
49 49
<br class="ldap-header">
......
63 63
			MetaDataGroup metaDataGroup = (MetaDataGroup)groupMap.get(groupId);
64 64
%>
65 65
			<h3><%= metaDataGroup.getName()  %></h3>
66
			<hr class="config-line">
67 66
<%
68 67
 			if (metaDataGroup.getComment() != null) {
69 68
%>
lib/admin/backup-configuration.jsp
39 39

  
40 40
</head>
41 41
<body>
42
<img src="<%= request.getContextPath() %>/metacat-logo.png"
42
<img src="<%= request.getContextPath() %>/metacat-logo-darkgray.png"
43 43
	width="100px" align="right" />
44 44
<h2>Backup Directory Configuration</h2>
45 45

  
......
78 78
<br class="auth-header">
79 79

  
80 80
<%@ include file="./page-message-section.jsp"%>
81
<hr class="config-line">
82
<br>
83 81

  
84 82
<form name="backupform" method="post"
85 83
	action="<%= request.getContextPath() %>/admin" target="_top"
......
99 97
	</tr>
100 98
</table>
101 99

  
102
<br>
103
<hr class="config-line">
104 100

  
105 101
<input type="hidden" name="configureType" value="backup"/>
106 102
<input type="hidden" name="processForm" value="true"/>
lib/admin/dataone-configuration.jsp
40 40
<body>
41 41
<%@ include file="./header-section.jsp"%>
42 42

  
43
<img src="<%= request.getContextPath() %>/metacat-logo.png" width="100px" align="right"/> 
43
<img src="<%= request.getContextPath() %>/metacat-logo-darkgray.png" width="100px" align="right"/> 
44 44
<h2>DataONE Configuration</h2>
45 45

  
46 46
<p> 
......
75 75
	<h3>Member Node Services</h3>
76 76
	Enable or disable DataONE Member Node Services for this deployment
77 77
	
78
	<hr class="config-line">
79 78
	<div class="form-row">
80
		<img class="question-mark" src="style/images/help.png" 
81
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
82 79
		<div class="textinput-label"><label for="dataone.mn.services.enabled" title="Enable DataONE Member Node Services">Enable DataONE Services</label></div>
83 80

  
84 81
		<%
......
104 101
				name="dataone.mn.services.enabled" 	             		    	    	           		    	             			
105 102
				value="true"/>
106 103
		<% } %>
107

  
104
		
105
		<img class="question-mark" src="style/images/help.png" 
106
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
108 107
	</div>
109

  
108
	<div class="clear"></div>
110 109
	<h3>Member Node Configuration</h3>
111 110
	General information identifiying this node, its owner, and contents.  You will need
112 111
	   a certificate to identify the node, and a DataONE account to act as a node contact.
113 112
	
114
	<hr class="config-line">
115
	
116 113
	<div class="form-row">
117
		<img class="question-mark" src="style/images/help.png" 
118
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
119 114
		<div class="textinput-label">
120 115
			<label for="dataone.nodeName" title="A short, human-readable name for this node">Node Name</label>
121 116
		</div>
......
123 118
			id="dataone.nodeName" 
124 119
			name="dataone.nodeName" 	             		    	    	           		    	             			
125 120
			value="<%= request.getAttribute("dataone.nodeName") %>"/> 
121
		<img class="question-mark" src="style/images/help.png" 
122
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
126 123
	</div>
127 124
	<div class="form-row">
128
		<img class="question-mark" src="style/images/help.png" 
129
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
130 125
		<div class="textinput-label">
131 126
			<label for="dataone.nodeDescription" title="A brief description of the node and its holdings">Node Description</label>
132 127
		</div>
......
134 129
			id="dataone.nodeDescription" 
135 130
			name="dataone.nodeDescription" 	             		    	    	           		    	             			
136 131
			value="<%= request.getAttribute("dataone.nodeDescription") %>"/> 
132
		<img class="question-mark" src="style/images/help.png" 
133
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
137 134
	</div>
138 135
	<div class="form-row">
139
		<img class="question-mark" src="style/images/help.png" 
140
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
141 136
		<div class="textinput-label">
142 137
			<label for="dataone.nodeId" title="The DataONE-assigned unique identifier for this node">Node Identifier</label>
143 138
		</div>
......
145 140
			id="dataone.nodeId" 
146 141
			name="dataone.nodeId" 	             		    	    	           		    	             			
147 142
			value="<%= request.getAttribute("dataone.nodeId") %>"/>
143
		<img class="question-mark" src="style/images/help.png" 
144
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
148 145
	</div>
149 146
	<div class="form-row">
150
		<img class="question-mark" src="style/images/help.png" 
151
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
152 147
		<div class="textinput-label">
153 148
			<label for="dataone.subject" title="The account in Distinguished Name (DN) format that represents this node in all service interactions">Node Subject</label>
154 149
		</div>
......
156 151
			id="dataone.subject" 
157 152
			name="dataone.subject" 	             		    	    	           		    	             			
158 153
			value="<%= request.getAttribute("dataone.subject") %>"/> 
154
		<img class="question-mark" src="style/images/help.png" 
155
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
159 156
	</div>
160 157
	<div class="form-row">
161
		<img class="question-mark" src="style/images/help.png" 
162
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
163 158
		<div class="textinput-label">
164 159
			<label for="dataone.contactSubject" title="A verified account in DN format to be used as the primary node contact for this node">Contact Subject</label>
165 160
		</div>
......
167 162
			id="dataone.contactSubject" 
168 163
			name="dataone.contactSubject" 	             		    	    	           		    	             			
169 164
			value="<%= request.getAttribute("dataone.contactSubject") %>"/> 
165
		<img class="question-mark" src="style/images/help.png" 
166
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
170 167
	</div>
171 168
	<div class="form-row">
172
		<img class="question-mark" src="style/images/help.png" 
173
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
174 169
		<div class="textinput-label">
175 170
			<label for="D1Client.certificate.file" title="The absolute path to the X.509 certificate used to authenticate this node">Node Certificate Path</label>
176 171
		</div>
......
178 173
			id="D1Client.certificate.file" 
179 174
			name="D1Client.certificate.file" 	             		    	    	           		    	             			
180 175
			value="<%= request.getAttribute("D1Client.certificate.file") %>"/> 
176
		<img class="question-mark" src="style/images/help.png" 
177
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
181 178
	</div>
182 179
	<div class="form-row">
183
		<img class="question-mark" src="style/images/help.png" 
184
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
185 180
		<div class="textinput-label"><label for="dataone.nodeSynchronize" title="Enable DataONE metadata synchronization">Enable Metadata Synchronization</label></div>
186 181

  
187 182
		<%
......
207 202
				name="dataone.nodeSynchronize" 	             		    	    	           		    	             			
208 203
				value="true"/>
209 204
		<% } %>
210

  
205
		<img class="question-mark" src="style/images/help.png" 
206
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
211 207
	</div>
212 208
    <p>&nbsp;</p>
213 209
    
210
   	<div class="clear"></div>
211
   	 
214 212
	<h3>Synchronization Schedule</h3>
215 213
	The schedule on which metadata should be synchronized with DataONE, expressed as a crontab entry.
216
	<hr class="config-line">
214
	
217 215
	<div class="form-row">
218
		<img class="question-mark" src="style/images/help.png" 
219
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
220 216
		<div class="textinput-label">
221 217
			<label for="dataone.nodeSynchronization.schedule.year" title="Year">Year</label>
222 218
		</div>
......
224 220
			id="dataone.nodeSynchronization.schedule.year" 
225 221
			name="dataone.nodeSynchronization.schedule.year" 	             		    	    	           		    	             			
226 222
			value="<%= request.getAttribute("dataone.nodeSynchronization.schedule.year") %>"/> 
223
		<img class="question-mark" src="style/images/help.png" 
224
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
227 225
	</div>
228 226
	<div class="form-row">
229
		<img class="question-mark" src="style/images/help.png" 
230
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
231 227
		<div class="textinput-label">
232 228
			<label for="dataone.nodeSynchronization.schedule.mon" title="Month">Month</label>
233 229
		</div>
234 230
		<input class="textinput" 
235 231
			id="dataone.nodeSynchronization.schedule.mon" 
236 232
			name="dataone.nodeSynchronization.schedule.mon" 	             		    	    	           		    	             			
237
			value="<%= request.getAttribute("dataone.nodeSynchronization.schedule.mon") %>"/> 
233
			value="<%= request.getAttribute("dataone.nodeSynchronization.schedule.mon") %>"/>
234
		<img class="question-mark" src="style/images/help.png" 
235
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/> 
238 236
	</div>
239 237
	<div class="form-row">
240
		<img class="question-mark" src="style/images/help.png" 
241
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
242 238
		<div class="textinput-label">
243 239
			<label for="dataone.nodeSynchronization.schedule.mday" title="Day of Month">Day of Month</label>
244 240
		</div>
......
246 242
			id="dataone.nodeSynchronization.schedule.mday" 
247 243
			name="dataone.nodeSynchronization.schedule.mday" 	             		    	    	           		    	             			
248 244
			value="<%= request.getAttribute("dataone.nodeSynchronization.schedule.mday") %>"/> 
245
		<img class="question-mark" src="style/images/help.png" 
246
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
249 247
	</div>
250 248
	<div class="form-row">
251
		<img class="question-mark" src="style/images/help.png" 
252
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
253 249
		<div class="textinput-label">
254 250
			<label for="dataone.nodeSynchronization.schedule.wday" title="Day of Week">Day of Week</label>
255 251
		</div>
......
257 253
			id="dataone.nodeSynchronization.schedule.wday" 
258 254
			name="dataone.nodeSynchronization.schedule.wday" 	             		    	    	           		    	             			
259 255
			value="<%= request.getAttribute("dataone.nodeSynchronization.schedule.wday") %>"/> 
256
		<img class="question-mark" src="style/images/help.png" 
257
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
260 258
	</div>
261 259
	<div class="form-row">
262
		<img class="question-mark" src="style/images/help.png" 
263
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
264 260
		<div class="textinput-label">
265 261
			<label for="dataone.nodeSynchronization.schedule.hour" title="Hours">Hours</label>
266 262
		</div>
......
268 264
			id="dataone.nodeSynchronization.schedule.hour" 
269 265
			name="dataone.nodeSynchronization.schedule.hour" 	             		    	    	           		    	             			
270 266
			value="<%= request.getAttribute("dataone.nodeSynchronization.schedule.hour") %>"/> 
267
		<img class="question-mark" src="style/images/help.png" 
268
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
271 269
	</div>
272 270
	<div class="form-row">
273
		<img class="question-mark" src="style/images/help.png" 
274
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
275 271
		<div class="textinput-label">
276 272
			<label for="dataone.nodeSynchronization.schedule.min" title="Minutes">Minutes</label>
277 273
		</div>
......
279 275
			id="dataone.nodeSynchronization.schedule.min" 
280 276
			name="dataone.nodeSynchronization.schedule.min" 	             		    	    	           		    	             			
281 277
			value="<%= request.getAttribute("dataone.nodeSynchronization.schedule.min") %>"/> 
278
		<img class="question-mark" src="style/images/help.png" 
279
			onClick="helpWindow('<%= request.getContextPath() %>','docs/dataone.html#configuring-metacat-as-a-member-node')"/>
282 280
	</div>
283 281
	<div class="form-row">
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff