r4608 - in trunk: lib lib/admin src/edu/ucsb/nceas/metacat/admin

[daigle at ecoinformatics.org]

Author: daigle
Date: 2008-11-21 10:32:18 -0800 (Fri, 21 Nov 2008)
New Revision: 4608

Modified:
   trunk/lib/admin/skins-configuration.jsp
   trunk/lib/metacat.properties.metadata.xml
   trunk/src/edu/ucsb/nceas/metacat/admin/SkinsAdmin.java
Log:
Remove application.default-style from the global configuration screen and activate it in the skins configuration.

Modified: trunk/lib/admin/skins-configuration.jsp
===================================================================
--- trunk/lib/admin/skins-configuration.jsp	2008-11-21 18:21:28 UTC (rev 4607)
+++ trunk/lib/admin/skins-configuration.jsp	2008-11-21 18:32:18 UTC (rev 4608)
@@ -120,7 +120,7 @@
 <%
 			} 
 %>
-					name="default-flag" id="<%= skinName %>-radio" value="<%= skinName %>" onChange="toggleHiddenDefaultText('default-flag', '<%= skinName %>')"/>
+					name="application.default-style" id="<%= skinName %>-radio" value="<%= skinName %>" onChange="toggleHiddenDefaultText('default-flag', '<%= skinName %>')"/>
 					<label class="checkradio-label" for="<%= skinName %>-radio"> Make  &quot;<%= skinName %>&quot; default </label>
 <%
 			for (Integer propertyKey : propertyKeys) {

Modified: trunk/lib/metacat.properties.metadata.xml
===================================================================
--- trunk/lib/metacat.properties.metadata.xml	2008-11-21 18:21:28 UTC (rev 4607)
+++ trunk/lib/metacat.properties.metadata.xml	2008-11-21 18:32:18 UTC (rev 4608)
@@ -194,22 +194,10 @@
 	</config>
 
 	<config>
-		<key>application.default-style</key>
-		<label>Application Style</label>
-		<group>3</group>
-		<index>4</index>
-		<description>
-			Custom display style for Metacat. Use default if there is no
-			custom style.
-		</description>
-		<helpFile>properties.html#application.default-style</helpFile>
-	</config>
-
-	<config>
 		<key>application.knbSiteURL</key>
 		<label>KNB Site URL</label>
 		<group>3</group>
-		<index>5</index>
+		<index>4</index>
 		<description>
 			Location of KNB website. Usually left as
 			http://knb.ecoinformatics.org
@@ -221,7 +209,7 @@
 		<key>application.datafilepath</key>
 		<label>Data File Path</label>
 		<group>3</group>
-		<index>6</index>
+		<index>5</index>
 		<description>
 			Where to store data. This should be some location outside
 			the knb install direcories.
@@ -233,7 +221,7 @@
 		<key>application.inlinedatafilepath</key>
 		<label>Inline Data File Path</label>
 		<group>3</group>
-		<index>7</index>
+		<index>6</index>
 		<description>
 			Where to store inline data. This should be some location
 			outside the knb install direcories.
@@ -245,7 +233,7 @@
 		<key>application.documentfilepath</key>
 		<label>Document File Path</label>
 		<group>3</group>
-		<index>8</index>
+		<index>7</index>
 		<description>
 			Where to store metadata documents. This should be some location
 			outside the knb install direcories.
@@ -257,7 +245,7 @@
 		<key>application.tempDir</key>
 		<label>Temporary File Path</label>
 		<group>3</group>
-		<index>9</index>
+		<index>8</index>
 		<description>
 			Where to store temporary documents. This is primarily used by
 			the data registry code. &lt;font color="red"&gt; Note: this must be 
@@ -271,7 +259,7 @@
 		<key>replication.logdir</key>
 		<label>Replication Log Directory</label>
 		<group>3</group>
-		<index>10</index>
+		<index>9</index>
 		<description>
 			The directory where replication log should be located.
 		</description>

Modified: trunk/src/edu/ucsb/nceas/metacat/admin/SkinsAdmin.java
===================================================================
--- trunk/src/edu/ucsb/nceas/metacat/admin/SkinsAdmin.java	2008-11-21 18:21:28 UTC (rev 4607)
+++ trunk/src/edu/ucsb/nceas/metacat/admin/SkinsAdmin.java	2008-11-21 18:32:18 UTC (rev 4608)
@@ -169,6 +169,10 @@
 			Vector<String> validationErrors = new Vector<String>();
 
 			try {
+				//Default style is global.
+				String defaultStyle = request.getParameter("application.default-style");
+				PropertyService.setProperty("application.default-style", defaultStyle);
+				
 				// For each skin property, check if it is changed and save it
 				Vector<String> skinNames = SkinUtil.getSkinNames();
 				for (String skinName : skinNames) {