- workaround for safari bug with definition lists inside fieldsets in ConfigBasic

- alternative can be seen in PerformanceMemory, where a dl is simulated with a table layout

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3442 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 18 years ago
parent 4e8eb1dbe3
commit b627c77df6

@ -33,7 +33,7 @@
</li> </li>
<li> <li>
#(statusPassword)#<img src="/env/grafics/warning.png" alt="warning" />&nbsp;Please set a password for your peer to protect your settings (> 3 characters); if this is successful you will be asked to log in with these values immediately.::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;Password is set#(/statusPassword)#<br /> #(statusPassword)#<img src="/env/grafics/warning.png" alt="warning" />&nbsp;Please set a password for your peer to protect your settings (> 3 characters); if this is successful you will be asked to log in with these values immediately.::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;Password is set#(/statusPassword)#<br />
<fieldset> <fieldset><table border="0"><tr><td>
<dl class="userConfig"> <dl class="userConfig">
<dt><label for="adminuser">Peer User:</label></dt> <dt><label for="adminuser">Peer User:</label></dt>
<dd><input type="text" name="adminuser" id="adminuser" value="#[defaultUser]#" size="16" maxlength="32" /></dd> <dd><input type="text" name="adminuser" id="adminuser" value="#[defaultUser]#" size="16" maxlength="32" /></dd>
@ -42,22 +42,22 @@
<dt><label for="adminpw2">Peer Password:</label></dt> <dt><label for="adminpw2">Peer Password:</label></dt>
<dd><input type="password" name="adminpw2" id="adminpw2" value="" size="16" maxlength="32" /> (repeat same password)</dd> <dd><input type="password" name="adminpw2" id="adminpw2" value="" size="16" maxlength="32" /> (repeat same password)</dd>
</dl> </dl>
</fieldset> </td></tr></table></fieldset>
</li> </li>
<li> <li>
#(statusName)#<img src="/env/grafics/warning.png" alt="warning" />&nbsp;Your peer name has not been customized; please set your own peer name::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;You have a nice peer name#(/statusName)#<br /> #(statusName)#<img src="/env/grafics/warning.png" alt="warning" />&nbsp;Your peer name has not been customized; please set your own peer name::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;You have a nice peer name#(/statusName)#<br />
<fieldset> <fieldset><table border="0"><tr><td>
<dl> <dl>
<dt><label for="peername">Peer Name: </label></dt> <dt><label for="peername">Peer Name: </label></dt>
<dd> <dd>
<input type="text" name="peername" id="peername" value="#[defaultName]#" size="20" maxlength="32" /> <input type="text" name="peername" id="peername" value="#[defaultName]#" size="20" maxlength="32" />
</dd> </dd>
</dl> </dl>
</fieldset> </td></tr></table></fieldset>
</li> </li>
<li> <li>
#(statusPort)#<img src="/env/grafics/warning.png" alt="warning" />&nbsp;Your peer cannot be reached from outside (what is not fatal, but would be good for the YaCy network); please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port.::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;Your peer can be reached by other peers#(/statusPort)#<br /> #(statusPort)#<img src="/env/grafics/warning.png" alt="warning" />&nbsp;Your peer cannot be reached from outside (what is not fatal, but would be good for the YaCy network); please open your firewall for this port and/or set a virtual server option in your router to allow connections on this port.::<img src="/env/grafics/ok.png" height="32px" width="32px" alt="ok" />&nbsp;Your peer can be reached by other peers#(/statusPort)#<br />
<fieldset> <fieldset><table border="0"><tr><td>
<dl> <dl>
<dt><label for="port">Peer Port: </label></dt> <dt><label for="port">Peer Port: </label></dt>
<dd> <dd>
@ -70,7 +70,7 @@
<input type="checkbox" name="enableUpnp" id="enableUpnp" align="top" #(enabled)#::checked="checked"#(/enabled)# /> <input type="checkbox" name="enableUpnp" id="enableUpnp" align="top" #(enabled)#::checked="checked"#(/enabled)# />
</dd>#(/upnp)# </dd>#(/upnp)#
</dl> </dl>
</fieldset> </td></tr></table></fieldset>
</li> </li>
</ol> </ol>
<fieldset>&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="set" value="Set Configuration" /></fieldset> <fieldset>&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="set" value="Set Configuration" /></fieldset>

