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

FCLT#64018 initHeight's weggehaald, frame-titles toegevoegd tbv missende lcl's (anders gaat die via het id), wat classes, en ongesloten recordsets aangepast, en nog wat andere kleine dingen

Browse Source 
svn path=/Website/trunk/; revision=51859
This commit is contained in:
Koen Reefman
2021-06-10 14:43:36 +00:00
parent 7a8edc8a3c
commit 7aea07a4e7
25 changed files with 47 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/ALG/alg_ruimtefunctie.asp
View File

@@ -60,9 +60,7 @@ FCLTHeader.Requires({plugins:["suggest","jQuery"], js: ["jQuery-ui.js"]})
//else
// var page="alg_show_ruimtefunctie.asp?srtruimte_lg_key=" + srtruimte_lg_key ;
IFRAMER("algrfFrame", page, { title: L("lcl_prs_dienst_frame"),
initHeight: "450px",
FcltClose: "algClose" } );
IFRAMER("algrfFrame", page, { FcltClose: "algClose", title: L("lcl_prs_dienst_frame")} );
%>
<% MODAL_END(); %>
</body>

4
APPL/BES/bes_bestelling.asp
View File

@@ -222,9 +222,7 @@ transitParam = buildTransitParam(["punch", "voorraad", "mld_key", "artikel_key",
}
if (page != "")
{
IFRAMER("besFrame", page, { title: L("lcl_bes_frame_algemeen"),
initHeight: "450px",
FcltClose: "besClose" } );
IFRAMER("besFrame", page, { FcltClose: "besClose", title: L("lcl_bes_frame_algemeen")} );
}
if (bes_key > -1)
{

2
APPL/BES/bes_opdr.asp
View File

@@ -87,7 +87,7 @@ oRs.Close();
if (finbof && !oRs.eof)
{
page="../fin/fin_list.asp?embedded=1&bes_key=" + opdr_key;
IFRAMER("finfactuur", page, { refreshOnClose: true } );
IFRAMER("finfactuur", page, { refreshOnClose: true, title: L("lcl_fin_invoices_frame")} );
}
verkoopfactuur_IFRAMER('bestelopdr', opdr_key);

4
APPL/BES/bes_srtprod.asp
View File

@@ -62,12 +62,12 @@
else
var page="bes_show_srtprod.asp?srtprod_key="+srtprod_key;
IFRAMER("besFrame", page, { FcltClose: "besClose" } );
IFRAMER("besFrame", page, { FcltClose: "besClose", title: L("lcl_bes_srtprod_frame") } );
if (srtprod_key > -1)
{
page = "bes_srtprod_prijs_list.asp?embedded=1&srtprod_key=" + srtprod_key;
IFRAMER("besPrijsFrame", page, { refreshOnClose: true } );
IFRAMER("besPrijsFrame", page, { refreshOnClose: true, title: L("lcl_bes_prijsverloop") } );
}
%>
<% PAGE_END(); %>

2
APPL/BES/bes_srtprod_search.asp
View File

@@ -43,7 +43,7 @@ var disc_key = getQParamInt("disc_key", -1); // Discipline
SEARCH_BLOCK_START();%>
<tr class="primsearch">
<td class="label"><label for="searchtext"><%=L("lcl_bes_srtprod")%></label></td>
<td><input type="text" class="fldsrch" name="searchtext" id="searchtext"></td>
<td><input type="text" class="fldshort" name="searchtext" id="searchtext"></td>
</tr>
<%
FCLTbedrijfselector("lev_key", // supplier

2
APPL/FAC/fac_bookmark.asp
View File

@@ -63,7 +63,7 @@ var bkm_title = "";
var page="fac_show_bookmark.asp";
page += "?bkm_id=" + bkm_id;
IFRAMER("bkmFrame", page, { FcltClose: "bkmClose" } );
IFRAMER("bkmFrame", page, { FcltClose: "bkmClose", title: L("lcl_fac_bookmark")} );
PAGE_END();%>
</body>
</html>

4
APPL/FAC/fac_faq.asp
View File

@@ -94,13 +94,13 @@ PAGE_START();
if (faq_key == -1)
{
var page="fac_edit_faq.asp"; // Maak een nieuw
IFRAMER("facFrame", page, { FcltClose: "facClose" } );
IFRAMER("facFrame", page, { FcltClose: "facClose", icon: "fa-bookmark", title: L("lcl_faq_item") } );
}
else
{
var page="fac_show_faq.asp";
page += "?faq_key=" + faq_key;
IFRAMER("facFrame", page, { FcltClose: "facClose", icon: "fa-bookmark", title:L("lcl_faq_item") } );
IFRAMER("facFrame", page, { FcltClose: "facClose", icon: "fa-bookmark", title: L("lcl_faq_item") } );
if (isProf || (haveOnlyFErights && hasAnyFaqStdm))
{

4
APPL/FAC/fac_menu.asp
View File

@@ -69,9 +69,7 @@ else
var page="fac_show_menu.asp";
page += "?menu_key="+menu_key+"&menuitem_key="+menuitem_key;
IFRAMER("menuFrame", page, { title: L("lcl_fac_menuoptie"),
initHeight: "450px",
FcltClose: "facClose" } );
IFRAMER("menuFrame", page, { FcltClose: "facClose", title: L("lcl_fac_menuoptie") });
PAGE_END();%>
</body>
</html>

5
APPL/FAC/job.asp
View File

@@ -127,7 +127,7 @@ if (!(MLDFOF_read || MLDFOF_write || BESFOF_read || BESFOF_write || MLDBOF_read
{
var params = { title: "<%=L("lcl_job_frame_algemeen")%>",
modal: true,
width: 180,
width: "auto",
resizable: false,
close: dialogClose,
create: FcltMgr.fnCreateCloseButton("div#dmodal")
@@ -150,8 +150,7 @@ if (!(MLDFOF_read || MLDFOF_write || BESFOF_read || BESFOF_write || MLDBOF_read
}
// 1. Het hoofdframe
page += "?job_key="+job_key;
IFRAMER("jobFrame", page, { initHeight: "450px",
FcltClose: "jobClose" } );
IFRAMER("jobFrame", page, { FcltClose: "jobClose", title: L("lcl_job_frame")} );
%>
</body>
</html>

2
APPL/FAC/job_search.asp
View File

@@ -50,7 +50,7 @@ if (!(MLDFOF_read || MLDFOF_write || BESFOF_read || BESFOF_write || MLDBOF_read
SEARCH_BLOCK_START();%>
<tr>
<td class="label"><label for="act_key"><%=L("lcl_job_nr")%></label></td>
<td><input type="text" class="fldnum" id="act_key" name="act_key" value=""></td>
<td><input type="text" class="fldshort" id="act_key" name="act_key" value=""></td>
</tr>
<%
FCLTpersoonselector("prs_prskey",

6
APPL/MLD/opdr_show_uren.asp
View File

@@ -42,6 +42,7 @@ if (opdr_uren_key > 0)
aday = new Date(oRs("mld_opdr_uren_datum").value);
medewerker_key = oRs("prs_perslid_key").value;
oRs.Close();
}
else
@@ -67,10 +68,7 @@ endofweek.setDate(startofweek.getDate() + 6);
<body class="showmode">
<%
var buttons = [ {title: L("lcl_submit"), icon: "fa-fclt-save", action:"mld_submit()"},
{title: L("lcl_cancel"), icon: "fa-fclt-cancel", action:"mld_cancel()"}
];
IFRAMER_HEADER("Weekbrief", buttons);
IFRAMER_HEADER("Weekbrief");
%>
<% SUBFRAME_START(); %>

7
APPL/MLD/opdr_uren.asp
View File

@@ -57,16 +57,13 @@ var authparams = user.checkAutorisation(autfunction); //Wat weet ik dan nou va
else
var page="opdr_show_uren.asp";
page += "?urole=" + urole + "&opdr_uren_key=" + opdr_uren_key;
IFRAMER("urenFrame", page, { title: L("lcl_opdr_frame_algemeen"),
initHeight: "450px",
FcltClose: "urenClose"
});
IFRAMER("urenFrame", page, { FcltClose: "urenClose", title: L("lcl_opdr_frame_algemeen") });
if ( opdr_uren_key > -1 )
{ // 2. De feitelijke urenbesteding
// betere parameters zijn wellicht van/tot/perslid
page="opdr_uren_info.asp?opdr_uren_key=" + opdr_uren_key;
IFRAMER("mwuren", page, { refreshOnClose: true } );
IFRAMER("mwuren", page, { refreshOnClose: true, title: L("lcl_mlduren_booked") } );
}
PAGE_END();
%>

3
APPL/MLD/opdr_uren_info.asp
View File

@@ -31,6 +31,7 @@ var opdr_uren_key = getQParamInt("opdr_uren_key");
var aday = new Date(oRs("mld_opdr_uren_datum").value);
var medewerker_key = oRs("prs_perslid_key").value;
var uren_status = oRs("mld_opdr_uren_status").value;
oRs.Close();
var startofweek = new Date(aday);
startofweek.setDate(startofweek.getDate() - aday.getDay() + 1);
@@ -59,7 +60,7 @@ function fnOpdrachtNr(oRs) {
var buttons = [];
if (uren_status == 2) // statusafhankelijk
if (false && uren_status == 2) // statusafhankelijk
{
var addurl = "appl/mld/XX";
buttons.push({ icon: "fa-plus", title: L("lcl_add"), action: "FcltMgr.openDetail('" + addurl + "', '" + L("lcl_add") + "')" });

5
APPL/MRK/mrk_bericht.asp
View File

@@ -78,10 +78,7 @@ if (mrk_key > 0)
page += "?mrk_key=" + mrk_key
+ "&urole=" + urole
+ "&embedded=1";
IFRAMER("mrkFrame", page, { title: L("lcl_mrk_frame_algemeen"),
initHeight: "450px",
FcltClose: "mrkClose"
});
IFRAMER("mrkFrame", page, { FcltClose: "mrkClose", title: L("lcl_mrk_frame_algemeen") });
PAGE_END();
%>
</body>

5
APPL/MSG/fac_nieuws.asp
View File

@@ -66,10 +66,7 @@ var urole = getQParamSafe("urole", ""); // Indien niet meegegeven, veronderste
var page="fac_show_nieuws.asp";
page += "?nieuws_key=" + nieuws_key
+ "&urole=" + urole;
IFRAMER("msgFrame", page, { title: L("lcl_mrk_frame_algemeen"),
initHeight: "450px",
FcltClose: "msgClose"
});
IFRAMER("msgFrame", page, { FcltClose: "msgClose", title: L("lcl_mrk_frame_algemeen") });
PAGE_END();
%>
</body>

5
APPL/MSG/msg_message.asp
View File

@@ -65,10 +65,7 @@ PAGE_START();
var page="msg_show_message.asp";
page += "?message_key=" + msg_key
+ "&urole=" + urole;
IFRAMER("msgFrame", page, { title: L("lcl_mrk_frame_algemeen"),
initHeight: "450px",
FcltClose: "msgClose"
});
IFRAMER("msgFrame", page, { FcltClose: "msgClose", title: L("lcl_mrk_frame_algemeen") });
PAGE_END();
%>
</body>

4
APPL/PRS/kpn_mandate.asp
View File

@@ -79,9 +79,7 @@ PAGE_START();
page += "?keys=" + kpnman_keys.join(",");
page += (modal ? "&modal=1" : "")
IFRAMER("kpnFrame", page, { title: L("lcl_kpn_mandate_frame"),
initHeight: "450px",
FcltClose: "kpnClose" } );
IFRAMER("kpnFrame", page, { FcltClose: "kpnClose", title: L("lcl_kpn_mandate_frame") } );
PAGE_END();
%>
</body>

4
APPL/PRS/prs_afdeling.asp
View File

@@ -81,9 +81,7 @@ else
var page="prs_show_afdeling.asp";
page += "?afd_key="+afd_key+"&afd_niveau="+afd_niveau;
IFRAMER("prsFrame", page, { title: L("lcl_prs_afdeling_frame"),
initHeight: "450px",
FcltClose: "prsClose" } );
IFRAMER("prsFrame", page, { FcltClose: "prsClose", title: L("lcl_prs_afdeling_frame") } );
PAGE_END();
%>
</body>

4
APPL/PRS/prs_contactpersoon.asp
View File

@@ -78,14 +78,14 @@ PAGE_START();
else
var page="prs_show_contactpersoon.asp?cps_key="+cps_key;
IFRAMER("cpsFrame", page, { FcltClose: "cpsClose" } );
IFRAMER("cpsFrame", page, { FcltClose: "cpsClose", title: L("lcl_prs_contactpersoon_frame") } );
var authparamsINSFOF = user.checkAutorisation("WEB_INSFOF", true);
var insfof_read = authparamsINSFOF;
if (insfof_read && cps_key > 0) // Bij interne contactpersonen met INSFOF leesrechten nu ook het objecten frame tonen (UWVA#51402).
{ // 2. Het optionele objectenschem met objecten die aan contactpersoon zijn uitgeleend
page="../ins/ins_list.asp?urole=fo&embedded=1&inacObjIncl=1&cps_key=" + cps_key;
IFRAMER("insdeel", page, { refreshOnClose: true } );
IFRAMER("insdeel", page, { refreshOnClose: true, title: L("lcl_ins_objects") } );
}
PAGE_END();
%>

8
APPL/PRS/prs_dienst.asp
View File

@@ -94,12 +94,16 @@ if ( (dloc_key > -1) || (dienst_key > -1 && bedrijf_key > -1))
{
page="prs_edit_dienstlocs.asp?immediate="+(immediate?1:0)+"&dienst_key="+dienst_key+"&bedrijf_key="+ bedrijf_key;
page_params.title = L("lcl_prs_locbld_select");
//page_params.icon = ??
page_params.icon = "fa-list";
}
else
{
page="prs_locdienst_list.asp?embedded=1&bedrijf_key="+bedrijf_key+"&dienst_key="+dienst_key+"&dloc_key="+dloc_key;
page_params.title = L("lcl_prs_dienst_scope");
page_params.icon = "fa-list";
}
IFRAMER("prsdiensten", page, page_params );
IFRAMER("prsdiensten", page, page_params);
}
PAGE_END();
%>

1
APPL/PRS/prs_edit_inzetbaar.asp
View File

@@ -78,6 +78,7 @@ if (prs_inzetbaar_key > -1)
$("#inzetbaar_tot").val(prs_inzetbaar_tot.getTime());
$("#time_from_inzetbaar_tot").val(toTimeString(prs_inzetbaar_tot));
$("#added").text(L("lcl_prs_inzetbaar_added"));
FcltMgr.resized();
}
else // Scherm sluiten
<% } %>

19
APPL/PRS/prs_perslid.asp
View File

@@ -110,14 +110,13 @@ PAGE_START();
// 1. De Persoongegevens
IFRAMER("prsframe", page, { FcltClose: "prsClose" } );
// if (prs_key > -1)
if (prs_key > 0)
{
if (S("use_capacity_planning") == 1)
{
// 2. De inzetbaarheid
page = "prs_inzetbaar_list.asp?embedded=1&prs_key=" + prs_key;
IFRAMER("prsinzetframe", page, { refreshOnClose: true } );
IFRAMER("prsinzetframe", page, { refreshOnClose: true, icon: "fa-list", title: L("lcl_prs_inzetbaar_title") } );
}
if (canBOF)
@@ -128,19 +127,11 @@ PAGE_START();
// 4. De verplichtingen incl. geleende objecten
page = "prs_obligations.asp?prs_key=" + prs_key;
IFRAMER("prsverplichtingframe", page, { refreshOnClose: true, title: L("lcl_prs_obligations"), icon: "fa-list" } );
// Contactpersoon van bedrijven? Te zeldzaam
// page = "prs_bedrijf_search_list.asp?cps_prs_key=" + prs_key;
// IFRAMER("prsbedrijflistframe", page, { refreshOnClose: true } );
// tracking naar subframe :-)
if (true) // iedereen die dit mag zien, mag ook de mutaties zien
{
page = protectQS.create("../shared/status_info.asp?urole=fo&prs_key=" + prs_key);
IFRAMER("prshistoryframe", page, { icon: "fa-list", title: L("lcl_tracking")} );
}
IFRAMER("prsverplichtingframe", page, { refreshOnClose: true, icon: "fa-list", title: L("lcl_prs_obligations") } );
// 5. tracking naar subframe, iedereen die dit mag zien, mag ook de mutaties zien
page = protectQS.create("../shared/status_info.asp?urole=fo&prs_key=" + prs_key);
IFRAMER("prshistoryframe", page, { icon: "fa-list", title: L("lcl_tracking")} );
}
PAGE_END();
%>

3
APPL/RES/res_reservering.asp
View File

@@ -939,8 +939,7 @@ if (options.length > 1) {
pageTitle = rrr.activiteit_omschrijving + " " + rrr.srtactiviteit_prefix + rrr.reservering_key + (rrr.rsv_ruimte_volgnr ? "/" + rrr.rsv_ruimte_volgnr : "") + " " + (rrr.rsv_ruimte_omschrijving || "");
PAGE_START({ pageHeader: { icon: rrr.activiteit_image || "fa-users", title: pageTitle } });
IFRAMER("resroomframe", page, { initHeight: "400px",
FcltClose: "roomClose" });
IFRAMER("resroomframe", page, { FcltClose: "roomClose" });
//======================================
if (rsv_ruimte_key > 0 || (srtact > 0 && act_key > 0 && res_ruimte_key > 0))

7
APPL/Shared/default.csx
View File

@@ -127,6 +127,8 @@ html {
body {
font-family: ==fontfamily==;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 0.75em;
line-height: 1.8em;
text-align: left;
@@ -838,7 +840,7 @@ div.seperator {
height: 32px;
font-size: 2.5em;
padding: 0px 10px 0px 10px;
color: ==frameheadercolor==; /*TODO*/
color: ==textcolor==;
font-family: ==fontfamily_titles==;
text-align: center;
border-bottom: 1px solid #ccc;
@@ -4993,6 +4995,9 @@ li.mi {
cursor: default;
}
.menuimg .fa-fw {
color: ==buttonbackgroundcolor==;
}
.rate.fa-star, .rate.fa-star-o {
color: #FFA500;

3
APPL/UPG/upgrade20211.inc
View File

@@ -50,13 +50,14 @@ function upgrade20211()
old_json_csstemplate = {}; // Dan maar helemaal leeg
__DoLog("Error on eval json: " + (e.description || e.message), "#f00");
}
oRs.Close();
__DoLog(old_json_csstemplate);
if ("headerimage" in old_json_csstemplate)
{
var new_template = S("csstemplate");
__DoLog(new_template);
new_template["headerimage"] = old_json_csstemplate["headerimage"];
__DoLog(new_template);
sql = "UPDATE fac_setting"
+ " SET fac_setting_pvalue = " + safe.quoted_sql(JSON.stringify(new_template, null, 2))
+ " WHERE fac_setting_name = 'csstemplate'";