projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Beim Anlegen einer Einheit bei allen Einheiten nachsehen, ob es eine Einheit mit...
[kivitendo-erp.git]
/
bin
/
mozilla
/
admin.pl
diff --git
a/bin/mozilla/admin.pl
b/bin/mozilla/admin.pl
index
32922a2
..
6ac2a51
100644
(file)
--- a/
bin/mozilla/admin.pl
+++ b/
bin/mozilla/admin.pl
@@
-440,11
+440,12
@@
sub form_header {
}
opendir TEMPLATEDIR, "$templates/." or $form->error("$templates : $!");
}
opendir TEMPLATEDIR, "$templates/." or $form->error("$templates : $!");
- @all = grep !/^\.\.?$/, readdir TEMPLATEDIR;
+ my @all = readdir(TEMPLATEDIR);
+ my @alldir = sort(grep({ -d "$templates/$_" && !/^\.\.?$/ } @all));
+ my @allhtml = sort(grep({ -f "$templates/$_" && /\.html$/ } @all));
closedir TEMPLATEDIR;
closedir TEMPLATEDIR;
- @allhtml = sort grep /\.html/, @all;
- @alldir = grep !/\.(html|tex|sty|odt)$/, @all;
+ @alldir = grep !/\.(html|tex|sty|odt|xml|txb)$/, @alldir;
@alldir = grep !/^(webpages|\.svn)$/, @alldir;
@allhtml = reverse grep !/Default/, @allhtml;
@alldir = grep !/^(webpages|\.svn)$/, @alldir;
@allhtml = reverse grep !/Default/, @allhtml;
@@
-473,7
+474,7
@@
sub form_header {
}
opendir CSS, "css/.";
}
opendir CSS, "css/.";
- @all =
grep /.*\.css$/, readdir CSS
;
+ @all =
sort(grep({ /\.css$/ && ($_ ne "tabcontent.css") } readdir(CSS)))
;
closedir CSS;
foreach $item (@all) {
closedir CSS;
foreach $item (@all) {
@@
-483,7
+484,6
@@
sub form_header {
$selectstylesheet .= qq|<option>$item\n|;
}
}
$selectstylesheet .= qq|<option>$item\n|;
}
}
- $selectstylesheet .= "<option>\n";
$form->header;
$form->header;
@@
-539,8
+539,8
@@
sub form_header {
<td><textarea name=address rows=4 cols=35>$myconfig->{address}</textarea></td>
</tr>
<tr valign=top>
<td><textarea name=address rows=4 cols=35>$myconfig->{address}</textarea></td>
</tr>
<tr valign=top>
- <th align=right>| . $locale->text('
Steuernumm
er') . qq|</th>
- <td><input name=
steuernummer size=14 value="$myconfig->{steuernumm
er}"></td>
+ <th align=right>| . $locale->text('
Tax numb
er') . qq|</th>
+ <td><input name=
taxnumber size=14 value="$myconfig->{taxnumb
er}"></td>
</tr>
<tr valign=top>
<th align=right>| . $locale->text('Ust-IDNr') . qq|</th>
</tr>
<tr valign=top>
<th align=right>| . $locale->text('Ust-IDNr') . qq|</th>
@@
-969,7
+969,7
@@
sub save {
# copy templates to the directory
opendir TEMPLATEDIR, "$templates/." or $form - error("$templates : $!");
# copy templates to the directory
opendir TEMPLATEDIR, "$templates/." or $form - error("$templates : $!");
- @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty)$/,
+ @templates = grep /$form->{mastertemplates}.*?\.(html|tex|sty
|xml|txb
)$/,
readdir TEMPLATEDIR;
closedir TEMPLATEDIR;
readdir TEMPLATEDIR;
closedir TEMPLATEDIR;
@@
-1444,7
+1444,7
@@
sub dbupdate {
<br>
<br>
-<a href="admin.pl?action=login&| .
+<a
id="enddatasetupdate"
href="admin.pl?action=login&| .
join("&", map({ "$_=" . $form->escape($form->{$_}); } qw(path rpw))) .
qq|">| . $locale->text("Continue") . qq|</a>|;
join("&", map({ "$_=" . $form->escape($form->{$_}); } qw(path rpw))) .
qq|">| . $locale->text("Continue") . qq|</a>|;