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

FSN#38526 BLOCK_START ook netjes buttons ondersteunen

Browse Source 
svn path=/Website/trunk/; revision=31633
This commit is contained in:
Jos Groot Lipman
2016-11-23 09:42:54 +00:00
parent b2474cb492
commit 06fdf8b4f5
5 changed files with 43 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
APPL/MLD/mld_close_confirm.asp
View File

@@ -203,21 +203,19 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
// Mag ik kennisbank raadplegen en standaard-antwoorden knippen/plakken
var authFaq = (S("faq_enabled") == 1) && user.checkAutorisation("WEB_FAQFOF", true);
var buttons = [];
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=bo&autosearch=1'"
var goegel = "FcltMgr.openDetail('/appl/fac/fac_faq_search.asp?urole=bo&autosearch=1'"
+ "+'&stdm_str='+'" + stdmld_arr.join(",") + "'"
+ "+'&disc_key_str='+'" + disc_arr.join(",") + "'"
+ ", '" + L("lcl_faq_kennisbank") + "') ";
var _imgstr2 = '<img class="details" id="goegel" title="' + L("lcl_fac_filterblok") + '" ' + _imgsrcstr2
+ ' onclick="' + _imgonclickstr2 + '">'
+ " <a class='details' onClick='PasteFromClipboard()'>[" + L("lcl_mld_paste") +"]</a>" ;
buttons.push({ icon: "book_open.png", title: L("lcl_mld_paste"), action: 'PasteFromClipboard()'});
buttons.push({ icon: "lightbulb.png", title: L("lcl_fac_filterblok"), action: goegel});
}
else
var _imgstr2 = '';
BLOCK_START("mldClose", txt + L("lcl_mld_finish_close") + (ingesloten.length == 1? " " + prefix + ingesloten[0]: "") + _imgstr2);
BLOCK_START("mldClose", txt + L("lcl_mld_finish_close") + (ingesloten.length == 1? " " + prefix + ingesloten[0]: ""),
{ buttons: buttons });
var sql_from_t = " FROM mld_afmeldtekst"
+ " WHERE ((mld_stdmelding_key IN (" + stdmld_arr.join(",") + ") )"
+ " OR (mld_stdmelding_key IS NULL AND mld_ins_discipline_key IN (" + disc_arr.join(",") + ") )"

31
APPL/MLD/mld_edit_melding.asp
View File

