Work on Dashboard

This commit is contained in:
Rick Falkvinge
2017-01-09 12:20:47 +01:00
parent e125f64697
commit a14bcab2e7
13 changed files with 66 additions and 20 deletions
+1
View File
@@ -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
{
+1 -1
View File
@@ -56,7 +56,7 @@ namespace Swarmops.Controls.Base
// Hard coded beta menu with build statistics, bug reporting option
output.Write(("<li class='Submenu' id='LiSwarmopsLogo'><div id='DivSwarmopsLogo'></div><ul>")); // Swarmops logo
output.Write(("<li class='Submenu' id='LiSwarmopsLogo'><a href='/'><div id='DivSwarmopsLogo'></div></a><ul>")); // Swarmops logo
output.Write("<li class='BuildNumber' dir='ltr'><a href='#builddata'><img src='/Images/PageIcons/swarmops-builder-40px.png' height='20' width='20' />" + Formatting.SwarmopsVersion + "</a></li>");
output.Write(
"<li class='Disabled' dir='ltr'><a href='#builddata'><img src='/Images/PageIcons/transparency-16px.png' height='20' width='20' />" +
+3 -2
View File
@@ -8,8 +8,9 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="PlaceHolderMain" Runat="Server">
Random Odometer <div class="odometer">1,234.01</div>
<div class="box" style="background-image: url(/Images/Other/member-background-istockphoto.jpg); background-size: 700px 110px"><div class="content">
<div class="odometer-wrapper"><div class="elementFloatFar odometer nocents">1,234.01</div><div class="odometer-label">Random Odometer (Testing new code)</div>
</div></div></div>
<h2>Dashboard Placeholder</h2>
<p>This system, <em>Swarmops,</em> 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.</p>
+1
View File
@@ -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);
Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

+15 -8
View File
@@ -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" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -140,10 +141,12 @@
<div style="background-image:url('/Images/Icons/iconshock-workchair-16px.png');background-repeat:no-repeat;padding-left:17px;float:left"><span class="hasTooltip" rel="Logged into <%=this.CurrentOrganization.Name %>" title="Click here to switch to another organization."><a href="/Security/ChangeOrganizations" id="LinkChangeOrganizations"><asp:Label ID="LabelCurrentOrganizationName" runat="server" /></a></span> |&nbsp;</div>
<div style="background-image:url('/Images/Icons/iconshock-gamepad-16px.png');background-repeat:no-repeat;padding-left:20px;float:left" id="divUserPreferences"><asp:Label ID="LabelPreferences" runat="server" /> | </div>
<div style="background-image:url('/Images/Icons/iconshock-lock-16px.png');background-repeat:no-repeat;padding-left:16px;float:left"><asp:LinkButton ID="LinkLogout" runat="server" OnClick="LinkLogout_Click" /> |&nbsp;</div>
<a href="/User/SelectLanguage"><asp:Image ID="ImageCultureIndicator" runat="server" ImageUrl="~/Images/Flags/uk-24px.png" /></a>
<a href="/User/SelectLanguage"><asp:Image ID="ImagekjjklCultureIndicator" runat="server" ImageUrl="~/Images/Flags/uk-24px.png" /></a>
</div>-->
<div class="topmenu">
<div class="center980px">
<div class="elementFloatFar" style="padding-top: 10px;"><a href="/User/SelectLanguage"><asp:Image ID="ImageCultureIndicator" runat="server" ImageUrl="~/Images/Flags/uk-24px.png" /></a></div>
<div class="elementFloatFar" style="padding-top: 5px; padding-left: 3px; padding-right: 3px"><a href="javascript:masterBeginEditPerson(0);"><img src="/Images/Icons/iconshock-user-<%=CurrentUser.Gender.ToString().ToLower() %>.png" height="28"/></a></div>
<div class="topSearchBox" id="divTopSearchBox"><asp:TextBox ID="SearchBox" runat="server" /></div>
<Swarmops5:MainMenu ID="MainMenu" runat="server" />
</div>
@@ -153,11 +156,15 @@
<div class="mainbar">
<!--<div id="page-icon-encaps"><asp:Image ID="IconPage" runat="server" ImageUrl="~/Images/PageIcons/iconshock-steering-wheel-40px.png" /></div><h1><asp:Label ID="LabelPageTitle" Text="Dashboard" runat="server" /></h1>-->
<div class="box">
<div class="content">
<% if (!(this.Page as PageV5Base).IsDashboard)
{ %>
<div class="box">
<div class="content"> <% } %>
<asp:ContentPlaceHolder ID="PlaceHolderMain" runat="server" />
</div>
</div>
<% if (!(this.Page as PageV5Base).IsDashboard)
{ %>
</div>
</div> <% } %>
</div>
@@ -165,11 +172,11 @@
<div class="sidebar">
<div class="box">
<div class="content">
<div class="box">
<div class="content">
<asp:Image ID="ImageLogo" Width="220" runat="server"/>
</div>
</div>
</div>
<h2 class="blue"><asp:Label ID="LabelSidebarInfo" runat="server" /><span class="arrow"></span></h2>
+9
View File
@@ -129,6 +129,15 @@ namespace Swarmops.Frontend {
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton LinkLogout;
/// <summary>
/// ImagekjjklCultureIndicator control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Image ImagekjjklCultureIndicator;
/// <summary>
/// ImageCultureIndicator control.
/// </summary>
+4
View File
@@ -814,6 +814,9 @@
<Content Include="Images\Icons\iconshock-switch-red-64px-hot.png" />
<Content Include="Images\Icons\iconshock-switch-red-64px.png" />
<Content Include="Images\Icons\iconshock-user-16px.png" />
<Content Include="Images\Icons\iconshock-user-female.png" />
<Content Include="Images\Icons\iconshock-user-male.png" />
<Content Include="Images\Icons\iconshock-user-unknown.png" />
<Content Include="Images\Icons\iconshock-warning-16px.png" />
<Content Include="Images\Icons\iconshock-warning-16x12px.png" />
<Content Include="Images\Icons\iconshock-warning-24px.png" />
@@ -843,6 +846,7 @@
<Content Include="Images\Ledgers\uploadbankfiles-type-seb.png" />
<Content Include="Images\Logo-Stock.png" />
<Content Include="Images\Other\clipart-panda-free-sandbox-icon-64px.png" />
<Content Include="Images\Other\member-background-istockphoto.jpg" />
<Content Include="Images\PageIcons\iconshock-abacus-16px.png" />
<Content Include="Images\PageIcons\iconshock-abacus-40px.png" />
<Content Include="Images\PageIcons\iconshock-assets-128px.png" />
+7 -9
View File
@@ -87,15 +87,13 @@
border-radius: 0.34em;
font-family: "Arimo", monospace;
padding: 0.15em;
background: #000;
color: #eee0d3;
background: #476EC7;
color: #FFEDC8;
}
.odometer.odometer-auto-theme .odometer-digit, .odometer.odometer-theme-car .odometer-digit {
-moz-box-shadow: inset 0 0 0.3em rgba(0, 0, 0, 0.8);
-webkit-box-shadow: inset 0 0 0.3em rgba(0, 0, 0, 0.8);
box-shadow: inset 0 0 0.3em rgba(0, 0, 0, 0.8);
box-shadow: inset 0 0 0.3em #1C397E;
background-size: 100%;
background-image: linear-gradient(to bottom, #333333 0%, #333333 40%, #101010 60%, #333333 80%, #333333 100%);
background-image: linear-gradient(to bottom, #476EC7 0%, #476EC7 40%, #1C397E 60%, #476EC7 80%, #476EC7 100%);
padding: 0 0.15em;
}
.odometer.odometer-auto-theme .odometer-digit:first-child, .odometer.odometer-theme-car .odometer-digit:first-child {
@@ -103,13 +101,13 @@
-webkit-border-radius: 0.2em;
border-radius: 0.2em 0 0 0.2em;
}
.odometer.odometer-auto-theme .odometer-digit:last-child, .odometer.odometer-auto-theme .odometer-digit:nth-last-child(2), .odometer.odometer-theme-car .odometer-digit:last-child, .odometer.odometer-theme-car .odometer-digit:nth-last-child(2) {
.odometer.odometer-auto-theme:not(.nocents) .odometer-digit:last-child, .odometer.odometer-auto-theme:not(.nocents) .odometer-digit:nth-last-child(2), .odometer.odometer-theme-car:not(.nocents) .odometer-digit:last-child, .odometer.odometer-theme-car:not(.nocents) .odometer-digit:nth-last-child(2) {
-moz-border-radius: 0 0.2em 0.2em 0;
-webkit-border-radius: 0;
border-radius: 0 0.2em 0.2em 0;
background-size: 100%;
background-image: linear-gradient(to bottom, #eee0d3 0%, #eee0d3 40%, #bbaa9a 60%, #eee0d3 80%, #eee0d3 100%);
background-color: #eee0d3;
background-image: linear-gradient(to bottom, #FFEDC8 0%, #FFEDC8 40%, #FFD580 60%, #FFEDC8 80%, #FFEDC8 100%);
background-color: #FFD580;
color: #000;
}
.odometer.odometer-auto-theme .odometer-digit .odometer-digit-inner, .odometer.odometer-theme-car .odometer-digit .odometer-digit-inner {
+25
View File
@@ -219,6 +219,10 @@ body.rtl .topSearchBox input {
background-position-y: 34px;
}
li#LiSwarmopsLogo a.sf-with-ul {
padding: 0px !important; /* override superfish superpadding */
}
#ctl00_MainMenu {
font: 14px/20px Ubuntu !important;
background-color: transparent;
@@ -239,7 +243,28 @@ body.rtl span.buildId {
direction: ltr; /* parentheses freak out unless specified LTR */
}
/* DASHBOARD THINGS */
.odometer {
font-size: 20px;
font-weight: 500;
}
.odometer-wrapper {
height: 30px;
}
.odometer-label {
font-size: 16px;
padding-top: 6px;
font-weight: 400;
padding-left: 4px;
}
body.rtl .odometer-label {
padding-left: inherit;
padding-right: 4px;
}
/* BARS AND BOXEN */