diff --git a/APPL/PDA/bestelling.asp b/APPL/PDA/bestelling.asp index af5943c6a6..1349168533 100644 --- a/APPL/PDA/bestelling.asp +++ b/APPL/PDA/bestelling.asp @@ -219,7 +219,7 @@ if (bes_key > -1) trackinglines = mobile.hastrackingpage('bestelling', bes_key); if (trackinglines>0) { - BUTTON(L("lcl_history"), {linkid: "#bes-2-"+bes_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); + BUTTON(L("lcl_history"), {linkid: "#bes-2-"+bes_key, dataicon: "bullets"}); } } CONTROLGROUP_END() @@ -234,7 +234,7 @@ if (bes_key > -1) { if (trackinglines>0) { - PAGE_START({id: "bes-2-"+bes_key}) + PAGE_START({id: "bes-2-"+bes_key, dialog: true}) mobile.trackingpage('bestelling', bes_key, S("bes_bestelling_prefix") + bes_key); PAGE_END(); } diff --git a/APPL/PDA/contract.asp b/APPL/PDA/contract.asp index 27985d175f..c0ed0873f6 100644 --- a/APPL/PDA/contract.asp +++ b/APPL/PDA/contract.asp @@ -336,7 +336,7 @@ var subject = L("lcl_cnt_contract") + " " + cnt_info.nummer_intern+ (cnt_info.ve trackinglines = mobile.hastrackingpage('contract', cnt_key); if (trackinglines > 0) { - BUTTON(L("lcl_history"), {linkid: "#cnt-2-" + cnt_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); + BUTTON(L("lcl_history"), {linkid: "#cnt-2-" + cnt_key, dataicon: "bullets"}); } var tsql = "SELECT COUNT(*) FROM cnt_contract_note n WHERE n.cnt_contract_key = " + cnt_key; @@ -367,7 +367,7 @@ var subject = L("lcl_cnt_contract") + " " + cnt_info.nummer_intern+ (cnt_info.ve if (trackinglines > 0) { - PAGE_START({id: "cnt-2-" + cnt_key}) + PAGE_START({id: "cnt-2-" + cnt_key, dialog: true}) mobile.trackingpage('contract', cnt_key, subject); PAGE_END(); } diff --git a/APPL/PDA/factuur.asp b/APPL/PDA/factuur.asp index 7dfbc46f75..fa658ce791 100644 --- a/APPL/PDA/factuur.asp +++ b/APPL/PDA/factuur.asp @@ -150,7 +150,7 @@ var subject = L("lcl_fin_invoice") + " " + fin_key; } trackinglines = mobile.hastrackingpage('factuur', fin_key); if (trackinglines > 0) { - BUTTON(L("lcl_history"), {linkid: "#page-2-"+fin_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); + BUTTON(L("lcl_history"), {linkid: "#page-2-"+fin_key, dataicon: "bullets"}); } CONTROLGROUP_END(); @@ -159,7 +159,7 @@ var subject = L("lcl_fin_invoice") + " " + fin_key; PAGE_END(); if (trackinglines > 0) { - PAGE_START({id: "page-2-"+fin_key}) + PAGE_START({id: "page-2-"+fin_key, dialog: true}) mobile.trackingpage('factuur', fin_key, subject); PAGE_END(); } diff --git a/APPL/PDA/iface.inc b/APPL/PDA/iface.inc index 8e9d3a8806..087e6c6e57 100644 --- a/APPL/PDA/iface.inc +++ b/APPL/PDA/iface.inc @@ -144,7 +144,7 @@ function FOOTER(params) function PAGE_START(params) { if (!params) params = {}; - %>
><% } function PAGE_END() diff --git a/APPL/PDA/ins_deel.asp b/APPL/PDA/ins_deel.asp index 7bedd1d19f..9fb7b8ee51 100644 --- a/APPL/PDA/ins_deel.asp +++ b/APPL/PDA/ins_deel.asp @@ -231,7 +231,7 @@ oRs.Close(); } trackinglines = mobile.hastrackingpage('deel', ins_key); if (trackinglines>0) { - BUTTON(L("lcl_history"), {linkid: "#ins-2-"+ins_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); + BUTTON(L("lcl_history"), {linkid: "#ins-2-"+ins_key, dataicon: "bullets"}); } if (user.checkAutorisation( "WEB_MLDUSE", true)) { var tsql = "SELECT COUNT(m.mld_melding_key)" @@ -265,7 +265,7 @@ oRs.Close(); PAGE_END(); if (trackinglines>0) { - PAGE_START({id: "ins-2-"+ins_key}) + PAGE_START({id: "ins-2-"+ins_key, dialog: true}) mobile.trackingpage('deel', ins_key, subject); PAGE_END(); } diff --git a/APPL/PDA/ins_inspect.asp b/APPL/PDA/ins_inspect.asp index 8821836b32..ea1168b0d2 100644 --- a/APPL/PDA/ins_inspect.asp +++ b/APPL/PDA/ins_inspect.asp @@ -590,10 +590,10 @@ else CONTROLGROUP_START(); if (oAr.length > 0) - BUTTON(L("lcl_ins_controle_previous")+" ("+oAr.length+")", {linkid: "#ins-3-"+ins_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); + BUTTON(L("lcl_ins_controle_previous")+" ("+oAr.length+")", {linkid: "#ins-3-"+ins_key, dataicon: "bullets"}); if (srtcontrole_info) - BUTTON(L("ins_srtcontrole_info"), {linkid: "#ins-2-"+ins_key, dataicon: "info", transition: "pop", datarel: "dialog"}); + BUTTON(L("ins_srtcontrole_info"), {linkid: "#ins-2-"+ins_key, dataicon: "info"}); switch (ins_deelsrtcontrole_status) { case -1: @@ -650,14 +650,14 @@ else CONTENT_END(); FOOTER(); PAGE_END(); - PAGE_START({id: "ins-2-"+ins_key}) + PAGE_START({id: "ins-2-"+ins_key, dialog: true}) HEADER({title: srtcontrole_oms, back: false, nohome: true}) ; CONTENT_START(); ROFIELD("fclthtml", "", srtcontrole_info, {multi: true}); CONTENT_END(); PAGE_END(); - PAGE_START({id: "ins-3-"+ins_key}); + PAGE_START({id: "ins-3-"+ins_key, dialog: true}); HEADER({title: L("lcl_ins_controle_previous"), back: true, nohome: true}); CONTENT_START(); diff --git a/APPL/PDA/melding.asp b/APPL/PDA/melding.asp index 345fa3f38e..f3e0d83d6e 100644 --- a/APPL/PDA/melding.asp +++ b/APPL/PDA/melding.asp @@ -811,7 +811,7 @@ if (action != "forward") } trackinglines = mobile.hastrackingpage('melding', mld_key); if (trackinglines>0) { - BUTTON(L("lcl_history"), {linkid: "#mld-2-"+mld_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); + BUTTON(L("lcl_history"), {linkid: "#mld-2-"+mld_key, dataicon: "bullets"}); } if (mfe.canReadNotes) { // Heb ik rechten om notities te zien var tsql = "SELECT COUNT(*) FROM mld_melding_note n WHERE n.mld_melding_key = " + mld_key; @@ -839,7 +839,7 @@ if (action != "forward") if (mld_key > -1) { if (trackinglines>0) { - PAGE_START({id: "mld-2-"+mld_key}) + PAGE_START({id: "mld-2-"+mld_key, dialog: true}) mobile.trackingpage('melding', mld_key, (mld_info.prefix || "")+ mld_key); PAGE_END(); } diff --git a/APPL/PDA/order.asp b/APPL/PDA/order.asp index bc4ddff17e..34fcc30eb4 100644 --- a/APPL/PDA/order.asp +++ b/APPL/PDA/order.asp @@ -547,7 +547,7 @@ else BUTTON(L("lcl_accept"), {click: "opdr_accept()", dataicon: "check"}); // DIT VEREIST NOG EEN OMZETTING IN opdr_cancel_save.asp > TODO if (this_opdr.canCancel) - BUTTON(L("lcl_mld_opdr_cancel_button"), {linkid: "#opdr-3-"+opdr_key, dataicon: "delete", transition: "pop", datarel: "dialog"}); + BUTTON(L("lcl_mld_opdr_cancel_button"), {linkid: "#opdr-3-"+opdr_key, dataicon: "delete"}); if (this_opdr.canChange) BUTTON(L("lcl_submit"), {click: "opdr_submit()", dataicon: "refresh"}); if (this_opdr.canGoedkeur || @@ -576,14 +576,14 @@ else if (this_opdr.canClose) { // Afmelden if (this_opdr.canOpmChange || hltopdr.aantal == 1) - BUTTON(L("lcl_close"), {linkid: "#opdr-4-" + opdr_key, dataicon: "check", transition: "pop", datarel: "dialog"}); + BUTTON(L("lcl_close"), {linkid: "#opdr-4-" + opdr_key, dataicon: "check"}); else BUTTON(L("lcl_close"), {click: "opdr_close()", dataicon: "check"}); } trackinglines = mobile.hastrackingpage('opdracht', opdr_key); if (trackinglines > 0) { - BUTTON(L("lcl_history"), {linkid: "#opdr-2-"+opdr_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); + BUTTON(L("lcl_history"), {linkid: "#opdr-2-"+opdr_key, dataicon: "bullets"}); } if (this_opdr.canShowOpdrNote) // Heb ik rechten om notities te zien { @@ -613,13 +613,13 @@ else if (trackinglines > 0) { - PAGE_START({id: "opdr-2-"+opdr_key}) + PAGE_START({id: "opdr-2-"+opdr_key, dialog: true}) mobile.trackingpage('opdracht', opdr_key, subject); PAGE_END(); } // scherm: Annuleren opdracht - PAGE_START({id: "opdr-3-"+opdr_key}) + PAGE_START({id: "opdr-3-"+opdr_key, dialog: true}) HEADER({title: L("lcl_mld_opdr_cancel_button")+" "+subject, back: false, nohome: true}); CONTENT_START(); %> @@ -637,7 +637,7 @@ else PAGE_END(); // scherm: Afmelden opdracht - PAGE_START({id: "opdr-4-" + opdr_key}) + PAGE_START({id: "opdr-4-" + opdr_key, dialog: true}) HEADER({title: L("lcl_close") + " " + subject, back: false, nohome:true}); CONTENT_START(); var nu = new Date; diff --git a/APPL/PDA/ruimte.asp b/APPL/PDA/ruimte.asp index 05289fa417..d46bac4482 100644 --- a/APPL/PDA/ruimte.asp +++ b/APPL/PDA/ruimte.asp @@ -125,7 +125,7 @@ var subject = oRs("plaats").value; } trackinglines = mobile.hastrackingpage('ruimte', ruimte_key); if (trackinglines > 0 && !tiny) { - BUTTON(L("lcl_history"), {linkid: "#page-2-"+ruimte_key, dataicon: "bullets", transition: "pop", datarel: "dialog"}); + BUTTON(L("lcl_history"), {linkid: "#page-2-"+ruimte_key, dataicon: "bullets"}); } // Toon meldingenknop als er lopende meldingen zijn en ik die mag zien (kan vast nog scherper) @@ -210,7 +210,7 @@ var subject = oRs("plaats").value; PAGE_END(); if (trackinglines > 0) { - PAGE_START({id: "page-2-"+ruimte_key}) + PAGE_START({id: "page-2-"+ruimte_key, dialog: true}) mobile.trackingpage('ruimte', ruimte_key, subject); PAGE_END(); }