Commit 3917ea05 authored by shake's avatar shake
Browse files

Updated some descriptors for the settings page

git-svn-id: https://subversion.umiacs.umd.edu/ace/trunk@156 f1b3a171-7291-4a19-a512-95ad0ad9394a
parent a4896c41
...@@ -19,121 +19,113 @@ ...@@ -19,121 +19,113 @@
<jsp:include page="header.jsp"/> <jsp:include page="header.jsp"/>
<h1>System Settings</h1> <h1>System Settings</h1>
<FORM name="settingsform" METHOD="POST" ENCTYPE="multipart/form-data" ACTION="UpdateSettings"> <FORM name="settingsform" METHOD="POST" ENCTYPE="multipart/form-data" ACTION="UpdateSettings">
<div id="settingstable"> <div id="settingsTable">
<table border="0"> <div class="settingsRow">
<tr> <div class="settingsName">Mail Server:</div>
<td>Mail Server:</td> <div class="settingsVal"><input type=text name="mail.server" value="${currSettings['mail.server']}"></div>
<td><input type=text name="mail.server" value="${currSettings['mail.server']}"></td> <div class="settingsHelp"><img src="images/help.png" title="Mail server to use when mailing reports. You will need to set this if you want reports to be mailed properly."></div>
<td><img src="images/help.png" title="Mail server to use when mailing reports. You will need to set this if you want reports to be mailed properly."></td> </div>
</tr> <div class="settingsRow">
<tr> <div class="settingsName">Mail From:</div>
<td>Mail From:</td> <div class="settingsVal"><input type=text name="mail.from" value="${currSettings['mail.from']}"></div>
<td><input type=text name="mail.from" value="${currSettings['mail.from']}"></td> <div class="settingsHelp"><img src="images/help.png" title="Set this e-mail address to an address e-mail should originate from"></div>
<td><img src="images/help.png" title="Set this e-mail address to an address e-mail should originate from"></td> </div>
</tr> <div class="settingsRow">
<tr> <div class="settingsName">Max Audit:</div>
<td>Max Audit:</td> <div class="settingsVal"><input type=text name="throttle.maxaudit" value="${currSettings['throttle.maxaudit']}"></div>
<td><input type=text name="throttle.maxaudit" value="${currSettings['throttle.maxaudit']}"></td> <div class="settingsHelp"><img src="images/help.png" title="Max number of running audits"></div>
<td><img src="images/help.png" title="Max number of running audits"></td> </div>
</tr> <div class="settingsRow">
<tr> <div class="settingsName">Audit Wait Time:</div>
<td>Audit Wait Time:</td> <div class="settingsVal"><input type=text name="throttle.wait" value="${currSettings['throttle.wait']}"></div>
<td><input type=text name="throttle.wait" value="${currSettings['throttle.wait']}"></td> <div class="settingsHelp"><img src="images/help.png" title="Minimum time between srb file reads in milliseconds"></div>
<td><img src="images/help.png" title="Minimum time between srb file reads in milliseconds"></td> </div>
</tr> <div class="settingsRow">
<tr> <div class="settingsName">Audit BPS:</div>
<td>Audit BPS:</td> <div class="settingsVal"><input type=text name="throttle.bps" value="${currSettings['throttle.bps']}"></div>
<td><input type=text name="throttle.bps" value="${currSettings['throttle.bps']}"></td> <div class="settingsHelp"><img src="images/help.png" title="Maximum bytes per second per running audit, default = 0 = unlimited"></div>
<td><img src="images/help.png" title="Maximum bytes per second per running audit, default = 0 = unlimited"></td> </div>
</tr> <div class="settingsRow">
<tr> <div class="settingsName">Auto Audit:</div>
<td>Auto Audit:</td> <div class="settingsVal"><input type=text name="auto.audit.disable" value="${currSettings['auto.audit.disable']}"></div>
<td><input type=text name="auto.audit.disable" value="${currSettings['auto.audit.disable']}"></td> <div class="settingsHelp"><img src="images/help.png" title="Start automated auditing"></div>
<td><img src="images/help.png" title="Start automated auditing"></td> </div>
</tr> <div class="settingsRow">
<tr> <div class="settingsName">IMS Host:</div>
<td>IMS Host:</td> <div class="settingsVal"><input type=text name="ims" value="${currSettings['ims']}"></div>
<td><input type=text name="ims" value="${currSettings['ims']}"></td> <div class="settingsHelp"><img src="images/help.png" title="IMS hostname to use. Unless you deployed your own IMS, this should probably not be changed"></div>
<td><img src="images/help.png" title="IMS hostname to use. Unless you deployed your own IMS, this should probably not be changed"></td> </div>
</tr> <div class="settingsRow">
<tr> <div class="settingsName">User Management:</div>
<td>User Management:</td> <div class="settingsVal"><input type=text name="auth.management" value="${currSettings['auth.management']}"></div>
<td><input type=text name="auth.management" value="${currSettings['auth.management']}"></td> <div class="settingsHelp"><img src="images/help.png" title="Set this to true to disable internal user management. This should only be used in conjunction with changes to the Authentication realm listed above."></div>
<td><img src="images/help.png" title="Set this to true to disable internal user management. This should only be used in conjunction with changes to the Authentication realm listed above."></td> </div>
</tr> <div class="settingsRow">
<tr> <div class="settingsName">Log Location:</div>
<td>Log Location:</td> <div class="settingsVal"><input type=text name="log4j.appender.A1.File" value="${currSettings['log4j.appender.A1.File']}"></div>
<td><input type=text name="log4j.appender.A1.File" value="${currSettings['log4j.appender.A1.File']}"></td> <div class="settingsHelp"><img src="images/help.png" title="The location of your logfile"></div>
<td><img src="images/help.png" title="The location of your logfile"></td> </div>
</tr> <c:choose>
<c:choose> <c:when test="${fileAppender}">
<c:when test="${fileAppender}"> <div class="settingsRow">
<tr> <div class="settingsName">Log Type:</div>
<td>Log Type:</td> <div class="settingsVal"><input type=text name="log4j.appender.A1" value="${currSettings['log4j.appender.A1']}"></div>
<td><input type=text name="log4j.appender.A1" value="${currSettings['log4j.appender.A1']}"></td> <div class="settingsHelp"><img src="images/help.png" title="Log everything to one file, will grow to infinity"></div>
<td><img src="images/help.png"></td> </div>
</tr> </c:when>
</c:when> <c:otherwise>
<c:otherwise> <div class="settingsRow">
<tr> <div class="settingsName">Log Type:</div>
<td>Log Type:</td> <div class="settingsVal"><input type=text name="log4j.appender.A1" value="${currSettings['log4j.appender.A1']}"></div>
<td><input type=text name="log4j.appender.A1" value="${currSettings['log4j.appender.A1']}"></td> <div class="settingsHelp"><img src="images/help.png" title="Rolling log file"></div>
<td><img src="images/help.png"></td> </div>
</tr> <div class="settingsRow">
<tr> <div class="settingsName">Log File Size:</div>
<td>Log File Size:</td> <div class="settingsVal"><input type=text name="log4j.appender.A1.maxFileSize" value="${currSettings['log4j.appender.A1.maxFileSize']}"></div>
<td><input type=text name="log4j.appender.A1.maxFileSize" value="${currSettings['log4j.appender.A1.maxFileSize']}"></td> <div class="settingsHelp"><img src="images/help.png" title="File size of your log"></div>
<td><img src="images/help.png" title="File size of your log"></td> </div>
</tr> <div class="settingsRow">
<tr> <div class="settingsName">Log Backup Index:</div>
<td>Log Backup Index:</td> <div class="settingsVal"><input type=text name="log4j.appender.A1.maxBackupIndex" value="${currSettings['log4j.appender.A1.maxBackupIndex']}"></div>
<td><input type=text name="log4j.appender.A1.maxBackupIndex" value="${currSettings['log4j.appender.A1.maxBackupIndex']}"></td> <div class="settingsHelp"><img src="images/help.png" title="Maximum backup index"></div>
<td><img src="images/help.png"></td> </div>
</tr> </c:otherwise>
</c:otherwise> </c:choose>
</c:choose> <br>
<tr></tr> <div class="settingsRow">
<tr> <div>Generic logging properties,
<td>Generic logging properties </td> change only if you know what you are doing</div>
</tr> </div>
<tr> <div class="settingsRow">
<td> change only if you know what you are doing</td> <div class="settingsName">Root Logger:</div>
</tr> <div class="settingsVal"><input type=text name="log4j.rootLogger" value="${currSettings['log4j.rootLogger']}"></div>
</div>
<tr> <div class="settingsRow">
<td>Root Logger:</td> <div class="settingsName">Pattern Layout:</div>
<td><input type=text name="log4j.rootLogger" value="${currSettings['log4j.rootLogger']}"></td> <div class="settingsVal"><input type=text name="log4j.appender.A1.layout" value="${currSettings['log4j.appender.A1.layout']}"></div>
<td><img src="images/help.png"></td> </div>
</tr> <div class="settingsRow">
<tr> <div class="settingsName">Conversion Pattern:</div>
<td>Pattern Layout:</td> <div class="settingsVal"><input type=text name="log4j.appender.A1.layout.ConversionPattern" value="${currSettings['log4j.appender.A1.layout.ConversionPattern']}"></div>
<td><input type=text name="log4j.appender.A1.layout" value="${currSettings['log4j.appender.A1.layout']}"></td> </div>
<td><img src="images/help.png"></td> <div class="settingsRow">
</tr> <div class="settingsName">IRods:</div>
<tr> <div class="settingsVal"><input type=text name="log4j.logger.edu.umiacs.irods" value="${currSettings['log4j.logger.edu.umiacs.irods']}"></div>
<td>Conversion Pattern:</td> </div>
<td><input type=text name="log4j.appender.A1.layout.ConversionPattern" value="${currSettings['log4j.appender.A1.layout.ConversionPattern']}"></td> <div class="settingsRow">
<td><img src="images/help.png"></td> <div class="settingsName">UMIACS Connection:</div>
</tr> <div class="settingsVal"><input type=text name="log4j.logger.edu.umiacs" value="${currSettings['log4j.logger.edu.umiacs']}"></div>
<tr> </div>
<td>IRods:</td> <div class="settingsRow">
<td><input type=text name="log4j.logger.edu.umiacs.irods" value="${currSettings['log4j.logger.edu.umiacs.irods']}"></td> <div class="settingsName">IRods Connection:</div>
<td><img src="images/help.png"></td> <div class="settingsVal"><input type=text name="irods.connection" value="${currSettings['irods.connection']}"></div>
</tr> </div>
<tr>
<td>umiacs:</td>
<td><input type=text name="log4j.logger.edu.umiacs" value="${currSettings['log4j.logger.edu.umiacs']}"></td>
<td><img src="images/help.png"></td>
</tr>
<tr>
<td>IRods Connection:</td>
<td><input type=text name="irods.connection" value="${currSettings['irods.connection']}"></td>
<td><img src="images/help.png"></td>
</tr>
</table>
</div> </div>
<input type=submit value="Submit" name="update" class="submitLink" style="margin-left: 50px;"> <input type=submit value="Default" name="default" class="submitLink"> <a href="Status">Cancel</a> <br>
<input type=submit value="Submit" name="update" class="submitLink" style="margin-left: 5%">
<input type=submit value="Default" name="default" class="submitLink">
<a href="Status" style="font-size: medium; text-decoration: underline;">Cancel</a>
</FORM> </FORM>
<jsp:include page="footer.jsp"/> <jsp:include page="footer.jsp"/>
......
...@@ -162,13 +162,35 @@ vertical-align: top; ...@@ -162,13 +162,35 @@ vertical-align: top;
margin-bottom: 5px; margin-bottom: 5px;
} }
#settingstable { #settingsTable {
font-size: small; font-size: small;
border: 1px solid #000000; border: 1px solid #000000;
margin-left: 50px; margin-left: 5%;
margin-right: 50px; margin-right: 5%;
width: 90%;
} }
#settingsitem { .settingsRow {
margin-left: 25%; margin-top: 5px;
margin-bottom: 5px;
height: 20px;
width: 100%;
clear: both;
}
.settingsName {
width: 200px;
float: left;
margin-left: 2px;
margin-top: 5px;
}
.settingsVal {
width: 250px;
float: left;
text-align: center;
}
.settingsHelp {
float: left;
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment