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

FSN#35094 Awesome fonts

Browse Source 
svn path=/Website/trunk/; revision=31235
This commit is contained in:
Jos Groot Lipman
2016-10-26 13:33:11 +00:00
parent 9ad7a622c6
commit 67cc16542e
11 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/BEZ/bez_edit_bezoekers_save.asp
View File

@@ -39,7 +39,7 @@ if (afspraak_key == -1)
afspraak_key = oRs("bez_afspraak_key").value;
}
var this_bez = bez.func_enabled_afspraak(afspraak_key);
user.auth_required_or_abort(this_bez.canChange);
user.auth_required_or_abort(this_bez.canReadAny);
var beztrack = [];
var result = saveBezoekers(afspraak_key, rsv_ruimte_key, { urole: urole });

4
APPL/FAC/fac_edit_template.asp
View File

@@ -75,8 +75,8 @@ function prettyJson(j)
<body id="editbody">
<% buttons = []
buttons.push ({title: L("lcl_submit"), icon: "opslaan.png", action: "doSubmit()" });
buttons.push( {title: L("lcl_cancel"), icon: "undo.png", action: "doCancel()" } );
buttons.push ({title: L("lcl_submit"), icon: "fa-save", action: "doSubmit()" });
buttons.push( {title: L("lcl_cancel"), icon: "fa-undo", action: "doCancel()" } );
IFRAMER_HEADER("Template", buttons);
%>
<div id="edit">

4
APPL/FAC/fac_edit_template_save.asp
View File

@@ -84,8 +84,8 @@ if (previewmode == 2)
<h1>Voorbeeld zoekformulier</h1>
<%
buttons = [];
buttons.push ({title: L("lcl_submit"), icon: "opslaan.png", action: "sample()" });
buttons.push( {title: L("lcl_cancel"), icon: "undo.png", action: "sample()" } );
buttons.push ({title: L("lcl_submit"), icon: "fa-save", action: "sample()" });
buttons.push( {title: L("lcl_cancel"), icon: "fa-undo", action: "sample()" } );
IFRAMER_HEADER("Voorbeeld header", buttons);
%>
<div id="search">

6
APPL/SCF/scaffolding_edit.inc
View File

@@ -245,10 +245,10 @@ function scaffolding_edit(model, scf_params)
}
}
if (model.REST_PUT || key < 0)
buttons.push({title: L("lcl_submit"), action:"scf_submit()", icon: "opslaan.png", singlepress: true, id: "btn_scf_submit" });
buttons.push({title: L("lcl_submit"), action:"scf_submit()", icon: "fa-save", singlepress: true, id: "btn_scf_submit" });
if (modal && model.REST_DELETE && key > 0)
buttons.push({title: L("lcl_delete"), action:"scf_delete()", icon: "delete.png", singlepress: true, id: "btn_scf_delete" });
buttons.push({title: L("lcl_cancel"), action:"scf_cancel()", icon: "undo.png", id: "btn_scf_cancel" });
buttons.push({title: L("lcl_delete"), action:"scf_delete()", icon: "fa-trash", singlepress: true, id: "btn_scf_delete" });
buttons.push({title: L("lcl_cancel"), action:"scf_cancel()", icon: "fa-undo", id: "btn_scf_cancel" });
if (model.hashints)
buttons.splice(0, 0, {title: L("lcl_hint"), action:"scf_enablehint()", icon: "lightbulb.png", id: "btn_scf_enablehint" });
if (!modal)

4
APPL/SCF/scaffolding_list.inc
View File

