diff --git a/Site5/App_Code/ControlV5Base.cs b/Site5/App_Code/ControlV5Base.cs
index 5818df9c..0d2b707e 100644
--- a/Site5/App_Code/ControlV5Base.cs
+++ b/Site5/App_Code/ControlV5Base.cs
@@ -1,6 +1,8 @@
using System;
using System.Collections.Generic;
+using System.IO;
using System.Web;
+using Swarmops.Logic.Cache;
using Swarmops.Logic.Swarm;
using Swarmops.Logic.Security;
using Swarmops.Logic.Structure;
@@ -37,4 +39,29 @@ public class ControlV5Base : System.Web.UI.UserControl
base.OnLoad(e);
}
+
+ protected string GetBuildIdentity()
+ {
+ // Read build number if not loaded, or set to "Private" if none
+ string buildIdentity = (string) GuidCache.Get("_buildIdentity");
+
+ if (buildIdentity == null)
+ {
+ try
+ {
+ using (StreamReader reader = File.OpenText(HttpContext.Current.Request.MapPath("~/BuildIdentity.txt")))
+ {
+ buildIdentity = "Build " + reader.ReadLine();
+ }
+ }
+ catch (Exception)
+ {
+ buildIdentity = "Private Build";
+ }
+
+ GuidCache.Set("_buildIdentity", buildIdentity);
+ }
+
+ return buildIdentity;
+ }
}
diff --git a/Site5/App_GlobalResources/Pages.Financial.resx b/Site5/App_GlobalResources/Pages.Financial.resx
index 16622b00..8d5b383d 100644
--- a/Site5/App_GlobalResources/Pages.Financial.resx
+++ b/Site5/App_GlobalResources/Pages.Financial.resx
@@ -112,10 +112,10 @@
2.0
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
Cash Advance #{0:N0} for {1} has been attested for {3:N2}.
@@ -282,7 +282,7 @@
As this is your own budget, attestation is already complete. Only validation is necessary.
- Upload Receipt Images:
+ Upload Receipt Images
Please enter the amount of money (in {0}) that you are claiming.
diff --git a/Site5/Controls/v5/Base/MainMenu.ascx.cs b/Site5/Controls/v5/Base/MainMenu.ascx.cs
index 7ce4fc08..279f32e8 100644
--- a/Site5/Controls/v5/Base/MainMenu.ascx.cs
+++ b/Site5/Controls/v5/Base/MainMenu.ascx.cs
@@ -53,6 +53,11 @@ namespace Swarmops.Controls.Base
}
localizedText = Server.HtmlEncode(localizedText); // muy importante
+ if (menuItem.Type == MenuItemType.BuildNumber)
+ {
+ localizedText = GetBuildIdentity();
+ }
+
string iconSize = "40px";
if (File.Exists(Server.MapPath("~/Images/PageIcons/" + menuItem.ImageUrl + "-20px.png")))
@@ -71,6 +76,7 @@ namespace Swarmops.Controls.Base
menuItem.ImageUrl, menuItem.NavigateUrl, localizedText, iconSize);
break;
case MenuItemType.Disabled:
+ case MenuItemType.BuildNumber:
string imageUrl = "/Images/PageIcons/" + menuItem.ImageUrl + "-" + iconSize + ".png";
if (String.IsNullOrEmpty(menuItem.ImageUrl))
{
diff --git a/Site5/MainMenu-v5.xml b/Site5/MainMenu-v5.xml
index 35047035..423007e2 100644
--- a/Site5/MainMenu-v5.xml
+++ b/Site5/MainMenu-v5.xml
@@ -228,12 +228,24 @@
- Ugly_Todo
- 1
+ Administration
+ 4
- Disabled
-
+ Submenu
+
+
+
+
+ 4
+
+
+
+ BuildNumber
+
+
+
+
\ No newline at end of file
diff --git a/Site5/Master-v5.master.cs b/Site5/Master-v5.master.cs
index d6228faf..075804d8 100644
--- a/Site5/Master-v5.master.cs
+++ b/Site5/Master-v5.master.cs
@@ -298,27 +298,7 @@ namespace Swarmops
return anyItemEnabled;
}*/
- private string GetBuildIdentity()
- {
- // Read build number if not loaded, or set to "Private" if none
- if (_buildIdentity == null)
- {
- try
- {
- using (StreamReader reader = File.OpenText(HttpContext.Current.Request.MapPath("~/BuildIdentity.txt")))
- {
- _buildIdentity = "Build " + reader.ReadLine();
- }
- }
- catch (Exception)
- {
- _buildIdentity = "Private Build";
- }
- }
-
- return _buildIdentity;
- }
/*