From 831d712014f52b35aca1e2e589fe72dfc675dc60 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Fri, 27 Mar 2015 13:53:39 +0100 Subject: [PATCH] Testing much clearer action icons --- Site5/Images/Abstract/ajaxloader-48x36px.gif | Bin 0 -> 3199 bytes Site5/Pages/v5/Financial/AttestCosts.aspx | 83 +++++++++++------- .../v5/Financial/Json-AttestableCosts.aspx.cs | 24 ++--- 3 files changed, 64 insertions(+), 43 deletions(-) create mode 100644 Site5/Images/Abstract/ajaxloader-48x36px.gif diff --git a/Site5/Images/Abstract/ajaxloader-48x36px.gif b/Site5/Images/Abstract/ajaxloader-48x36px.gif new file mode 100644 index 0000000000000000000000000000000000000000..e9facaae9c13aac68dd06d908df38daf7289a9f2 GIT binary patch literal 3199 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 I-vF0?1Ag?{g8%>k literal 0 HcmV?d00001 diff --git a/Site5/Pages/v5/Financial/AttestCosts.aspx b/Site5/Pages/v5/Financial/AttestCosts.aspx index 10c89f05..10e87106 100644 --- a/Site5/Pages/v5/Financial/AttestCosts.aspx +++ b/Site5/Pages/v5/Financial/AttestCosts.aspx @@ -16,13 +16,15 @@ preload([ '/Images/Abstract/ajaxloader-medium.gif', - '/Images/Icons/iconshock-balloon-yes-16px-hot.png', - '/Images/Icons/iconshock-balloon-yes-16px-disabled.png', - '/Images/Icons/iconshock-balloon-yes-16px-disabled-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/Icons/iconshock-balloon-yes-128x96px-hot.png', + '/Images/Icons/iconshock-balloon-yes-128x96px-disabled.png', + '/Images/Icons/iconshock-balloon-yes-128x96px-disabled-hot.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-undo-128x96px.png', + '/Images/Icons/iconshock-undo-128x96px-hot.png' ]); $(document).ready(function () { @@ -41,19 +43,20 @@ }, onLoadSuccess: function () { - $(".LocalIconApproval").attr("src", "/Images/Icons/iconshock-balloon-yes-16px-disabled.png"); // initialize as disabled until budgets known - $(".LocalIconApproved").attr("src", "/Images/Icons/iconshock-greentick-16px.png"); - $(".LocalIconUndo").attr("src", "/Images/Icons/iconshock-balloon-undo-16px.png"); + $(".LocalIconApproval").attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px-disabled.png"); // initialize as disabled until budgets known + $(".LocalIconApproved").attr("src", "/Images/Icons/iconshock-green-tick-128x96px.png"); + $(".LocalIconDenied").attr("src", "/Images/Icons/iconshock-red-cross-circled-128x96px.png"); + $(".LocalIconUndo").attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px.png"); $(".LocalIconApproved.LocalNew, .LocalIconUndo.LocalNew, .LocalIconDenied.LocalNew, .LocalIconApproval.LocalPreviouslyAttested, .LocalIconDenial.LocalPreviouslyAttested, .LocalIconDenied.LocalPreviouslyAttested").css("display", "none"); - $(".LocalIconDenial").attr("src", "/Images/Icons/iconshock-balloon-no-16px.png"); + $(".LocalIconDenial").attr("src", "/Images/Icons/iconshock-balloon-no-128x96px.png"); $(".LocalIconApproval, .LocalIconUndo, .LocalIconDenial").css("cursor", "pointer"); $(".LocalIconApproval").mouseover(function () { if ($(this).attr("rel") != "loading") { if ($(this).hasClass("LocalFundsInsufficient")) { - $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-16px-disabled-hot.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px-hot-disabled.png"); } else { - $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-16px-hot.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px-hot.png"); } } }); @@ -61,22 +64,40 @@ $(".LocalIconApproval").mouseout(function () { if ($(this).attr("rel") != "loading") { if ($(this).hasClass("LocalFundsInsufficient")) { - $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-16px-disabled.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px-disabled.png"); } else { - $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-16px.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px.png"); } } }); $(".LocalIconUndo").mouseover(function () { if ($(this).attr("rel") != "loading") { - $(this).attr("src", "/Images/Icons/iconshock-balloon-undo-16px-hot.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px-hot.png"); } }); $(".LocalIconUndo").mouseout(function () { if ($(this).attr("rel") != "loading") { - $(this).attr("src", "/Images/Icons/iconshock-balloon-undo-16px.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px.png"); + } + }); + + $(".LocalIconDenial").mouseover(function () { + if ($(this).attr("rel") != "loading") { + $(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-128x96px.png"); + } + }); + + $(".LocalIconDenial").click(function() { + if ($(this).attr("rel") != "loading" && $("#IconDenial" + $(this).attr("baseid")) != "loading") { + <%=this.DialogDeny.ClientID%>_open(); } }); @@ -86,9 +107,9 @@ return; } - if ($(this).attr("rel") != "loading") { + if ($(this).attr("rel") != "loading" && $("#IconDenial" + $(this).attr("baseid")) != "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"); $.ajax({ type: "POST", @@ -99,11 +120,11 @@ success: $.proxy(function (msg) { var baseid = $(this).attr("baseid"); if (msg.d.Success) { - $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-16px.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px.png"); $(this).attr("rel", "active"); $(this).hide(); $("#IconApproved" + baseid).fadeIn(100); - $("#IconDenial" + baseid).stop(true,true).css("display", "none").css("opacity", 1.0); + $("#IconDenial" + baseid).finish().css("display", "none").css("opacity", 1.0); $("#IconUndo" + baseid).fadeIn(100); $('.row' + baseid).animate({ color: "#AAA" }, 400); alertify.success(msg.d.DisplayMessage); @@ -116,7 +137,7 @@ } else { // failure, likely from attesting too quickly and overrunning budget $(this).attr("rel", ""); - $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-16px-disabled.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px-disabled.png"); $("#IconDenial" + baseid).css('opacity', 1.0).css("cursor", "pointer"); alertify.error(msg.d.DisplayMessage); @@ -130,7 +151,7 @@ $(".LocalIconUndo").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"); $("#IconApproved" + $(this).attr("baseid")).fadeTo(1000, 0.01); $.ajax({ type: "POST", @@ -141,10 +162,10 @@ success: $.proxy(function (msg) { if (msg.d.Success) { var baseid = $(this).attr("baseid"); - $(this).attr("src", "/Images/Icons/iconshock-balloon-undo-16px.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-undo-128x96px.png"); $(this).attr("rel", ""); $(this).hide(); - $("#IconApproved" + baseid).stop(true, true).css("opacity", 1.0).css("display", "none"); + $("#IconApproved" + baseid).finish().css("opacity", 1.0).css("display", "none"); $("#IconApproval" + baseid).fadeIn(100); $("#IconDenial" + baseid).fadeIn(100).css("cursor", "pointer"); $('.row' + baseid).animate({ color: "#000" }, 100); @@ -156,7 +177,7 @@ setAttestability(); recheckBudgets(); // will double-check budgets against server } else { - $(this).attr("src", "/Images/Icons/iconshock-greentick-16px.png"); + $(this).attr("src", "/Images/Icons/iconshock-greentick-128x96px.png"); alertify.error(msg.d.DisplayMessage); // TODO: Add alert box? } @@ -171,13 +192,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"); } }); @@ -247,13 +268,13 @@ if (fundsInBudget >= amountRequested) { $(this).removeClass("LocalFundsInsufficient"); 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"); } } else if (!$(this).hasClass("LocalFundsInsufficient")) { $(this).addClass("LocalFundsInsufficient"); if ($(this).attr("rel") != "loading") { - $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-16px-disabled.png"); + $(this).attr("src", "/Images/Icons/iconshock-balloon-yes-128x96px-disabled.png"); } } @@ -295,7 +316,7 @@ - +

diff --git a/Site5/Pages/v5/Financial/Json-AttestableCosts.aspx.cs b/Site5/Pages/v5/Financial/Json-AttestableCosts.aspx.cs index 1b537963..63fd923c 100644 --- a/Site5/Pages/v5/Financial/Json-AttestableCosts.aspx.cs +++ b/Site5/Pages/v5/Financial/Json-AttestableCosts.aspx.cs @@ -50,12 +50,12 @@ public partial class Pages_v5_Finance_Json_AttestableCosts : DataV5Base result.AppendFormat( "\"item\":\"{0}\",\"beneficiary\":\"{1}\",\"description\":\"{2}\",\"budgetName\":\"{3}\",\"amountRequested\":\"{4:N2}\",\"itemId\":\"{5}\"," + "\"dox\":\"" + (item.HasDox ? hasDoxString : " ") + "\"," + - "\"actions\":\"" + - "" + - "  " + - "" + - "" + - "\"", + "\"actions\":\"" + + "" + + "" + + "" + + "" + + "\"", JsonSanitize(GetGlobalResourceObject("Global", item.IdentityDisplay).ToString()), JsonSanitize(item.Beneficiary), JsonSanitize(TryLocalize(item.Description)), JsonSanitize(item.BudgetName), @@ -69,12 +69,12 @@ public partial class Pages_v5_Finance_Json_AttestableCosts : DataV5Base result.AppendFormat( "\"item\":\"{0}\",\"beneficiary\":\"{1}\",\"description\":\"{2}\",\"budgetName\":\"{3}\",\"previous\":\"yes\",\"amountRequested\":\"{4:N2}\",\"itemId\":\"{5}\"," + "\"dox\":\"" + (item.HasDox ? hasDoxString : " ") + "\"," + - "\"actions\":\"" + - "" + - "  " + - "" + - "" + - "\"", + "\"actions\":\"" + + "" + + "" + + "" + + "" + + "\"", JsonSanitize(GetGlobalResourceObject("Global", item.IdentityDisplay).ToString()), JsonSanitize(item.Beneficiary), JsonSanitize(TryLocalize(item.Description)), JsonSanitize(item.BudgetName),