From b19d081fb501b2316eb457cb612e5e0e6f5e91f1 Mon Sep 17 00:00:00 2001 From: Ruud Lipper Date: Thu, 22 Dec 2016 09:50:07 +0000 Subject: [PATCH] FSN#38685 Vergeten iconen naar font-awesome svn path=/Website/trunk/; revision=32093 --- APPL/IMG/icons.inc | 9 ++++++++- APPL/INS/ins_deelkoppeling.js | 2 +- APPL/INS/ins_inspect_list.asp | 4 ++-- APPL/INS/ins_list.inc | 4 ++-- APPL/PRJ/rap_prj6.asp | 8 +++----- APPL/PRJ/rap_prj7.asp | 4 ++-- APPL/PRS/prs_perslid_substitutes.asp | 16 +++------------- APPL/PRS/sel_substitute_tab.js | 4 ++-- 8 files changed, 23 insertions(+), 28 deletions(-) diff --git a/APPL/IMG/icons.inc b/APPL/IMG/icons.inc index 9646f7bf8e..8991499586 100644 --- a/APPL/IMG/icons.inc +++ b/APPL/IMG/icons.inc @@ -49,6 +49,7 @@ var ICONS = { "impersonate.png" : "fa-handshake-o", "innemen.png" : "fa-arrow-circle-down", "inspfinish.png" : "fa-flag-o", + "finish.png" : "fa-flag-o", "invoice.png" : "fa-file-text-o", "key.png" : "fa-code", "legenda.png" : "fa-list-ul", @@ -75,7 +76,13 @@ var ICONS = { "wall_brick.png" : "fa-key", "wijzigen.png" : "fa-edit", "zone.png" : "fa-map-marker", - "flike_none.png" : "fa-question-circle" + "flike_none.png" : "fa-question-circle", + "doorvoeren.png" : "fa-cog", + "offerteok.png" : "fa-thumbs-up", + "offertenok.png" : "fa-thumbs-down", + "levering.png" : "fa-bell-o", + "sound.png" : "fa-volume-up", + "magnifier.png" : "fa-desktop" } %> \ No newline at end of file diff --git a/APPL/INS/ins_deelkoppeling.js b/APPL/INS/ins_deelkoppeling.js index 976152ef86..b35de27adf 100644 --- a/APPL/INS/ins_deelkoppeling.js +++ b/APPL/INS/ins_deelkoppeling.js @@ -21,7 +21,7 @@ function CreateRow(naar_key, srtdeel_name, naar_name, naar_desc) cell = tr.insertCell(-1); cell.className = "result"; cell.align = "center"; - cell.innerHTML = ""; + cell.innerHTML = ""; // innerHTML opent een htmlparser die overbodige spaties en line breaks verwijderd in IE, daarom met innerText oplossen // Input velden moeten wel met innerHTML of outerHTML anders wordt het text diff --git a/APPL/INS/ins_inspect_list.asp b/APPL/INS/ins_inspect_list.asp index 89968ed817..79103b210b 100644 --- a/APPL/INS/ins_inspect_list.asp +++ b/APPL/INS/ins_inspect_list.asp @@ -426,9 +426,9 @@ var authparams = user.checkAutorisation("WEB_INSUSE"); var res = ""; if (oRs("ins_deelsrtcontrole_status").Value == 5 || oRs("ins_deelsrtcontrole_status").Value == 6) { if (oRs("ins_controlemode_success").Value == null) - res = ''; + res = ''; else - res = ''; + res = ''; } return res; } diff --git a/APPL/INS/ins_list.inc b/APPL/INS/ins_list.inc index aec5e6ea1c..4f6e21e43c 100644 --- a/APPL/INS/ins_list.inc +++ b/APPL/INS/ins_list.inc @@ -685,9 +685,9 @@ function ins_list (pautfunction, params) { var res = ""; if (oRs("ins_controlemode_success").Value == null) - res = ''; + res = ''; else - res = ''; + res = ''; return res; } diff --git a/APPL/PRJ/rap_prj6.asp b/APPL/PRJ/rap_prj6.asp index d4388eeae8..a5f5966956 100644 --- a/APPL/PRJ/rap_prj6.asp +++ b/APPL/PRJ/rap_prj6.asp @@ -389,16 +389,14 @@ sql = "SELECT prj_selectie_key, prj_selectie_tabelkey, prj_selectie_tabelnaam," function DetachWP(oRs) { if (oRs("prs_afdeling_key").value == null) // Lege werkplek, zelfs geen afdeling - return ""; + return ""; else if (oRs("prj_perslidwerkplek_key").value != null) // perslid met werkplek - return ""; + + " tblName='"+ oRs("prj_selectie_tabelnaam").value + "'>" // Kan PRJ_WERKPLEK of PRS_PERSLIDWERKPLEK zijn else // Losse persoon is niet te verwijderen return ""; } diff --git a/APPL/PRJ/rap_prj7.asp b/APPL/PRJ/rap_prj7.asp index 83cce45917..210254903f 100644 --- a/APPL/PRJ/rap_prj7.asp +++ b/APPL/PRJ/rap_prj7.asp @@ -243,8 +243,8 @@ else if (oRs("cad_imp_contour_opp").value != null) // Gewoon gevonden Ruimte return oRs("cad_imp_contour_opp").value; else - return "" + return "" } var rst = new ResultsetTable({ keyColumn: "prj_ruimte_key", diff --git a/APPL/PRS/prs_perslid_substitutes.asp b/APPL/PRS/prs_perslid_substitutes.asp index 83ca54424c..4ffb7b011c 100644 --- a/APPL/PRS/prs_perslid_substitutes.asp +++ b/APPL/PRS/prs_perslid_substitutes.asp @@ -114,17 +114,8 @@ FCLTHeader.Requires({ plugins:["jQuery"], urlAdd: [{urlParam: "prs_key", field: "prs_key", init: pkey}] }); %> - - " - OnClick="AddItem();" - class="button" - id=Button1 - name=Button1> - + - @@ -149,9 +140,8 @@ FCLTHeader.Requires({ plugins:["jQuery"], <% BLOCK_END(); - var buttons = [ {title: L("lcl_submit"), action: "prs_submit()" }, - {title: L("lcl_cancel"), action: "prs_cancel()" } - ]; + var buttons = [ {title: L("lcl_prs_subst_add_btn"), action: "AddItem()" }, + {title: L("lcl_submit"), action: "prs_submit()" }]; CreateButtons(buttons); IFACE.FORM_END(); %> diff --git a/APPL/PRS/sel_substitute_tab.js b/APPL/PRS/sel_substitute_tab.js index 805bebcd58..04080db7bd 100644 --- a/APPL/PRS/sel_substitute_tab.js +++ b/APPL/PRS/sel_substitute_tab.js @@ -97,8 +97,8 @@ function CreateRow(prs_key, prs_name, dept_name, rowIndex, editable) cell = tr.insertCell(-1); cell.className = "result"; cell.align = "center"; - cell.innerHTML = ""; + cell.innerHTML = ""; // Create order prs_name field cell = tr.insertCell(-1);