diff --git a/Site/Bases/PageV5Base.cs b/Site/Bases/PageV5Base.cs index 701f495c..fb635f85 100644 --- a/Site/Bases/PageV5Base.cs +++ b/Site/Bases/PageV5Base.cs @@ -17,6 +17,7 @@ namespace Swarmops.Frontend { public int DbVersionRequired = 0; // v5 mechanism public Access PageAccessRequired = null; // v5 mechanism + public bool IsDashboard = false; // if true, master doesn't box in protected new MasterV5Base Master { diff --git a/Site/Controls/v5/Base/MainMenu.ascx.cs b/Site/Controls/v5/Base/MainMenu.ascx.cs index 0a47e7ac..c860ff17 100644 --- a/Site/Controls/v5/Base/MainMenu.ascx.cs +++ b/Site/Controls/v5/Base/MainMenu.ascx.cs @@ -56,7 +56,7 @@ namespace Swarmops.Controls.Base // Hard coded beta menu with build statistics, bug reporting option - output.Write(("
This system, Swarmops, is under heavy (re)construction. It has been the admin mainstay of the Swedish Pirate Party since 2006, and is being generalized to encompass any organization.
diff --git a/Site/Default.aspx.cs b/Site/Default.aspx.cs index c9f63ac9..f3990d55 100644 --- a/Site/Default.aspx.cs +++ b/Site/Default.aspx.cs @@ -12,6 +12,7 @@ namespace Swarmops.Frontend { protected void Page_Load (object sender, EventArgs e) { + IsDashboard = true; PageTitle = Global.Dashboard_PageTitle; PageIcon = "iconshock-steering-wheel"; this.PageAccessRequired = new Access (AccessAspect.Null, AccessType.Read); diff --git a/Site/Images/Icons/iconshock-user-female.png b/Site/Images/Icons/iconshock-user-female.png new file mode 100644 index 00000000..70568b1f Binary files /dev/null and b/Site/Images/Icons/iconshock-user-female.png differ diff --git a/Site/Images/Icons/iconshock-user-male.png b/Site/Images/Icons/iconshock-user-male.png new file mode 100644 index 00000000..22c41bf0 Binary files /dev/null and b/Site/Images/Icons/iconshock-user-male.png differ diff --git a/Site/Images/Icons/iconshock-user-unknown.png b/Site/Images/Icons/iconshock-user-unknown.png new file mode 100644 index 00000000..b4497898 Binary files /dev/null and b/Site/Images/Icons/iconshock-user-unknown.png differ diff --git a/Site/Images/Other/member-background-istockphoto.jpg b/Site/Images/Other/member-background-istockphoto.jpg new file mode 100644 index 00000000..dac0db7c Binary files /dev/null and b/Site/Images/Other/member-background-istockphoto.jpg differ diff --git a/Site/Master-v5.master b/Site/Master-v5.master index b6b29b90..edd15d85 100644 --- a/Site/Master-v5.master +++ b/Site/Master-v5.master @@ -1,5 +1,6 @@ <%@ Master Language="C#" AutoEventWireup="true" Inherits="Swarmops.Frontend.MasterV5" Codebehind="Master-v5.master.cs" %> <%@ Import Namespace="System.Runtime.CompilerServices" %> +<%@ Import Namespace="Swarmops.Frontend" %> @@ -140,10 +141,12 @@