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

FSN#35094 Opfrissen icon-set font-awesome

Browse Source 
svn path=/Website/trunk/; revision=31579
This commit is contained in:
Jos Groot Lipman
2016-11-21 08:08:39 +00:00
parent b1e3e61b2e
commit b670369840
21 changed files with 140 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/CAD/tabs.inc
View File

@@ -72,10 +72,11 @@ function CreateTabs()
else
_aPinned[i] = _Params;
$(pindiv).removeClass("fa-unlock fa-lock");
if (_aPinned[i])
pindiv.src = '../Pictures/locked.png'
$(pindiv).addClass("fa-lock");
else
pindiv.src = '../Pictures/unlocked.png'
$(pindiv).addClass("fa-unlock");
}
function tabSetParam(param)
{
@@ -129,7 +130,7 @@ function resizetabIframe()
%>
<li class='ui-state-default ui-corner-top'><a href='#fr<%=_FTabs[i].id%>'><%=_FTabs[i].str%>
</a>
<%=_FTabs[i].pinnable?"<img onClick='togglePin(this, "+i+")' src=../Pictures/unlocked.png>":""%>
<%=_FTabs[i].pinnable?"<span class='details fa fa-unlock fa-fw' onClick='togglePin(this, "+i+")'></span>":""%>
</li>
<%
} %>

7
APPL/Localscripts/FcltMgr.js
View File

@@ -34,6 +34,7 @@ var FcltMgr =
hrefBase = hrefBase.substr(0, hrefBase.indexOf("&" + nm + "="));
hrefBase += "&" + params.appendurl;
}
// Vervang een eventuele hamburger door een spinner
$("li#printhamburger i.fa.fa-fw.fa-bars").attr("class", "fa fa-fw fa-refresh fa-spin fa-2x");
window.location.href = hrefBase;
},
@@ -145,7 +146,7 @@ var FcltMgr =
{
if (data.taboption == "T")
{
var html = "<span title='"+L("lcl_current_tab_unsave")+"' class='tabpinned' onclick='FcltMgr.saveTab(this);'>&nbsp;<img src='../Pictures/pin.png'></span>";
var html = "<span title='"+L("lcl_current_tab_unsave")+"' class='tabpinned' onclick='FcltMgr.saveTab(this);'>&nbsp;<i class='fa fa-thumb-tack'></i></span>";
$(data.tab).find("span:first").text(ttl);
$(data.tab).find(".tabclose").before($(html));
}
@@ -364,7 +365,7 @@ var FcltMgr =
if (telang)
titel += "&hellip;";
var tpl = "<li openerId='" + openerId + "'><a href='#" + theId + "'><span ttl='" +org_titel+ "'>" +titel + "</span>"
+ (params.showpin?"<span title='"+L("lcl_current_tab_unsave")+"' class='tabpinned' onclick='FcltMgr.saveTab(this)'>&nbsp;<img src='../Pictures/pin.png'></span>":"")
+ (params.showpin?"<span title='"+L("lcl_current_tab_unsave")+"' class='tabpinned' onclick='FcltMgr.saveTab(this)'>&nbsp;<i class='fa fa-thumb-tack'></i></span>":"")
+ (params.noclose?"":"<span class='tabclose' onclick='FcltMgr._pageManager._closeTab(this)'>&nbsp;X</span>")
+ "</a></li>"
@@ -928,7 +929,7 @@ var FcltMgr =
elm_iframe.contentWindow.setTimeout(function () {
var $body = $("body", elm_iframe.contentDocument);
$body.prepend("<div class='busyloading'><i class='fa fa-spinner fa-pulse fa-3x fa-fw'></i></div>");
}, 500);
}, 1000);
});
// Als resultlist te breed is moet er wel een scrollbar onderin komen.

7
APPL/MLD/mld_edit_melding.asp
View File

