From 899c6b7c71bcadabd2de30121087f55973574811 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sat, 2 Feb 2019 12:16:03 +0100 Subject: [PATCH] Fixed icons of inbound, outbound invoices --- .../v5/Financial/Json-ListInvoicesInbound.aspx.cs | 2 +- .../Financial/Json-ListInvoicesOutbound.aspx.cs | 2 +- Site/Pages/v5/Financial/ListInvoicesInbound.aspx | 15 +++++---------- Site/Pages/v5/Financial/ListInvoicesOutbound.aspx | 5 ++++- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Site/Pages/v5/Financial/Json-ListInvoicesInbound.aspx.cs b/Site/Pages/v5/Financial/Json-ListInvoicesInbound.aspx.cs index a33fd76f..256185b6 100644 --- a/Site/Pages/v5/Financial/Json-ListInvoicesInbound.aspx.cs +++ b/Site/Pages/v5/Financial/Json-ListInvoicesInbound.aspx.cs @@ -44,7 +44,7 @@ public partial class Pages_v5_Finance_Json_ListInvoicesInbound : DataV5Base StringBuilder result = new StringBuilder (16384); string hasDoxString = - ""; + ""; result.Append ("{\"rows\":["); diff --git a/Site/Pages/v5/Financial/Json-ListInvoicesOutbound.aspx.cs b/Site/Pages/v5/Financial/Json-ListInvoicesOutbound.aspx.cs index ba3d49f6..85a54dc7 100644 --- a/Site/Pages/v5/Financial/Json-ListInvoicesOutbound.aspx.cs +++ b/Site/Pages/v5/Financial/Json-ListInvoicesOutbound.aspx.cs @@ -42,7 +42,7 @@ public partial class Pages_v5_Finance_Json_ListInvoicesOutbound : DataV5Base StringBuilder result = new StringBuilder (16384); string hasDoxString = - ""; + ""; result.Append ("{\"rows\":["); diff --git a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx index fb6ac165..4e2a4848 100644 --- a/Site/Pages/v5/Financial/ListInvoicesInbound.aspx +++ b/Site/Pages/v5/Financial/ListInvoicesInbound.aspx @@ -17,19 +17,11 @@ } preload([ - '/Images/Abstract/ajaxloader-medium.gif', '/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-balloon-undo-128x96px.png' ]); /* -- commented out -- do we need attestation logic for this page? @@ -70,7 +62,10 @@ $('#tableInboundInvoices').datagrid( { onLoadSuccess: function() { - $(".LocalViewDox").click(function() { + + $(".LocalIconDox").attr('src', '/Images/Icons/iconshock-balloon-examine-128x96px.png'); + + $(".LocalIconDox").click(function() { $("a.FancyBox_Gallery[rel='" + $(this).attr("baseid") + "']").first().click(); diff --git a/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx b/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx index 642746e8..0f8fe8b2 100644 --- a/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx +++ b/Site/Pages/v5/Financial/ListInvoicesOutbound.aspx @@ -53,7 +53,10 @@ ( { onLoadSuccess: function () { - $(".LocalViewDox").click(function () { + + $(".LocalIconDox").attr('src', '/Images/Icons/iconshock-balloon-examine-128x96px.png'); + + $(".LocalIconDox").click(function () { $("a.FancyBox_Gallery[rel='" + $(this).attr("baseid") + "']").first().click();