@@ -1029,7 +1029,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
// hier komen vaste aanwijzingen
BLOCK_END();
BLOCK_START("mldRef", L("lcl_reference"), false, !stdm_info.kanverwijzen); %>
BLOCK_START("mldRef", L("lcl_reference"), { hidden: !stdm_info.kanverwijzen}); %>
<input type="hidden" name="kto_type" value="<%=mld_melding.kto_type%>">
<input type="hidden" name="kto_key" value="<%=mld_melding.kto_key%>">
<input type="hidden" name="filtercode" id="filtercode" value=<%=((stdm_info.kanverwijzen==128)?"M" :"O")%>>
@@ -1063,7 +1063,7 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
oRs.close();
}
// Als de objecte knop aanwezig is of er zijn geselecteerde objecten te tonen dan objectenblok tonen.
// Als de objecten knop aanwezig is of er zijn geselecteerde objecten te tonen dan objectenblok tonen.
var objparams = {ins_key: ins_key,
canChange: this_mld.canPlaatsChange,
verplicht: mld_melding.srtinst_verplicht,
@@ -1082,16 +1082,16 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
if (S("mld_flexcolumns") == 2)
gen_flex(2); // dan hier....
var _imgsrcstr = 'src="../Pictures/lightbulb.png" ';
var _imgonclickstr = "FcltMgr.openDetail('appl/mld/mld_search.asp?urole=" + urole + "&chkSelf=1&chkBusy=1&autosearch=1&opl=1&searchtekst='" + "+escape($('#melding_omschrijving').val())+" + "'&locatie_key='" + "+($('#locatiekey').val()||-1)+" + "'&disc=-1', '"
+ L("lcl_mld_similarcalls")
+ "') ";
var buttons = [];
var goegel = "FcltMgr.openDetail('appl/mld/mld_search.asp?urole=" + urole + "&chkSelf=1&chkBusy=1&autosearch=1&opl=1&searchtekst='" + "+escape($('#melding_omschrijving').val())+" + "'&locatie_key='" + "+($('#locatiekey').val()||-1)+" + "'&disc=-1', '"
+ L("lcl_mld_similarcalls") + "') ";
if (lBestaandeMelding && (this_mld.canBOwrite || this_mld.canFOwrite))
buttons.push({ icon: "lightbulb.png", title: L("lcl_mld_similarcalls"), action: goegel});
BLOCK_START("mldOmschrijving",
L("lcl_txt") + (lBestaandeMelding && (this_mld.canBOwrite || this_mld.canFOwrite)
? '<span class="fa fa-lightbulb-o details" id="goegel" title="' + L("lcl_mld_similarcalls") + '" onclick="' + _imgonclickstr + '"></span>'
: ''),
{ hidden: (mld_melding.freetext == 0 && mld_melding.subject == 0) }); // Geen omschrijving indien mld_stdmelding_freetext == 0 en mld_stdmelding_subject == 0
L("lcl_txt"),
{ buttons: buttons,
hidden: (mld_melding.freetext == 0 && mld_melding.subject == 0) }); // Geen omschrijving indien mld_stdmelding_freetext == 0 en mld_stdmelding_subject == 0
// Short subject
if (mld_melding.subject != 0)
{
@@ -1121,18 +1121,15 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
{
// Mag ik kennisbank raadplegen en standaard-antwoorden knippen/plakken
var authFaq = (S("faq_enabled")==1) && user.checkAutorisation("WEB_FAQFOF", true);
var buttons = [];
if (authFaq && authFaq.PRSwritelevel<9) // schrijfrechten op WEB_FAQFOF nodig
{
var _imgonclickstr2 = "FcltMgr.openDetail('/appl/fac/fac_faq_search.asp?urole="+urole+"&autosearch=1&s='+escape($('#melding_omschrijving').val())"
var paste = "FcltMgr.openDetail('/appl/fac/fac_faq_search.asp?urole="+urole+"&autosearch=1&s='+escape($('#melding_omschrijving').val())"
+ ", '" + L("lcl_faq_kennisbank") + "') ";
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>" ;
buttons.push({ icon: "book_open.png", title: L("lcl_mld_paste"), action: paste});
}
else
var _imgstr2 = '';
BLOCK_START("mldBehandel", L("lcl_behandelgegevens") + _imgstr2);
BLOCK_START("mldBehandel", L("lcl_behandelgegevens"), { buttons: buttons });
RWTEXTAREATR("remark",
"fldtxt",

14
APPL/MLD/mld_show_melding.asp
View File

@@ -516,14 +516,16 @@ 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 _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 + "', '"
var goegel = "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") + "') ";
var buttons = [];
if (backo || fronto)
buttons.push({ icon: "lightbulb.png", title: L("lcl_mld_similarcalls"), action: goegel});
BLOCK_START("mldOmschrijving",
L("lcl_txt") + ((backo || fronto)
? '<span class="fa fa-lightbulb-o details" id="goegel" title="' + L("lcl_mld_similarcalls") + '" onclick="' + _imgonclickstr + '"></span>'
:''
),
{ hidden: mld_melding.freetext == 0 }); // Geen omschrijving indien mld_stdmelding_freetext == 0
L("lcl_txt"),
{ buttons: buttons,
hidden: mld_melding.freetext == 0 }); // Geen omschrijving indien mld_stdmelding_freetext == 0
ROTEXTAREATR("fldtxt", "", mld_melding.mld_omschr, {id: "txt", suppressEmpty: true, mldlink: true });
BLOCK_END();

9
APPL/MLD/mld_show_note2.asp
View File

@@ -185,15 +185,16 @@ var timestamp_notes = new Date();
return html;
}
var refresher = '<img class="details blockrefresh" id="refresh" src="../Pictures/page_refresh.png" title="' + L("lcl_refresh") + '" onclick="FcltMgr.reload()">';
var buttons = [];
buttons.push({ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()"});
if (urole=="fo" || urole=="bo")
refresher += '<img class="details blockrefresh" id="printen" src="../Pictures/print.png" title="' + L("lcl_print_table") + '" onclick="doPrint()">';
buttons.push({ icon: "print.png", title: L("lcl_print"), action: 'doPrint()' });
if (kenmerk_key != -1)
refresher += '<img class="details blockrefresh" id="upload" src="../Pictures/attach.png" title="' + L("lcl_appendixes") + '" onclick="Upload()">';
buttons.push({ icon: "attach.png", title: L("lcl_appendixes"), action: 'Upload()' });
BLOCK_START("mldHistorie", (tracking?L("lcl_mld_behandeling"):L("lcl_mld_frame_notes")) + refresher);
BLOCK_START("mldHistorie", (tracking?L("lcl_mld_behandeling"):L("lcl_mld_frame_notes")), { buttons: buttons });
sql = "SELECT n.mld_melding_note_aanmaak"
+ ", n.mld_melding_note_key"

11
APPL/Shared/iface.inc
View File

@@ -120,7 +120,16 @@ function BLOCK_START(id, title, params) {
__blockactive__ = true;
%><!-- BLOCK_START <%=id%> -->
<div id="<%=id%>" class="fcltblock" <%=params.hidden? ' style="display:none"' : ''%>>
<div class="fcltblockhead"><%=title%></div>
<div class="fcltblockhead"><%=title%>
<%
if (params.buttons && params.buttons.length)
{
%><div class="blockbuttoncontainer" style="float:right;"><%
CreateButtons(params.buttons, { showIcons: true} );
%></div><%
}
%>
</div>
<div class="inside" id="<%=id%>List">
<table class="fcltblocktab" width="100%"><%
}