Re-added Admin menu and display of build number

This commit is contained in:
Rick Falkvinge
2014-09-27 14:03:25 +02:00
parent ef160918ca
commit 120522d817
5 changed files with 52 additions and 27 deletions
+27
View File
@@ -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;
}
}
@@ -112,10 +112,10 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AttestCosts_AdvanceAttested" xml:space="preserve">
<value>Cash Advance #{0:N0} for {1} has been attested for {3:N2}.</value>
@@ -282,7 +282,7 @@
<value>As this is your own budget, attestation is already complete. Only validation is necessary.</value>
</data>
<data name="FileExpenseClaim_UploadRecieptImages" xml:space="preserve">
<value>Upload Receipt Images:</value>
<value>Upload Receipt Images</value>
</data>
<data name="FileExpenseClaim_ValidationError_Amount" xml:space="preserve">
<value>Please enter the amount of money (in {0}) that you are claiming.</value>
+6
View File
@@ -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))
{
+16 -4
View File
@@ -228,12 +228,24 @@
<!-- TEMP PLACEHOLDER -->
<MainMenuItem>
<ResourceKey>Ugly_Todo</ResourceKey>
<UserLevel>1</UserLevel>
<ResourceKey>Administration</ResourceKey>
<UserLevel>4</UserLevel>
<Permissions />
<ImageUrl />
<Type>Disabled</Type>
<Children />
<Type>Submenu</Type>
<Children>
<MainMenuItem>
<ResourceKey />
<UserLevel>4</UserLevel>
<Permissions />
<ImageUrl />
<NavigateUrl />
<Type>BuildNumber</Type>
<Children />
</MainMenuItem>
</Children>
</MainMenuItem>
</ArrayOfMainMenuItem>
-20
View File
@@ -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;
}
/*