Displayfix in der Samba CGI

Disksize Rechnung im Installer angepasst

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

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 6266f297dd7476ff87f6f51536bb17648a35a706..a66dbe15047c33bf169999f49287231c75965082 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -624,7 +624,7 @@ END
                        <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                        <input type='hidden' name='NAME' value='$userline[0]' />
                                        <input type='hidden' name='ACTION' value='smbuserenable' />
-                                       <input type='image' alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/on.gif' />
+                                       <input type='image' alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' />
                        </form></td>
 END
 ;
@@ -636,7 +636,7 @@ END
                        <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                        <input type='hidden' name='NAME' value='$userline[0]' />
                                        <input type='hidden' name='ACTION' value='smbuserdisable' />
-                                       <input type='image' alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/off.gif' />
+                                       <input type='image' alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' />
                        </form></td>
 END
 ;
@@ -720,8 +720,8 @@ END
                <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>
-               <tr><td align='right' width='33%'><img src='/images/off.gif' /></td><td align='left'>$Lang::tr{'deactivate user'}</td></tr>
+               <tr><td align='right' width='33%'><img src='/images/off.gif' /></td><td align='left'>$Lang::tr{'activate user'}</td></tr>
+               <tr><td align='right' width='33%'><img src='/images/on.gif' /></td><td align='left'>$Lang::tr{'deactivate user'}</td></tr>
                <tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>$Lang::tr{'change passwords'}</td></tr>
                <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
                </table>

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 7a6e2257ef3b4bad556d2ea15184eb7b2b0ffeea..938329f533ed624fd8eafd3216ce2b01a8c05880 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -361,8 +361,8 @@ int main(int argc, char *argv[])
        
   /* Calculating Root-Size dependend of Max Disk Space */
   if ( disk < 756 )
-               root_partition = 256;
-       else if ( disk >= 1024 && disk <= 3072 )
+               root_partition = 200;
+       else if ( disk >= 756 && disk <= 3072 )
                root_partition = 512;
        else 
                root_partition = 2048;