New upload icon, some renames

This commit is contained in:
Rick Falkvinge
2019-01-10 12:05:22 +01:00
parent e5028f4b4a
commit fbbd57629e
6 changed files with 36 additions and 6 deletions
+1 -1
View File
@@ -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
+23 -2
View File
@@ -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);
}
+1 -1
View File
@@ -194,7 +194,7 @@
<div class="center980px">
<div class="login-page-logo"><asp:Image ID="ImageLogo" runat="server" ImageUrl="/Images/Swarmops-logo-256px.png" Width="128"/></div>
<div class="login-page-logo"><asp:Image ID="ImageLogo" runat="server" ImageUrl="/Images/swarmops-logo-256px.png" Width="128"/></div>
<div class="box qrlogin">
<div class="content">
<div align="center" id="divLoginQr"><asp:Image ID="ImageBitIdQr" runat="server"/></div>
+1 -1
View File
@@ -82,7 +82,7 @@
<div class="center980px">
<div class="currentuserinfo"><div style="background-image: url('/Images/Icons/iconshock-user-16px.png'); background-repeat: no-repeat; padding-left: 16px; float: left"><asp:Label ID="LabelCurrentUserName" runat="server" /> | </div><div style="background-image: url('/Images/Icons/iconshock-workchair-16px.png'); background-repeat: no-repeat; padding-left: 17px; float: left"><asp:Label ID="LabelCurrentOrganizationName" runat="server" /> |&nbsp;</div><div style="background-image: url('/Images/Icons/iconshock-gamepad-16px.png'); background-repeat: no-repeat; padding-left: 20px; float: left"><asp:Label ID="LabelPreferences" runat="server" /> |&nbsp;</div><asp:Image ID="ImageCultureIndicator" runat="server" ImageUrl="~/Images/Flags/uk-24px.png" /></div>
<div class="logoimage"><a href="/"><img style="border: none" src="/Security/Images/Swarmops-Logo.png" alt="Swarmops Logo" /></a></div>
<div class="logoimage"><a href="/"><asp:Image ID="ImageLogo" runat="server" ImageUrl="/Images/swarmops-logo-256px.png" Width="128"/></a></div>
<div class="break"></div>
<div class="topmenu">
</div>
+9
View File
@@ -75,6 +75,15 @@ namespace Swarmops.Pages.Security {
/// </remarks>
protected global::System.Web.UI.WebControls.Image ImageCultureIndicator;
/// <summary>
/// ImageLogo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Image ImageLogo;
/// <summary>
/// LabelContentTitle control.
/// </summary>
+1 -1
View File
@@ -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;
}