From fbbd57629ece43b58ab6d58cfda36017f8b7a588 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 10 Jan 2019 12:05:22 +0100 Subject: [PATCH] New upload icon, some renames --- Site/Pages/v5/Ledgers/EndOfMonth.aspx | 2 +- Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs | 25 +++++++++++++++++-- Site/Security/Login.aspx | 2 +- Site/Security/RequestPasswordReset.aspx | 2 +- .../RequestPasswordReset.aspx.designer.cs | 9 +++++++ Site/Style/style-v5.css | 2 +- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/Site/Pages/v5/Ledgers/EndOfMonth.aspx b/Site/Pages/v5/Ledgers/EndOfMonth.aspx index e5223e3c..6257f5e1 100644 --- a/Site/Pages/v5/Ledgers/EndOfMonth.aspx +++ b/Site/Pages/v5/Ledgers/EndOfMonth.aspx @@ -16,7 +16,7 @@ $('img.eomitem-wrench').attr('src', '/Images/Icons/iconshock-balloon-wrench-128x96px.png'); $('img.eomitem-document').attr('src', '/Images/Icons/iconshock-balloon-invoice-128x96px.png'); - $('img.eomitem-upload').attr('src', '/Images/Icons/iconshock-upload-128x96px.png'); + $('img.eomitem-upload').attr('src', '/Images/Icons/iconshock-balloon-up-128x96px.png'); // pointer cursor over action icons diff --git a/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs b/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs index bee9b39f..29a683f0 100644 --- a/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs +++ b/Site/Pages/v5/Ledgers/EndOfMonth.aspx.cs @@ -101,7 +101,7 @@ namespace Swarmops.Frontend.Pages.Ledgers // TODO: Check if the last data upload was into the current month EomItem dataUploadItem = new EomItem(); - dataUploadItem.Id = "BankDataUpload-" + assetAccount.Identity.ToString(CultureInfo.InvariantCulture); + dataUploadItem.Id = "BankTransactionData-" + assetAccount.Identity.ToString(CultureInfo.InvariantCulture); dataUploadItem.Icon = "upload"; dataUploadItem.Completed = false; // todo dataUploadItem.Name = String.Format(Resources.Pages.Ledgers.EndOfMonth_UploadTransactionDataFor, @@ -341,7 +341,28 @@ namespace Swarmops.Frontend.Pages.Ledgers return new AjaxCallResult {Success = true}; } - + + [WebMethod] + public static AjaxCallResult UploadTransactionData(string guid, string itemId) + { + AuthenticationData authData = GetAuthenticationDataAndCulture(); + if (!authData.Authority.HasAccess(new Access(authData.CurrentOrganization, AccessAspect.BookkeepingDetails))) + { + throw new UnauthorizedAccessException(); + } + + string[] parts = itemId.Split('-'); + FinancialAccount account = FinancialAccount.FromIdentity(Int32.Parse(parts[1])); + + if (account.OrganizationId != authData.CurrentOrganization.Identity) + { + throw new UnauthorizedAccessException(); + } + + Documents documents = Documents.RecentFromDescription(guid); + + + } diff --git a/Site/Security/Login.aspx b/Site/Security/Login.aspx index e01f0503..e948966b 100644 --- a/Site/Security/Login.aspx +++ b/Site/Security/Login.aspx @@ -194,7 +194,7 @@
- +
diff --git a/Site/Security/RequestPasswordReset.aspx b/Site/Security/RequestPasswordReset.aspx index ee03c716..765d3bb7 100644 --- a/Site/Security/RequestPasswordReset.aspx +++ b/Site/Security/RequestPasswordReset.aspx @@ -82,7 +82,7 @@
|
| 
| 
-
Swarmops Logo
+
diff --git a/Site/Security/RequestPasswordReset.aspx.designer.cs b/Site/Security/RequestPasswordReset.aspx.designer.cs index 4394d2e7..8630058a 100644 --- a/Site/Security/RequestPasswordReset.aspx.designer.cs +++ b/Site/Security/RequestPasswordReset.aspx.designer.cs @@ -75,6 +75,15 @@ namespace Swarmops.Pages.Security { /// protected global::System.Web.UI.WebControls.Image ImageCultureIndicator; + /// + /// ImageLogo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Image ImageLogo; + /// /// LabelContentTitle control. /// diff --git a/Site/Style/style-v5.css b/Site/Style/style-v5.css index d03f38e5..fcc6c6dd 100644 --- a/Site/Style/style-v5.css +++ b/Site/Style/style-v5.css @@ -249,7 +249,7 @@ body.rtl #MainMenuContainer #LiSwarmopsLogo { #DivSwarmopsLogo { width: 60px; height: 34px; - background-image: url('/Images/logo-banner-dual-16x9.png'); + background-image: url('/Images/swarmops-logo-head-dual-16x9.png'); background-size: 60px 68px; }