@@ -1089,7 +1089,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
BLOCK_START("mldOmschrijving",
L("lcl_txt") + (lBestaandeMelding && (this_mld.canBOwrite || this_mld.canFOwrite)
? '<img class="details" id="goegel" title="' + L("lcl_mld_similarcalls") + '" ' + _imgsrcstr + ' onclick="' + _imgonclickstr + '">'
? '<span class="fa fa-lightbulb-o details" id="goegel" title="' + L("lcl_mld_similarcalls") + '" onclick="' + _imgonclickstr + '"></span>'
: ''),
true,
(mld_melding.freetext == 0 && mld_melding.subject == 0)); // Geen omschrijving indien mld_stdmelding_freetext == 0 en mld_stdmelding_subject == 0
@@ -1124,11 +1124,10 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
var authFaq = (S("faq_enabled")==1) && user.checkAutorisation("WEB_FAQFOF", true);
if (authFaq && authFaq.PRSwritelevel<9) // schrijfrechten op WEB_FAQFOF nodig
{
var _imgsrcstr2 = 'src="../Pictures/book_open.png" ';
var _imgonclickstr2 = "FcltMgr.openDetail('/appl/fac/fac_faq_search.asp?urole="+urole+"&autosearch=1&s='+escape($('#melding_omschrijving').val())"
+ ", '" + L("lcl_faq_kennisbank") + "') ";
var _imgstr2 = '<img class="details" id="goegel" title="' + L("lcl_fac_filterblok") + '" ' + _imgsrcstr2
+ ' onclick="' + _imgonclickstr2 + '">'
var _imgstr2 = '<span class="fa fa-book details" id="goegel" title="' + L("lcl_fac_filterblok") + '" '
+ ' onclick="' + _imgonclickstr2 + '"></span>'
+ " <a class='details' onClick='PasteFromClipboard()'>[" + L("lcl_mld_paste") +"]</a>" ;
}
else

3
APPL/MLD/mld_show_melding.asp
View File

