Viele kleine Schnheitsfehler in einigen CGIs angepasst

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@528 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 5a631a03c88368af7f81f104c1c39b3ae6f30f24..90ea4b788710eb8dd639ab844c39e0bc2f1bb79a 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -345,7 +345,6 @@ WARNING: untranslated string: trafficred
 WARNING: untranslated string: traffics
 WARNING: untranslated string: trafficsum
 WARNING: untranslated string: trafficto
-WARNING: untranslated string: tripwire cronjobs
 WARNING: untranslated string: up
 WARNING: untranslated string: urlfilter background image
 WARNING: untranslated string: urlfilter log

diff --git a/doc/language_issues.en b/doc/language_issues.en
index cb6c09fb05d99d2a37f6dff08002ed2de88ca1a3..e9e977ccd32f41f2423f4c7c688d526cd6f54eb3 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -333,7 +333,6 @@ WARNING: untranslated string: pakfire configuration
 WARNING: untranslated string: red
 WARNING: untranslated string: remove x509
 WARNING: untranslated string: settingsc
-WARNING: untranslated string: tripwire cronjobs
 WARNING: untranslated string: up
 WARNING: untranslated string: urlfilter background image
 WARNING: untranslated string: urlfilter log

diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi
index 0a1cf1d9682093abf78f88cd18d72564f641a8f4..312c0096637279abf01f05a7ec35f0ad39497e8c 100644 (file)
--- a/html/cgi-bin/hardwaregraphs.cgi
+++ b/html/cgi-bin/hardwaregraphs.cgi
@@ -274,8 +274,6 @@ END
   &Header::closebox();
 }
 
-&Header::closebox();
-
 &Header::closebigbox();
 &Header::closepage();
 

diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi
index a8660b7423fd5da78aed5ce220ba80204ac467b3..f24ce1aa07b2117fcd0013134e3fff3d08e6bc31 100644 (file)
--- a/html/cgi-bin/outgoingfw.cgi
+++ b/html/cgi-bin/outgoingfw.cgi
@@ -364,13 +364,13 @@ END
 print <<END
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
        <table width='100%'>
-               <tr><td width='10%' align='right'><b>Modus 0:</b><td width='90%' align='left' colspan='2'>In diesem Modus ist es allen Rechnern im Netzwerk uneingeschraenkt moeglich Verbindungen ins Internet aufzubauen.
-               <tr><td width='10%' align='right'><b>Modus 1:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.
-               <tr><td width='10%' align='right'><b>Modus 2:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden saemtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.<br />Hier ist eine Besonderheit der P2P-Filter.
+               <tr><td width='10%' align='left'><b>Modus 0:</b><td width='90%' align='left' colspan='2'>In diesem Modus ist es allen Rechnern im Netzwerk uneingeschraenkt moeglich Verbindungen ins Internet aufzubauen.
+               <tr><td width='10%' align='left'><b>Modus 1:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.
+               <tr><td width='10%' align='left'><b>Modus 2:</b><td width='90%' align='left' colspan='2'>In diesem Modus werden saemtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.<br />Hier ist eine Besonderheit der P2P-Filter.
                <tr><td colspan='3'><hr />
-               <tr><td width='10%' align='right'>      <select name='POLICY'><option value='MODE0' $selected{'POLICY'}{'MODE0'}>Modus 0</option><option value='MODE1' $selected{'POLICY'}{'MODE1'}>Modus 1</option><option value='MODE2' $selected{'POLICY'}{'MODE2'}>Modus 2</option></select>
+               <tr><td width='10%' align='left'>       <select name='POLICY' style="width: 85px"><option value='MODE0' $selected{'POLICY'}{'MODE0'}>Modus 0</option><option value='MODE1' $selected{'POLICY'}{'MODE1'}>Modus 1</option><option value='MODE2' $selected{'POLICY'}{'MODE2'}>Modus 2</option></select>
                    <td width='45%' align='left'><input type='submit' name='ACTION' value=$Lang::tr{'save'} />
