From 37b906296d32c854bdfeb2534f09f5ac792fb983 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sun, 5 Apr 2015 21:06:38 +0200 Subject: [PATCH] Fixed loc & URL path cosmetics in DashboardTodos --- Logic/Swarm/DashboardTodos.cs | 8 ++++---- Site5/App_GlobalResources/Global.resx | 3 +++ Site5/Master-v5.master.cs | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Logic/Swarm/DashboardTodos.cs b/Logic/Swarm/DashboardTodos.cs index 201c235b..aa01631f 100644 --- a/Logic/Swarm/DashboardTodos.cs +++ b/Logic/Swarm/DashboardTodos.cs @@ -55,7 +55,7 @@ namespace Swarmops.Logic.Swarm } todo.Icon = "/Images/PageIcons/iconshock-invoice-greentick-16px.png"; - todo.Url = "/Pages/v5/Financial/ValidateReceipts.aspx"; + todo.Url = "/Financial/ValidateReceipts"; Add (todo); } @@ -116,7 +116,7 @@ namespace Swarmops.Logic.Swarm } todo.Icon = "/Images/PageIcons/iconshock-stamped-paper-16px.png"; - todo.Url = "/Pages/v5/Financial/AttestCosts.aspx"; + todo.Url = "/Financial/AttestCosts"; Add (todo); } @@ -175,7 +175,7 @@ namespace Swarmops.Logic.Swarm } todo.Icon = "/Images/PageIcons/iconshock-stamped-paper-16px.png"; - todo.Url = "/Pages/v5/Financial/AttestCosts.aspx"; + todo.Url = "/Financial/AttestCosts"; Add (todo); } @@ -194,7 +194,7 @@ namespace Swarmops.Logic.Swarm todoNormal.Url = todoUrgent.Url = - todoOverdue.Url = "/Pages/v5/Financial/PayOutMoney.aspx"; + todoOverdue.Url = "/Financial/PayOutMoney"; todoNormal.Icon = todoUrgent.Icon = diff --git a/Site5/App_GlobalResources/Global.resx b/Site5/App_GlobalResources/Global.resx index 17dd08d9..599b8f9f 100644 --- a/Site5/App_GlobalResources/Global.resx +++ b/Site5/App_GlobalResources/Global.resx @@ -671,4 +671,7 @@ No reason was specified. As inter-activist communication when denying resources, et cetera + + No urgent action items. Yay! + \ No newline at end of file diff --git a/Site5/Master-v5.master.cs b/Site5/Master-v5.master.cs index 0ff88ac5..0ab111c5 100644 --- a/Site5/Master-v5.master.cs +++ b/Site5/Master-v5.master.cs @@ -117,7 +117,7 @@ namespace Swarmops this.LabelActionPlaceholder1.Text = "Action shortcut 1 (TODO)"; this.LabelActionPlaceholder2.Text = "Action shortcut 2 (TODO)"; - this.LabelNoTodoItems.Text = "No Action Items (LOC)"; + this.LabelNoTodoItems.Text = Resources.Global.Global_NoActionItems; // Set up todo items