@@ -516,12 +516,11 @@ function parentButton()
gen_flex(); // dan hier....
//21-2-2016 11:18:10/PF voor Logcentre-toepassing is mld_onderwerp wel een dingetje; zo heeft het iig geen nut.
var _imgsrcstr = 'src="../Pictures/lightbulb.png" ';
var _imgonclickstr = "FcltMgr.openDetail('/appl/mld/mld_search.asp?urole=" + urole + "&chkSelf=1&chkBusy=1&autosearch=1&gebouw_key=" + mld_melding.bld_key + "&locatie_key=" + mld_melding.loc_key + "&stdm_str=" + mld_melding.stdm + "', '"
+ L("lcl_mld_similarcalls") + "') ";
BLOCK_START("mldOmschrijving",
L("lcl_txt") + ((backo || fronto)
? '<img class="details" id="goegel" title="' + L("lcl_mld_similarcalls") + '" '+ _imgsrcstr + 'onclick="' + _imgonclickstr + '">'
? '<span class="fa fa-lightbulb-o details" id="goegel" title="' + L("lcl_mld_similarcalls") + '" onclick="' + _imgonclickstr + '"></span>'
:''
),
true,

4
APPL/MLD/mld_show_note.asp
View File

@@ -88,7 +88,7 @@ var tracking = getQParamInt("tracking", 1) == 1; // tracking erbij tonen? Onderd
{
var html = "";
if (oRs("mld_melding_note_flag").Value == 1)
html = "<span class='femark' title='" + safe.htmlattr(L("lcl_mld_zichtbaar_FE")) + "'><img src='../pictures/unlocked.png'></span>";
html = "<span class='femark' title='" + safe.htmlattr(L("lcl_mld_zichtbaar_FE")) + "'><i class='fa fa-unlock'></i></span>";
return html;
}
@@ -246,7 +246,7 @@ var tracking = getQParamInt("tracking", 1) == 1; // tracking erbij tonen? Onderd
rst.addColumn(new Column({caption: L("lcl_date"), content: "mld_melding_note_aanmaak", datatype:"date", prettydate: true, nowrap: true}));
rst.addColumn(new Column({caption: L("lcl_time"), content: "mld_melding_note_aanmaak", datatype:"time"}));
if (mld_key > 0 && !mfe.haveOnlyFErights)
rst.addColumn(new Column({caption: "<img src='../pictures/locked.png'>", title: L("lcl_mld_zichtbaar_FE"), content: fnZichtbaar}));
rst.addColumn(new Column({caption: "<i class='fa fa-lock'></i>", title: L("lcl_mld_zichtbaar_FE"), content: fnZichtbaar}));
rst.addColumn(new Column({caption: L("lcl_mld_changedby"), content: fnPerslidNaamFull}));
if (mld_key == -1) {
rst.addColumn(new Column({caption: L("lcl_mld_number"), content: "mld_melding_key"}));

BIN
APPL/Pictures/mldflag0.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
APPL/Pictures/mldflag1.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 441 B

BIN
APPL/Pictures/mldflag2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 451 B

BIN
APPL/Pictures/mldflag3.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 432 B

BIN
APPL/Pictures/mldflag4.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 493 B

BIN
APPL/Pictures/mldflag5.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 495 B

BIN
APPL/Pictures/mldflag6.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 462 B

BIN
APPL/Pictures/mldflag7.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 572 B

BIN
APPL/Pictures/mldflag8.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 494 B

BIN
APPL/Pictures/mldflag9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 577 B

8
APPL/RES/res.inc
View File

@@ -1123,20 +1123,20 @@ res = {
{
txtnp = "<span title='" + L("lcl_res_plan_tt_meer_eerder")
+ "' class='details' id='resplanmoreprev' onclick='" + fnStep + "(-1, 0)'>"
+ L("lcl_res_plan_meer_eerder")
+ I("fa-plus-circle")
+ "</span> "
+ txtnp;
txtnp = "<span title='" + L("lcl_res_plan_tt_eerder")
+ "' class='details' id='resplanprev' onclick='" + fnStep
+ "(-1, -1)'>"
+ L("lcl_res_plan_eerder")
+ I("fa-arrow-left")
+ "</span> "
+ txtnp;
}
if (fnStep && dagen==nr_days) // laatste dag
{
txtnp = txtnp + " <span title='"+L("lcl_res_plan_tt_meer_later")+"' class='details' id='resplanmorenext' onclick='"+fnStep+"(0, +1)'>"+L("lcl_res_plan_meer_later")+"</span>";
txtnp = txtnp + " <span title='"+L("lcl_res_plan_tt_later")+"' class='details' id='resplannext' onclick='"+fnStep+"(+1, +1)'>"+L("lcl_res_plan_later")+"</span>";
txtnp = txtnp + " <span title='"+L("lcl_res_plan_tt_meer_later")+"' class='details' id='resplanmorenext' onclick='"+fnStep+"(0, +1)'>"+I("fa-plus-circle")+"</span>";
txtnp = txtnp + " <span title='"+L("lcl_res_plan_tt_later")+"' class='details' id='resplannext' onclick='"+fnStep+"(+1, +1)'>"+I("fa-arrow-right")+"</span>";
}
if (hour_px < 16 && dttxt) // alleen nog datum op losse regel

23
APPL/Shared/Suggest/suggest.css
View File

@@ -5,11 +5,6 @@
/* suggestbox styles */
.suggest {
background-image:url(suggest.png) ;
background-repeat:no-repeat;
background-position:206px;
}
input.suggestReadOnly { width:218px; background-color:#AECB27; }
input.suggestBad { background-color:#FFFFFF; color : #FF0000; }
@@ -43,4 +38,22 @@ img.suggestfoto, div.suggestfoto {
div.suggestfoto {
width: 40px;
}
i.suggestklikker {
font-size: 1.5em;
position: relative;
z-index: 1;
left: -16px;
top: 1px;
color: #7B7B7B;
cursor: pointer;
width: 0;
}
i.suggestbusy {
font-size: 1.5em;
display:none;
position:absolute;
z-index:999
}

47
APPL/Shared/Suggest/suggest.js
View File

@@ -25,8 +25,13 @@
*/
var $suggestbusy;
var suggesttimer;
function Suggest(inParams)
{
// Genereer een enkel stukje busy-html die voor alle suggests in deze pagina hergebruiken
if (!$suggestbusy)
$suggestbusy = $("<i class='fa fa-gear fa-spin suggestbusy'></i>").appendTo($("body"));
var params = inParams;
var storeKeyField; // = inStoreKeyField; // use function withKeyField() to assign field
@@ -101,6 +106,9 @@ function Suggest(inParams)
}
*/
}
var $klikker = $("<i class='fa fa-angle-down fa-fw suggestklikker'></i>");
$(params.queryField).after($klikker);
params.queryField.setAttribute("sgKey", params.initKey);
// IE6 en IE7 hebben functie hasAttribute niet
if (!params.queryField.hasAttribute)
@@ -193,6 +201,8 @@ function Suggest(inParams)
(document.activeElement == params.queryField ||
thisdoc.activeElement == _completeDiv ||
document.activeElement == _comboDiv ||
document.activeElement == $suggestbusy[0] ||
document.activeElement == $klikker[0] ||
$("body").hasClass("modal") || // Zou anders in IE9 sluiten bij klikken op scrollbar
thisdoc.activeElement.parentElement == _completeDiv))
return;
@@ -219,32 +229,28 @@ function Suggest(inParams)
timerID = setTimeout(params.objectName + '.requestLoop(-1);', THROTTLE_PERIOD);
});
params.queryField.onclick = function (evt)
$klikker.click(function (e)
{
if (!isReadOnly())
{
// Als je op vergrootglas hebt gedrukt moet checkExist altijd false zijn want je wilt een lijst.
// Anders krijg je ook het verschijnsel dat je 2 keer moet klikken voordat je de lijst krijgt.
params.queryField.removeAttribute("checkExist");
evt = evt||window.event;
var offX = evt.offsetX || evt.layerX; // layerX is FireFox
if (params.queryField.clientWidth-offX<20) // op de 'combodiv' geklikt
$(params.queryField).focus(); // zodat anderen door onblur verbergen
if (!isAutocompleteDivVisible())
{
if (!isAutocompleteDivVisible())
{
autoOpen();
}
else
{
setValue(params.queryField.getAttribute("sgKey"),
params.queryField.getAttribute("sgCurrentValue"), false, false,
autoOpen();
}
else
{
setValue(params.queryField.getAttribute("sgKey"),
params.queryField.getAttribute("sgCurrentValue"), false, false,
params.queryField.getAttribute("sgExtraParam"));
hideAutocompleteDiv();
}
return;
}
return;
}
};
});
params.queryField.onmousemove = function (evt)
{
if (!isReadOnly())
@@ -494,7 +500,11 @@ function Suggest(inParams)
function doRequest(keyword, bAll)
{
setClass("suggestBusy");
var pos = $(params.queryField).next().position();
$suggestbusy.css("top", pos.top);
$suggestbusy.css("left", pos.left);
window.suggesttimer = setTimeout(function () { $suggestbusy.show(); }, 500);
sendQuery(keyword, bAll);
latestServerQuery = keyword;
}
@@ -542,7 +552,7 @@ function Suggest(inParams)
doRequest(query().toLowerCase(), false);
}
if (keyword == '' || params.queryField.value == params.queryField.defaultValue)
if (params.queryField.value == '' || params.queryField.value == params.queryField.defaultValue)
{
hideAutocompleteDiv();
suggestionValues = [];
@@ -607,6 +617,9 @@ function Suggest(inParams)
// Callback functie van HTTP Request
function process(data, textStatus)
{
clearTimeout(window.suggesttimer);
$suggestbusy.hide();
var checkExist = params.queryField.hasAttribute("checkExist");
var doonChange = params.queryField.getAttribute("doonChange");

6
APPL/Shared/calendar.inc
View File

@@ -48,7 +48,8 @@ function _initVrijedagen()
altFormat: "@",
buttonImage: "<%=rooturl%>/appl/pictures/calendar.png",
buttonImageOnly: true,
showOn: "<%=device.test(device.isMobile)?"focus":S("cal_showOn")%>",
//showOn: "<%=device.test(device.isMobile)?"focus":S("cal_showOn")%>",
showOn: "none",
dateFormat: 'D dd-mm-yy',
changeYear: true,
changeMonth: true,
@@ -162,6 +163,9 @@ function _FCLTcalendar (fieldID, params)
%>
<input class="flddate<%=!params.readonly&&params.required?" required":""%><%=params.addClass? " " + params.addClass : ""%>" type="<%=params.hidden?"hidden":"text"%>" <%=readotag%> <%=hiddentag%> id="show_<%=fieldID%>" value="<%=iniDate%>" nofollow="<%=params.nofollow? 1 : 0%>">
<% if (!params.hidden) { %>
<i class='fa fa-calendar fa-fw dateklikker' onclick='$("#show_<%=fieldID%>").datepicker("show")'></i>
<% } %>
<%
if (params.timeField)
{ %>

57
APPL/Shared/default.csx
View File

@@ -514,7 +514,7 @@ span.ia2 { /*inline action v2 */
background-color: ==inlineactionbackgroundcolor==;
border-radius: 2px;
box-shadow: 1px 2px 2px #333;
text-transform: uppercase;
/* text-transform: uppercase; */
}
span.ia2:hover {
@@ -1155,6 +1155,9 @@ div#buttons.dialog a {
div#buttons.dialog img {
margin-right: 20px;
}
div.buttoncontainer {
margin-right:-5px;
}
.dialogtext {
display: inline;
@@ -1256,7 +1259,7 @@ img.profile {
width: 220px;
}
img.details, span.details, tr.details, div.ref {
img.details, span.details, tr.details, i.details div.ref {
border: 0;
cursor: pointer;
margin: 0;
@@ -2591,8 +2594,20 @@ select.fldimport_app_key, .fldfinomsch, .flduitvExist
}
.flddate, .fldtime, .fldfinbtw, .fldprocent {
width: 90px;
width: 102px;
}
i.dateklikker {
font-size: 1.2em;
position: relative;
z-index: 1;
left: -17px;
top: 0px;
color: #666;
cursor: pointer;
width: 0;
}
.fldtime {
cursor: pointer;
}
@@ -2902,7 +2917,8 @@ body#mod_resmulti div#show_date_from { height: 250px }
#mod_signature { height: 320px; }
#mod_grprecht { min-width: 550px; }
#mod_algmultiedit{ min-width: 500px; }
#bes_add_fav { min-width: 500px; }
#mod_favorites { min-width: 500px; }
div#mldsimilar {
padding: 4px 4px 4px 10px;
}
@@ -2944,6 +2960,9 @@ div#menutabs{
top: 82px;
border: 0px;
}
div.ui-tabs-submenu{
position: absolute;
}
div#menudivider{
position: absolute;
@@ -2955,9 +2974,6 @@ div#menudivider{
cursor: pointer;
background-color: ==dividercolor==;
}
div#menudivider.dividerclosed{
width: 0px;
}
div#maintabs{
position: absolute;
@@ -3042,10 +3058,20 @@ div#menutabs li.ui-state-active {
margin: 0px;
}
.ui-tabs-submenu ul {
padding: 0px;
margin: 0px;
}
/*div#PersFAC ul li {*/
#menutabs .ui-layout-content ul li {
list-style: none;
}
#menutabs .ui-tabs-submenu ul li {
list-style: none;
}
div#PersFAC ul li {
color: ==persmenucolor==;
background-color: ==persmenubackgroundcolor==;
@@ -3173,6 +3199,23 @@ li.mi:hover span.menupinned
text-decoration: none;
}
#menutabs .ui-tabs-submenu ul {
border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd;
border-left: 1px solid #ddd;
}
#menutabs .ui-tabs-submenu ul li {
font-weight: normal;
color: ==menuitemcolor==;
background-color: ==menuitembackgroundcolor==;
list-style: none;
border-top: 1px solid #ddd;
padding: 0px 3px 1px 3px;
text-decoration: none;
white-space: nowrap;
}
li.mi:hover {
background-color:==menuitemhovercolor==!important;
cursor: pointer;

21
APPL/Shared/header.inc
View File

@@ -182,7 +182,6 @@ FCLTHeader =
%> <meta http-equiv="Content-Type" content="text/html;charset=<%=Response.Charset%>">
<%=S("http_meta_head")%>
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
<link rel="stylesheet" href="<%=rooturl%>/appl/img/css/font-awesome.min.css">
<%
// FSN#14103 Voorkom back-button problemen
// user_lang en rooturl resp. voor date.js en FcltMgr.js
@@ -224,6 +223,7 @@ FCLTHeader =
var theme = // S("cssfordesktop") ||
"/appl/Localscripts/theme/" + _jqueryuiver_css + ".min.css";
FCLTHeader.AddStylesheet(rooturl + theme);
FCLTHeader.AddStylesheet(rooturl + "/appl/img/css/font-awesome.min.css");
for (var i = 0; i < FCLTHeader._params.css.length; i++)
{
@@ -243,7 +243,7 @@ FCLTHeader =
if (agent.indexOf("MSIE") > 0)
{
Response.Write("\n<!--[if lte IE 8]>");
FCLTHeader.AddStylesheet(rooturl+"/appl/shared/ie-fix.css"); // Alleen IE9 en ouder
FCLTHeader.AddStylesheet(rooturl+"/appl/shared/ie-fix.css"); // Alleen IE8 en ouder
Response.Write("\n<![endif]-->");
}
@@ -316,6 +316,23 @@ FCLTHeader =
});
</script><%
}
// IE8 heeft moeite met de :before van font-awesome bij gecachte pagina's
// Dit lijkt te helpen
// http://stackoverflow.com/a/10209030/569090
if (agent.indexOf("MSIE") > 0)
{ %>
<!--[if lte IE 8]>
<script type="text/javascript">
if (window.$)
$(function () {
var sheets = document.styleSheets;
for(var s = 0, slen = sheets.length; s < slen; s++) {
sheets[s].href = sheets[s].href;
}
});
</script>
<![endif]-->
<% }
},
defaultTemplate : // De defaults