@@ -136,11 +136,11 @@ function scaffolding_list(model, scf_params)
// en we kunnen geen 500-status meer doen? busyLoading(); // via ResultsetTable is te laat (na REST_GET) dus maar zelf
buttons = [];
if (!nobuttons)
buttons.push({ icon: "page_refresh.png", title: L("lcl_refresh"), action: "FcltMgr.reload()", id: "btn_scf_refresh" });
buttons.push({ icon: "fa-refresh", title: L("lcl_refresh"), action: "FcltMgr.reload()", id: "btn_scf_refresh" });
if (model["REST_POST"] && authparams.PRSwritelevel < 9 && authparams.ALGwritelevel < 9)
{
var addurl = scf_params.this_path + "?mode=wrap" + transit;
buttons.push({ icon: "plus.png", title: L("lcl_add"), action: "scf_add()", id: "btn_scf_add" });
buttons.push({ icon: "fa-plus", title: L("lcl_add"), action: "scf_add()", id: "btn_scf_add" });
}
var xxx_params = { filter : scf_params.filter || shared.qs2json(model),

4
APPL/SCF/scaffolding_show.inc
View File

@@ -81,9 +81,9 @@ function scaffolding_show(model, scf_params)
if (model["REST_PUT"]) // TODO: Eventueel autfunction testen?
{
buttons.push({title: L("lcl_change"), action: "xxx_change()", icon: "wijzigen.png" });
buttons.push({title: L("lcl_change"), action: "xxx_change()", icon: "fa-edit" });
if (model["REST_DELETE"])
buttons.push({title: L("lcl_delete"), action: "xxx_delete()", icon: "delete.png" });
buttons.push({title: L("lcl_delete"), action: "xxx_delete()", icon: "fa-trash" });
}
// if stylesheet gevonden
var fso = Server.CreateObject("Scripting.FileSystemObject");

8
APPL/Shared/Shared.inc
View File

@@ -1628,4 +1628,12 @@ IP =
}
}
function I(icon)
{
if (icon.match(/^fa-/))
return "<i class='fa {0}'></i>".format(icon);
else
return "<img alt='' src='{0}/appl/pictures/{1}'>".format(rooturl, icon);
}
%>

21
APPL/Shared/default.csx
View File

@@ -1081,7 +1081,11 @@ span.button:hover {
/* Met icons een lichtere achtergrond */
#buttons ul li.hasIcon,
#buttons ul li.hasIcon a {
background-color: rgba(255,255,255,0.5);
background-color: ==iconbackgroundcolor==;
}
#buttons ul li.hasIcon a:hoover {
background-color: ==iconhoverbackgroundcolor==;
padding: 7px 10px 0px 11px;
}
@@ -3937,10 +3941,23 @@ body.floorscreen3d {
#buttons ul li.hasIcon,
#buttons ul li.hasIcon a {
padding: 9px 10px 5px 12px; /* is vierkant weer bon-ton? */
padding: ==iconpadding==; /* is vierkant weer bon-ton? */
border-radius: 2px!important;
}
li.hasIcon i.fa {
color:==iconcolor==;
font-size: ==iconsize==;
}
li.hasIcon i.fa:hover {
font-size: ==iconhoversize==;
}
#buttons ul li.hasIcon:hover,
#buttons ul li.hasIcon a:hover {
padding: ==iconhoverpadding==;
}
.ui-widget-content{
border:0px;
}

12
APPL/Shared/header.inc
View File

@@ -179,7 +179,8 @@ 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
%> <script type="text/javascript">
@@ -353,7 +354,14 @@ FCLTHeader =
profmenubackgroundcolor: "transparent",
mgtmenucolor: "#004f80",
mgtmenubackgroundcolor: "transparent",
portalkopcolor: "#333"
portalkopcolor: "#333",
iconcolor: "#2d7d9a",
iconbackgroundcolor: "rgba(255,255,255,0.75)",
iconsize: "130%",
iconpadding: "9px 8px 4px 10px",
iconhoverbackgroundcolor: "rgba(255,255,255,1)",
iconhoversize: "160%",
iconhoverpadding: "9px 8px 4px 10px"
},
// tpl en cssfile worden alleen gebruikt bij concept/preview, anders zijn ze leeg

2
APPL/Shared/iface.inc
View File

@@ -29,7 +29,7 @@ function CreateButton(tekst, onClick, btn, params) //akey, id, params)
fcltClick="<%=onClick%>"
<%= btn.id != null ?'id="' + btn.id + '"' : '' %>><%
if (hasIcon) {
%><img alt="" src="<%=rooturl%>/appl/pictures/<%=btn.icon%>"><%
Response.Write(I(btn.icon));
if (params.isDialog && btn.tooltip)
{
%><div class="dialogtext"><%= btn.tooltip %></div><%

4
APPL/Shared/resultset_table_v2.inc
View File

@@ -610,10 +610,10 @@ function __rsProcessResultset(processParams) // processParams wordt blind aan al
buttons = this.buttons || [];
if (!noPrint)
{
buttons = buttons.concat([ { icon: "print.png", title: L("lcl_print_table"), action: "doOutput(1)" } ]);
buttons = buttons.concat([ { icon: "fa-print", title: L("lcl_print_table"), action: "doOutput(1)" } ]);
if (!noExcel)
{
buttons = buttons.concat([ { icon: "excel.png", title: L("lcl_export_to_excel"), action: "doOutput(2)" } ]);
buttons = buttons.concat([ { icon: "fa-table", title: L("lcl_export_to_excel"), action: "doOutput(2)" } ]);
}
}
if (this.advancedprint)