From 2e1cdae9a3fa04cc07e1a3799118bac7094af94f Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Tue, 19 Apr 2022 14:20:54 +0200 Subject: [PATCH] Made different Layouts more customizable --- Layout/andom-tec/footer.php | 12 +-- Layout/andom-tec/header.php | 19 +++-- Layout/andom-tec/menu.php | 71 +++++++++++++----- Layout/andom-tec/topbar.php | 4 +- .../{andom-tec => andom_old}/Address/Form.php | 0 .../Address/Index.php | 0 .../Building/Form.php | 0 .../Building/Index.php | 0 .../Cpeprovisioning/Index.php | 0 .../Cpeshipping/History.php | 0 .../Cpeshipping/Index.php | 0 .../Cpeshipping/csv/dhl.csv.php | 0 .../Dashboard/Index.php | 0 .../attachments/new_order_spin.pdf.php | 0 .../Emailtemplates/customer/new_order.php | 0 .../order/billing_external_energie.php | 0 .../Emailtemplates/order/int_billing_info.php | 0 .../Linework/Index.php | 0 .../{andom-tec => andom_old}/Network/Form.php | 0 .../Network/Index.php | 0 .../{andom-tec => andom_old}/Order/Form.php | 0 .../{andom-tec => andom_old}/Order/Index.php | 0 .../Patching/Index.php | 0 .../Pipework/Index.php | 0 Layout/{andom-tec => andom_old}/Pop/Form.php | 0 .../{andom-tec => andom_old}/Product/Form.php | 0 .../Product/Index.php | 0 .../Producttech/Form.php | 0 .../Producttech/Index.php | 0 Layout/{andom-tec => andom_old}/User/Form.php | 0 .../{andom-tec => andom_old}/User/Index.php | 0 .../Workflow/form.php | 0 .../Workflow/items/bool.php | 0 .../Workflow/items/color.php | 0 .../Workflow/items/date.php | 0 .../Workflow/items/delimiter.php | 0 .../Workflow/items/empty.php | 0 .../Workflow/items/enum.php | 0 .../Workflow/items/file.php | 0 .../Workflow/items/gps.php | 0 .../Workflow/items/int.php | 0 .../Workflow/items/string.php | 0 .../Workflow/items/text.php | 0 .../mfExceptionhandler/error_404.php | 0 .../mfExceptionhandler/error_500.php | 0 .../mfExceptionhandler.cli.php | 0 .../mfExceptionhandler.web.php | 0 .../mfLogin/Index.php | 2 +- Layout/default/Address/Form.php | 4 +- Layout/default/Address/Index.php | 9 ++- Layout/default/Building/Form.php | 4 +- Layout/default/Building/Index.php | 4 +- Layout/default/Cpeprovisioning/Index.php | 4 +- Layout/default/Cpeshipping/History.php | 4 +- Layout/default/Cpeshipping/Index.php | 4 +- Layout/default/Dashboard/Index.php | 4 +- Layout/default/Linework/Index.php | 4 +- Layout/default/Network/Form.php | 4 +- Layout/default/Network/Index.php | 4 +- Layout/default/News/Index.php | 4 +- Layout/default/Order/Form.php | 10 ++- Layout/default/Order/Index.php | 4 +- Layout/default/Patching/Index.php | 4 +- Layout/default/Pipework/Index.php | 4 +- Layout/default/Pop/Form.php | 4 +- Layout/default/Preorder/Form.php | 4 +- Layout/default/Preordercampaign/Index.php | 4 +- Layout/default/Product/Form.php | 4 +- Layout/default/Product/Index.php | 4 +- Layout/default/Producttech/Form.php | 4 +- Layout/default/Producttech/Index.php | 4 +- Layout/default/User/Form.php | 4 +- Layout/default/User/Index.php | 4 +- Layout/default/Voicenumber/Form.php | 4 +- Layout/default/Voicenumberblock/Form.php | 4 +- Layout/default/Voicenumberblock/Index.php | 4 +- Layout/default/footer.php | 10 +-- Layout/default/header.php | 2 +- Layout/default/mfLogin/Index.php | 2 +- Layout/default/topbar.php | 4 +- application/Address/AddressController.php | 4 +- lib/mvcfronk/mfLayout/mfLayout.php | 27 ++++++- ...-logo-kopf.png => fiberbuddy-logo-top.png} | Bin ...ec-logo-transp.png => fiberbuddy-logo.png} | Bin public/assets/images/the-tool-logo-top.png | Bin 0 -> 10046 bytes 85 files changed, 170 insertions(+), 110 deletions(-) rename Layout/{andom-tec => andom_old}/Address/Form.php (100%) rename Layout/{andom-tec => andom_old}/Address/Index.php (100%) rename Layout/{andom-tec => andom_old}/Building/Form.php (100%) rename Layout/{andom-tec => andom_old}/Building/Index.php (100%) rename Layout/{andom-tec => andom_old}/Cpeprovisioning/Index.php (100%) rename Layout/{andom-tec => andom_old}/Cpeshipping/History.php (100%) rename Layout/{andom-tec => andom_old}/Cpeshipping/Index.php (100%) rename Layout/{andom-tec => andom_old}/Cpeshipping/csv/dhl.csv.php (100%) rename Layout/{andom-tec => andom_old}/Dashboard/Index.php (100%) rename Layout/{andom-tec => andom_old}/Emailtemplates/attachments/new_order_spin.pdf.php (100%) rename Layout/{andom-tec => andom_old}/Emailtemplates/customer/new_order.php (100%) rename Layout/{andom-tec => andom_old}/Emailtemplates/order/billing_external_energie.php (100%) rename Layout/{andom-tec => andom_old}/Emailtemplates/order/int_billing_info.php (100%) rename Layout/{andom-tec => andom_old}/Linework/Index.php (100%) rename Layout/{andom-tec => andom_old}/Network/Form.php (100%) rename Layout/{andom-tec => andom_old}/Network/Index.php (100%) rename Layout/{andom-tec => andom_old}/Order/Form.php (100%) rename Layout/{andom-tec => andom_old}/Order/Index.php (100%) rename Layout/{andom-tec => andom_old}/Patching/Index.php (100%) rename Layout/{andom-tec => andom_old}/Pipework/Index.php (100%) rename Layout/{andom-tec => andom_old}/Pop/Form.php (100%) rename Layout/{andom-tec => andom_old}/Product/Form.php (100%) rename Layout/{andom-tec => andom_old}/Product/Index.php (100%) rename Layout/{andom-tec => andom_old}/Producttech/Form.php (100%) rename Layout/{andom-tec => andom_old}/Producttech/Index.php (100%) rename Layout/{andom-tec => andom_old}/User/Form.php (100%) rename Layout/{andom-tec => andom_old}/User/Index.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/form.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/items/bool.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/items/color.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/items/date.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/items/delimiter.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/items/empty.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/items/enum.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/items/file.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/items/gps.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/items/int.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/items/string.php (100%) rename Layout/{andom-tec => andom_old}/Workflow/items/text.php (100%) rename Layout/{andom-tec => andom_old}/mfExceptionhandler/error_404.php (100%) rename Layout/{andom-tec => andom_old}/mfExceptionhandler/error_500.php (100%) rename Layout/{andom-tec => andom_old}/mfExceptionhandler/mfExceptionhandler.cli.php (100%) rename Layout/{andom-tec => andom_old}/mfExceptionhandler/mfExceptionhandler.web.php (100%) rename Layout/{andom-tec => andom_old}/mfLogin/Index.php (97%) rename public/assets/images/{the-tool-logo-kopf.png => fiberbuddy-logo-top.png} (100%) rename public/assets/images/{andom-tec-logo-transp.png => fiberbuddy-logo.png} (100%) create mode 100644 public/assets/images/the-tool-logo-top.png diff --git a/Layout/andom-tec/footer.php b/Layout/andom-tec/footer.php index e0244376b..a9b49274c 100644 --- a/Layout/andom-tec/footer.php +++ b/Layout/andom-tec/footer.php @@ -6,16 +6,10 @@ diff --git a/Layout/andom-tec/header.php b/Layout/andom-tec/header.php index 5d144dce5..2a268eb8a 100644 --- a/Layout/andom-tec/header.php +++ b/Layout/andom-tec/header.php @@ -2,14 +2,14 @@ - Fiberbuddy + <?=MFAPPNAME_FULL?> - + @@ -18,17 +18,26 @@ + - - + + + + - + + + diff --git a/Layout/andom-tec/menu.php b/Layout/andom-tec/menu.php index 8454a1093..6ae37c0d9 100644 --- a/Layout/andom-tec/menu.php +++ b/Layout/andom-tec/menu.php @@ -4,27 +4,37 @@ diff --git a/Layout/andom-tec/topbar.php b/Layout/andom-tec/topbar.php index 291d5d859..42bd3f2a8 100644 --- a/Layout/andom-tec/topbar.php +++ b/Layout/andom-tec/topbar.php @@ -118,10 +118,10 @@
  • " class="logo"> - + - +
    • diff --git a/Layout/andom-tec/Address/Form.php b/Layout/andom_old/Address/Form.php similarity index 100% rename from Layout/andom-tec/Address/Form.php rename to Layout/andom_old/Address/Form.php diff --git a/Layout/andom-tec/Address/Index.php b/Layout/andom_old/Address/Index.php similarity index 100% rename from Layout/andom-tec/Address/Index.php rename to Layout/andom_old/Address/Index.php diff --git a/Layout/andom-tec/Building/Form.php b/Layout/andom_old/Building/Form.php similarity index 100% rename from Layout/andom-tec/Building/Form.php rename to Layout/andom_old/Building/Form.php diff --git a/Layout/andom-tec/Building/Index.php b/Layout/andom_old/Building/Index.php similarity index 100% rename from Layout/andom-tec/Building/Index.php rename to Layout/andom_old/Building/Index.php diff --git a/Layout/andom-tec/Cpeprovisioning/Index.php b/Layout/andom_old/Cpeprovisioning/Index.php similarity index 100% rename from Layout/andom-tec/Cpeprovisioning/Index.php rename to Layout/andom_old/Cpeprovisioning/Index.php diff --git a/Layout/andom-tec/Cpeshipping/History.php b/Layout/andom_old/Cpeshipping/History.php similarity index 100% rename from Layout/andom-tec/Cpeshipping/History.php rename to Layout/andom_old/Cpeshipping/History.php diff --git a/Layout/andom-tec/Cpeshipping/Index.php b/Layout/andom_old/Cpeshipping/Index.php similarity index 100% rename from Layout/andom-tec/Cpeshipping/Index.php rename to Layout/andom_old/Cpeshipping/Index.php diff --git a/Layout/andom-tec/Cpeshipping/csv/dhl.csv.php b/Layout/andom_old/Cpeshipping/csv/dhl.csv.php similarity index 100% rename from Layout/andom-tec/Cpeshipping/csv/dhl.csv.php rename to Layout/andom_old/Cpeshipping/csv/dhl.csv.php diff --git a/Layout/andom-tec/Dashboard/Index.php b/Layout/andom_old/Dashboard/Index.php similarity index 100% rename from Layout/andom-tec/Dashboard/Index.php rename to Layout/andom_old/Dashboard/Index.php diff --git a/Layout/andom-tec/Emailtemplates/attachments/new_order_spin.pdf.php b/Layout/andom_old/Emailtemplates/attachments/new_order_spin.pdf.php similarity index 100% rename from Layout/andom-tec/Emailtemplates/attachments/new_order_spin.pdf.php rename to Layout/andom_old/Emailtemplates/attachments/new_order_spin.pdf.php diff --git a/Layout/andom-tec/Emailtemplates/customer/new_order.php b/Layout/andom_old/Emailtemplates/customer/new_order.php similarity index 100% rename from Layout/andom-tec/Emailtemplates/customer/new_order.php rename to Layout/andom_old/Emailtemplates/customer/new_order.php diff --git a/Layout/andom-tec/Emailtemplates/order/billing_external_energie.php b/Layout/andom_old/Emailtemplates/order/billing_external_energie.php similarity index 100% rename from Layout/andom-tec/Emailtemplates/order/billing_external_energie.php rename to Layout/andom_old/Emailtemplates/order/billing_external_energie.php diff --git a/Layout/andom-tec/Emailtemplates/order/int_billing_info.php b/Layout/andom_old/Emailtemplates/order/int_billing_info.php similarity index 100% rename from Layout/andom-tec/Emailtemplates/order/int_billing_info.php rename to Layout/andom_old/Emailtemplates/order/int_billing_info.php diff --git a/Layout/andom-tec/Linework/Index.php b/Layout/andom_old/Linework/Index.php similarity index 100% rename from Layout/andom-tec/Linework/Index.php rename to Layout/andom_old/Linework/Index.php diff --git a/Layout/andom-tec/Network/Form.php b/Layout/andom_old/Network/Form.php similarity index 100% rename from Layout/andom-tec/Network/Form.php rename to Layout/andom_old/Network/Form.php diff --git a/Layout/andom-tec/Network/Index.php b/Layout/andom_old/Network/Index.php similarity index 100% rename from Layout/andom-tec/Network/Index.php rename to Layout/andom_old/Network/Index.php diff --git a/Layout/andom-tec/Order/Form.php b/Layout/andom_old/Order/Form.php similarity index 100% rename from Layout/andom-tec/Order/Form.php rename to Layout/andom_old/Order/Form.php diff --git a/Layout/andom-tec/Order/Index.php b/Layout/andom_old/Order/Index.php similarity index 100% rename from Layout/andom-tec/Order/Index.php rename to Layout/andom_old/Order/Index.php diff --git a/Layout/andom-tec/Patching/Index.php b/Layout/andom_old/Patching/Index.php similarity index 100% rename from Layout/andom-tec/Patching/Index.php rename to Layout/andom_old/Patching/Index.php diff --git a/Layout/andom-tec/Pipework/Index.php b/Layout/andom_old/Pipework/Index.php similarity index 100% rename from Layout/andom-tec/Pipework/Index.php rename to Layout/andom_old/Pipework/Index.php diff --git a/Layout/andom-tec/Pop/Form.php b/Layout/andom_old/Pop/Form.php similarity index 100% rename from Layout/andom-tec/Pop/Form.php rename to Layout/andom_old/Pop/Form.php diff --git a/Layout/andom-tec/Product/Form.php b/Layout/andom_old/Product/Form.php similarity index 100% rename from Layout/andom-tec/Product/Form.php rename to Layout/andom_old/Product/Form.php diff --git a/Layout/andom-tec/Product/Index.php b/Layout/andom_old/Product/Index.php similarity index 100% rename from Layout/andom-tec/Product/Index.php rename to Layout/andom_old/Product/Index.php diff --git a/Layout/andom-tec/Producttech/Form.php b/Layout/andom_old/Producttech/Form.php similarity index 100% rename from Layout/andom-tec/Producttech/Form.php rename to Layout/andom_old/Producttech/Form.php diff --git a/Layout/andom-tec/Producttech/Index.php b/Layout/andom_old/Producttech/Index.php similarity index 100% rename from Layout/andom-tec/Producttech/Index.php rename to Layout/andom_old/Producttech/Index.php diff --git a/Layout/andom-tec/User/Form.php b/Layout/andom_old/User/Form.php similarity index 100% rename from Layout/andom-tec/User/Form.php rename to Layout/andom_old/User/Form.php diff --git a/Layout/andom-tec/User/Index.php b/Layout/andom_old/User/Index.php similarity index 100% rename from Layout/andom-tec/User/Index.php rename to Layout/andom_old/User/Index.php diff --git a/Layout/andom-tec/Workflow/form.php b/Layout/andom_old/Workflow/form.php similarity index 100% rename from Layout/andom-tec/Workflow/form.php rename to Layout/andom_old/Workflow/form.php diff --git a/Layout/andom-tec/Workflow/items/bool.php b/Layout/andom_old/Workflow/items/bool.php similarity index 100% rename from Layout/andom-tec/Workflow/items/bool.php rename to Layout/andom_old/Workflow/items/bool.php diff --git a/Layout/andom-tec/Workflow/items/color.php b/Layout/andom_old/Workflow/items/color.php similarity index 100% rename from Layout/andom-tec/Workflow/items/color.php rename to Layout/andom_old/Workflow/items/color.php diff --git a/Layout/andom-tec/Workflow/items/date.php b/Layout/andom_old/Workflow/items/date.php similarity index 100% rename from Layout/andom-tec/Workflow/items/date.php rename to Layout/andom_old/Workflow/items/date.php diff --git a/Layout/andom-tec/Workflow/items/delimiter.php b/Layout/andom_old/Workflow/items/delimiter.php similarity index 100% rename from Layout/andom-tec/Workflow/items/delimiter.php rename to Layout/andom_old/Workflow/items/delimiter.php diff --git a/Layout/andom-tec/Workflow/items/empty.php b/Layout/andom_old/Workflow/items/empty.php similarity index 100% rename from Layout/andom-tec/Workflow/items/empty.php rename to Layout/andom_old/Workflow/items/empty.php diff --git a/Layout/andom-tec/Workflow/items/enum.php b/Layout/andom_old/Workflow/items/enum.php similarity index 100% rename from Layout/andom-tec/Workflow/items/enum.php rename to Layout/andom_old/Workflow/items/enum.php diff --git a/Layout/andom-tec/Workflow/items/file.php b/Layout/andom_old/Workflow/items/file.php similarity index 100% rename from Layout/andom-tec/Workflow/items/file.php rename to Layout/andom_old/Workflow/items/file.php diff --git a/Layout/andom-tec/Workflow/items/gps.php b/Layout/andom_old/Workflow/items/gps.php similarity index 100% rename from Layout/andom-tec/Workflow/items/gps.php rename to Layout/andom_old/Workflow/items/gps.php diff --git a/Layout/andom-tec/Workflow/items/int.php b/Layout/andom_old/Workflow/items/int.php similarity index 100% rename from Layout/andom-tec/Workflow/items/int.php rename to Layout/andom_old/Workflow/items/int.php diff --git a/Layout/andom-tec/Workflow/items/string.php b/Layout/andom_old/Workflow/items/string.php similarity index 100% rename from Layout/andom-tec/Workflow/items/string.php rename to Layout/andom_old/Workflow/items/string.php diff --git a/Layout/andom-tec/Workflow/items/text.php b/Layout/andom_old/Workflow/items/text.php similarity index 100% rename from Layout/andom-tec/Workflow/items/text.php rename to Layout/andom_old/Workflow/items/text.php diff --git a/Layout/andom-tec/mfExceptionhandler/error_404.php b/Layout/andom_old/mfExceptionhandler/error_404.php similarity index 100% rename from Layout/andom-tec/mfExceptionhandler/error_404.php rename to Layout/andom_old/mfExceptionhandler/error_404.php diff --git a/Layout/andom-tec/mfExceptionhandler/error_500.php b/Layout/andom_old/mfExceptionhandler/error_500.php similarity index 100% rename from Layout/andom-tec/mfExceptionhandler/error_500.php rename to Layout/andom_old/mfExceptionhandler/error_500.php diff --git a/Layout/andom-tec/mfExceptionhandler/mfExceptionhandler.cli.php b/Layout/andom_old/mfExceptionhandler/mfExceptionhandler.cli.php similarity index 100% rename from Layout/andom-tec/mfExceptionhandler/mfExceptionhandler.cli.php rename to Layout/andom_old/mfExceptionhandler/mfExceptionhandler.cli.php diff --git a/Layout/andom-tec/mfExceptionhandler/mfExceptionhandler.web.php b/Layout/andom_old/mfExceptionhandler/mfExceptionhandler.web.php similarity index 100% rename from Layout/andom-tec/mfExceptionhandler/mfExceptionhandler.web.php rename to Layout/andom_old/mfExceptionhandler/mfExceptionhandler.web.php diff --git a/Layout/andom-tec/mfLogin/Index.php b/Layout/andom_old/mfLogin/Index.php similarity index 97% rename from Layout/andom-tec/mfLogin/Index.php rename to Layout/andom_old/mfLogin/Index.php index 05c49c691..9cbe4be4b 100644 --- a/Layout/andom-tec/mfLogin/Index.php +++ b/Layout/andom_old/mfLogin/Index.php @@ -20,7 +20,7 @@
    diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php index bc5493f1c..6900ee4a1 100644 --- a/Layout/default/Address/Form.php +++ b/Layout/default/Address/Form.php @@ -6,7 +6,7 @@
      -
    1. the-tool
      2. +
    3. Personen & Firmen
    4. id) ? "bearbeiten" : "Neu" ?>
    @@ -344,4 +344,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/Address/Index.php b/Layout/default/Address/Index.php index bc598b06f..6d06432ca 100644 --- a/Layout/default/Address/Index.php +++ b/Layout/default/Address/Index.php @@ -3,7 +3,8 @@ $pagination_baseurl_params = ["filter" => $filter]; $pagination_entity_name = "Adressen"; ?> - + +
    @@ -11,7 +12,7 @@
      -
    1. ">the-tool
      2. +
    2. ">
    3. ">Personen & Firmen
    4. @@ -224,5 +225,5 @@ - - \ No newline at end of file + + diff --git a/Layout/default/Building/Form.php b/Layout/default/Building/Form.php index 31d15bbfc..5ec903a2c 100644 --- a/Layout/default/Building/Form.php +++ b/Layout/default/Building/Form.php @@ -5,7 +5,7 @@
        -
      1. ">the-tool
        2. +
      2. ">
      3. ">Objekte
      4. id) ? "bearbeiten" : "Neu" ?>
      @@ -460,4 +460,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/Building/Index.php b/Layout/default/Building/Index.php index 6f71fcc79..856219403 100644 --- a/Layout/default/Building/Index.php +++ b/Layout/default/Building/Index.php @@ -13,7 +13,7 @@
        -
      1. ">the-tool
        2. +
      2. ">
      3. Objekte
      @@ -472,4 +472,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/Cpeprovisioning/Index.php b/Layout/default/Cpeprovisioning/Index.php index 3f763ebf9..3c816e1e6 100644 --- a/Layout/default/Cpeprovisioning/Index.php +++ b/Layout/default/Cpeprovisioning/Index.php @@ -6,7 +6,7 @@
        -
      1. ">the-tool
        2. +
      2. ">
      3. CPE Provisioning
      @@ -375,4 +375,4 @@ }) - + diff --git a/Layout/default/Cpeshipping/History.php b/Layout/default/Cpeshipping/History.php index 8e911de76..1c33d91e7 100644 --- a/Layout/default/Cpeshipping/History.php +++ b/Layout/default/Cpeshipping/History.php @@ -6,7 +6,7 @@
        -
      1. ">the-tool
        2. +
      2. ">
      3. ">CPE Versand
      4. Versand-CSV History
      @@ -123,4 +123,4 @@ - + diff --git a/Layout/default/Cpeshipping/Index.php b/Layout/default/Cpeshipping/Index.php index bef8918e9..cb8d8bad1 100644 --- a/Layout/default/Cpeshipping/Index.php +++ b/Layout/default/Cpeshipping/Index.php @@ -11,7 +11,7 @@
        -
      1. ">the-tool
        2. +
      2. ">
      3. CPE Versand
      @@ -126,4 +126,4 @@ }); - + diff --git a/Layout/default/Dashboard/Index.php b/Layout/default/Dashboard/Index.php index 020594dbc..000ca6d0e 100644 --- a/Layout/default/Dashboard/Index.php +++ b/Layout/default/Dashboard/Index.php @@ -6,7 +6,7 @@
        -
      1. the-tool
        2. +
      3. Dashboard
      @@ -44,4 +44,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php index 8aec82c6d..96e847a3c 100644 --- a/Layout/default/Linework/Index.php +++ b/Layout/default/Linework/Index.php @@ -13,7 +13,7 @@
        -
      1. ">the-tool
        2. +
      2. ">
      3. Leitungsbau
      @@ -645,4 +645,4 @@ function validateWorkflowItem(id) { - + diff --git a/Layout/default/Network/Form.php b/Layout/default/Network/Form.php index 9a73543a1..edc2a6eaa 100644 --- a/Layout/default/Network/Form.php +++ b/Layout/default/Network/Form.php @@ -6,7 +6,7 @@
        -
      1. ">the-tool
        2. +
      2. ">
      3. ">Netzgebiete
      4. id) ? "bearbeiten" : "Neu" ?>
      @@ -100,4 +100,4 @@ $("#addresstypes").select2(); - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/Network/Index.php b/Layout/default/Network/Index.php index f1a6488fc..23a7fd544 100644 --- a/Layout/default/Network/Index.php +++ b/Layout/default/Network/Index.php @@ -11,7 +11,7 @@
        -
      1. ">the-tool
        2. +
      2. ">
      3. ">Netzgebiete
      4. @@ -298,4 +298,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/News/Index.php b/Layout/default/News/Index.php index 0fc089f90..a6f2a11a4 100644 --- a/Layout/default/News/Index.php +++ b/Layout/default/News/Index.php @@ -6,7 +6,7 @@
          -
        1. ">the-tool
          2. +
        2. ">
        3. News
        @@ -73,4 +73,4 @@ }); - + diff --git a/Layout/default/Order/Form.php b/Layout/default/Order/Form.php index 3dd0cccc7..847b555d0 100644 --- a/Layout/default/Order/Form.php +++ b/Layout/default/Order/Form.php @@ -10,7 +10,7 @@
          -
        1. ">the-tool
          2. +
        2. ">
        3. ">Bestellungen
        4. id) ? "bearbeiten" : "Neu" ?>
        @@ -701,6 +701,7 @@
        + is("Admin", "netoperator")): ?> id && !$includes_external_product): ?>
        @@ -711,6 +712,7 @@
        +
        @@ -767,7 +769,7 @@ // kunde owner_id && is_object(($order->owner))): ?> - $('#owner_id').autoComplete('set', { value: owner_id?>, text: 'owner_id) ? str_replace(["\n", "\r"], " ", $order->owner->getCompanyOrName())." (".$order->owner->zip." ".$order->owner->city.", ".$order->owner->street.")".(($order->owner->customer_number) ? " [".$order->owner->customer_number."]" : "") : ""?>'}); + $('#owner_id').autoComplete('set', { value: owner_id?>, text: 'owner_id) ? str_replace("'", "\\'", str_replace(["\n", "\r"], " ", $order->owner->getCompanyOrName()))." (".$order->owner->zip." ".$order->owner->city.", ".$order->owner->street.")".(($order->owner->customer_number) ? " [".$order->owner->customer_number."]" : "") : ""?>'}); $('#owner_id').autoComplete(); @@ -797,7 +799,7 @@ // rechnungsadresse billingaddress_id && is_object($order->billingaddress)): ?> - $('#billingaddress_id').autoComplete('set', { value: billingaddress_id?>, text: 'billingaddress_id) ? $order->billingaddress->getCompanyOrName()." (".$order->billingaddress->zip." ".$order->billingaddress->city.", ".$order->billingaddress->street.")" : ""?>'}); + $('#billingaddress_id').autoComplete('set', { value: billingaddress_id?>, text: 'billingaddress_id) ? str_replace("'", "\\'", str_replace(["\n", "\r"], " ", $order->billingaddress->getCompanyOrName()))." (".$order->billingaddress->zip." ".$order->billingaddress->city.", ".$order->billingaddress->street.")" : ""?>'}); $('#billingaddress_id').autoComplete(); @@ -1215,4 +1217,4 @@ } - + diff --git a/Layout/default/Order/Index.php b/Layout/default/Order/Index.php index 16503d374..6e653fa6f 100644 --- a/Layout/default/Order/Index.php +++ b/Layout/default/Order/Index.php @@ -25,7 +25,7 @@
          -
        1. ">the-tool
          2. +
        2. ">
        3. Bestellungen
        @@ -1131,4 +1131,4 @@ } - + diff --git a/Layout/default/Patching/Index.php b/Layout/default/Patching/Index.php index 6dce760bc..9c84133c3 100644 --- a/Layout/default/Patching/Index.php +++ b/Layout/default/Patching/Index.php @@ -11,7 +11,7 @@
          -
        1. ">the-tool
          2. +
        2. ">
        3. Patchungen
        @@ -193,4 +193,4 @@
        - + diff --git a/Layout/default/Pipework/Index.php b/Layout/default/Pipework/Index.php index a00939755..e1f8aa476 100644 --- a/Layout/default/Pipework/Index.php +++ b/Layout/default/Pipework/Index.php @@ -13,7 +13,7 @@
          -
        1. ">the-tool
          2. +
        2. ">
        3. Tiefbau
        @@ -291,4 +291,4 @@ $('select[name=wfitem_pipework_finished]').each(function() { - + diff --git a/Layout/default/Pop/Form.php b/Layout/default/Pop/Form.php index 57ca7ab26..77b54a2ee 100644 --- a/Layout/default/Pop/Form.php +++ b/Layout/default/Pop/Form.php @@ -6,7 +6,7 @@
          -
        1. ">the-tool
          2. +
        2. ">
        3. ">Netzgebiete
        4. POP
        5. id) ? "bearbeiten" : "Neu" ?>
          6. @@ -147,4 +147,4 @@ }); - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/Preorder/Form.php b/Layout/default/Preorder/Form.php index a1d71e26c..366ced48e 100644 --- a/Layout/default/Preorder/Form.php +++ b/Layout/default/Preorder/Form.php @@ -5,7 +5,7 @@
            -
          1. ">the-tool
            2. +
          2. ">
          3. ">Vorbestellkampagne
          4. id) ? "bearbeiten" : "Neu" ?>
          @@ -272,4 +272,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/Preordercampaign/Index.php b/Layout/default/Preordercampaign/Index.php index 2becf522e..7e3abc094 100644 --- a/Layout/default/Preordercampaign/Index.php +++ b/Layout/default/Preordercampaign/Index.php @@ -6,7 +6,7 @@
            -
          1. ">the-tool
            2. +
          2. ">
          3. Vorbestellung
          @@ -101,4 +101,4 @@
          - + diff --git a/Layout/default/Product/Form.php b/Layout/default/Product/Form.php index 5d08de955..e7115e531 100644 --- a/Layout/default/Product/Form.php +++ b/Layout/default/Product/Form.php @@ -6,7 +6,7 @@
            -
          1. ">the-tool
            2. +
          2. ">
          3. ">Produkte
          4. id) ? "bearbeiten" : "Neu" ?>
          @@ -293,4 +293,4 @@ }); - + diff --git a/Layout/default/Product/Index.php b/Layout/default/Product/Index.php index 4e4033aa5..a638e63fc 100644 --- a/Layout/default/Product/Index.php +++ b/Layout/default/Product/Index.php @@ -11,7 +11,7 @@
            -
          1. ">the-tool
            2. +
          2. ">
          3. Produkte
          @@ -77,4 +77,4 @@
          - + diff --git a/Layout/default/Producttech/Form.php b/Layout/default/Producttech/Form.php index c44416a57..7a5c2f12e 100644 --- a/Layout/default/Producttech/Form.php +++ b/Layout/default/Producttech/Form.php @@ -5,7 +5,7 @@
            -
          1. ">the-tool
            2. +
          2. ">
          3. ">Produkte
          4. ">Technologien
          5. id) ? "bearbeiten" : "Neu" ?>
            6. @@ -225,4 +225,4 @@ }); - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/Producttech/Index.php b/Layout/default/Producttech/Index.php index f5045495b..90e6dc33e 100644 --- a/Layout/default/Producttech/Index.php +++ b/Layout/default/Producttech/Index.php @@ -6,7 +6,7 @@
              -
            1. ">the-tool
              2. +
            2. ">
            3. ">Produkte
            4. Technologien
            @@ -52,4 +52,4 @@
            - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/User/Form.php b/Layout/default/User/Form.php index 5cf86bcd2..9a9607bd3 100644 --- a/Layout/default/User/Form.php +++ b/Layout/default/User/Form.php @@ -9,7 +9,7 @@
              -
            1. ">the-tool
              2. +
            2. ">
            3. ">Benutzer
            @@ -84,4 +84,4 @@ - \ No newline at end of file diff --git a/Layout/default/User/Index.php b/Layout/default/User/Index.php index 7805ba3fb..0dc0beba0 100644 --- a/Layout/default/User/Index.php +++ b/Layout/default/User/Index.php @@ -13,7 +13,7 @@
              -
            1. ">the-tool
              2. +
            2. ">
            3. Benutzer
            @@ -94,4 +94,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/Voicenumber/Form.php b/Layout/default/Voicenumber/Form.php index f3710b891..b8530bff7 100644 --- a/Layout/default/Voicenumber/Form.php +++ b/Layout/default/Voicenumber/Form.php @@ -5,7 +5,7 @@
              -
            1. ">the-tool
              2. +
            2. ">
            3. ">Rufnummernblöcke
            4. #block_id=block->id?>">block->number_first?> - block->number_last?>
            5. getFullNumber()?> bearbeiten
              6. @@ -175,4 +175,4 @@ autoclose: true }); - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/Voicenumberblock/Form.php b/Layout/default/Voicenumberblock/Form.php index 7aed72bab..2850ecefc 100644 --- a/Layout/default/Voicenumberblock/Form.php +++ b/Layout/default/Voicenumberblock/Form.php @@ -5,7 +5,7 @@
                -
              1. ">the-tool
                2. +
              2. ">
              3. ">Rufnummernblöcke
              4. id) ? "bearbeiten" : "Neu" ?>
              @@ -96,4 +96,4 @@
              - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/Voicenumberblock/Index.php b/Layout/default/Voicenumberblock/Index.php index 3a31abbff..6dddc0a6a 100644 --- a/Layout/default/Voicenumberblock/Index.php +++ b/Layout/default/Voicenumberblock/Index.php @@ -11,7 +11,7 @@
                -
              1. ">the-tool
                2. +
              2. ">
              3. Rufnummernblöcke
              @@ -160,4 +160,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/Layout/default/footer.php b/Layout/default/footer.php index ae7e8bd44..c2286a7b0 100644 --- a/Layout/default/footer.php +++ b/Layout/default/footer.php @@ -7,15 +7,9 @@
              "> - the tool © 2021 Xinon GmbH - Made by fronk -
              -
              -
              - About Us - Help - Contact Us -
              + the tool © Xinon GmbH - Made by fronk
              +
              diff --git a/Layout/default/header.php b/Layout/default/header.php index c2ba9fe86..2a268eb8a 100644 --- a/Layout/default/header.php +++ b/Layout/default/header.php @@ -2,7 +2,7 @@ - the tool + <?=MFAPPNAME_FULL?> diff --git a/Layout/default/mfLogin/Index.php b/Layout/default/mfLogin/Index.php index 59ad0f938..03a2ae918 100644 --- a/Layout/default/mfLogin/Index.php +++ b/Layout/default/mfLogin/Index.php @@ -20,7 +20,7 @@