admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#38685 1-8 toegevoegd

Browse Source 
svn path=/Website/trunk/; revision=31938
This commit is contained in:
Koen Reefman
2016-12-12 16:29:37 +00:00
parent 6d4325b5b3
commit c25c71f333
8 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/ALG/alg_ruimteafdeling.js
View File

@@ -39,7 +39,7 @@ function CreateRow(afd_key, afd_name, bezetting, oppervlak, bruto)
cell = tr.insertCell(-1);
cell.className = "result";
cell.align = "center";
cell.innerHTML = "<img src='../Pictures/order_cancel.gif' OnClick='delRow(this)' style='cursor:pointer'>";
cell.innerHTML = "<i class='fa fa-fw fa-times' OnClick='delRow(this)' style='cursor:pointer'></i>";
// 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

2
APPL/FAC/prodsearch.asp
View File

@@ -307,7 +307,7 @@ function fncolSoort(srt, noicon)
if (noicon)
return queries[srt].intern;
var l_icon = queries[srt].icon;
return "<img src='" + l_icon + "'>" + queries[srt].intern;
return "<i class='fa fa-fw " + l_icon + "'></i> " + queries[srt].intern;
}
function suggest_box_histogram (titel, histograms, kolom, params)

14
APPL/FAC/prodsearch.inc
View File

@@ -87,7 +87,7 @@ function prodsearch_queries(write_discs, filter)
+ lcl.xsql('sd.bes_srtdeel_opmerking', 'sd.bes_srtdeel_key') + "||','||"
+ "bes_srtdeel_nr ||','||"
+ "p.prs_bedrijf_naam)", supper),
icon: "../Pictures/cart.png",
icon: "fa-shopping-cart",
vakgroep: L("lcl_bes_discipline"),
intern: L("lcl_srch_bestellingen"),
histogram: { "ins_discipline_omschrijving": { lcl: L("lcl_bes_discipline") },
@@ -136,7 +136,7 @@ function prodsearch_queries(write_discs, filter)
+lcl.xsql('mld_stdmelding_hint','mld_stdmelding_key')+"||', '||"
+lcl.xsql('d.ins_discipline_omschrijving','d.ins_discipline_key') +"||', '||"
+lcl.xsql('sd.ins_srtdiscipline_omschrijving', 'sd.ins_srtdiscipline_key') +")", supper),
icon : "../Pictures/wijzigen.png",
icon : "fa-edit",
vakgroep: L("lcl_vakgroup"),
intern: L("lcl_srch_meldingen"),
histogram: { "ins_srtdiscipline_omschrijving": { lcl: L("lcl_mld_vakgroeptype") },
@@ -212,7 +212,7 @@ function prodsearch_queries(write_discs, filter)
" AND " + sati_sql + " >= " + filter.satisfaction.val :"")
+ reslocstr,
///doet de 3d wel + (reslocstr!=""?" AND g.alg_locatie_key IN ("+reslocstr+")":"")
icon : "../Pictures/house.png",
icon : "fa-location-arrow",
intern: L("lcl_srch_vergaderruimtes"),
histogram: { "ins_discipline_omschrijving": { lcl: L("lcl_res_roomcat") },
"alg_locatie_plaats": { lcl: L("lcl_location") },
@@ -269,7 +269,7 @@ function prodsearch_queries(write_discs, filter)
+ " AND ra.res_srtactiviteit_key = rsa.res_srtactiviteit_key"
+ " AND res_srtactiviteit_soort = 1)"
+ " AND d.ins_discipline_key IN (SELECT res_discipline_key FROM res_v_srtartikel_onrgoed rsao)", // Alleen CV
icon : "../Pictures/cake.png",
icon : "fa-birthday-cake",
intern: L("lcl_srch_verbruiksartikelen")
}
@@ -317,7 +317,7 @@ function prodsearch_queries(write_discs, filter)
+ " AND res_srtactiviteit_soort = 1)" // Alleen CV
+ reslocstr,
///doet de 3d wel + (reslocstr!=""?" AND g.alg_locatie_key IN ("+reslocstr+")":"")
icon : "../Pictures/television.png",
icon : "fa-television",
intern: L("lcl_srch_resdeel")
}
@@ -398,7 +398,7 @@ function prodsearch_queries(write_discs, filter)
+ " , "+S("prs_pers_string")
+ " , "+S("prs_dep_string")
+ " , prs_srtperslid_omschrijving",
icon : "../Pictures/person.png",
icon : "fa-user",
intern: L("lcl_srch_personen"),
histogram: { "extra": { lcl: L("lcl_department") },
"prs_srtperslid_omschrijving": { lcl: L("lcl_prs_person_function") }
@@ -439,7 +439,7 @@ function prodsearch_queries(write_discs, filter)
queries['faq'] =
{ sql: fsql
, icon : "../Pictures/book_open.png"
, icon : "fa-question"
, intern : L("lcl_faq_item")
}
}

