This commit is contained in:
Rick Falkvinge
2014-08-20 01:06:43 +00:00
parent 9a16f487b5
commit b54f9aaa6d
4 changed files with 37 additions and 10 deletions
+30
View File
@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
/// <summary>
/// Summary description for MainMenuItem
/// </summary>
[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; }
}
+1 -4
View File
@@ -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
/// <param name="e">An <see cref="T:System.EventArgs"></see> that contains the event data.</param>
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)
+5 -1
View File
@@ -285,6 +285,10 @@
<data name="UploadBankFiles_ErrorInterpretation" xml:space="preserve">
<value>&lt;h3&gt;The bank file could not be imported.&lt;/h3&gt;&lt;p&gt;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. &lt;strong&gt;Please retry.&lt;/strong&gt;</value>
</data>
<data name="UploadBankFiles_ExpectedFile" xml:space="preserve">
<value>Expected File</value>
<comment>The name of the expected file for uploading.</comment>
</data>
<data name="UploadBankFiles_FileImportedHeader" xml:space="preserve">
<value>File Successfully Imported</value>
<comment>Displayed as header after successful processing</comment>
@@ -350,7 +354,7 @@
<value>Processing Complete</value>
</data>
<data name="UploadBankFiles_ResultsBad" xml:space="preserve">
<value>&lt;p&gt;&lt;strong&gt;The file could not be read as an input file to this bank.&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</value>
<value>&lt;p&gt;&lt;br/&gt;&lt;strong&gt;The file could not be read as an input file to this bank.&lt;/strong&gt;&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;</value>
<comment>Displayed when the input file can't be parsed, before import attempt.</comment>
</data>
<data name="UploadBankFiles_ResultsGood" xml:space="preserve">
+1 -5
View File
@@ -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();