X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=3b37dab5ea5800b456fd19e9c63ee8542fc5f3dc;hb=9c2d49bb4dae241b4290afaeeb762d9c0e584301;hp=6ac2a514404e660364e1d6dda425c9cb2816d2b3;hpb=27cd1e791f08771c4c0873461c83397345a47d88;p=kivitendo-erp.git diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 6ac2a5144..3b37dab5e 100644 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -473,9 +473,13 @@ sub form_header { } } - opendir CSS, "css/."; - @all = sort(grep({ /\.css$/ && ($_ ne "tabcontent.css") } readdir(CSS))); - closedir CSS; +# opendir CSS, "css/."; +# @all = grep /.*\.css$/, readdir CSS; +# closedir CSS; + +# css dir has styles that are not intended as general layouts. +# reverting to hardcoded list + @all = qw(lx-office-erp.css Win2000.css); foreach $item (@all) { if ($item eq $myconfig->{stylesheet}) { @@ -487,8 +491,13 @@ sub form_header { $form->header; - if ($myconfig->{menustyle} eq "neu") { $neu = "checked"; } - else { $old = "checked"; } + if ($myconfig->{menustyle} eq "v3") { + $menustyle_v3 = "checked"; + } elsif ($myconfig->{menustyle} eq "neu") { + $menustyle_neu = "checked"; + } else { + $menustyle_old = "checked"; + } print qq| @@ -503,16 +512,16 @@ sub form_header { - + - - {password}> + + - + @@ -596,8 +605,13 @@ sub form_header { - + {templates}>
| . $locale->text('Login') . qq|
| . $locale->text('Password') . qq|{password}>
| . $locale->text('Name') . qq|
| . $locale->text('E-mail') . qq|
| . $locale->text('Setup Menu') . qq| New -  Old | . + $locale->text("Top (CSS)") . qq| +  | . + $locale->text("Top (Javascript)") . qq| +  | . + $locale->text("Old (on the side)") . qq| +
@@ -625,24 +639,25 @@ sub form_header { print qq| | . $locale->text('Driver') . qq| -  $item +  $item | . $locale->text('Host') . qq| - {"${item}_dbhost"}> + |; if ($item eq 'Pg') { + print qq| | . $locale->text('Dataset') . qq| - {Pg_dbname}> + | . $locale->text('Port') . qq| - {Pg_dbport}> + | . $locale->text('User') . qq| - {"${item}_dbuser"}> + | . $locale->text('Password') . qq| - {"${item}_dbpasswd"}> + |; } @@ -658,13 +673,13 @@ sub form_header { | . $locale->text('Dataset') . qq| {"${item}_dbuser"}> | . $locale->text('Password') . qq| - {"${item}_dbpasswd"}> + |; } print qq| - {dbpasswd}> + @@ -1276,9 +1291,9 @@ sub dbselect_source { | . $locale->text('User') . qq| - {dbuser}> + | . $locale->text('Password') . qq| - + @@ -1369,12 +1384,12 @@ sub update_dataset { {script}> -{dbdriver}> -{dbhost}> -{dbport}> -{dbuser}> -{dbpasswd}> -{dbdefault}> + + + + + + @@ -1457,7 +1472,7 @@ sub create_dataset { } opendir SQLDIR, "sql/." or $form - error($!); - foreach $item (sort grep /-chart\.sql/, readdir SQLDIR) { + foreach $item (sort grep /-chart\.sql\z/, readdir SQLDIR) { next if ($item eq 'Default-chart.sql'); $item =~ s/-chart\.sql//; push @charts, @@ -1466,21 +1481,22 @@ sub create_dataset { closedir SQLDIR; $selectencoding = qq|
| . $locale->text('The following Datasets need to be updated') . qq|

-{dbdriver}> -{dbuser}> -{dbhost}> -{dbport}> -{dbpasswd}> -{dbdefault}> + + + + + + @@ -1651,12 +1667,12 @@ sub delete_dataset {

-{dbdriver}> -{dbuser}> -{dbhost}> -{dbport}> -{dbpasswd}> -{dbdefault}> + + + + + +