2
APPL/FIN/fin.inc
View File

@@ -1490,7 +1490,7 @@ fin = { func_enabled_factuur: // Wat mag ik zoal op deze specifieke factuur?
+ "<tr>"
+ "<th>"
+ (this_fin.canInvLinChange
? "<img title='" + L("lcl_add") + "' src='../pictures/plus.png' OnClick='AddItem();FcltMgr.resized();'>"
? "<i class='fa fa-plus fa-lg' title='" + L("lcl_add") + "' OnClick='AddItem();FcltMgr.resized();'></i>"
: "")
+ "&nbsp;<img id='imp_materiaal' title='" + L("lcl_import") + "'"
+ (hasMateriaal ? "" : " style='display: none'")

2
APPL/IMG/icons.inc
View File

@@ -37,6 +37,7 @@ var ICONS = {
"doemelding.png" : "fa-magic",
"doorzet.png" : "fa-paper-plane-o",
"email.png" : "fa-envelope-o",
"excel.png" : "fa-table",
"fileopen.png" : "fa-play",
"folder.png" : "fa-upload", /* for import */
"forward.png" : "fa-forward",
@@ -53,6 +54,7 @@ var ICONS = {
"key.png" : "fa-code",
"legenda.png" : "fa-list-ul",
"link.png" : "fa-chain", //"fa-chain,fa-clock-o"
"link_break.png" : "fa-chain-broken",
"lightbulb.png" : "fa-lightbulb-o",
"mld_order.png" : "fa-wrench",
"newversion.png" : "fa-bolt",

7
APPL/MLD/mld_faq.asp
View File

@@ -107,11 +107,8 @@ user.auth_required_or_abort(authparamsUSE || authparamsFOF);
%> <a href="<%=safe.htmlattr(hurl)%>" target="_new"><%=safe.html(hlnk)%></a><br/>
<% } %>
<div id="faqsolved" onClick="faqSolved(<%=oRs("fac_faq_key").value%>);" class="ref"><div class="button">
<img class="opgelost"
title="<%=L("lcl_faq_mld_3")%>"
alt="<%=L("lcl_faq_mld_3")%>"
src="../pictures/accept.png">
</img><%=L("lcl_faq_mld_3")%></div>
<i class="fa fa-fw fa-check" title="<%=L("lcl_faq_mld_3")%>"></i>
<%=L("lcl_faq_mld_3")%></div>
</div>
</div>
</li>

2
APPL/PRS/prs_edit_bedrijfadres.asp
View File

@@ -258,7 +258,7 @@ else
<td>
<input type="text" id="bijlage" name="bijlage" class="fld" value="<%=safe.htmlattr(bijlage)%>" readonly>
&nbsp;
<input type="button" class="mbutton" onClick="edit_bijlage()">
<i class="fa fa-fw fa-folder-open fa-lg" onClick="edit_bijlage()"></i>
</td>
</tr>
<%

2
APPL/Shared/iface.inc
View File

@@ -65,7 +65,7 @@ function CreateButton(tekst, onClick, btn, params) //akey, id, params)
// autoshowOnly: false
// autoshow : false
// }
var HAMBUTTONS = ["print.png", "email.png", "csv.png", "fa-print", "fa-table", "fa-refresh", "page_refresh.png", "legenda.png"];
var HAMBUTTONS = ["print.png", "email.png", "csv.png", "fa-print", "excel.png", "fa-table", "fa-refresh", "page_refresh.png", "legenda.png"];
function CreateButtons(buttons, params)
{
params = params || {};