diff --git a/Site/Pages/v5/Financial/AttestCosts.aspx b/Site/Pages/v5/Financial/AttestCosts.aspx index 066438da..5072b93b 100644 --- a/Site/Pages/v5/Financial/AttestCosts.aspx +++ b/Site/Pages/v5/Financial/AttestCosts.aspx @@ -29,7 +29,8 @@ '/Images/Icons/iconshock-red-cross-128x96px.png', '/Images/Icons/iconshock-red-cross-circled-128x96px.png', '/Images/Icons/iconshock-balloon-undo-128x96px.png', - '/Images/Icons/iconshock-balloon-undo-128x96px-hot.png' + '/Images/Icons/iconshock-balloon-undo-128x96px-hot.png', + '/Images/Icons/iconshock-search-hot-256px.png' ]); loadUninitializedBudgets(); // no need to wait for doc.ready to load operating params diff --git a/Site/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs b/Site/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs index 2c90a946..f2484fe2 100644 --- a/Site/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs +++ b/Site/Pages/v5/Financial/Json-ValidatableReceipts.aspx.cs @@ -29,7 +29,7 @@ public partial class Pages_v5_Finance_Json_ValidatableReceipts : DataV5Base StringBuilder result = new StringBuilder (16384); string hasDoxString = - ""; + ""; result.Append ("{\"rows\":["); FinancialTransactionTagSets tagSets = FinancialTransactionTagSets.ForOrganization (CurrentOrganization); diff --git a/Site/Pages/v5/Financial/ValidateReceipts.aspx b/Site/Pages/v5/Financial/ValidateReceipts.aspx index 64dfe658..c1287294 100644 --- a/Site/Pages/v5/Financial/ValidateReceipts.aspx +++ b/Site/Pages/v5/Financial/ValidateReceipts.aspx @@ -16,51 +16,59 @@ preload([ '/Images/Abstract/ajaxloader-medium.gif', - '/Images/Icons/iconshock-balloon-yes-16px-hot.png', - '/Images/Icons/iconshock-balloon-no-16px-hot.png', - '/Images/Icons/iconshock-greentick-16px.png', - '/Images/Icons/iconshock-redcross-16px.png', - '/Images/Icons/undo-16px.png' + '/Images/Abstract/ajaxloader-48x36px.gif', + '/Images/Icons/iconshock-balloon-yes-128x96px-hot.png', + '/Images/Icons/iconshock-balloon-yes-128x96px-disabled.png', + '/Images/Icons/iconshock-balloon-yes-128x96px-hot-disabled.png', + '/Images/Icons/iconshock-balloon-yes-128x96px-gold.png', + '/Images/Icons/iconshock-balloon-yes-128x96px-hot-gold.png', + '/Images/Icons/iconshock-balloon-no-128x96px-hot.png', + '/Images/Icons/iconshock-green-tick-128x96px.png', + '/Images/Icons/iconshock-red-cross-128x96px.png', + '/Images/Icons/iconshock-red-cross-circled-128x96px.png', + '/Images/Icons/iconshock-balloon-undo-128x96px.png', + '/Images/Icons/iconshock-balloon-undo-128x96px-hot.png', + '/Images/Icons/iconshock-search-hot-256px.png' ]); $(document).ready(function () { $('#TableAttestableCosts').datagrid( { onLoadSuccess: function () { - $(".LocalIconApproval").attr("src", "/Images/Icons/iconshock-balloon-yes-16px.png"); - $(".LocalIconApproved").attr("src", "/Images/Icons/iconshock-greentick-16px.png"); + $(".LocalIconApproval").attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px.png"); + $(".LocalIconApproved").attr("src", "/Images/Icons/iconshock-green-tick-128x96px.png"); $(".LocalIconApproved, .LocalIconDenied").css("display", "none"); - $(".LocalIconDenial").attr("src", "/Images/Icons/iconshock-balloon-no-16px.png"); + $(".LocalIconDenial").attr("src", "/Images/Icons/iconshock-balloon-no-128x96px.png"); $(".LocalIconApproval, .LocalIconApproved, .LocalIconDenial").css("cursor", "pointer"); $(".LocalIconApproval").mouseover(function () { if ($(this).attr("rel") != "loading") { - $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-16px-hot.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px-hot.png"); } }); $(".LocalIconApproval").mouseout(function () { if ($(this).attr("rel") != "loading") { - $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-16px.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px.png"); } }); $(".LocalIconApproved").mouseover(function () { if ($(this).attr("rel") != "loading") { - $(this).attr("src", "/Images/Icons/undo-16px.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px.png"); } }); $(".LocalIconApproved").mouseout(function () { if ($(this).attr("rel") != "loading") { - $(this).attr("src", "/Images/Icons/iconshock-greentick-16px.png"); + $(this).attr("src", "/Images/Icons/iconshock-green-tick-128x96px.png"); } }); $(".LocalIconApproval").click(function () { if ($(this).attr("rel") != "loading") { $(this).attr("rel", "loading"); - $(this).attr("src", "/Images/Abstract/ajaxloader-medium.gif"); + $(this).attr("src", "/Images/Abstract/ajaxloader-48x36px.gif"); $("#IconDenial" + $(this).attr("baseid")).fadeTo(1000, 0.01).css("cursor", "default"); var thisIcon = this; $.ajax({ @@ -71,7 +79,7 @@ dataType: "json", success: function (msg) { $(thisIcon).css("display", "none"); - $(thisIcon).attr("src", "/Images/Icons/iconshock-balloon-yes-16px.png"); + $(thisIcon).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px.png"); $(thisIcon).attr("rel", "active"); $("#IconApproved" + $(thisIcon).attr("baseid")).fadeIn(100); alertify.success(unescape(msg.d)); @@ -83,7 +91,7 @@ $(".LocalIconApproved").click(function () { if ($(this).attr("rel") != "loading") { $(this).attr("rel", "loading"); - $(this).attr("src", "/Images/Abstract/ajaxloader-medium.gif"); + $(this).attr("src", "/Images/Abstract/ajaxloader-48x36px.gif"); var thisIcon = this; $.ajax({ type: "POST", @@ -93,7 +101,7 @@ dataType: "json", success: function (msg) { $(thisIcon).css("display", "none"); - $(thisIcon).attr("src", "/Images/Icons/iconshock-greentick-16px.png"); + $(thisIcon).attr("src", "/Images/Icons/iconshock-green-tick-128x96px.png"); $(thisIcon).attr("rel", ""); $("#IconApproval" + $(thisIcon).attr("baseid")).fadeIn(100); $("#" + $(thisIcon).attr("rel"), ""); @@ -110,13 +118,13 @@ $(".LocalIconDenial").mouseover(function () { if ($(this).attr("rel") != "loading") { - $(this).attr("src", "/Images/Icons/iconshock-balloon-no-16px-hot.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-no-128x96px-hot.png"); } }); $(".LocalIconDenial").mouseout(function () { if ($(this).attr("rel") != "loading") { - $(this).attr("src", "/Images/Icons/iconshock-balloon-no-16px.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-no-128x96px.png"); } });