diff --git a/APPL/BES/bes_bestelling.js b/APPL/BES/bes_bestelling.js index e642e93042..d1155ab228 100644 --- a/APPL/BES/bes_bestelling.js +++ b/APPL/BES/bes_bestelling.js @@ -68,7 +68,9 @@ function clear_item_details() window.stock_info = {}; // even onbekend. var imgObj = $("#photo")[0]; imgObj.src = "../Pictures/no_photo.gif"; + imgObj.style = "display: block"; imgObj.onclick = null; + $("#photo").prev().removeClass("fa-file-pdf-o").addClass("fa-question").css("display", "none"); $("#srtgroep_text,#srtdeel_omschrijving,#srtdeel_opmerking").html(""); $("#opmerking_tr").hide(); @@ -95,20 +97,28 @@ function show_item_details(bes_item_info) if (bes_item_info.srtdeel_image) { var im_file = bes_item_info.srtdeel_image; - imgObj.src = im_file; im_file_upper = im_file.toUpperCase(); extension = im_file_upper.substr(im_file_upper.length - 3, 3); if (extension == "PDF") { - imgObj.src = "../Pictures/pdf.jpg"; + imgObj.style = "display: none"; + $("#photo").prev().removeClass("fa-question").addClass("fa-file-pdf-o").css("display", "inline-block"); bes_supAddress = im_file; } else + { + $("#photo").prev().removeClass("fa-file-pdf-o").addClass("fa-question").css("display", "none"); + imgObj.src = im_file; + imgObj.style = "display: block"; bes_supAddress = bes_item_info.prs_bedrijf_details_loc; + } imgObj.onclick = navigateToSupplier; } - else { + else + { + $("#photo").prev().toggleClass("fa-question fa-file-pdf-o").css("display", "none"); imgObj.src = "../Pictures/no_photo.gif"; + imgObj.style = "display: block"; imgObj.onclick = null; } diff --git a/APPL/BES/bes_edit_bestelling.asp b/APPL/BES/bes_edit_bestelling.asp index 4e4f0f8749..34c2e3acf7 100644 --- a/APPL/BES/bes_edit_bestelling.asp +++ b/APPL/BES/bes_edit_bestelling.asp @@ -706,8 +706,8 @@ else // nieuwe bestelling. Defaults bepalen %><% } */ - FCLTadresselector("deliveryAddr", "sgAdres", - { + FCLTadresselector("deliveryAddr", "sgAdres", + { label: L("lcl_delivery_address"), adresKey: bes_bestelling.mld_adres_key, emptyOption: "", @@ -716,7 +716,7 @@ else // nieuwe bestelling. Defaults bepalen onChange: "onChangeAdres", readonly: (bes_key > 0 && aflever_readonly), required: true - }) ; + }) ; RWFIELDTR("delivery_place", "fld", L("lcl_bes_del_room"), bes_bestelling.afleverruimte, { required: S("bes_afleverruimte_verplicht") == 1, @@ -861,13 +861,22 @@ else // nieuwe bestelling. Defaults bepalen }); // Het informatieblok van een geselecteerd artikel %> - - - + + + + diff --git a/APPL/BES/bes_fe_menu.asp b/APPL/BES/bes_fe_menu.asp index 118e8a92f8..81bbcfc6ad 100644 --- a/APPL/BES/bes_fe_menu.asp +++ b/APPL/BES/bes_fe_menu.asp @@ -111,6 +111,7 @@ sql += " ORDER BY sg.bes_srtgroep_volgnr" var oRs = Oracle.Execute(sql) var last_groep = -1; +var isFA = false; while (!oRs.Eof) { if (last_groep != oRs("bes_srtgroep_key").Value) @@ -130,10 +131,14 @@ while (!oRs.Eof) icon = S("bes_image_path") + oRs("disc_key").Value + "/" + icon; l_icon = icon; l_index = l_icon.lastIndexOf('.'); - if (l_index != -1){ + if (l_index != -1) + { l_icon=l_icon.substr(l_index+1); - if (l_icon.toUpperCase() == 'PDF'){ - icon="../Pictures/pdf.jpg"; + isFA = false; + if (l_icon.toUpperCase() == 'PDF') + { + icon="fa-file-pdf-o"; + isFA = true; } } var url = icon; @@ -145,14 +150,23 @@ while (!oRs.Eof) } %>
" id="srtgroep_text">
- <%if (url) - { %> - - <%} - else - { +<% + if (url) + { + if (isFA) // gebruik een font-awesome icon + { + %>    <% + } + else + { + %> <% + } + } + else + { %>  <% - }%> + } +%>
<%=""+safe.html(oRs("product").value) + "
" +(safe.curr(oRs("prijs").value) != 0 ? ""+S("currency_pref") + safe.curr(oRs("prijs").value)+"" : "") + (oRs("eenheid").value ? (" / " + safe.html(oRs("eenheid").value)+"") : "") + (oRs("opmerking").value ? ("
" + safe.html(oRs("opmerking").value)+"") : "") %>
diff --git a/APPL/FAC/prodsearch.asp b/APPL/FAC/prodsearch.asp index 88f4e54477..f02a88c400 100644 --- a/APPL/FAC/prodsearch.asp +++ b/APPL/FAC/prodsearch.asp @@ -239,7 +239,7 @@ function fncolAction(oRs) if (icon.match(/\.pdf$/i)) { - icon="../Pictures/pdf.jpg"; + icon="fa-file-pdf-o"; } } hint = L("lcl_do_bestelling_hint");