More work on upload-bank-files

This commit is contained in:
Rick Falkvinge
2011-12-30 18:06:21 +00:00
parent 271e16e07c
commit 69650329c2
3 changed files with 39 additions and 10 deletions
+8 -1
View File
@@ -5,18 +5,23 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<!-- jQuery and plugins -->
<script language="javascript" type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" ></script>
<script language="javascript" type="text/javascript" src="/Scripts/jquery.leanModal.min.js" ></script>
<!-- fonts -->
<link href='https://fonts.googleapis.com/css?family=Permanent+Marker' rel='stylesheet' type='text/css' />
<link href='https://fonts.googleapis.com/css?family=Ubuntu:light,regular,500,bold' rel='stylesheet' type='text/css' />
<link href='https://fonts.googleapis.com/css?family=Arimo:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css' />
<!-- page title -->
<title>Activizr - Pirate Edition</title>
<!-- telerik style sheet manager, followed by style sheet -->
<telerik:RadStyleSheetManager id="RadStyleSheetManager" runat="server" />
<link href="/Style/style-v5.css" rel="stylesheet" type="text/css" />
<!-- additional scripts etc from individual pages -->
<asp:ContentPlaceHolder id="PlaceHolderHead" runat="server" />
<asp:Literal ID="LiteralCrowdinScript" runat="server" Text="" />
@@ -29,7 +34,7 @@
</script>
</head>
<body>
<form id="form2" runat="server">
<form id="form1" runat="server">
<telerik:RadScriptManager ID="RadScriptManager1" runat="server" />
<script type="text/javascript">
//Put your JavaScript code here.
@@ -40,6 +45,8 @@
<telerik:RadSkinManager ID="RadSkinManager1" Runat="server" Skin="WebBlue">
</telerik:RadSkinManager>
<!-- Main menu, dynamically constructed -->
<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" /> | </div><div style="background-image:url('/Images/Icons/iconshock-lock-16px.png');background-repeat:no-repeat;padding-left:16px;float:left"><asp:LinkButton ID="LinkLogout" runat="server" OnClick="LinkLogout_Click" /> |&nbsp;</div><asp:Image ID="ImageCultureIndicator" runat="server" ImageUrl="~/Images/Flags/uk.png" /> <asp:LinkButton ID="LinkTranslate" Visible="false" Text="Translate Into" OnClick="LinkTranslate_Click" runat="server" /></div>
<div class="logoimage"><a href="/"><img style="border:none" src="/Style/Images/activizr-v5-pirateedition-logo.png" alt="Activizr Logo" /></a></div>
+25 -9
View File
@@ -46,7 +46,7 @@ div.BankUploadInstructionsImage
#lean_overlay {
position: fixed;
z-index:100;
z-index:10000;
top: 0px;
left: 0px;
height:100%;
@@ -87,13 +87,14 @@ div.BankUploadInstructionsImage
<asp:Content ID="Content2" ContentPlaceHolderID="PlaceHolderMain" Runat="Server">
<asp:UpdatePanel ID="Panel1" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<h2><asp:Label ID="LabelSelectBankUploadFilter" Text="Select File Type To Upload" runat="server"/></h2>
<h2><asp:Label ID="LabelSelectBankUploadFilter" Text="Select Bank And Bookkeeping" runat="server"/></h2>
<h3><asp:Label ID="LabelBank" Text="Bank" runat="server" /></h3>
<asp:ImageButton OnClick="ButtonSebAccountFile_Click" CssClass="FileTypeImage" ID="ButtonSebAccountFile" runat="server" ImageUrl="~/Images/Ledgers/uploadbankfiles-type-seb-kontoutdrag.png"/>
<asp:ImageButton CssClass="FileTypeImage" ID="ButtonSebPaymentFile" runat="server" ImageUrl="~/Images/Ledgers/uploadbankfiles-type-seb-bankgirofil.png"/>
<asp:HiddenField ID="HiddenFileType" runat="server"/>
<div style="clear:both;margin-bottom:10px"></div>
<div id="DivSelectAccount" <asp:Literal ID="LiteralSelectAccountDivStyle" runat="server" Text="style='opacity:0;display:none;'" />>
<h3><asp:Label ID="LabelSelectAccount" runat="server" Text="XYZ" /></h3>
<h3><asp:Label ID="LabelSelectAccount" runat="server" Text="Bookkeeping Account" /></h3>
<asp:DropDownList runat="server" ID="DropAccounts" OnSelectedIndexChanged="DropAccounts_SelectedIndexChanged" AutoPostBack="true"/>
</div>
</ContentTemplate>
@@ -102,15 +103,28 @@ div.BankUploadInstructionsImage
</Triggers>
</asp:UpdatePanel>
<div style="opacity:0;display:none" id="DivInstructions">
<h2><asp:Label ID="LabelDownloadInstructions" Text="XYZ Bank Download Instructions" runat="server" /></h2>
<a rel="leanModal" name="ModalDownloadInstructions" id="go" href="#ModalDownloadInstructions">Foo<asp:Image ID="ImageDownloadInstructions" ImageUrl="~/Images/Ledgers/uploadbankfiles-seb-kontoutdrag-small.png" ImageAlign="Right" runat="server" /></a>
<p><asp:Literal ID="LiteralDownloadInstructions" runat="server" Text="Fooo!!!" /><asp:Literal ID="LiteralLastAccountRecord" runat="server" /></p><p><asp:Label ID="LabelClickImage" runat="server" /></p>
<div style="clear:both"></div>
<div style="opacity:0;display:none;padding-top:20px" id="DivInstructions">
<asp:UpdatePanel ID="PanelInstructions" UpdateMode="Conditional" runat="server">
<ContentTemplate>
<br/><h2><asp:Label ID="LabelUploadH2Header" Text="Upload Bank File" runat="server" /></h2>
<a rel="leanModal" name="ModalDownloadInstructions" id="go" href="#ModalDownloadInstructions"><asp:Image ID="ImageDownloadInstructions" ImageUrl="~/Images/Ledgers/uploadbankfiles-seb-kontoutdrag-small.png" ImageAlign="Right" runat="server" /></a>
<h3><asp:Label ID="LabelDownloadInstructions" Text="Download File From Bank" runat="server" /></h3>
<p><asp:Literal ID="LiteralDownloadInstructions" runat="server" Text="Fooo!!!" /><asp:Literal ID="LiteralLastAccountRecord" runat="server" /></p><p><asp:Label ID="LabelClickImage" runat="server" /></p>
<div style="clear:both"></div>
<h3><asp:Label ID="LabelUploadH3Header" Text="Upload File To Activizr" runat="server" /></h3>
</ContentTemplate>
<Triggers>
<asp:AsyncPostBackTrigger ControlID="ButtonSebAccountFile" EventName="Click" />
</Triggers>
</asp:UpdatePanel>
<telerik:RadAsyncUpload ID="Upload" runat="server" />
</div>
<div id="ModalDownloadInstructions">
<asp:UpdatePanel ID="PanelInstructions" runat="server" UpdateMode="Conditional">
<asp:UpdatePanel ID="PanelModalInstructions" runat="server" UpdateMode="Conditional">
<ContentTemplate>
<h2><asp:Label ID="LabelModalInstructionHeader" Text="Bank Screenshot" runat="server" /></h2>
<span style="text-align:center"><asp:Image runat="server" ID="ImageDownloadInstructionsFull" /></span><br /><br /><hr /><br />
<asp:Literal ID="LiteralDownloadInstructionsModal" runat="server" />
</ContentTemplate>
@@ -119,6 +133,8 @@ div.BankUploadInstructionsImage
</Triggers>
</asp:UpdatePanel>
</div>
<br/>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="PlaceHolderSide" Runat="Server">
@@ -82,6 +82,12 @@ namespace Activizr.Site.Pages.Ledgers
"$(\"#DivInstructions\").fadeTo('slow',1.0);", true);
ScriptManager.RegisterClientScriptBlock(this.Panel1, this.Panel1.GetType(), "ShowInstructions",
"$(\"#DivInstructions\").css('display','inline');", true);
ScriptManager.RegisterClientScriptBlock(this.Panel1, this.Panel1.GetType(), "ReiterateModality",
"$(function () { $(\"a[rel*=leanModal]\").leanModal();});", true);
}
}
}