X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fadmin.pl;h=2eb53876cc29b7aecf22f5237a17f7ff7e06501e;hb=a14a3ff56b00e22c39a2cfb0e465f8c7764a4cd4;hp=76513b0e14d8606480a8090476c4f1b49e2643f1;hpb=19e256f26da4cd6d842b85ba9a9377aedab3d9e1;p=kivitendo-erp.git diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index 76513b0e1..2eb53876c 100644 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -440,11 +440,12 @@ sub form_header { } opendir TEMPLATEDIR, "$templates/." or $form->error("$templates : $!"); - @all = grep({ !/^\.\.?$/ && -d "$templates/$_" } readdir(TEMPLATEDIR)); + my @all = readdir(TEMPLATEDIR); + my @alldir = sort(grep({ -d "$templates/$_" && !/^\.\.?$/ } @all)); + my @allhtml = sort(grep({ -f "$templates/$_" && /\.html$/ } @all)); closedir TEMPLATEDIR; - @allhtml = sort grep /\.html/, @all; - @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @all; + @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir; @alldir = grep !/^(webpages|\.svn)$/, @alldir; @allhtml = reverse grep !/Default/, @allhtml; @@ -473,7 +474,7 @@ sub form_header { } opendir CSS, "css/."; - @all = grep /.*\.css$/, readdir CSS; + @all = sort(grep({ /\.css$/ && ($_ ne "tabcontent.css") } readdir(CSS))); closedir CSS; foreach $item (@all) { @@ -483,12 +484,16 @@ sub form_header { $selectstylesheet .= qq|$item\n|; } } - $selectstylesheet .= "\n"; $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| @@ -539,8 +544,8 @@ sub form_header { $myconfig->{address} - | . $locale->text('Steuernummer') . qq| - + | . $locale->text('Tax number') . qq| + | . $locale->text('Ust-IDNr') . qq| @@ -596,8 +601,13 @@ sub form_header { | . $locale->text('Setup Menu') . qq| - New - Old + | . + $locale->text("Top (CSS)") . qq| + | . + $locale->text("Top (Javascript)") . qq| + | . + $locale->text("Old (on the side)") . qq| + {templates}>