From 3e209ee0839af1e8056bb238f423c540a4966dba Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 21 Jun 2007 16:13:20 +0000 Subject: [PATCH] HTML-Vorlagen, die von admin.pl aus verwendet werden, auf die Benutzung des Template-Toolkits umgestellt. --- bin/mozilla/admin.pl | 38 +++--- locale/de/all | 8 +- templates/webpages/admin/adminlogin_de.html | 4 +- .../webpages/admin/adminlogin_master.html | 4 +- .../webpages/admin/backup_dataset_de.html | 26 ++-- .../admin/backup_dataset_email_done_de.html | 8 +- .../backup_dataset_email_done_master.html | 8 +- .../webpages/admin/backup_dataset_master.html | 26 ++-- .../admin/change_admin_password_de.html | 7 +- .../admin/change_admin_password_master.html | 7 +- .../webpages/admin/create_dataset_de.html | 26 ++-- .../webpages/admin/create_dataset_master.html | 26 ++-- templates/webpages/admin/dbadmin_de.html | 22 ++-- templates/webpages/admin/dbadmin_master.html | 22 ++-- templates/webpages/admin/dbcreate_de.html | 8 +- templates/webpages/admin/dbcreate_master.html | 8 +- templates/webpages/admin/dbdelete_de.html | 8 +- templates/webpages/admin/dbdelete_master.html | 8 +- .../webpages/admin/dbupgrade_all_done_de.html | 9 +- .../admin/dbupgrade_all_done_master.html | 9 +- .../webpages/admin/dbupgrade_header_de.html | 2 +- .../admin/dbupgrade_header_master.html | 2 +- .../webpages/admin/delete_dataset_de.html | 22 ++-- .../webpages/admin/delete_dataset_master.html | 22 ++-- templates/webpages/admin/edit_user_de.html | 118 +++++++++--------- .../webpages/admin/edit_user_master.html | 118 +++++++++--------- templates/webpages/admin/list_users_de.html | 33 ++--- .../webpages/admin/list_users_master.html | 33 ++--- .../webpages/admin/restore_dataset_de.html | 16 +-- .../admin/restore_dataset_master.html | 16 +-- .../restore_dataset_start_footer_de.html | 6 +- .../restore_dataset_start_footer_master.html | 6 +- .../restore_dataset_start_header_de.html | 2 +- .../restore_dataset_start_header_master.html | 2 +- .../webpages/admin/update_dataset_de.html | 38 +++--- .../webpages/admin/update_dataset_master.html | 38 +++--- 36 files changed, 379 insertions(+), 377 deletions(-) diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl index b8ec2f748..8cd34c35e 100644 --- a/bin/mozilla/admin.pl +++ b/bin/mozilla/admin.pl @@ -115,7 +115,7 @@ sub adminlogin { qq|Lx-Office ERP $form->{version} | . $locale->text('Administration'); $form->header(); - print $form->parse_html_template('admin/adminlogin'); + print $form->parse_html_template2('admin/adminlogin'); } sub login { @@ -155,7 +155,7 @@ sub list_users { $form->{MEMBERS} = [ @members{sort { lc $a cmp lc $b } keys %members} ]; $form->header(); - print $form->parse_html_template("admin/list_users"); + print $form->parse_html_template2("admin/list_users"); } sub add_user { @@ -313,7 +313,7 @@ sub edit_user_form { chop $form->{all_acs}; $form->header(); - print $form->parse_html_template("admin/edit_user"); + print $form->parse_html_template2("admin/edit_user"); } sub save { @@ -520,7 +520,7 @@ sub change_admin_password { . $locale->text('Change Admin Password'); $form->header(); - print $form->parse_html_template("admin/change_admin_password"); + print $form->parse_html_template2("admin/change_admin_password"); } sub change_password { @@ -572,7 +572,7 @@ sub dbselect_source { $form->{ALLOW_DBBACKUP} = "$pg_dump_exe" ne "DISABLED"; $form->header(); - print $form->parse_html_template("admin/dbadmin"); + print $form->parse_html_template2("admin/dbadmin"); } sub continue { @@ -594,7 +594,7 @@ sub update_dataset { $form->{ALL_UPDATED} = !scalar @need_updates; $form->header(); - print $form->parse_html_template("admin/update_dataset"); + print $form->parse_html_template2("admin/update_dataset"); } sub dbupdate { @@ -609,7 +609,7 @@ sub dbupdate { $| = 1; - print $form->parse_html_template("admin/dbupgrade_all_header"); + print $form->parse_html_template2("admin/dbupgrade_all_header"); foreach my $i (@update_rows) { restore_form($saved_form); @@ -618,7 +618,7 @@ sub dbupdate { my $controls = parse_dbupdate_controls($form, $form->{dbdriver}); - print $form->parse_html_template("admin/dbupgrade_header"); + print $form->parse_html_template2("admin/dbupgrade_header"); $form->{dbupdate} = $form->{dbname}; $form->{$form->{dbname}} = 1; @@ -626,10 +626,10 @@ sub dbupdate { User->dbupdate($form); User->dbupdate2($form, $controls); - print $form->parse_html_template("admin/dbupgrade_footer"); + print $form->parse_html_template2("admin/dbupgrade_footer"); } - print $form->parse_html_template("admin/dbupgrade_all_done"); + print $form->parse_html_template2("admin/dbupgrade_all_done"); } sub create_dataset { @@ -663,7 +663,7 @@ sub create_dataset { . $locale->text('Create Dataset'); $form->header(); - print $form->parse_html_template("admin/create_dataset"); + print $form->parse_html_template2("admin/create_dataset"); } sub dbcreate { @@ -677,7 +677,7 @@ sub dbcreate { . $locale->text('Create Dataset'); $form->header(); - print $form->parse_html_template("admin/dbcreate"); + print $form->parse_html_template2("admin/dbcreate"); } sub delete_dataset { @@ -691,7 +691,7 @@ sub delete_dataset { $form->{DBSOURCES} = [ map { { "name", $_ } } sort @dbsources ]; $form->header(); - print $form->parse_html_template("admin/delete_dataset"); + print $form->parse_html_template2("admin/delete_dataset"); } sub dbdelete { @@ -707,7 +707,7 @@ sub dbdelete { . $locale->text('Database Administration') . " / " . $locale->text('Delete Dataset'); $form->header(); - print $form->parse_html_template("admin/dbdelete"); + print $form->parse_html_template2("admin/dbdelete"); } sub backup_dataset { @@ -729,7 +729,7 @@ sub backup_dataset { $form->{from} = "Lx-Office Admin <${username}\@${hostname}>"; $form->header(); - print $form->parse_html_template("admin/backup_dataset"); + print $form->parse_html_template2("admin/backup_dataset"); } sub backup_dataset_start { @@ -818,7 +818,7 @@ sub backup_dataset_start { . $locale->text('Backup Dataset'); $form->header(); - print $form->parse_html_template("admin/backup_dataset_email_done"); + print $form->parse_html_template2("admin/backup_dataset_email_done"); } } @@ -844,7 +844,7 @@ sub restore_dataset { } $form->header(); - print $form->parse_html_template("admin/restore_dataset"); + print $form->parse_html_template2("admin/restore_dataset"); } sub restore_dataset_start { @@ -956,7 +956,7 @@ sub restore_dataset_start { $AUTOFLUSH = 1; $form->header(); - print $form->parse_html_template("admin/restore_dataset_start_header"); + print $form->parse_html_template2("admin/restore_dataset_start_header"); while (my $line = <$in>) { print $line; @@ -964,7 +964,7 @@ sub restore_dataset_start { $in->close(); $form->{retval} = $CHILD_ERROR >> 8; - print $form->parse_html_template("admin/restore_dataset_start_footer"); + print $form->parse_html_template2("admin/restore_dataset_start_footer"); unlink "${tmpdir}/.pgpass", $tmp; rmdir $tmpdir; diff --git a/locale/de/all b/locale/de/all index b4aa531a3..6c52b7299 100644 --- a/locale/de/all +++ b/locale/de/all @@ -1095,12 +1095,12 @@ aktualisieren wollen?', 'The base unit does not exist.' => 'Die Basiseinheit existiert nicht.', 'The base unit relations must not contain loops (e.g. by saying that unit A\'s base unit is B, B\'s base unit is C and C\'s base unit is A) in row %d.' => 'Die Beziehungen der Einheiten dürfen keine Schleifen beinhalten (z.B. wenn gesagt wird, dass Einheit As Basiseinheit B, Bs Basiseinheit C und Cs Basiseinheit A ist) in Zeile %d.', 'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' => 'Die Spalten "Zahlbar bis", "Kumulierte Gebühren" und "Zinsen" zeigen Daten der letzten für diese Rechnung erzeugten Mahnung.', - 'The database has been successfully deleted.' => 'Die Datenbank wurde erfolgreich gelöscht.', + 'The database [% HTML.escape(db) %] has been successfully deleted.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich gelöscht.', 'The database update/creation did not succeed. The file contained the following error:' => 'Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei enthielt den folgenden Fehler:', 'The database upgrade for the introduction of Buchungsgruppen is now complete.' => 'Das Datenbankupgrade für die Einführung von Buchungsgruppen ist jetzt beendet.', 'The database upgrade for the introduction of units is now complete.' => 'Das Datenbankupgrade zwecks Einführung von Einheiten ist nun beendet.', - 'The dataset has been successfully created.' => 'Die Datenbank wurde erfolgreich erstellt.', - 'The dataset backup has been sent via email to .' => 'Die Datenbanksicherung wurde an per Email verschickt.', + 'The dataset [% HTML.escape(db) %] has been successfully created.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich angelegt.', + 'The dataset backup has been sent via email to [% HTML.escape(to) %].' => 'Die Datenbanksicherung wurde per Email an [% HTML.escape(to) %] verschickt.', 'The dataset has to exist before a restoration can be started.' => 'Die Datenbank muss vor der Wiederherstellung bereits angelegt worden sein.', 'The dataset name is missing.' => 'Der Datenbankname fehlt.', 'The directory %s does not exist.' => 'Das Verzeichnis %s existiert nicht.', @@ -1126,7 +1126,7 @@ aktualisieren wollen?', 'The pg_dump process could not be started.' => 'Der pg_dump-Prozess konnte nicht gestartet werden.', 'The pg_restore process could not be started.' => 'Der pg_restore-Prozess konnte nicht gestartet werden.', 'The preferred one is to install packages provided by your operating system distribution (e.g. Debian or RPM packages).' => 'Die bevorzugte Art, ein Perl-Modul zu installieren, ist durch Installation eines von Ihrem Betriebssystem zur Verfügung gestellten Paketes (z.B. Debian-Pakete oder RPM).', - 'The program\'s exit code was ("0" usually means that everything went OK).' => 'Der Exitcode des Programms war ("0" bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).', + 'The program\'s exit code was [% HTML.escape(retval) %] ("0" usually means that everything went OK).' => 'Der Exitcode des Programms war [% HTML.escape(retval) %] ("0" bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).', 'The restoration process has started. Here\'s the output of the "pg_restore" command:' => 'Der Wiederherstellungsprozess wurde gestartet. Hier ist die Ausgabe des "pg_restore"-Programmes:', 'The restoration process is complete. Please review "pg_restore"\'s output to find out if the restoration was successful.' => 'Die Wiederherstellung ist abgeschlossen. Bitte sehen Sie sich die Ausgabe von "pg_restore" an, um festzustellen, ob die Wiederherstellung erfolgreich war.', 'The second way is to use Perl\'s CPAN module and let it download and install the module for you.' => 'Die zweite Variante besteht darin, Perls CPAN-Modul zu benutzen und es das Modul für Sie installieren zu lassen.', diff --git a/templates/webpages/admin/adminlogin_de.html b/templates/webpages/admin/adminlogin_de.html index 012625e33..196ef8f76 100644 --- a/templates/webpages/admin/adminlogin_de.html +++ b/templates/webpages/admin/adminlogin_de.html @@ -1,10 +1,10 @@ - +[% USE HTML %]
-

Version

+

Version [% HTML.escape(version) %]

Administration

diff --git a/templates/webpages/admin/adminlogin_master.html b/templates/webpages/admin/adminlogin_master.html index 0353914bf..ad32c485b 100644 --- a/templates/webpages/admin/adminlogin_master.html +++ b/templates/webpages/admin/adminlogin_master.html @@ -1,10 +1,10 @@ - +[% USE HTML %]
-

Version

+

Version [% HTML.escape(version) %]

Administration

diff --git a/templates/webpages/admin/backup_dataset_de.html b/templates/webpages/admin/backup_dataset_de.html index 6ee0fc717..5fc9b76bc 100644 --- a/templates/webpages/admin/backup_dataset_de.html +++ b/templates/webpages/admin/backup_dataset_de.html @@ -1,4 +1,4 @@ - +[% USE HTML %] -

+

[% title %]

- + [% IF NO_DATABSES %] Auf diesem Server wurden keine Datenbanken gefunden. - + [% ELSE %]
- - - - + + + +

Bitte wählen Sie die zu sichernde Datenbank gefunden: - +

@@ -47,7 +47,7 @@
- + @@ -77,8 +77,8 @@
Von
- - + + @@ -91,7 +91,7 @@
- + [% END %] diff --git a/templates/webpages/admin/backup_dataset_email_done_de.html b/templates/webpages/admin/backup_dataset_email_done_de.html index e8eec5163..1d506531f 100644 --- a/templates/webpages/admin/backup_dataset_email_done_de.html +++ b/templates/webpages/admin/backup_dataset_email_done_de.html @@ -1,11 +1,11 @@ - +[% USE HTML %] -

+

[% title %]

-

Die Datenbanksicherung wurde an per Email verschickt.

+

Die Datenbanksicherung wurde per Email an [% HTML.escape(to) %] verschickt.

- +
diff --git a/templates/webpages/admin/backup_dataset_email_done_master.html b/templates/webpages/admin/backup_dataset_email_done_master.html index 268045a50..71d55776f 100644 --- a/templates/webpages/admin/backup_dataset_email_done_master.html +++ b/templates/webpages/admin/backup_dataset_email_done_master.html @@ -1,11 +1,11 @@ - +[% USE HTML %] -

+

[% title %]

-

The dataset backup has been sent via email to .

+

The dataset backup has been sent via email to [% HTML.escape(to) %].

- +
diff --git a/templates/webpages/admin/backup_dataset_master.html b/templates/webpages/admin/backup_dataset_master.html index 41dc331b0..23f674c34 100644 --- a/templates/webpages/admin/backup_dataset_master.html +++ b/templates/webpages/admin/backup_dataset_master.html @@ -1,4 +1,4 @@ - +[% USE HTML %] -

+

[% title %]

- + [% IF NO_DATABSES %] No databases have been found on this server. - + [% ELSE %]
- - - - + + + +

Please select the database you want to backup: - +

@@ -47,7 +47,7 @@
- + @@ -77,8 +77,8 @@
From
- - + + @@ -91,7 +91,7 @@
- + [% END %] diff --git a/templates/webpages/admin/change_admin_password_de.html b/templates/webpages/admin/change_admin_password_de.html index 3c7aa5588..39469ae66 100644 --- a/templates/webpages/admin/change_admin_password_de.html +++ b/templates/webpages/admin/change_admin_password_de.html @@ -1,4 +1,4 @@ - +[% USE HTML %]

Administratorpasswort ändern

@@ -16,10 +16,9 @@ - + -

-

+

diff --git a/templates/webpages/admin/change_admin_password_master.html b/templates/webpages/admin/change_admin_password_master.html index cc316b3d4..fb41f9fde 100644 --- a/templates/webpages/admin/change_admin_password_master.html +++ b/templates/webpages/admin/change_admin_password_master.html @@ -1,4 +1,4 @@ - +[% USE HTML %]

Change Admin Password

@@ -16,10 +16,9 @@ - + -

-

+

diff --git a/templates/webpages/admin/create_dataset_de.html b/templates/webpages/admin/create_dataset_de.html index 1ddd1af16..55ff4eabf 100644 --- a/templates/webpages/admin/create_dataset_de.html +++ b/templates/webpages/admin/create_dataset_de.html @@ -1,13 +1,13 @@ - +[% USE HTML %] -

+

[% title %]

- + @@ -19,7 +19,7 @@ @@ -28,22 +28,22 @@
existierende Datenbanken[% HTML.escape(dbsources) %]
Schriftsatz
Kontenplan anlegen
- - - - - - + + + + + + - - + + diff --git a/templates/webpages/admin/create_dataset_master.html b/templates/webpages/admin/create_dataset_master.html index 9f494cca5..5d480cc6f 100644 --- a/templates/webpages/admin/create_dataset_master.html +++ b/templates/webpages/admin/create_dataset_master.html @@ -1,13 +1,13 @@ - +[% USE HTML %] -

+

[% title %]

- + @@ -19,7 +19,7 @@ @@ -28,22 +28,22 @@
Existing Datasets[% HTML.escape(dbsources) %]
Multibyte Encoding
Create Chart of Accounts
- - - - - - + + + + + + - - + + diff --git a/templates/webpages/admin/dbadmin_de.html b/templates/webpages/admin/dbadmin_de.html index 615c74e46..94796d719 100644 --- a/templates/webpages/admin/dbadmin_de.html +++ b/templates/webpages/admin/dbadmin_de.html @@ -1,6 +1,6 @@ - +[% USE HTML %] -

+

[% title %]

@@ -10,7 +10,7 @@ - + - + - + - + @@ -37,7 +37,7 @@ - + @@ -47,18 +47,18 @@
@@ -19,16 +19,16 @@
Datenbankcomputer Port
Benutzer Passwort
Datenbankvorlage
- - + +
- + [% IF ALLOW_DBBACKUP %] - + [% END %] diff --git a/templates/webpages/admin/dbadmin_master.html b/templates/webpages/admin/dbadmin_master.html index 2123f807e..a1306f057 100644 --- a/templates/webpages/admin/dbadmin_master.html +++ b/templates/webpages/admin/dbadmin_master.html @@ -1,6 +1,6 @@ - +[% USE HTML %] -

+

[% title %]

@@ -10,7 +10,7 @@ - + - + - + - + @@ -37,7 +37,7 @@ - + @@ -47,18 +47,18 @@
@@ -19,16 +19,16 @@
Host Port
User Password
Database template
- - + +
- + [% IF ALLOW_DBBACKUP %] - + [% END %] diff --git a/templates/webpages/admin/dbcreate_de.html b/templates/webpages/admin/dbcreate_de.html index 472c421ca..ab62b1bd2 100644 --- a/templates/webpages/admin/dbcreate_de.html +++ b/templates/webpages/admin/dbcreate_de.html @@ -1,12 +1,12 @@ - +[% USE HTML %] -

+

[% title %]

-

Die Datenbank wurde erfolgreich erstellt.

+

Die Datenbank [% HTML.escape(db) %] wurde erfolgreich angelegt.

- +

diff --git a/templates/webpages/admin/dbcreate_master.html b/templates/webpages/admin/dbcreate_master.html index 6e3947c8a..a5894b4cf 100644 --- a/templates/webpages/admin/dbcreate_master.html +++ b/templates/webpages/admin/dbcreate_master.html @@ -1,12 +1,12 @@ - +[% USE HTML %] -

+

[% title %]

-

The dataset has been successfully created.

+

The dataset [% HTML.escape(db) %] has been successfully created.

- +

diff --git a/templates/webpages/admin/dbdelete_de.html b/templates/webpages/admin/dbdelete_de.html index 0e892237f..d827356f3 100644 --- a/templates/webpages/admin/dbdelete_de.html +++ b/templates/webpages/admin/dbdelete_de.html @@ -1,12 +1,12 @@ - +[% USE HTML %] -

+

[% title %]

-

Die Datenbank wurde erfolgreich gelöscht.

+

Die Datenbank [% HTML.escape(db) %] wurde erfolgreich gelöscht.

- +

diff --git a/templates/webpages/admin/dbdelete_master.html b/templates/webpages/admin/dbdelete_master.html index cf69c42cc..2c8d485d1 100644 --- a/templates/webpages/admin/dbdelete_master.html +++ b/templates/webpages/admin/dbdelete_master.html @@ -1,12 +1,12 @@ - +[% USE HTML %] -

+

[% title %]

-

The database has been successfully deleted.

+

The database [% HTML.escape(db) %] has been successfully deleted.

- +

diff --git a/templates/webpages/admin/dbupgrade_all_done_de.html b/templates/webpages/admin/dbupgrade_all_done_de.html index d89f889f1..d65ee3d6e 100644 --- a/templates/webpages/admin/dbupgrade_all_done_de.html +++ b/templates/webpages/admin/dbupgrade_all_done_de.html @@ -1,16 +1,17 @@ - +[% USE HTML%] +[% IF NOTHING_TO_DO %]

Es wurden keine Datenbanken ausgewählt.

- + [% ELSE %]

Alle Datenbankupdates wurden eingespielt.

- +[% END %] - +
diff --git a/templates/webpages/admin/dbupgrade_all_done_master.html b/templates/webpages/admin/dbupgrade_all_done_master.html index 0b7127724..c9a5a1b0b 100644 --- a/templates/webpages/admin/dbupgrade_all_done_master.html +++ b/templates/webpages/admin/dbupgrade_all_done_master.html @@ -1,16 +1,17 @@ - +[% USE HTML%] +[% IF NOTHING_TO_DO %]

No datasets have been selected.

- + [% ELSE %]

All database upgrades have been applied.

- +[% END %]
- +
diff --git a/templates/webpages/admin/dbupgrade_header_de.html b/templates/webpages/admin/dbupgrade_header_de.html index dff3423a2..8408cf9ad 100644 --- a/templates/webpages/admin/dbupgrade_header_de.html +++ b/templates/webpages/admin/dbupgrade_header_de.html @@ -1 +1 @@ -
Datenbankaktualisierung ()
+[% USE HTML %]
Datenbankaktualisierung ([% HTML.escape(dbname) %])
diff --git a/templates/webpages/admin/dbupgrade_header_master.html b/templates/webpages/admin/dbupgrade_header_master.html index b25c7bd5c..a5a27b607 100644 --- a/templates/webpages/admin/dbupgrade_header_master.html +++ b/templates/webpages/admin/dbupgrade_header_master.html @@ -1 +1 @@ -
Dataset upgrade ()
+[% USE HTML %]
Dataset upgrade ([% HTML.escape(dbname) %])
diff --git a/templates/webpages/admin/delete_dataset_de.html b/templates/webpages/admin/delete_dataset_de.html index 50c3fc932..696d0cc0f 100644 --- a/templates/webpages/admin/delete_dataset_de.html +++ b/templates/webpages/admin/delete_dataset_de.html @@ -1,6 +1,6 @@ - +[% USE HTML %] -

+

[% title %]

@@ -8,19 +8,19 @@ Wenn Sie eine solche Datenbank löschen wollen, so müssen Sie zuerst die Benutzer bearbeiten, die die fragliche Datenbank benutzen, und sie so ändern, dass sie eine andere Datenbank benutzen.

Bitte wählen Sie die zu löschende Datenbank aus: - +

- - - - - - + + + + + + - + - + diff --git a/templates/webpages/admin/delete_dataset_master.html b/templates/webpages/admin/delete_dataset_master.html index bc791480e..afb4b88b2 100644 --- a/templates/webpages/admin/delete_dataset_master.html +++ b/templates/webpages/admin/delete_dataset_master.html @@ -1,6 +1,6 @@ - +[% USE HTML %] -

+

[% title %]

@@ -11,19 +11,19 @@ use another dataset.

Please seletct the dataset you want to delete: - +

- - - - - - + + + + + + - + - + diff --git a/templates/webpages/admin/edit_user_de.html b/templates/webpages/admin/edit_user_de.html index 01dd48059..e1a0fccbc 100644 --- a/templates/webpages/admin/edit_user_de.html +++ b/templates/webpages/admin/edit_user_de.html @@ -1,8 +1,8 @@ - +[% USE HTML %] -
+
[% title %]
@@ -10,63 +10,63 @@
- + - - + + - + - + - + - + - + - + - + - + - + - +
Anmeldung
Passwort
Name
eMail
Unterschrift
Telefon
Fax
Firma
Adresse
Steuernummer
USt-IdNr.
DUNS-Nr.
@@ -77,8 +77,8 @@ Datumsformat @@ -87,23 +87,23 @@ Zahlenformat Auswahllistenbegrenzung - + Sprache @@ -112,22 +112,22 @@ Stilvorlage Drucker - + benutze Vorlagen @@ -139,21 +139,21 @@ Vorlagen auswählen Menüsetup - checked> Oben (mit CSS) - checked> Oben (mit Javascript) - checked> Alt (seitlich) +  Oben (mit CSS) +  Oben (mit Javascript) +  Alt (seitlich) - + @@ -169,24 +169,24 @@ Treiber PostgreSQL Datenbankcomputer - + Datenbank - + Port - + Benutzer - + Passwort - + - + @@ -197,24 +197,24 @@ Zugriffkontrolle - + [% FOREACH acl = ACLS %] - checked> - + + - - checked> - -
- + [% USE SUBACLS_it = Iterator(acl.SUBACLS) %][% FOREACH subacl = SUBACLS_it %] + + + [% UNLESS SUBACLS_it.last %]
[% END %] + [% END %] - + [% END %] - +
@@ -226,15 +226,15 @@ - - - + + + - - - + + +
checked> Angebotchecked> Bestellungchecked> Rechnung Angebot Bestellung Rechnung
checked> Anfragenchecked> Lieferantenbestellungchecked> Einkaufsrechnung Anfragen Lieferantenbestellung Einkaufsrechnung
@@ -244,15 +244,15 @@ - - + + - + [% IF edit %] - + [% END %]
diff --git a/templates/webpages/admin/edit_user_master.html b/templates/webpages/admin/edit_user_master.html index 4b2747f82..c5f4809c7 100644 --- a/templates/webpages/admin/edit_user_master.html +++ b/templates/webpages/admin/edit_user_master.html @@ -1,8 +1,8 @@ - +[% USE HTML %]
-
+
[% title %]
@@ -10,63 +10,63 @@
- + - - + + - + - + - + - + - + - + - + - + - + - +
Login
Password
Name
E-mail
Signature
Phone
Fax
Company
Address
Tax number
Ust-IDNr
DUNS-Nr
@@ -77,8 +77,8 @@ Date Format @@ -87,23 +87,23 @@ Number Format Dropdown Limit - + Language @@ -112,22 +112,22 @@ Stylesheet Printer - + Use Templates @@ -139,21 +139,21 @@ Setup Templates Setup Menu - checked> Top (CSS) - checked> Top (Javascript) - checked> Old (on the side) +  Top (CSS) +  Top (Javascript) +  Old (on the side) - + @@ -169,24 +169,24 @@ Driver PostgreSQL Host - + Dataset - + Port - + User - + Password - + - + @@ -197,24 +197,24 @@ Access Control - + [% FOREACH acl = ACLS %] - checked> - + + - - checked> - -
- + [% USE SUBACLS_it = Iterator(acl.SUBACLS) %][% FOREACH subacl = SUBACLS_it %] + + + [% UNLESS SUBACLS_it.last %]
[% END %] + [% END %] - + [% END %] - +
@@ -226,15 +226,15 @@ - - - + + + - - - + + +
checked> Angebotchecked> Bestellungchecked> Rechnung Angebot Bestellung Rechnung
checked> Anfragenchecked> Lieferantenbestellungchecked> Einkaufsrechnung Anfragen Lieferantenbestellung Einkaufsrechnung
@@ -244,15 +244,15 @@ - - + + - + [% IF edit %] - + [% END %]
diff --git a/templates/webpages/admin/list_users_de.html b/templates/webpages/admin/list_users_de.html index ae612b672..4b35bb09e 100644 --- a/templates/webpages/admin/list_users_de.html +++ b/templates/webpages/admin/list_users_de.html @@ -1,8 +1,8 @@ - +[% USE HTML %]
-
+
[% title %]

@@ -16,32 +16,33 @@ - - - - - - - - - + [% SET row_odd = '1' %] + [% FOREACH row = MEMBERS %] + + + + + + + + - + [% END %]
Vorlagen
localhost
[% HTML.escape(row.login) %][% HTML.escape(row.name) %][% HTML.escape(row.company) %][% HTML.escape(row.dbdriver) %][% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %][% HTML.escape(row.dbname) %][% HTML.escape(row.templates) %]

- + - + [% IF LOCKED %] - + [% ELSE %] - + [% END %]

Zum Bearbeiten den Zugriffsnamen anklicken!

diff --git a/templates/webpages/admin/list_users_master.html b/templates/webpages/admin/list_users_master.html index 00eb70063..fc7c70ad6 100644 --- a/templates/webpages/admin/list_users_master.html +++ b/templates/webpages/admin/list_users_master.html @@ -1,8 +1,8 @@ - +[% USE HTML %] -
+
[% title %]

@@ -16,32 +16,33 @@ - - - - - - - - - + [% SET row_odd = '1' %] + [% FOREACH row = MEMBERS %] + + + + + + + + - + [% END %]
Templates
localhost
[% HTML.escape(row.login) %][% HTML.escape(row.name) %][% HTML.escape(row.company) %][% HTML.escape(row.dbdriver) %][% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %][% HTML.escape(row.dbname) %][% HTML.escape(row.templates) %]

- + - + [% IF LOCKED %] - + [% ELSE %] - + [% END %]

Click on login name to edit!

diff --git a/templates/webpages/admin/restore_dataset_de.html b/templates/webpages/admin/restore_dataset_de.html index 053d13269..34877de2c 100644 --- a/templates/webpages/admin/restore_dataset_de.html +++ b/templates/webpages/admin/restore_dataset_de.html @@ -1,14 +1,14 @@ - +[% USE HTML %] -

+

[% title %]

- - - - + + + +

Bitte geben Sie den Namen der Datenbank ein, in der Sie die Sicherung wiederherstellen wollen. @@ -32,7 +32,7 @@ Schriftsatz @@ -43,7 +43,7 @@ - +

diff --git a/templates/webpages/admin/restore_dataset_master.html b/templates/webpages/admin/restore_dataset_master.html index 6af567442..4ede0bbba 100644 --- a/templates/webpages/admin/restore_dataset_master.html +++ b/templates/webpages/admin/restore_dataset_master.html @@ -1,14 +1,14 @@ - +[% USE HTML %] -

+

[% title %]

- - - - + + + +

Please enter the name of the dataset you want to restore the backup in. @@ -32,7 +32,7 @@ Multibyte Encoding @@ -43,7 +43,7 @@ - +

diff --git a/templates/webpages/admin/restore_dataset_start_footer_de.html b/templates/webpages/admin/restore_dataset_start_footer_de.html index 32622ea99..0376b5243 100644 --- a/templates/webpages/admin/restore_dataset_start_footer_de.html +++ b/templates/webpages/admin/restore_dataset_start_footer_de.html @@ -1,15 +1,15 @@ - +[% USE HTML %]

Die Wiederherstellung ist abgeschlossen. Bitte sehen Sie sich die Ausgabe von "pg_restore" an, um festzustellen, ob die Wiederherstellung erfolgreich war. - Der Exitcode des Programms war ("0" bedeutet normalerweise, dass die Wiederherstellung erfolgreich war). + Der Exitcode des Programms war [% HTML.escape(retval) %] ("0" bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).

- +
diff --git a/templates/webpages/admin/restore_dataset_start_footer_master.html b/templates/webpages/admin/restore_dataset_start_footer_master.html index e1fb78a8c..b6717050e 100644 --- a/templates/webpages/admin/restore_dataset_start_footer_master.html +++ b/templates/webpages/admin/restore_dataset_start_footer_master.html @@ -1,15 +1,15 @@ - +[% USE HTML %]

The restoration process is complete. Please review "pg_restore"'s output to find out if the restoration was successful. - The program's exit code was ("0" usually means that everything went OK). + The program's exit code was [% HTML.escape(retval) %] ("0" usually means that everything went OK).

- +
diff --git a/templates/webpages/admin/restore_dataset_start_header_de.html b/templates/webpages/admin/restore_dataset_start_header_de.html index b575d1281..e34055938 100644 --- a/templates/webpages/admin/restore_dataset_start_header_de.html +++ b/templates/webpages/admin/restore_dataset_start_header_de.html @@ -1,6 +1,6 @@ -

+

[% title %]

Der Wiederherstellungsprozess wurde gestartet. Hier ist die Ausgabe des "pg_restore"-Programmes:

diff --git a/templates/webpages/admin/restore_dataset_start_header_master.html b/templates/webpages/admin/restore_dataset_start_header_master.html index b047125a9..accca00d4 100644 --- a/templates/webpages/admin/restore_dataset_start_header_master.html +++ b/templates/webpages/admin/restore_dataset_start_header_master.html @@ -1,6 +1,6 @@ -

+

[% title %]

The restoration process has started. Here's the output of the "pg_restore" command:

diff --git a/templates/webpages/admin/update_dataset_de.html b/templates/webpages/admin/update_dataset_de.html index badb29032..2338487da 100644 --- a/templates/webpages/admin/update_dataset_de.html +++ b/templates/webpages/admin/update_dataset_de.html @@ -1,11 +1,11 @@ - +[% USE HTML %] -

+

[% title %]

- + [% IF ALL_UPDATED %] Alle Datenbanken sind auf aktuellem Stand. - + [% ELSE %]
@@ -21,24 +21,24 @@ Benutzer - - - - - PostgreSQL - - - + [% SET odd = '1' %][% USE NEED_UPDATES_it = Iterator(NEED_UPDATES) %][% FOREACH row = NEED_UPDATES_it %] + + + [% HTML.escape(row.dbname) %] + PostgreSQL + [% HTML.escape(row.dbhost) %] + [% HTML.escape(row.dbport) %] + [% HTML.escape(row.dbuser) %] - - - - + [% IF NEED_UPDATES_it.last %] + + [% END %] + [% END %] - - + +
@@ -49,7 +49,7 @@
- + [% END %] diff --git a/templates/webpages/admin/update_dataset_master.html b/templates/webpages/admin/update_dataset_master.html index 6e1acff03..f91797e86 100644 --- a/templates/webpages/admin/update_dataset_master.html +++ b/templates/webpages/admin/update_dataset_master.html @@ -1,11 +1,11 @@ - +[% USE HTML %] -

+

[% title %]

- + [% IF ALL_UPDATED %] All Datasets up to date! - + [% ELSE %]
@@ -21,24 +21,24 @@ User - - - - - PostgreSQL - - - + [% SET odd = '1' %][% USE NEED_UPDATES_it = Iterator(NEED_UPDATES) %][% FOREACH row = NEED_UPDATES_it %] + + + [% HTML.escape(row.dbname) %] + PostgreSQL + [% HTML.escape(row.dbhost) %] + [% HTML.escape(row.dbport) %] + [% HTML.escape(row.dbuser) %] - - - - + [% IF NEED_UPDATES_it.last %] + + [% END %] + [% END %] - - + +
@@ -49,7 +49,7 @@
- + [% END %] -- 2.20.1