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:

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"%>

Also available in: Unified diff