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

FSN#40666 dirty op lijsten juist weergeven + afmeldiconen via font awesome

Browse Source 
svn path=/Website/branches/v2017.1/; revision=34009
This commit is contained in:
Ruud Lipper
2017-05-26 12:54:08 +00:00
parent 230b9b841e
commit 59b4c252e2
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
APPL/RES/res.css
View File

@@ -274,13 +274,6 @@ tr div.res_fatal { background-color: #ccc;
background-image:url(../pictures/resdirty.png)!important;
z-index: 1; }
tr.res_fatal td { background-color: #F88 !important;
border: 1px solid #D44444;
background-repeat: no-repeat;
background-image:url(../pictures/resdirty.png)!important;
padding-left : 20px;
z-index: 1; }
span.res_fatal,
input[type=text].button.required.res_fatal
{ background-color: #F88 !important;

4
APPL/RES/res_list.inc
View File

@@ -2233,7 +2233,7 @@ function res_list (pautfunction, params)
if (oRs("res_status_bo_key").Value >= 5)
{
if (!excel)
content = "<img src='../Pictures/res_ok.gif'><div style='display:none'>"+oRs("res_status_bo_key").Value+"</div>";
content = "<i class='fa fa-check-square-o fa-lg'></i><div style='display:none'>"+oRs("res_status_bo_key").Value+"</div>";
else
content = L("lcl_Yes");
}
@@ -2351,7 +2351,7 @@ function res_list (pautfunction, params)
// eerst maar eens niet meer tonen. Als er gefundeerde klachten komen is
// deze snel genoeg combined terug te halen
// rst.addColumn(new Column({caption: L("lcl_location"), content: "locatie"}));
rst.addColumn(new Column({caption: (excel?L("lcl_res_resafm"):'<img id="checkall" src="../Pictures/res_ok.gif">'), content: fncolCompleteRes}));
rst.addColumn(new Column({caption: (excel?L("lcl_res_resafm"):'<i class="fa fa-check-square-o fa-lg"></i>'), content: fncolCompleteRes}));
if (S("res_reservering_flags") > 0)
rst.addColumn(new Column({caption: "o", content: fncolFlags, align: "center"}));
rst.addColumn(new Column({caption: L("lcl_room_n"), content: "res_ruimte_nr", combine: false, hasActions: true}));

2
APPL/RES/res_list.js
View File

@@ -85,7 +85,7 @@ function resClose(rowArray)
FcltCallbackAndThen(function() { // Reservering is nu afgemeld. Geef afvinkbox weer aan het eind van de regel
resKeyArray = resKeyString.split(",");
for (var i = 0; i < resKeyArray.length; i++) {
$("#afm" + resKeyArray[i]).html('<img src="../Pictures/res_ok.gif" alt="' + todayString + '&nbsp;&nbsp;-&nbsp;&nbsp;' + user_naam + '">');
$("#afm" + resKeyArray[i]).html('<i class="fa fa-check-square-o fa-lg"></i>');
}
}),
"json");

19
APPL/Shared/default.csx
View File

@@ -3738,7 +3738,24 @@ input#materiallist_button::-ms-clear, input.suggestBusy::-ms-clear, input.fldfle
}
div.fatal {
padding: 5px;
}
}
tr.res_fatal td { background-color: #F88 !important; }
tr.res_fatal td:before {
content: "\f00d";
font-family: FontAwesome;
color: rgba(183, 59, 46, 1);
font-size: 1.2em;
white-space: nowrap;
padding: 2px;
}
/* geen kruizen in de multiselect/hamburger kolom ivm uitlijning */
tr.res_fatal td.multiselect:before, tr.res_fatal td.hambCont:before, tr.res_fatal td.inlinedetails:before {
content: none;
}
.warning {
background-color: orange;
color: black;