diff --git a/Site5/App_Code/MainMenuItem.cs b/Site5/App_Code/MainMenuItem.cs
new file mode 100644
index 00000000..4f5e7f1e
--- /dev/null
+++ b/Site5/App_Code/MainMenuItem.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+///
+/// Summary description for MainMenuItem
+///
+[Serializable]
+public class MainMenuItem
+{
+ public MainMenuItem()
+ {
+ Children = new MainMenuItem[0];
+ }
+
+ // FromXml
+ // ToXml
+
+ public string ResourceKey { get; set; }
+ public int UserLevel { get; set; }
+ public string Permissions { get; set; }
+ public string ImageUrl { get; set; }
+ public string NavigateUrl { get; set; }
+
+ // TODO: INSERTION POINT (for plugins)
+
+ public MainMenuItem[] Children { get; set; }
+
+}
\ No newline at end of file
diff --git a/Site5/App_Code/PageV5Base.cs b/Site5/App_Code/PageV5Base.cs
index c40b27c9..82d11daa 100644
--- a/Site5/App_Code/PageV5Base.cs
+++ b/Site5/App_Code/PageV5Base.cs
@@ -19,6 +19,7 @@ public class PageV5Base : System.Web.UI.Page
{
public PermissionSet pagePermissionDefault = new PermissionSet(Permission.CanSeeSelf); //Use from menu;
public Access PageAccessRequired = null; // v5 mechanism
+ public int DatabaseVersionRequired = 0; // v5 mechanism
/// An that contains the event data.
protected override void OnInitComplete(System.EventArgs e)
@@ -64,10 +65,6 @@ public class PageV5Base : System.Web.UI.Page
protected override void OnPreInit(EventArgs e)
{
- // Unlock Telerik (kick out at first opportunity...)
-
- this.Application["Telerik.Web.UI.Key"] = "Activizr";
-
// Localization
// Set default culture (English, United States, but that doesn't work so fake it to GB)
diff --git a/Site5/App_GlobalResources/Pages.Ledgers.resx b/Site5/App_GlobalResources/Pages.Ledgers.resx
index 2cef0781..1bf19b9e 100644
--- a/Site5/App_GlobalResources/Pages.Ledgers.resx
+++ b/Site5/App_GlobalResources/Pages.Ledgers.resx
@@ -285,6 +285,10 @@
<h3>The bank file could not be imported.</h3><p>This has one of three reasons: you missed some detail in the download instructions, the bank has changed its format, or you accidentally uploaded the wrong file entirely (like a photo from your last party instead of the transactions list). No transactions were imported at all. <strong>Please retry.</strong>
+
+ Expected File
+ The name of the expected file for uploading.
+
File Successfully Imported
Displayed as header after successful processing
@@ -350,7 +354,7 @@
Processing Complete
- <p><strong>The file could not be read as an input file to this bank.</strong></p><p>There are several reasons this could happen: the file may be bad, the bank may have silently changed its format, or you uploaded the wrong file entirely. Please try again.</p>
+ <p><br/><strong>The file could not be read as an input file to this bank.</strong></p><p>There are several reasons this could happen: the file may be corrupt, the bank may have silently changed its file format, or you uploaded the wrong file entirely. Please try again.</p>
Displayed when the input file can't be parsed, before import attempt.
diff --git a/Site5/Security/Login.aspx.cs b/Site5/Security/Login.aspx.cs
index 81c8bc11..655bca3f 100644
--- a/Site5/Security/Login.aspx.cs
+++ b/Site5/Security/Login.aspx.cs
@@ -24,12 +24,8 @@ namespace Swarmops.Pages.Security
return;
}
- //Person rick = Person.FromIdentity(1);
- //rick.SetPassword("1");
+ // THE DAMN BITID NEEDS TO GO INTO ANDROID WALLET SO WE CAN STREAMLINE AND REWRITE THIS POS
- // Unlock Telerik
-
- this.Application["Telerik.Web.UI.Key"] = "Activizr";
this.LabelLoginFailed.Visible = false;
this.TextLogin.Focus();