fix for dl/fieldset problem in Safari

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3444 6c8d7289-2bf4-0310-a012-ef5d649a1542

3 files changed, 20 insertions, 18 deletions

diff --git a/htroot/ConfigBasic.html b/htroot/ConfigBasic.html
index 0b51520e6..89101f1c8 100644
--- a/htroot/ConfigBasic.html
+++ b/htroot/ConfigBasic.html
@@ -33,7 +33,7 @@
         </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 />
-          <fieldset><table border="0"><tr><td>
+          <fieldset>
             <dl class="userConfig">
               <dt><label for="adminuser">Peer User:</label></dt>
               <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>
               <dd><input type="password" name="adminpw2" id="adminpw2" value="" size="16" maxlength="32" /> (repeat same password)</dd>
             </dl>
-          </td></tr></table></fieldset>
+          </fieldset>
         </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 />
-          <fieldset><table border="0"><tr><td>
+          <fieldset>
             <dl>
               <dt><label for="peername">Peer Name: </label></dt>
               <dd>
                 <input type="text" name="peername" id="peername" value="#[defaultName]#" size="20" maxlength="32" />
               </dd>
             </dl>
-          </td></tr></table></fieldset>
+          </fieldset>
         </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 />
-          <fieldset><table border="0"><tr><td>
+          <fieldset>
             <dl>
               <dt><label for="port">Peer Port: </label></dt>
               <dd>
@@ -70,7 +70,7 @@
                 <input type="checkbox" name="enableUpnp" id="enableUpnp" align="top" #(enabled)#::checked="checked"#(/enabled)# />
               </dd>#(/upnp)#
             </dl>
-          </td></tr></table></fieldset>
+          </fieldset>
         </li>
       </ol>
       <fieldset>&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" name="set" value="Set Configuration" /></fieldset>
diff --git a/htroot/PerformanceMemory_p.html b/htroot/PerformanceMemory_p.html
index b8d215cc2..77ed44d17 100644
--- a/htroot/PerformanceMemory_p.html
+++ b/htroot/PerformanceMemory_p.html
@@ -61,18 +61,13 @@
     <form action="PerformanceMemory_p.html" method="post" enctype="multipart/form-data">

       <fieldset>

         <legend>Memory Settings</legend>

-        <table border="0" cellpadding="2" cellspacing="1" width="60%">

-          <colgroup><col width="20%" /><col width="40%" /></colgroup>

-          <tr>

-            <td class="TableCellDark" align="right"><label for="Xmx">Memory reserved for JVM</label>&nbsp;</td>

-            <td class="TableCellLight" align="left">&nbsp;<input name="Xmx" id="Xmx" type="text" size="4" maxlength="4" value="#[Xmx]#" /> MByte</td>

-		  </tr>

-          <tr>

-            <td class="TableCellLight" align="right"><input type="submit" name="setStartup" value="Set" /></td>

-            <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)#

-            </td>

-          </tr>

-        </table>

+        <dl>

+          <dt><label for="Xmx">Memory reserved for JVM</label></dt>

+          <dd><input name="Xmx" id="Xmx" type="text" size="4" maxlength="4" value="#[Xmx]#" /> MByte&nbsp;

+              <input type="submit" name="setStartup" value="Set" />&nbsp;

+              #(setStartupCommit)#::<div class="commit">Accepted change. This will take effect after <strong>restart</strong> of YaCy</div>::<div class="error"></div>#(/setStartupCommit)#

+          </dd>

+        </dl>

       </fieldset>

     </form>

     

diff --git a/htroot/env/base.css b/htroot/env/base.css
index 74374083e..215eb4921 100644
--- a/htroot/env/base.css
+++ b/htroot/env/base.css
@@ -37,6 +37,13 @@
   font-family:/*Helvetica, Arial, */sans-serif;
 }
 
+/* the following dl style is needed to patch a bug in Safari
+   which occurs when definition lists appears inside of fieldsets */
+dl {
+  display:inline-block;
+  width:96%;
+}
+
 body {
   margin:0;
   padding:0;