Project

General

Profile

« Previous | Next » 

Revision 4100

Added by daigle about 16 years ago

Clean up formatting on configuration pages

View differences:

lib/admin/admin.css
57 57

  
58 58
input[type="radio"] {
59 59
	margin-bottom: 4px;
60
	width: 13px;
60 61
}
61 62

  
62 63
input[type="checkbox"] {
......
72 73
	margin-right: auto;
73 74
}
74 75

  
76
.config-section-header {
77
	font-size: 16pt;
78
	font-weight: bold;
79
	border-bottom: solid #dddddd 1px;
80
}
81

  
82
.config-line {
83
	color: #dddddd;
84
	background-color: #dddddd;
85
	height: 1px;
86
}
87

  
75 88
.config-section {
76 89
	display: table;
77 90
	width: 100%
......
103 116
.config-property-input {
104 117
	text-align: left;
105 118
	vertical-align: middle;
106
	width: 400px;
119
	width: 418px;
107 120
}
108 121

  
109 122
.config-question-mark {
......
111 124
	vertical-align: middle;
112 125
}
113 126

  
114
.section {
115
	font-size: 16pt;
116
	font-weight: bold;
117
	border-bottom: solid #dddddd 1px;
118
}
119

  
120 127
.login-input {
121 128
	width: 150px;
122 129
}
lib/admin/ldap-configuration.jsp
1
<%@ page language="java" import="java.util.Set,java.util.Map,java.util.Vector" %>
2
<%@ page language="java" import="edu.ucsb.nceas.utilities.*" %>
1
<%@ page language="java"%>
2
<%@ page import="java.util.Set,java.util.Map,java.util.Vector,edu.ucsb.nceas.utilities.*" %>
3 3
<%
4 4
	/**
5 5
 *  '$RCSfile$'
......
62 62
	MetaDataGroup globalGroup = groupMap.get(new Integer(1));
63 63
%>
64 64
  <h3><%=globalGroup.getName()%></h3> 
65
  <hr class=config>
65
  <hr class="config-line">
66 66
<%
67 67
 	if (globalGroup.getComment() != null) {
68 68
%>
......
99 99
%>
100 100
	</table>
101 101
	<h3><%=orgGroup.getName()%></h3> 
102
    <hr class=config>
102
    <hr class="config-line">
103 103
<%
104 104
 	if (orgGroup.getComment() != null) {
105 105
%>
lib/admin/admin.js
96 96
	document.getElementById(objectID).style.display = 'table'; 
97 97
} 
98 98

  
99
function toggleHiddenDefaultText(radioName, activeSkinName) {
100
	radioList = document.getElementsByName(radioName);
101
	for (i = 0; i < radioList.length; i++) {
102
		radioId = radioList[i].id;
103
		nameArray = radioId.split("-", 1);
104
		radioSkinName = nameArray[0];
105
		if (radioSkinName == activeSkinName) {
106
			document.getElementById("hiding-default-" + radioSkinName).style.display = 'inline';
107
		} else {
108
			document.getElementById("hiding-default-" + radioSkinName).style.display = 'none';
109
		}
110
	}
111
}
112

  
113

  
lib/admin/database-configuration.jsp
1
<%@ page    language="java" import="java.util.Vector,edu.ucsb.nceas.metacat.admin.DBAdmin,edu.ucsb.nceas.metacat.service.PropertyService" %>
2
<%@ page    language="java" import="edu.ucsb.nceas.metacat.DBVersion,edu.ucsb.nceas.metacat.MetaCatVersion" %>
1
<%@ page language="java" %>
2
<%@ page import="java.util.Vector,edu.ucsb.nceas.metacat.DBVersion,edu.ucsb.nceas.metacat.MetaCatVersion" %>
3 3

  
4 4
<% 
5 5
/**
lib/admin/skins-configuration.jsp
58 58

  
59 59

  
60 60
<h3>Skins Configuration</h3>
61
<hr class=config>
61
<hr class="config-line">
62 62
<div class="heading-comment">
63 63
	Choose and configure the skins that will be available in this instance of MetaCat
64 64
</div><br>
......
112 112
					<label for="<%= skinName %>-radio"> Make <%= skinName %> default </label>
113 113
				</td>
114 114
				<td class="config-property-input" >
115
					<input type="radio" name="default-flag" id="<%= skinName %>-radio" value="<%= skinName %>" onChange="toggleHiddenInline(this, 'hiding-default-<%= skinName %>')"/>
115
					<input type="radio" name="default-flag" id="<%= skinName %>-radio" value="<%= skinName %>" onChange="toggleHiddenDefaultText('default-flag', '<%= skinName %>')"/>
116 116
				</td>
117 117
				<td class="config-question-mark">
118 118
					<img src="style/images/question-mark.gif" 
......
133 133
					<label for="<%= metaDataProperty.getKey() %>" title="<%= metaDataProperty.getDescription() %>"><%= metaDataProperty.getLabel() %></label>  
134 134
				</td>
135 135
				<td class="config-property-input"> 			
136
					<select name="<%= metaDataProperty.getKey() %>">
136
					<select name="<%= skinName %>.<%= metaDataProperty.getKey() %>">
137 137
<%
138
					Vector<String> fieldOptions = metaDataProperty.getFieldOptions();
139
					for (String optionName : fieldOptions) {
138
					Vector<String> fieldOptionNames = metaDataProperty.getFieldOptionNames();
139
					Vector<String> fieldOptionValues = metaDataProperty.getFieldOptionValues();
140
					for (int i = 0; i < fieldOptionNames.size(); i++) {
140 141
%>
141
						<option value="<%= optionName %>"> <%= optionName %>
142
						<option value="<%= fieldOptionValues.elementAt(i) %>"> <%= fieldOptionNames.elementAt(i) %>
142 143
<%
143 144
					}
144 145
%>
......
157 158
					<label  for="<%= metaDataProperty.getKey() %>" title="<%= metaDataProperty.getDescription() %>"><%= metaDataProperty.getLabel() %></label>
158 159
				</td>
159 160
				<td class="config-property-input"> 
160
					<input id="<%= metaDataProperty.getKey() %>" name="<%= metaDataProperty.getKey() %>" 	             		    	    	           		    	             			
161
					<input id="<%= skinName %>.<%= metaDataProperty.getKey() %>" name="<%= skinName %>.<%= metaDataProperty.getKey() %>" 	             		    	    	           		    	             			
161 162
							type="<%= fieldType %>"
162 163
							alt="<%= metaDataProperty.getDescription() %>"/> 
163 164
				</td>
......
173 174
					<label for="<%= metaDataProperty.getKey() %>" title="<%= metaDataProperty.getDescription() %>"><%= metaDataProperty.getLabel() %></label>
174 175
				</td>
175 176
				<td class="config-property-input"> 
176
					<input id="<%= metaDataProperty.getKey() %>" name="<%= metaDataProperty.getKey() %>" 
177
					<input id="<%= skinName %>.<%= metaDataProperty.getKey() %>" name="<%= skinName %>.<%= metaDataProperty.getKey() %>" 
177 178
							value="<%= skinProperties.get(metaDataProperty.getKey()) %>"	             		    	    	           		    	             			
178 179
							type="<%= fieldType %>	"           			
179 180
							alt="<%= metaDataProperty.getDescription() %>"/>	           		    
lib/admin/admin-login.jsp
1
<%@ page    language="java" import="java.util.Vector,edu.ucsb.nceas.metacat.util.LDAPUtil,edu.ucsb.nceas.metacat.service.PropertyService" %>
1
<%@ page language="java" %> 
2
<%@ page import="java.util.Vector,edu.ucsb.nceas.metacat.util.LDAPUtil,edu.ucsb.nceas.metacat.service.PropertyService" %>
2 3
<% 
3 4
/**
4 5
 *  '$RCSfile$'
......
62 63
<br class="ldap-header">
63 64

  
64 65
<%@ include file="./page-message-section.jsp"%>
65
<hr class=config>
66
<hr class="config-line">
66 67
<br>
67 68

  
68 69
<form name="loginform" method="post" action="<%= request.getContextPath() %>/admin"
......
103 104
</table>
104 105

  
105 106
<br>
106
<hr class=config>
107
<hr class="config-line">
107 108

  
108 109
<table class="admin-login">
109 110
	<tr>
lib/admin/page-message-section.jsp
1
<%@ page    language="java" import="java.util.Vector" %>
1
<%@ page language="java" import="java.util.Vector" %>
2 2
<% 
3 3
/**
4 4
 *  '$RCSfile$'
lib/admin/properties-configuration.jsp
1
<%@ page language="java" import="java.util.Collection,java.util.Set,java.util.TreeSet,java.util.Map,java.util.Vector" %>
2
<%@ page language="java" import="edu.ucsb.nceas.utilities.PropertiesMetaData,edu.ucsb.nceas.utilities.MetaDataGroup,edu.ucsb.nceas.utilities.MetaDataProperty" %>
1
<%@ page language="java" %>
2
<%@ page import="java.util.Set,java.util.Map,java.util.Vector,edu.ucsb.nceas.utilities.PropertiesMetaData" %>
3
<%@ page import="edu.ucsb.nceas.utilities.MetaDataGroup,edu.ucsb.nceas.utilities.MetaDataProperty" %>
3 4
<% 
4 5
/**
5 6
 *  '$RCSfile$'
......
59 60
			// for this group, display the header (group name)
60 61
			MetaDataGroup metaDataGroup = (MetaDataGroup)groupMap.get(groupId);
61 62
%>
62
			<p class="section"><%= metaDataGroup.getName()  %></p>
63
			<table class="config-section">
63
		<h3><%= metaDataGroup.getName()  %></h3>
64
		<table class="config-section">
64 65
<%
65 66
			// get all the properties in this group
66 67
			Map<Integer, MetaDataProperty> propertyMap = 
......
79 80
     			<td class="config-property-input" >		
80 81
					<select name="<%= metaDataProperty.getKey() %>">
81 82
<%
82
					Vector<String> fieldOptions = metaDataProperty.getFieldOptions();
83
					for (String optionName : fieldOptions) {
83
					Vector<String> fieldOptionValues = metaDataProperty.getFieldOptionValues();
84
					Vector<String> fieldOptionNames = metaDataProperty.getFieldOptionNames();
85
					for (int i = 0; i < fieldOptionNames.size(); i++) {
84 86
%>
85
					<option value="<%= optionName %>"> <%= optionName %>
87
					<option value="<%= fieldOptionValues.elementAt(i) %>"> <%= fieldOptionNames.elementAt(i) %>
86 88
<%
87 89
				}
88 90
%>
lib/admin/configure-restart.jsp
1
<%@ page    language="java" %>
1
<%@ page language="java" %>
2 2
<% 
3 3
/**
4 4
 *  '$RCSfile$'
lib/admin/metacat-configuration.jsp
52 52
<br class="main-header">
53 53

  
54 54
<%@ include file="page-message-section.jsp"%>
55
<hr class=config>
55
<hr class="config-line">
56 56

  
57
<table class=configuration-table>
57
<table class="configuration-table">
58 58
<%
59 59
	if (ldapConfigured != null && ldapConfigured) {
60 60
%>
61 61
        <tr>
62
        <td class=configured-tag>[configured] </td>
63
		<td class=property-title> LDAP Configuration </td> 
64
		<td class=configure-link> <a href="<%= request.getContextPath() %>/admin?configureType=ldap">Reconfigure Now</a> </td>
62
        <td class="configured-tag">[configured] </td>
63
		<td class="property-title"> LDAP Configuration </td> 
64
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=ldap">Reconfigure Now</a> </td>
65 65
        </tr>
66 66
<%
67 67
	} else {
......
79 79
	if (propsConfigured != null && propsConfigured) {
80 80
%>
81 81
        <tr>
82
        <td class=configured-tag>[configured] </td>
83
		<td class=property-title> Metacat System Properties </td> 
84
		<td class=configure-link> <a href="<%= request.getContextPath() %>/admin?configureType=properties">Reconfigure Now</a> </td>
82
        <td class="configured-tag">[configured] </td>
83
		<td class="property-title"> Metacat System Properties </td> 
84
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=properties">Reconfigure Now</a> </td>
85 85
        </tr>
86 86
<%
87 87
	} else {
88 88
%>    		
89 89
        <tr>
90
 		<td class=unconfigured-tag>[unconfigured] </td>  
91
 		<td class=property-title> Metacat System Properties </td>
92
		<td class=configure-link> <a href="<%= request.getContextPath() %>/admin?configureType=properties">Configure Now</a> </td>			
90
 		<td class="unconfigured-tag">[unconfigured] </td>  
91
 		<td class="property-title"> Metacat System Properties </td>
92
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=properties">Configure Now</a> </td>			
93 93
    	</tr>
94 94
<%
95 95
	}
......
97 97
    if (skinsConfigured != null && skinsConfigured) {
98 98
%>
99 99
        <tr>
100
        <td class=configured-tag>[configured] </td>
101
		<td class=property-title> Skins Specific Properties </td> 
102
		<td class=configure-link> <a href="<%= request.getContextPath() %>/admin?configureType=skins">Reconfigure Now</a> </td>
100
        <td class="configured-tag">[configured] </td>
101
		<td class="property-title"> Skins Specific Properties </td> 
102
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=skins">Reconfigure Now</a> </td>
103 103
        </tr>
104 104
<%
105 105
	} else {
106 106
%>    		
107 107
        <tr>
108
 		<td class=unconfigured-tag>[unconfigured] </td>  
109
 		<td class=property-title> Skins Specific Properties </td>
110
		<td class=configure-link> <a href="<%= request.getContextPath() %>/admin?configureType=skins">Configure Now</a> </td>			
108
 		<td class="unconfigured-tag">[unconfigured] </td>  
109
 		<td class="property-title"> Skins Specific Properties </td>
110
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=skins">Configure Now</a> </td>			
111 111
    	</tr>
112 112
<%
113 113
	}
......
117 117
    				metacatVersion.compareTo(databaseVersion) == 0)) {
118 118
%>
119 119
    	<tr>
120
    	<td class=configured-tag>[configured] </td>
121
    	<td class=property-title> Database Installation/Upgrade </td> 
122
		<td class=configure-link> Version: <%= databaseVersion.getVersionString() %> </td>    		
120
    	<td class="configured-tag">[configured] </td>
121
    	<td class="property-title"> Database Installation/Upgrade </td> 
122
		<td class="configure-link"> Version: <%= databaseVersion.getVersionString() %> </td>    		
123 123
    	</tr>
124 124
<%
125 125
	} else {
126 126
%>    		
127 127
    	<tr>
128
    	<td class=unconfigured-tag>[unconfigured] </td>  
129
    	<td class=property-title> Database Installation/Upgrade </td>
128
    	<td class="unconfigured-tag">[unconfigured] </td>  
129
    	<td class="property-title"> Database Installation/Upgrade </td>
130 130
<%
131 131
	if (propsConfigured != null && propsConfigured) {
132 132
%>
133 133
        	
134
		<td class=configure-link> <a href="<%= request.getContextPath() %>/admin?configureType=database">Configure Now</a> </td>			
134
		<td class="configure-link"> <a href="<%= request.getContextPath() %>/admin?configureType=database">Configure Now</a> </td>			
135 135
        	
136 136
<%
137 137
	} else {
138 138
%> 
139
		<td class=configure-link> Configure System Properties First </td>
139
		<td class="configure-link"> Configure System Properties First </td>
140 140
<%
141 141
				}
142 142
			%>     	
......
145 145
	}
146 146
%>
147 147
</table>
148
<hr class=config>
148
<hr class="config-line">
149 149

  
150 150
<%
151 151
	if (metacatConfigured != null && metacatConfigured) {
......
177 177
	    </ol>
178 178
	</p>
179 179
	
180
	<hr class=config>
180
	<hr class="config-line">
181 181
	<br clear="right"/>
182 182
	<h3>Restarting Metacat</h3>
183 183
	<p>The simplest way to restart metacat is to restart the entire servlet engine.
......
191 191
                request.getContextPath() %></a>
192 192
	</p>
193 193

  
194
	<hr class=config>
194
	<hr class="config-line">
195 195
	<%@ include file="./login-footer-section.jsp"%>
196 196

  
197 197
	</body>

Also available in: Unified diff