jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature: New Theme

Browse Source 
New icon, theme, and fuzzy time. Add moment.js
This commit is contained in:
Gary Sharp
2013-12-24 14:15:07 +11:00
parent ec118a3395
commit f1ee2937cd
216 changed files with 7816 additions and 1948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Public/Models/HeldDevices/HeldDeviceQueryModel.cs
+3 -3
View File
@@ -43,16 +43,16 @@ namespace Disco.Web.Areas.Public.Models.HeldDevices
var n = DateTime.Now;
if (!this.ReadyForReturn && this.EstimatedReturnTime.HasValue && this.EstimatedReturnTime.Value > n)
{
uhdm.EstimatedReturnTime = this.EstimatedReturnTime.ToFuzzy();
uhdm.EstimatedReturnTime = this.EstimatedReturnTime.FromNow();
}
if (this.ReadyForReturn)
{
uhdm.ReadyForReturnSince = this.ReadyForReturnSince.ToFuzzy();
uhdm.ReadyForReturnSince = this.ReadyForReturnSince.FromNow();
uhdm.IsAlert = (this.ReadyForReturnSince.Value < DateTime.Now.AddDays(-3));
}
if (this.WaitingForUserAction)
{
uhdm.WaitingForUserActionSince = this.WaitingForUserActionSince.ToFuzzy();
uhdm.WaitingForUserActionSince = this.WaitingForUserActionSince.FromNow();
uhdm.IsAlert = (this.WaitingForUserActionSince.Value < n.AddDays(-6));
}
return uhdm;