@ -19,37 +19,37 @@
<td>Now<br />#(gc)#before <a href="PerformanceMemory_p.html?gc=">GC</a>::after GC#(/gc)#</td> <td>Now<br />#(gc)#before <a href="PerformanceMemory_p.html?gc=">GC</a>::after GC#(/gc)#</td>
<td>Description<br />&nbsp;</td> <td>Description<br />&nbsp;</td>
</tr> </tr>
<tr class="TableCellDark"> <tr class="TableCellLight">
<td class="TableHeader" align="left">Max</td> <td class="TableCellDark" align="left">Max</td>
<td align="center" colspan="4">#[memoryMax]# MByte</td> <td align="center" colspan="4">#[memoryMax]# MByte</td>
<td align="left">maximum memory that the JVM will attempt to use</td> <td align="left">maximum memory that the JVM will attempt to use</td>
</tr> </tr>
<tr class="TableCellDark"> <tr class="TableCellLight">
<td class="TableHeader" align="left">Available</td> <td class="TableCellDark" align="left">Available</td>
<td align="right">#[memoryAvailAfterStartup]# MByte</td> <td align="right">#[memoryAvailAfterStartup]# MByte</td>
<td align="right">#[memoryAvailAfterInitBGC]# MByte</td> <td align="right">#[memoryAvailAfterInitBGC]# MByte</td>
<td align="right">#[memoryAvailAfterInitAGC]# MByte</td> <td align="right">#[memoryAvailAfterInitAGC]# MByte</td>
<td align="right">#[memoryAvailNow]# MByte</td> <td align="right">#[memoryAvailNow]# MByte</td>
<td align="left">total available memory including free for the JVM within maximum</td> <td align="left">total available memory including free for the JVM within maximum</td>
</tr> </tr>
<tr class="TableCellDark"> <tr class="TableCellLight">
<td class="TableHeader" align="left">Total</td> <td class="TableCellDark" align="left">Total</td>
<td align="right">#[memoryTotalAfterStartup]# KByte</td> <td align="right">#[memoryTotalAfterStartup]# KByte</td>
<td align="right">#[memoryTotalAfterInitBGC]# KByte</td> <td align="right">#[memoryTotalAfterInitBGC]# KByte</td>
<td align="right">#[memoryTotalAfterInitAGC]# KByte</td> <td align="right">#[memoryTotalAfterInitAGC]# KByte</td>
<td align="right">#[memoryTotalNow]# MByte</td> <td align="right">#[memoryTotalNow]# MByte</td>
<td align="left">total memory taken from the OS</td> <td align="left">total memory taken from the OS</td>
</tr> </tr>
<tr class="TableCellDark"> <tr class="TableCellLight">
<td class="TableHeader" align="left">Free</td> <td class="TableCellDark" align="left">Free</td>
<td align="right">#[memoryFreeAfterStartup]# KByte</td> <td align="right">#[memoryFreeAfterStartup]# KByte</td>
<td align="right">#[memoryFreeAfterInitBGC]# KByte</td> <td align="right">#[memoryFreeAfterInitBGC]# KByte</td>
<td align="right">#[memoryFreeAfterInitAGC]# KByte</td> <td align="right">#[memoryFreeAfterInitAGC]# KByte</td>
<td align="right">#[memoryFreeNow]# MByte</td> <td align="right">#[memoryFreeNow]# MByte</td>
<td align="left">free memory in the JVM within total amount</td> <td align="left">free memory in the JVM within total amount</td>
</tr> </tr>
<tr class="TableCellDark"> <tr class="TableCellLight">
<td class="TableHeader" align="left">Used</td> <td class="TableCellDark" align="left">Used</td>
<td align="right">#[memoryUsedAfterStartup]# KByte</td> <td align="right">#[memoryUsedAfterStartup]# KByte</td>
<td align="right">#[memoryUsedAfterInitBGC]# KByte</td> <td align="right">#[memoryUsedAfterInitBGC]# KByte</td>
<td align="right">#[memoryUsedAfterInitAGC]# KByte</td> <td align="right">#[memoryUsedAfterInitAGC]# KByte</td>
@ -64,13 +64,12 @@
<table border="0" cellpadding="2" cellspacing="1" width="60%"> <table border="0" cellpadding="2" cellspacing="1" width="60%">
<colgroup><col width="20%" /><col width="40%" /></colgroup> <colgroup><col width="20%" /><col width="40%" /></colgroup>
<tr> <tr>
<td class="TableHeader" align="right"><label for="Xmx">Memory reserved for JVM</label>&nbsp;</td> <td class="TableCellDark" align="right"><label for="Xmx">Memory reserved for JVM</label>&nbsp;</td>
<td class="TableCellDark" align="right"><input name="Xmx" id="Xmx" type="text" size="4" maxlength="4" value="#[Xmx]#" /> MByte</td> <td class="TableCellLight" align="left">&nbsp;<input name="Xmx" id="Xmx" type="text" size="4" maxlength="4" value="#[Xmx]#" /> MByte</td>
</tr> </tr>
<tr> <tr>
<td #(setStartupCommit)#class="TableCellLight"::class="commit"::class="error"#(/setStartupCommit)# colspan="2" align="right"> <td class="TableCellLight" align="right"><input type="submit" name="setStartup" value="Set" /></td>
#(setStartupCommit)#::Accepted change. This will take effect after <strong>restart</strong> of YaCy#(/setStartupCommit)# <td #(setStartupCommit)#class="TableCellLight"::class="commit"::class="error"#(/setStartupCommit)# align="left">&nbsp;#(setStartupCommit)#::Accepted change. This will take effect after <strong>restart</strong> of YaCy#(/setStartupCommit)#
<input type="submit" name="setStartup" value="Set" />
</td> </td>
</tr> </tr>
</table> </table>
@ -87,7 +86,7 @@
</tr> </tr>
#{TableList}# #{TableList}#
<tr class="TableCellLight"> <tr class="TableCellLight">
<td align="left">#[tableIndexPath]#</td> <td align="left" class="TableCellDark">#[tableIndexPath]#</td>
<td align="right">#[tableIndexChunkSize]#</td> <td align="right">#[tableIndexChunkSize]#</td>
<td align="right">#[tableIndexCount]#</td> <td align="right">#[tableIndexCount]#</td>
<td align="right">#[tableIndexMem]# MB</td> <td align="right">#[tableIndexMem]# MB</td>
@ -114,7 +113,7 @@
</tr> </tr>
#{NodeList}# #{NodeList}#
<tr class="TableCellLight"> <tr class="TableCellLight">
<td align="left">#[nodeCachePath]#</td> <td align="left" class="TableCellDark">#[nodeCachePath]#</td>
<td align="right">#[nodeChunkSize]#</td> <td align="right">#[nodeChunkSize]#</td>
<td align="right">#[nodeCacheCount]#</td> <td align="right">#[nodeCacheCount]#</td>
<td align="right">#[nodeCacheMem]# MB</td> <td align="right">#[nodeCacheMem]# MB</td>
@ -161,7 +160,7 @@
</tr> </tr>
#{ObjectList}# #{ObjectList}#
<tr class="TableCellLight"> <tr class="TableCellLight">
<td align="left">#[objectCachePath]#</td> <td align="left" class="TableCellDark">#[objectCachePath]#</td>
<td align="right">#[objectHitChunkSize]#</td> <td align="right">#[objectHitChunkSize]#</td>
<td align="right">#[objectHitCacheCount]#</td> <td align="right">#[objectHitCacheCount]#</td>
<td align="right">#[objectHitCacheMem]# MB</td> <td align="right">#[objectHitCacheMem]# MB</td>

Loading…
Cancel
Save