Project

General

Profile

Revision 4608

Added by daigle about 12 years ago

Remove application.default-style from the global configuration screen and activate it in the skins configuration.

View differences:

lib/metacat.properties.metadata.xml
194 194
	</config>
195 195

  
196 196
	<config>
197
		<key>application.default-style</key>
198
		<label>Application Style</label>
199
		<group>3</group>
200
		<index>4</index>
201
		<description>
202
			Custom display style for Metacat. Use default if there is no
203
			custom style.
204
		</description>
205
		<helpFile>properties.html#application.default-style</helpFile>
206
	</config>
207

  
208
	<config>
209 197
		<key>application.knbSiteURL</key>
210 198
		<label>KNB Site URL</label>
211 199
		<group>3</group>
212
		<index>5</index>
200
		<index>4</index>
213 201
		<description>
214 202
			Location of KNB website. Usually left as
215 203
			http://knb.ecoinformatics.org
......
221 209
		<key>application.datafilepath</key>
222 210
		<label>Data File Path</label>
223 211
		<group>3</group>
224
		<index>6</index>
212
		<index>5</index>
225 213
		<description>
226 214
			Where to store data. This should be some location outside
227 215
			the knb install direcories.
......
233 221
		<key>application.inlinedatafilepath</key>
234 222
		<label>Inline Data File Path</label>
235 223
		<group>3</group>
236
		<index>7</index>
224
		<index>6</index>
237 225
		<description>
238 226
			Where to store inline data. This should be some location
239 227
			outside the knb install direcories.
......
245 233
		<key>application.documentfilepath</key>
246 234
		<label>Document File Path</label>
247 235
		<group>3</group>
248
		<index>8</index>
236
		<index>7</index>
249 237
		<description>
250 238
			Where to store metadata documents. This should be some location
251 239
			outside the knb install direcories.
......
257 245
		<key>application.tempDir</key>
258 246
		<label>Temporary File Path</label>
259 247
		<group>3</group>
260
		<index>9</index>
248
		<index>8</index>
261 249
		<description>
262 250
			Where to store temporary documents. This is primarily used by
263 251
			the data registry code. &lt;font color="red"&gt; Note: this must be 
......
271 259
		<key>replication.logdir</key>
272 260
		<label>Replication Log Directory</label>
273 261
		<group>3</group>
274
		<index>10</index>
262
		<index>9</index>
275 263
		<description>
276 264
			The directory where replication log should be located.
277 265
		</description>
lib/admin/skins-configuration.jsp
120 120
<%
121 121
			} 
122 122
%>
123
					name="default-flag" id="<%= skinName %>-radio" value="<%= skinName %>" onChange="toggleHiddenDefaultText('default-flag', '<%= skinName %>')"/>
123
					name="application.default-style" id="<%= skinName %>-radio" value="<%= skinName %>" onChange="toggleHiddenDefaultText('default-flag', '<%= skinName %>')"/>
124 124
					<label class="checkradio-label" for="<%= skinName %>-radio"> Make  &quot;<%= skinName %>&quot; default </label>
125 125
<%
126 126
			for (Integer propertyKey : propertyKeys) {
src/edu/ucsb/nceas/metacat/admin/SkinsAdmin.java
169 169
			Vector<String> validationErrors = new Vector<String>();
170 170

  
171 171
			try {
172
				//Default style is global.
173
				String defaultStyle = request.getParameter("application.default-style");
174
				PropertyService.setProperty("application.default-style", defaultStyle);
175
				
172 176
				// For each skin property, check if it is changed and save it
173 177
				Vector<String> skinNames = SkinUtil.getSkinNames();
174 178
				for (String skinName : skinNames) {

Also available in: Unified diff