FSN#39258 iconen -> font awesome

svn path=/Website/branches/v2016.3/; revision=32612
This commit is contained in:
2017-01-30 16:20:04 +00:00
parent 80789579f7
commit c1778efc93
8 changed files with 39 additions and 19 deletions

View File

@@ -188,8 +188,15 @@ else
RWFIELDTR("srtdeel_eenheid", "fld", L("lcl_bes_unity"), art.eenheid);
RWFIELDTR("voorraadfactor", "fld", L("lcl_bes_voorraadfactor"), art.voorraadfactor, { required: true });
RWFIELDTR("image", "fld", L("lcl_bes_image"), art.image, { extrabutton: { pclass: "mbutton", onclick: "edit_image()" } });
%>
<tr>
<td class="label"><label for="image" class="">Afbeelding:</label></td><td>
<input class="fld" name="image" id="image" value="">
&nbsp;<i class="fa fa-lg fa-folder-open mbutton" onclick="edit_image()">&nbsp;</i>
</td>
</tr>
<tr>
<td class="label"><label class="selector" for="itemfilter"><%=L("lcl_bes_srtprod")%>:</label>
</td>

View File

@@ -138,8 +138,6 @@ while (!oRs.Eof)
}
var url = icon;
}
else
var url = "../Pictures/mld_stdm_default.jpg"; // Leuker: een rondje met de eerste letter oid.
var maxcol = S("iconcolumns"); // setting
if (pos > 0 && pos%maxcol == 0) {
@@ -147,7 +145,14 @@ while (!oRs.Eof)
}
%><td class='iconmenu' width='<%=Math.floor(100/maxcol)%>%'
onclick='run_create_bes (<%=oRs("disc_key").Value%>,<%=oRs("product_key").Value%>);'>
<%if (url)
{ %>
<img theSrc='<%=safe.htmlattr(url)%>'>
<%}
else
{
%>&nbsp;<i class='fa fa-5x fa-question'>&nbsp;</i><%
}%>
<div class="iconlabel">
<%="<span class='iprd'>"+safe.html(oRs("product").value) + "</span><br>" +(safe.curr(oRs("prijs").value) != 0 ? "<span class='iprs'>"+S("currency_pref") + safe.curr(oRs("prijs").value)+"</span>" : "") + (oRs("eenheid").value ? ("<span class='ieenh'>&nbsp;/&nbsp;" + safe.html(oRs("eenheid").value)+"</span>") : "") + (oRs("opmerking").value ? ("<br><span class='iopm'>" + safe.html(oRs("opmerking").value)+"</span>") : "") %>
</div>

View File

@@ -446,7 +446,7 @@ function makeContactSuggest()
initExtraParam: "",
urlAdd: (bez_sel_contactpersoon == 2? [{urlParam: "loc_key", field: "locatiekey"}] : null) // Contactpersoon afhankelijk van locatie?
});
$(this).before('<img src="../Pictures/instantadd.png" title="'+L("lcl_bez_new_contact")+'" OnClick="makeContact('+rowNr+')" style="cursor:pointer">');
$(this).before('<i class="fa fa-plus" title="'+L("lcl_bez_new_contact")+'" OnClick="makeContact('+rowNr+')">&nbsp;</i>');
});
})
}

View File

@@ -741,7 +741,7 @@ function bez_list(pautfunction, params)
oRsC.MoveNext();
}
}
icon = "<img class='lendobj' src='../Pictures/uitlenen.png'" + (icontxt != ""? " alt='" + icontxt : "") + "'>";
icon = "<i class='fa-link lendobj'" + (icontxt != ""? " title='" + icontxt : "") + "'>&nbsp;</i>";
}
if (outputmode != 0 || (oRs("prs_contactpersoon_key").value == null && oRs("prs_perslid_key").value == null))

View File

@@ -264,7 +264,7 @@ if( txt ) rowIndex = txt.rowIndex;
+ " maxlength="+(ktype=='N'&&kdec?klen+1:klen)
+ (ktype=='D'?' onKeyPress=owkenmerkDateKey() onPropertyChange=owkenmerkDateChange()':'')
+ " style='width:" + (klen > 28? (klen > 40? "360" : "" + (klen * 100 / 14 + 10)) : "200") + "px'>")
+ ((val && ktype == 'X') ? "<input type=button class=mbutton style='width:20px;height:20px;background-image:url(../Pictures/fileopen.gif)' onClick='openDoc(\\\""+ safe.jsstring(S("image_path_virtual")) + val1 + "\\\");'>" : "");
+ ((val && ktype == 'X') ? "<i class=\"fa fa-lg fa-folder-open mbutton\" onClick='openDoc(\\\""+ safe.jsstring(S("image_path_virtual")) + val1 + "\\\");'>&nbsp;</i>" : "");
if( ktype == 'R' ) {

View File

@@ -178,8 +178,6 @@ switch (lvl) {
// Wel erg hard...
if (oRs("foto").Value)
var url = S("mlds_image_path") + (oRs("foto").Value);
else
var url = "../Pictures/mld_stdm_default.jpg";
var maxcol = S("iconcolumns");
if (pos > 0 && pos%maxcol == 0) {
@@ -188,7 +186,14 @@ switch (lvl) {
%><td class='iconmenu' width='<%=Math.floor(100/maxcol)%>%'
title='<%=safe.htmlattr(oRs("mld_stdmelding_hint").Value || oRs("mld_stdmelding_omschrijving").Value)%>'
onclick='run_create_mld (<%=oRs("ins_srtdiscipline_key").Value%>,<%=oRs("mld_stdmelding_key").Value%>);'>
<%if (url)
{ %>
<img theSrc='<%=safe.htmlattr(url)%>'>
<%}
else
{
%>&nbsp;<i class='fa fa-5x fa-question'>&nbsp;</i><%
}%>
<div class="iconlabel"><%=safe.html(oRs("mld_stdmelding_omschrijving").value) %></div>
</td><%
pos ++;

View File

@@ -1520,9 +1520,9 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
});
}
if (S("res_reservering_flags") > 0)
if (true)//S("res_reservering_flags") > 0)
{
if (urole != "fe")
if (false)//role != "fe")
{
flag_array = [];
for (i=0; i<S("res_reservering_flags"); i++)
@@ -1541,12 +1541,17 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
}
else
{
ROFIELDTR("fld", L("lcl_res_flags")
, L("lcl_res_flag"+rrr.status_flag)
, { html: "style='padding-left: 20px; background-repeat: no-repeat; background-image: url(../Pictures/resflag"+rrr.status_flag+".png)'"
, suppressEmpty: true
}
);
%>
<tr>
<td class="label"><label><%=L("lcl_res_flags")%>:</label></td>
<td>
<span class="readonly fld">
<%=I("fa-circle respl resflag"+rrr.status_flag)%>
<%=L("lcl_res_flag"+rrr.status_flag)%>
</span>
</td>
</tr>
<%
}
}

View File

@@ -1339,10 +1339,8 @@ div.buttoncontainer {
{
width: 20px;
height: 20px;
background-image: url(../appl/Pictures/folder.png); /*TODO*/
background-repeat: no-repeat;
color: #7B7B7B;
border: 0;
background-color: transparent!important;
}
/* een inline button */
.ilbutton {