From a14bcab2e7fb2bbd85b04e7edfca868a037a1fd2 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Mon, 9 Jan 2017 12:20:47 +0100 Subject: [PATCH] Work on Dashboard --- Site/Bases/PageV5Base.cs | 1 + Site/Controls/v5/Base/MainMenu.ascx.cs | 2 +- Site/Default.aspx | 5 ++-- Site/Default.aspx.cs | 1 + Site/Images/Icons/iconshock-user-female.png | Bin 0 -> 5512 bytes Site/Images/Icons/iconshock-user-male.png | Bin 0 -> 5253 bytes Site/Images/Icons/iconshock-user-unknown.png | Bin 0 -> 3791 bytes .../Other/member-background-istockphoto.jpg | Bin 0 -> 61939 bytes Site/Master-v5.master | 23 ++++++++++------ Site/Master-v5.master.designer.cs | 9 +++++++ Site/Site.csproj | 4 +++ Site/Style/odometer-theme-car.css | 16 +++++------ Site/Style/style-v5.css | 25 ++++++++++++++++++ 13 files changed, 66 insertions(+), 20 deletions(-) create mode 100644 Site/Images/Icons/iconshock-user-female.png create mode 100644 Site/Images/Icons/iconshock-user-male.png create mode 100644 Site/Images/Icons/iconshock-user-unknown.png create mode 100644 Site/Images/Other/member-background-istockphoto.jpg 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(("