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

FSN#35094 Opfrissen icon-set

Browse Source 
svn path=/Website/trunk/; revision=31941
This commit is contained in:
Peter Feij
2016-12-13 08:28:13 +00:00
parent c25c71f333
commit 0bd93254df
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
APPL/FAC/prodsearch.asp
View File

@@ -186,18 +186,18 @@ function fncolAction(oRs)
var hint = "";
switch (module) {
case "mlddisc":
icon = "../Pictures/wijzigen_p.png";
icon = "fa-comment-o";
hint = L("lcl_do_melding_hint");
break;
case "mldstdm":
icon = "../Pictures/wijzigen_p.png";
icon = "fa-comment-o";
if (oRs.Fields("foto").Value != null){
icon = S("mlds_image_path") + oRs.Fields("foto").Value;
}
hint = L("lcl_do_melding_hint");
break;
case "resruimte":
icon = "../Pictures/house_p.png";
icon = "fa-map-marker";
if (oRs.Fields("foto").Value != null)
{
icon = oRs.Fields("foto").Value;
@@ -207,7 +207,7 @@ function fncolAction(oRs)
hint = L("lcl_do_reservering_hint");
break;
case "resartikel":
icon = "../Pictures/cake_p.png";
icon = "fa-cutlery";
if (oRs.Fields("foto").Value != null)
{
icon = oRs.Fields("foto").Value;
@@ -217,7 +217,7 @@ function fncolAction(oRs)
hint = L("lcl_do_reservering_hint");
break;
case "resdeel":
icon = "../Pictures/television_p.png";
icon = "fa-bullhorn";
if (oRs.Fields("foto").Value != null)
{
icon = oRs.Fields("foto").Value;
@@ -229,7 +229,7 @@ function fncolAction(oRs)
case "bescatalogus":
case "besartikelgroep":
case "besartikel":
icon = "../Pictures/cart_p.png";
icon = "fa-cart-plus";
if (oRs.Fields("foto").Value != null)
{
@@ -245,7 +245,7 @@ function fncolAction(oRs)
hint = L("lcl_do_bestelling_hint");
break;
case "faq":
icon = "../Pictures/book_open_p.png";
icon = "fa-book";
hint = L("lcl_faq_item");
break;
case "prsperslid":
@@ -254,7 +254,10 @@ function fncolAction(oRs)
hint = L("lcl_person");
break;
}
return '<img class="details" height="100" src="' + icon +'" title="'+ hint + '">';
if (icon.match(/^fa-/))
return "<i class='fa fa-fw prodicon {0}' title='{1}'></i>".format(icon, safe.htmlattr(hint));
else
return "<img class='details prodimg' src='" + icon + "' title='"+ safe.htmlattr(hint) + "'>";
}
function fncolProduct(oRs)
@@ -519,7 +522,7 @@ function suggest_box_resruimte (titel, histograms, kolom, params)
break;
}
var txt = "<span class='removetag' title='"+L("lcl_srch_remove")+"' onclick='refresh_filter({"+item+": \"\"})'>&nbsp;&nbsp;&nbsp;&nbsp;</span>";
var txt = "<span class='fa fa-times fa-fw removetag' title='"+L("lcl_srch_remove")+"' onclick='refresh_filter({"+item+": \"\"})'>&nbsp;&nbsp;&nbsp;&nbsp;</span>";
Response.Write(txt);
var txt = /* lbl + ": " + */ "<span class='tag'>" + safe.html(xx) + "</span>";
Response.Write(txt);
@@ -555,7 +558,7 @@ function suggest_box_resruimte (titel, histograms, kolom, params)
});
rst.addColumn(new Column({hasActions: true, caption:"", content:fncolAction, align: "center" }));
rst.addColumn(new Column({caption: L("lcl_descr"), content:fncolProduct}));
rst.addColumn(new Column({caption: "", content:fncolProduct}));
rst.addColumn(new Column({caption: "", content: fncolType, combine:true}));
rst.addColumn(new Column({caption: "", content:fncolPrijs, datatype: "currency", combine:true}));
if (filter.soort.val == "resruimte" && filter.date_from_ms.val>0)

10
APPL/FAC/prodsearch.inc
View File

@@ -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 : "fa-edit",
icon : "fa-comment-o",
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 : "fa-location-arrow",
icon : "fa-map-marker",
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 : "fa-birthday-cake",
icon : "fa-cutlery",
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 : "fa-television",
icon : "fa-bullhorn",
intern: L("lcl_srch_resdeel")
}
@@ -439,7 +439,7 @@ function prodsearch_queries(write_discs, filter)
queries['faq'] =
{ sql: fsql
, icon : "fa-question"
, icon : "fa-book"
, intern : L("lcl_faq_item")
}
}