-                   <td width='45%' align='right'>
+                   <td width='45%' align='left'>
 END
 ;
        if ($outfwsettings{'POLICY'} ne 'MODE0') {

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 3b9704ce26fdf5f20406111411e4a745281217b2..af2f6e353cc2fbc1b01b231fe3e8e69279b3cadf 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2988,8 +2988,7 @@ print <<END
 <tr><td class='base' nowrap='nowrap'>$Lang::tr{'ca name'}:</td>
 <td nowrap='nowrap'><input type='text' name='CA_NAME' value='$cgiparams{'CA_NAME'}' size='15' />
 <td nowrap='nowrap'><input type='file' name='FH' size='30' /></td>
-<td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /></td>
-<td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td>    
+<td nowrap='nowrap'><input type='submit' name='ACTION' value='$Lang::tr{'upload ca certificate'}' /><br /><input type='submit' name='ACTION' value='$Lang::tr{'show crl'}' /></td>    
 </tr></table></form>
 END
     ;
@@ -3026,8 +3025,8 @@ if (&Ovpnfunc::haveOrangeNet()) {
 print <<END            
 <tr><td class='base' nowrap='nowrap'>$Lang::tr{'local vpn hostname/ip'}:</td>
     <td><input type='text' name='VPN_IP' value='$cgiparams{'VPN_IP'}' size='30' /></td>
-       <td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn subnet'}</td>
-       <td><input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' size='30' /></td></tr>
+       <td class='boldbase' nowrap='nowrap'></td><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn subnet'}
+       <br /><input type='TEXT' name='DOVPN_SUBNET' value='$cgiparams{'DOVPN_SUBNET'}' size='30' /></td></tr>
 <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn device'}</td>
     <td><select name='DDEVICE' ><option value='tun' $selected{'DDEVICE'}{'tun'}>TUN</option>
                                 <option value='tap' $selected{'DDEVICE'}{'tap'}>TAP</option></select></td>                                 
@@ -3083,4 +3082,4 @@ print "</form></table>";
 #RWSERVER
 &Ovpnfunc::rwclientstatus($activeonrun);
 &Ovpnfunc::net2netstatus($activeonrun);
-&Header::closepage();
\ No newline at end of file
+&Header::closepage();

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 6d191ea09f1d7e99f4135fdee4e9a88f178707eb..8426e98d223dfb053002b9a9c0cf7d10674b2329 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -677,7 +677,7 @@ END
                print <<END
                <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                                                                <input type='hidden' name='ACTION' value='pcadd' />
-                                                                                               <input type='image' alt='$Lang::tr{'add pc'}' src='/images/network.png' /></form>
+                                                                                               <input type='image' alt='$Lang::tr{'pc add'}' src='/images/network.png' /></form>
 END
 ;
                }
@@ -697,7 +697,7 @@ END
                <table width='95%' cellspacing='0'>
                <tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
                <tr><td align='right' width='33%'><img src='/images/user-option-add.png' /></td><td align='left'>$Lang::tr{'add user'}</td></tr>
-               <tr><td align='right' width='33%'><img src='/images/network.png' /></td><td align='left'>$Lang::tr{'add pc'}</td></tr>
+               <tr><td align='right' width='33%'><img src='/images/network.png' /></td><td align='left'>$Lang::tr{'pc add'}</td></tr>
                <tr><td align='right' width='33%'><img src='/images/user-option-remove.png' /></td><td align='left'>$Lang::tr{'delete user'}</td></tr>
                <tr><td align='right' width='33%'><img src='/images/network-error.png' /></td><td align='left'>$Lang::tr{'delete pc'}</td></tr>
                <tr><td align='right' width='33%'><img src='/images/on.gif' /></td><td align='left'>$Lang::tr{'activate user'}</td></tr>

diff --git a/html/cgi-bin/sambahlp.cgi b/html/cgi-bin/sambahlp.cgi
index 0c190284fec9b89852b649a5ae72b0c316def433..1586e0fe9ef4d540df6f517b47b7e045cf8a891e 100644 (file)
--- a/html/cgi-bin/sambahlp.cgi
+++ b/html/cgi-bin/sambahlp.cgi
@@ -16,7 +16,7 @@ require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
 &Header::showhttpheaders();
-&Header::openpage('Samba', 1, '');
+&Header::openpagewithoutmenu('Samba', 1, '');
 &Header::openbigbox('100%', 'left', '', 'BigBox');
 &Header::openbox('100%', 'left', '', 'Sambahelp');