From 3aa5cee2f12c1dff757539b60196bf5e1be0a5d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sven=20Sch=C3=B6ling?= Date: Fri, 21 Nov 2014 18:17:16 +0100 Subject: [PATCH] Layout: title Ausgabe normalisieren MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ...mit dem Ziel das später ins Layout zu migrieren. - In allen Templates den Tital auch wirklich als erstes ins DOM verschoben - unterschiedliche Verwendung der folgenden Muster vereinheitlicht:

...

...

...

a .... - Verwendung der gleichen Klasse im Footer in

geändert - Puffer entfert Das ergibt insgesamt folgende Effekte: - Einheitliches Rendern der Überschrift - Einheitlicher Abstand zum Content - flash/message werden immer unter der Überschrift angezeigt --- bin/mozilla/arap.pl | 6 ++---- bin/mozilla/ic.pl | 11 +++-------- .../acctranscorrections/analyze_overview.html | 3 +-- .../assistant_for_ap_ar_wrong_taxkeys.html | 3 +-- ...tant_for_invoice_inventory_with_taxkeys.html | 3 +-- .../assistant_for_wrong_taxes.html | 3 +-- .../assistant_for_wrong_taxkeys.html | 3 +-- .../fix_ap_ar_wrong_taxkeys.html | 3 +-- .../fix_invoice_inventory_with_taxkeys.html | 3 +-- .../acctranscorrections/fix_wrong_taxkeys.html | 3 +-- templates/webpages/am/config.html | 2 +- .../webpages/am/confirm_delete_warehouse.html | 3 +-- templates/webpages/am/edit_accounts.html | 11 ++++------- templates/webpages/am/edit_price_factor.html | 4 ++-- templates/webpages/am/edit_tax.html | 4 ++-- templates/webpages/am/edit_templates.html | 6 ++---- templates/webpages/am/edit_units.html | 17 +++-------------- templates/webpages/am/edit_warehouse.html | 6 +++--- templates/webpages/am/language_header.html | 5 +---- templates/webpages/am/language_list.html | 4 ---- templates/webpages/am/lead_header.html | 5 +---- templates/webpages/am/lead_list.html | 5 +---- templates/webpages/am/list_price_factors.html | 2 +- templates/webpages/am/list_tax.html | 3 +-- templates/webpages/am/list_warehouses.html | 3 +-- templates/webpages/ap/search.html | 3 +-- templates/webpages/ar/search.html | 3 +-- .../bankaccounts/bank_account_display_form.html | 3 +-- templates/webpages/business/form.html | 2 +- templates/webpages/business/list.html | 3 +-- templates/webpages/ca/list.html | 7 ++----- templates/webpages/common/show_history.html | 14 +++++++------- templates/webpages/common/show_vc_details.html | 6 +----- templates/webpages/csv_import/form.html | 3 +-- templates/webpages/ct/search.html | 4 ++-- templates/webpages/ct/search_contact.html | 4 ++-- templates/webpages/customer_vendor/form.html | 2 +- .../webpages/customer_vendor/tabs/vcnotes.html | 5 ++--- templates/webpages/datev/export.html | 5 +---- templates/webpages/datev/export3.html | 1 - .../webpages/datev/export_bewegungsdaten.html | 5 +---- templates/webpages/datev/export_stammdaten.html | 4 +--- .../dbupgrade/SKR04_3804_already_exists.html | 3 ++- .../webpages/dbupgrade/SKR04_3804_update.html | 3 ++- .../dbupgrade/acc_trans_constraints.html | 3 ++- templates/webpages/dbupgrade/auth/clients.html | 3 +-- .../dbupgrade/cp_greeting_update_form.html | 4 ++-- .../webpages/dbupgrade/default_bin_parts.html | 3 ++- .../default_bin_parts_no_warehouse.html | 2 +- .../webpages/dbupgrade/erzeugnisnummern.html | 4 +++- templates/webpages/dbupgrade/header.html | 7 +------ .../webpages/dbupgrade/no_default_currency.html | 3 ++- .../webpages/dbupgrade/orphaned_currencies.html | 3 ++- templates/webpages/dbupgrade/show_partlist.html | 3 ++- .../webpages/dbupgrade/steuerfilterung.html | 3 +-- .../webpages/dbupgrade/tax_constraints.html | 3 ++- templates/webpages/dbupgrade/taxkey_update.html | 3 ++- .../webpages/dbupgrade/warehouse_form.html | 2 +- templates/webpages/delivery_term/form.html | 2 +- templates/webpages/delivery_term/list.html | 3 +-- templates/webpages/department/form.html | 2 +- templates/webpages/department/list.html | 3 +-- templates/webpages/do/form_header.html | 4 ++-- templates/webpages/do/search.html | 4 ++-- templates/webpages/do/stock_in_form.html | 4 ++-- templates/webpages/do/stock_out_form.html | 3 +-- templates/webpages/drafts/load.html | 6 +----- templates/webpages/drafts/save_new.html | 6 +----- templates/webpages/dunning/add.html | 2 +- templates/webpages/dunning/edit_config.html | 5 ++--- templates/webpages/dunning/search.html | 5 ++--- templates/webpages/dunning/set_email.html | 4 ++-- templates/webpages/dunning/show_invoices.html | 4 ++-- templates/webpages/fu/add_edit.html | 6 +++--- templates/webpages/fu/edit_access_rights.html | 4 ++-- templates/webpages/fu/report_for_todo_list.html | 3 +-- templates/webpages/fu/search.html | 4 ++-- templates/webpages/generic/calculate_qty.html | 7 ++----- templates/webpages/generic/cov_selection.html | 8 ++------ templates/webpages/generic/edit_email.html | 7 ++----- templates/webpages/generic/part_selection.html | 4 ++-- .../generic/select_delivery_customer.html | 6 ++---- templates/webpages/generic/select_part.html | 2 +- templates/webpages/generic/select_vendor.html | 6 ++---- .../generictranslations/edit_greetings.html | 5 +---- .../generictranslations/edit_sepa_strings.html | 5 +---- templates/webpages/gl/form_header.html | 5 ++--- templates/webpages/gl/search.html | 6 ++---- templates/webpages/ic/form_header.html | 2 +- templates/webpages/ic/search.html | 4 +--- templates/webpages/ic/search_update_prices.html | 3 +-- templates/webpages/io/select_item.html | 3 +-- templates/webpages/ir/form_header.html | 4 ++-- .../login_screen/old_configuration_files.html | 2 +- .../webpages/oe/check_for_direct_delivery.html | 3 +-- .../oe/edit_periodic_invoices_config.html | 3 +-- templates/webpages/oe/report_for_todo_list.html | 3 +-- templates/webpages/oe/search.html | 4 ++-- templates/webpages/payment_term/form.html | 2 +- templates/webpages/payment_term/list.html | 3 +-- templates/webpages/pe/partsgroup_form.html | 5 +---- templates/webpages/pe/partsgroup_report.html | 5 +---- templates/webpages/pe/pricegroup_form.html | 5 +---- templates/webpages/pe/pricegroup_report.html | 5 +---- templates/webpages/pe/search.html | 5 +---- .../webpages/presenter/record/record_list.html | 2 +- templates/webpages/project/search.html | 3 +-- templates/webpages/project_status/form.html | 2 +- templates/webpages/project_status/list.html | 3 +-- templates/webpages/project_type/form.html | 2 +- templates/webpages/project_type/list.html | 3 +-- templates/webpages/record_links/add_filter.html | 2 +- .../form.html | 2 +- .../list.html | 3 +-- .../requirement_spec_complexity/form.html | 2 +- .../requirement_spec_complexity/list.html | 3 +-- .../requirement_spec_predefined_text/form.html | 2 +- .../requirement_spec_predefined_text/list.html | 3 +-- .../webpages/requirement_spec_risk/form.html | 2 +- .../webpages/requirement_spec_risk/list.html | 3 +-- .../webpages/requirement_spec_status/form.html | 2 +- .../webpages/requirement_spec_status/list.html | 3 +-- .../webpages/requirement_spec_type/form.html | 2 +- .../webpages/requirement_spec_type/list.html | 3 +-- templates/webpages/rp/html_report_susa.html | 3 +-- templates/webpages/sepa/bank_transfer_add.html | 3 +-- .../webpages/sepa/bank_transfer_create.html | 3 +-- .../webpages/sepa/bank_transfer_created.html | 3 +-- templates/webpages/sepa/bank_transfer_edit.html | 3 +-- .../bank_transfer_mark_as_closed_step1.html | 3 +-- .../webpages/sepa/bank_transfer_search.html | 3 +-- templates/webpages/task_server/show.html | 3 +-- templates/webpages/todo/show_todo_list.html | 3 +-- templates/webpages/ustva/config_step1.html | 8 ++------ templates/webpages/ustva/config_step2.html | 10 ++-------- templates/webpages/ustva/report.html | 9 ++------- templates/webpages/vk/search_invoice.html | 4 +--- templates/webpages/webdav/_list.html | 3 +-- templates/webpages/wh/journal_filter.html | 4 ++-- .../webpages/wh/removal_parts_selection.html | 3 +-- templates/webpages/wh/report_filter.html | 4 ++-- .../webpages/wh/transfer_parts_selection.html | 4 ++-- templates/webpages/wh/warehouse_selection.html | 4 ++-- .../wh/warehouse_selection_assembly.html | 4 ++-- .../webpages/wh/warehouse_selection_stock.html | 4 ++-- 145 files changed, 208 insertions(+), 370 deletions(-) diff --git a/bin/mozilla/arap.pl b/bin/mozilla/arap.pl index f56da182f..67b1c4871 100644 --- a/bin/mozilla/arap.pl +++ b/bin/mozilla/arap.pl @@ -169,13 +169,11 @@ sub select_name { my $title = $locale->text('Select from one of the names below'); print qq| +

$title

+
{script}> - - - -
$title
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl index d6ecf671f..a51555372 100644 --- a/bin/mozilla/ic.pl +++ b/bin/mozilla/ic.pl @@ -288,12 +288,9 @@ sub update_prices { # $form->header; # # print qq| +#

| . $locale->text('choice part') . qq|

# #
-# -# -# -# # # # @@ -722,11 +719,9 @@ sub addtop100 { my $colspan = $#column_index + 1; print qq| +

$form->{title}

+
| . $locale->text('choice part') . qq|
 | . $locale->text('Part Number') . qq|
- - - - diff --git a/templates/webpages/acctranscorrections/analyze_overview.html b/templates/webpages/acctranscorrections/analyze_overview.html index b059a3a8e..f85ba4ff7 100644 --- a/templates/webpages/acctranscorrections/analyze_overview.html +++ b/templates/webpages/acctranscorrections/analyze_overview.html @@ -1,7 +1,6 @@ [%- USE T8 %] [% USE HTML %][% USE LxERP %] - -

[% title %]

+

[% title %]

[% 'kivitendo has found one or more problems in the general ledger.' | $T8 %]

diff --git a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html index c82876a1e..8671faacc 100644 --- a/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html +++ b/templates/webpages/acctranscorrections/assistant_for_ap_ar_wrong_taxkeys.html @@ -1,7 +1,6 @@ [%- USE T8 %] [% USE HTML %][% USE LxERP %] - -

[% title %]

+

[% title %]

[% 'There is at least one transaction for which the user has chosen a logically wrong taxkey.' | $T8 %] diff --git a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html index 5971d5c27..458193553 100644 --- a/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html +++ b/templates/webpages/acctranscorrections/assistant_for_invoice_inventory_with_taxkeys.html @@ -1,7 +1,6 @@ [%- USE T8 %] [% USE HTML %][% USE LxERP %] - -

[% title %]

+

[% title %]

[% 'There is at least one sales or purchase invoice for which kivitendo recorded an inventory transaction with taxkeys even though no tax was recorded.' | $T8 %] diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html index 4d47e605b..0d81bb608 100644 --- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html +++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxes.html @@ -1,7 +1,6 @@ [%- USE T8 %] [% USE HTML %][% USE LxERP %] - -

[% title %]

+

[% title %]

[% 'The following transaction contains wrong taxes:' | $T8 %] diff --git a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html index 4d335db54..3ed544f11 100644 --- a/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html +++ b/templates/webpages/acctranscorrections/assistant_for_wrong_taxkeys.html @@ -1,7 +1,6 @@ [%- USE T8 %] [% USE HTML %][% USE LxERP %] - -

[% title %]

+

[% title %]

[% 'The following transaction contains wrong taxkeys:' | $T8 %] diff --git a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html index e6252dc7d..e95121596 100644 --- a/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html +++ b/templates/webpages/acctranscorrections/fix_ap_ar_wrong_taxkeys.html @@ -1,7 +1,6 @@ [%- USE T8 %] [% USE HTML %] - -

[% title %]

+

[% title %]

[% 'The wrong taxkeys for AP and AR transactions have been fixed.' | $T8 %] diff --git a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html index 4fab42b0c..0c13cfbd9 100644 --- a/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html +++ b/templates/webpages/acctranscorrections/fix_invoice_inventory_with_taxkeys.html @@ -1,7 +1,6 @@ [%- USE T8 %] [% USE HTML %] - -

[% title %]

+

[% title %]

[% 'The wrong taxkeys for inventory transactions for sales and purchase invoices have been fixed.' | $T8 %] diff --git a/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html b/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html index 6fde4eff1..749b4057f 100644 --- a/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html +++ b/templates/webpages/acctranscorrections/fix_wrong_taxkeys.html @@ -1,7 +1,6 @@ [%- USE T8 %] [% USE HTML %] - -

[% title %]

+

[% title %]

[% 'The wrong taxkeys have been fixed.' | $T8 %] diff --git a/templates/webpages/am/config.html b/templates/webpages/am/config.html index 257f6a7ac..13b060a16 100644 --- a/templates/webpages/am/config.html +++ b/templates/webpages/am/config.html @@ -1,7 +1,7 @@ [%- USE T8 %] [%- USE LxERP %] [%- USE HTML %][%- USE L %] -

[% title %]
+

[% title %]

diff --git a/templates/webpages/am/confirm_delete_warehouse.html b/templates/webpages/am/confirm_delete_warehouse.html index 28dd70d27..d26b75dbb 100644 --- a/templates/webpages/am/confirm_delete_warehouse.html +++ b/templates/webpages/am/confirm_delete_warehouse.html @@ -1,7 +1,6 @@ [%- USE T8 %] [%- USE HTML %] - -
[% title %]
+

[% title %]

[% 'Do you really want to delete this warehouse?' | $T8 %]

diff --git a/templates/webpages/am/edit_accounts.html b/templates/webpages/am/edit_accounts.html index 1e5b03ce9..95cd8c09d 100644 --- a/templates/webpages/am/edit_accounts.html +++ b/templates/webpages/am/edit_accounts.html @@ -1,6 +1,9 @@ [%- USE T8 %] [%- USE L %] -[% USE HTML %] -
[% 'Report about warehouse transactions' | $T8 %]
- diff --git a/templates/webpages/wh/removal_parts_selection.html b/templates/webpages/wh/removal_parts_selection.html index 5cf5ffa35..5bc1e30a9 100644 --- a/templates/webpages/wh/removal_parts_selection.html +++ b/templates/webpages/wh/removal_parts_selection.html @@ -1,13 +1,12 @@ [%- USE T8 %] [%- USE HTML %][%- USE JavaScript %] +

[% title %]

-
[% title %]
-

[% 'Removal from warehouse' | $T8 %]: [% warehouse_description %]

diff --git a/templates/webpages/wh/report_filter.html b/templates/webpages/wh/report_filter.html index 12a3e0b60..70fb4f126 100644 --- a/templates/webpages/wh/report_filter.html +++ b/templates/webpages/wh/report_filter.html @@ -1,6 +1,8 @@ [%- USE T8 %] [%- USE L %] [%- USE HTML %][%- USE JavaScript %] +

[% 'Report about warehouse contents' | $T8 %]

+ -
[% 'Report about warehouse contents' | $T8 %]
- diff --git a/templates/webpages/wh/transfer_parts_selection.html b/templates/webpages/wh/transfer_parts_selection.html index 5a7aabf86..0f5d2f50a 100644 --- a/templates/webpages/wh/transfer_parts_selection.html +++ b/templates/webpages/wh/transfer_parts_selection.html @@ -1,5 +1,7 @@ [%- USE T8 %] [%- USE HTML %][%- USE JavaScript %] +

[% title %]

+
$form->{title}
$option