Update: SignalR v1.0.1 Migration; Json.NET

This commit is contained in:
Gary Sharp committed 2013-05-06 19:04:29 +10:00
1 parent 9431ec983e
commit f320db3538
39 files changed
+2132 -1132

No files matched your search

@@ -1,5 +1,5 @@
using Disco.Data.Repository.Monitor; using Disco.Data.Repository.Monitor;
using SignalR; using Microsoft.AspNet.SignalR;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -15,7 +15,7 @@ namespace Disco.BI.Interop.SignalRHandlers
RepositoryMonitor.StreamAfterCommit.Subscribe(AfterCommit); RepositoryMonitor.StreamAfterCommit.Subscribe(AfterCommit);
} }
protected override System.Threading.Tasks.Task OnReceivedAsync(IRequest request, string connectionId, string data) protected override Task OnReceived(IRequest request, string connectionId, string data)
{ {
// Add to Group // Add to Group
if (!string.IsNullOrWhiteSpace(data) && data.StartsWith("/addToGroups:") && data.Length > 13) if (!string.IsNullOrWhiteSpace(data) && data.StartsWith("/addToGroups:") && data.Length > 13)
@@ -26,7 +26,8 @@ namespace Disco.BI.Interop.SignalRHandlers
this.Groups.Add(connectionId, g); this.Groups.Add(connectionId, g);
} }
} }
return base.OnReceivedAsync(request, connectionId, data);
return base.OnReceived(request, connectionId, data);
} }
private static void AfterCommit(RepositoryMonitorEvent e) private static void AfterCommit(RepositoryMonitorEvent e)
@@ -2,9 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using SignalR; using Microsoft.AspNet.SignalR;
using SignalR.Hosting.AspNet;
using SignalR.Infrastructure;
namespace Disco.BI.Interop.SignalRHandlers namespace Disco.BI.Interop.SignalRHandlers
{ {
+17 -13
View File
@@ -46,28 +46,32 @@
<Reference Include="itextsharp"> <Reference Include="itextsharp">
<HintPath>..\Resources\Libraries\iTextSharp\itextsharp.dll</HintPath> <HintPath>..\Resources\Libraries\iTextSharp\itextsharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.AspNet.SignalR.Core">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Owin">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.0.1\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.SystemWeb">
<HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.1.0.1\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Owin.Host.SystemWeb">
<HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.1.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private> <Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath> <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference> </Reference>
<Reference Include="Quartz"> <Reference Include="Quartz">
<HintPath>..\Resources\Libraries\Quartz\Quartz.dll</HintPath> <HintPath>..\Resources\Libraries\Quartz\Quartz.dll</HintPath>
</Reference> </Reference>
<Reference Include="SignalR, Version=0.5.1.10822, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.AspNet, Version=0.5.1.10822, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SignalR.Hosting.AspNet.0.5.3\lib\net45\SignalR.Hosting.AspNet.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.Common">
<HintPath>..\packages\SignalR.Hosting.Common.0.5.3\lib\net40\SignalR.Hosting.Common.dll</HintPath>
</Reference>
<Reference Include="Spring.Core"> <Reference Include="Spring.Core">
<HintPath>..\Resources\Libraries\Spring.NET\Spring.Core.dll</HintPath> <HintPath>..\Resources\Libraries\Spring.NET\Spring.Core.dll</HintPath>
</Reference> </Reference>
@@ -237,7 +241,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" /> <UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" /> <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0506.1443")] [assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1443")] [assembly: AssemblyFileVersion("1.2.0506.1845")]
+6 -4
View File
@@ -1,14 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="EntityFramework" version="5.0.0" targetFramework="net45" /> <package id="EntityFramework" version="5.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Owin" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.SystemWeb" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" /> <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" /> <package id="Newtonsoft.Json" version="5.0.4" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" />
<package id="SignalR.Hosting.AspNet" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Server" version="0.5.3" targetFramework="net45" />
</packages> </packages>
+2 -2
View File
@@ -50,7 +50,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
@@ -122,7 +122,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" /> <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<PropertyGroup> <PropertyGroup>
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0506.1442")] [assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1442")] [assembly: AssemblyFileVersion("1.2.0506.1845")]
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40-Client" /> <package id="Newtonsoft.Json" version="5.0.4" targetFramework="net40-Client" />
</packages> </packages>
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0506.1436")] [assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1436")] [assembly: AssemblyFileVersion("1.2.0506.1845")]
+2 -2
View File
@@ -42,7 +42,7 @@
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -159,7 +159,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>
<UserProperties BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" /> <UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_StartDate="2011/7/1" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" /> <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0506.1443")] [assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1443")] [assembly: AssemblyFileVersion("1.2.0506.1845")]
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="EntityFramework" version="5.0.0" targetFramework="net45" /> <package id="EntityFramework" version="5.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" /> <package id="Newtonsoft.Json" version="5.0.4" targetFramework="net45" />
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0506.1443")] [assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1443")] [assembly: AssemblyFileVersion("1.2.0506.1845")]
+7 -15
View File
@@ -39,31 +39,23 @@
<Reference Include="EntityFramework"> <Reference Include="EntityFramework">
<HintPath>..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath> <HintPath>..\packages\EntityFramework.5.0.0\lib\net45\EntityFramework.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.AspNet.SignalR.Core">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private> <Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath> <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="Quartz"> <Reference Include="Quartz">
<HintPath>..\Resources\Libraries\Quartz\Quartz.dll</HintPath> <HintPath>..\Resources\Libraries\Quartz\Quartz.dll</HintPath>
</Reference> </Reference>
<Reference Include="RazorGenerator.Mvc, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="RazorGenerator.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\RazorGenerator.Mvc.1.5.4.0\lib\net40\RazorGenerator.Mvc.dll</HintPath> <HintPath>..\packages\RazorGenerator.Mvc.2.0.1\lib\net40\RazorGenerator.Mvc.dll</HintPath>
</Reference>
<Reference Include="SignalR, Version=0.5.1.10822, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.AspNet, Version=0.5.1.10822, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SignalR.Hosting.AspNet.0.5.3\lib\net45\SignalR.Hosting.AspNet.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.Common">
<HintPath>..\packages\SignalR.Hosting.Common.0.5.3\lib\net40\SignalR.Hosting.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -160,7 +152,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" /> <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<PropertyGroup> <PropertyGroup>
@@ -2,16 +2,15 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using SignalR; using Microsoft.AspNet.SignalR;
using SignalR.Hosting.AspNet; using Microsoft.AspNet.SignalR.Infrastructure;
using SignalR.Infrastructure;
namespace Disco.Services.Logging.Targets namespace Disco.Services.Logging.Targets
{ {
public class LogLiveContext : PersistentConnection public class LogLiveContext : PersistentConnection
{ {
protected override System.Threading.Tasks.Task OnReceivedAsync(IRequest request, string connectionId, string data) protected override System.Threading.Tasks.Task OnReceived(IRequest request, string connectionId, string data)
{ {
// Add to Group // Add to Group
if (!string.IsNullOrWhiteSpace(data) && data.StartsWith("/addToGroups:") && data.Length > 13) if (!string.IsNullOrWhiteSpace(data) && data.StartsWith("/addToGroups:") && data.Length > 13)
@@ -23,7 +22,7 @@ namespace Disco.Services.Logging.Targets
} }
} }
return base.OnReceivedAsync(request, connectionId, data); return base.OnReceived(request, connectionId, data);
} }
internal static void Broadcast(LogBase logModule, Models.LogEventType eventType, DateTime Timestamp, params object[] Arguments) internal static void Broadcast(LogBase logModule, Models.LogEventType eventType, DateTime Timestamp, params object[] Arguments)
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0506.1443")] [assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1443")] [assembly: AssemblyFileVersion("1.2.0506.1845")]
@@ -2,16 +2,15 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using SignalR; using Microsoft.AspNet.SignalR;
using SignalR.Hosting.AspNet; using Microsoft.AspNet.SignalR.Infrastructure;
using SignalR.Infrastructure;
namespace Disco.Services.Tasks namespace Disco.Services.Tasks
{ {
public class ScheduledTasksLiveStatusService : PersistentConnection public class ScheduledTasksLiveStatusService : PersistentConnection
{ {
protected override System.Threading.Tasks.Task OnReceivedAsync(IRequest request, string connectionId, string data) protected override System.Threading.Tasks.Task OnReceived(IRequest request, string connectionId, string data)
{ {
// Add to Group // Add to Group
if (!string.IsNullOrWhiteSpace(data) && data.StartsWith("/addToGroups:") && data.Length > 13) if (!string.IsNullOrWhiteSpace(data) && data.StartsWith("/addToGroups:") && data.Length > 13)
@@ -22,8 +21,7 @@ namespace Disco.Services.Tasks
this.Groups.Add(connectionId, g); this.Groups.Add(connectionId, g);
} }
} }
return base.OnReceived(request, connectionId, data);
return base.OnReceivedAsync(request, connectionId, data);
} }
internal static void Broadcast(ScheduledTaskStatusLive SessionStatus) internal static void Broadcast(ScheduledTaskStatusLive SessionStatus)
+3 -5
View File
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="EntityFramework" version="5.0.0" targetFramework="net45" /> <package id="EntityFramework" version="5.0.0" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net45" /> <package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" /> <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" /> <package id="Newtonsoft.Json" version="5.0.4" targetFramework="net45" />
<package id="RazorGenerator.Mvc" version="1.5.4.0" targetFramework="net45" /> <package id="RazorGenerator.Mvc" version="2.0.1" targetFramework="net45" />
<package id="SignalR.Hosting.AspNet" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Server" version="0.5.3" targetFramework="net45" />
<package id="SqlServerCompact" version="4.0.8854.1" targetFramework="net40" /> <package id="SqlServerCompact" version="4.0.8854.1" targetFramework="net40" />
<package id="WebActivatorEx" version="2.0.1" targetFramework="net45" /> <package id="WebActivatorEx" version="2.0.1" targetFramework="net45" />
</packages> </packages>
@@ -45,7 +45,7 @@
</Reference> </Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -133,7 +133,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>
<VisualStudio> <VisualStudio>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_BuildAction="Both" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2011/7/1" /> <UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildAction="Both" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" /> <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0506.1443")] [assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1443")] [assembly: AssemblyFileVersion("1.2.0506.1845")]
+1 -1
View File
@@ -5,6 +5,6 @@
<package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net45" /> <package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" /> <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" /> <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" /> <package id="Newtonsoft.Json" version="5.0.4" targetFramework="net45" />
<package id="WebActivatorEx" version="2.0.1" targetFramework="net45" /> <package id="WebActivatorEx" version="2.0.1" targetFramework="net45" />
</packages> </packages>
+2 -2
View File
@@ -4,7 +4,7 @@ using System.Linq;
using System.Web; using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
using System.Web.Routing; using System.Web.Routing;
using SignalR; using Microsoft.AspNet.SignalR;
namespace Disco.Web namespace Disco.Web
{ {
@@ -75,7 +75,7 @@ namespace Disco.Web
// Task Status SignalR Route // Task Status SignalR Route
routes.MapConnection<Disco.Services.Tasks.ScheduledTasksLiveStatusService>( routes.MapConnection<Disco.Services.Tasks.ScheduledTasksLiveStatusService>(
"API_Logging_TaskStatusNotifications", "API_Logging_TaskStatusNotifications",
"API/Logging/TaskStatusNotifications/{*operation}"); "API/Logging/TaskStatusNotifications");
// Task Status Ajax Route // Task Status Ajax Route
routes.MapRoute( routes.MapRoute(
+4 -4
View File
@@ -1,6 +1,6 @@
using System.Web.Mvc; using System.Web.Mvc;
using System.Web.Routing; using System.Web.Routing;
using SignalR; using Microsoft.AspNet.SignalR;
namespace Disco.Web.Areas.API namespace Disco.Web.Areas.API
{ {
@@ -17,13 +17,13 @@ namespace Disco.Web.Areas.API
public override void RegisterArea(AreaRegistrationContext context) public override void RegisterArea(AreaRegistrationContext context)
{ {
context.Routes.MapConnection<Disco.Services.Logging.Targets.LogLiveContext>( context.Routes.MapConnection<Disco.Services.Logging.Targets.LogLiveContext>(
"API_Logging_Notifications", "API/Logging/Notifications/{*operation}"); "API_Logging_Notifications", "API/Logging/Notifications");
context.Routes.MapConnection<Disco.Services.Tasks.ScheduledTasksLiveStatusService>( context.Routes.MapConnection<Disco.Services.Tasks.ScheduledTasksLiveStatusService>(
"API_Logging_TaskStatusNotifications", "API/Logging/TaskStatusNotifications/{*operation}"); "API_Logging_TaskStatusNotifications", "API/Logging/TaskStatusNotifications");
context.Routes.MapConnection<Disco.BI.Interop.SignalRHandlers.RepositoryMonitorNotifications>( context.Routes.MapConnection<Disco.BI.Interop.SignalRHandlers.RepositoryMonitorNotifications>(
"API_Repository_Notifications", "API/Repository/Notifications/{*operation}"); "API_Repository_Notifications", "API/Repository/Notifications");
context.MapRoute( context.MapRoute(
"API_Update", "API_Update",
@@ -1,6 +1,6 @@
using System.Web.Mvc; using System.Web.Mvc;
using System.Web.Routing; using System.Web.Routing;
using SignalR; using Microsoft.AspNet.SignalR;
namespace Disco.Web.Areas.Public namespace Disco.Web.Areas.Public
{ {
@@ -17,7 +17,7 @@ namespace Disco.Web.Areas.Public
public override void RegisterArea(AreaRegistrationContext context) public override void RegisterArea(AreaRegistrationContext context)
{ {
context.Routes.MapConnection<BI.Interop.SignalRHandlers.UserHeldDevices>( context.Routes.MapConnection<BI.Interop.SignalRHandlers.UserHeldDevices>(
"Public_UserHeldDevices_Notifications", "Public/UserHeldDevices/Notifications/{*operation}"); "Public_UserHeldDevices_Notifications", "Public/UserHeldDevices/Notifications");
context.MapRoute( context.MapRoute(
"Public_Credits", "Public_Credits",
File diff suppressed because it is too large. Load diff
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<bundle minify="true" runOnBuild="true"> <bundle minify="true" runOnBuild="true">
<file>/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-0.5.3.js</file> <file>/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-1.0.1.js</file>
</bundle> </bundle>
@@ -1,2 +1,2 @@
(function(n,t){"use strict";if(typeof n!="function")throw"SignalR: jQuery not found. Please ensure jQuery is referenced before the SignalR.js file.";if(!t.JSON)throw"SignalR: No JSON parser found. Please ensure json2.js is referenced before the SignalR.js file if you need to support clients without native JSON parsing support, e.g. IE<8.";var i,e,o=!1,f=n(t),r={onStart:"onStart",onStarting:"onStarting",onSending:"onSending",onReceived:"onReceived",onError:"onError",onReconnect:"onReconnect",onStateChanged:"onStateChanged",onDisconnect:"onDisconnect"},s=function(n,i){if(i!==!1){var r;typeof t.console!="undefined"&&(r="["+(new Date).toTimeString()+"] SignalR: "+n,t.console.debug?t.console.debug(r):t.console.log&&t.console.log(r))}},h=function(i){var r;return(i=n.trim(i),i.indexOf("http")!==0)?!1:(r=t.document.createElement("a"),r.href=i,r.protocol+r.host!==t.location.protocol+t.location.host)},u=function(t,i,u){return i===t.state?(n(t).trigger(r.onStateChanged,[{oldState:t.state,newState:u}]),t.state=u,!0):!1},c=function(n){return n.state===i.connectionState.disconnected};i=function(n,t,r){return new i.fn.init(n,t,r)},i.events=r,i.changeState=u,i.isDisconnecting=c,i.connectionState={connecting:0,connected:1,reconnecting:2,disconnected:4},i.hub={start:function(){throw"SignalR: Error loading hubs. Ensure your hubs reference is correct, e.g. <script src='/signalr/hubs'><\/script>.";}},f.load(function(){o=!0}),i.fn=i.prototype={init:function(n,t,i){this.url=n,this.qs=t,typeof i=="boolean"&&(this.logging=i)},ajaxDataType:"json",logging:!1,state:i.connectionState.disconnected,reconnectDelay:2e3,start:function(e,s){var c=this,l={waitForPageLoad:!0,transport:"auto",jsonp:!1},y,a=c.deferral||n.Deferred(),v=t.document.createElement("a"),p;return(n.type(e)==="function"?s=e:n.type(e)==="object"&&(n.extend(l,e),n.type(l.callback)==="function"&&(s=l.callback)),!o&&l.waitForPageLoad===!0)?(f.load(function(){c.deferral=a,c.start(e,s)}),a.promise()):u(c,i.connectionState.disconnected,i.connectionState.connecting)===!1?(a.resolve(c),a.promise()):(v.href=c.url,v.protocol&&v.protocol!==":"?(c.protocol=v.protocol,c.host=v.host,c.baseUrl=v.protocol+"//"+v.host):(c.protocol=t.document.location.protocol,c.host=t.document.location.host,c.baseUrl=c.protocol+"//"+c.host),c.wsProtocol=c.protocol==="https:"?"wss://":"ws://",h(c.url)&&(c.log("Auto detected cross domain url."),l.transport==="auto"&&(l.jsonp||(l.jsonp=!n.support.cors,l.jsonp&&c.log("Using jsonp because this browser doesn't support CORS")),l.transport=l.jsonp===!0?"longPolling":["webSockets","longPolling"])),c.ajaxDataType=l.jsonp?"jsonp":"json",n(c).bind(r.onStart,function(){n.type(s)==="function"&&s.call(c),a.resolve(c)}),y=function(t,e){if(e=e||0,e>=t.length){c.transport||(n(c).trigger(r.onError,"SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization."),a.reject("SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization."),c.stop());return}var o=t[e],s=n.type(o)==="object"?o:i.transports[o];if(o.indexOf("_")===0){y(t,e+1);return}s.start(c,function(){c.transport=s,u(c,i.connectionState.connecting,i.connectionState.connected),n(c).trigger(r.onStart),f.unload(function(){c.stop(!1)})},function(){y(t,e+1)})},p=c.url+"/negotiate",c.log("Negotiating with '"+p+"'."),n.ajax({url:p,global:!1,cache:!1,type:"GET",data:{},dataType:c.ajaxDataType,error:function(t){n(c).trigger(r.onError,[t.responseText]),a.reject("SignalR: Error during negotiation request: "+t.responseText),c.stop()},success:function(t){if(c.appRelativeUrl=t.Url,c.id=t.ConnectionId,c.webSocketServerUrl=t.WebSocketServerUrl,!t.ProtocolVersion||t.ProtocolVersion!=="1.0"){n(c).trigger(r.onError,"SignalR: Incompatible protocol version."),a.reject("SignalR: Incompatible protocol version.");return}n(c).trigger(r.onStarting);var u=[],f=[];n.each(i.transports,function(n){if(n==="webSockets"&&!t.TryWebSockets)return!0;f.push(n)}),n.isArray(l.transport)?n.each(l.transport,function(){var t=this;(n.type(t)==="object"||n.type(t)==="string"&&n.inArray(""+t,f)>=0)&&u.push(n.type(t)==="string"?""+t:t)}):n.type(l.transport)==="object"||n.inArray(l.transport,f)>=0?u.push(l.transport):u=f,y(u)}}),a.promise())},starting:function(t){var i=this,u=n(i);return u.bind(r.onStarting,function(){t.call(i),u.unbind(r.onStarting)}),i},send:function(n){var t=this;if(t.state===i.connectionState.disconnected)throw"SignalR: Connection must be started before data can be sent. Call .start() before .send()";if(t.state===i.connectionState.connecting)throw"SignalR: Connection has not been fully initialized. Use .start().done() or .start().fail() to run logic after the connection has started.";return t.transport.send(t,n),t},sending:function(t){var i=this;return n(i).bind(r.onSending,function(){t.call(i)}),i},received:function(t){var i=this;return n(i).bind(r.onReceived,function(n,r){t.call(i,r)}),i},statLine truncated (function(n,t){"use strict";function a(t,r){var u,f;if(n.isArray(t)){for(u=t.length-1;u>=0;u--)f=t[u],n.type(t)==="object"||n.type(f)==="string"&&i.transports[f]||(r.log("Invalid transport: "+f+", removing it from the transports list."),t.splice(u,1));t.length===0&&(r.log("No transports remain within the specified transport array."),t=null)}else n.type(t)==="object"||i.transports[t]||t==="auto"||(r.log("Invalid transport: "+t.toString()),t=null);return t}function v(n){return n==="http:"?80:n==="https:"?443:void 0}function s(n,t){return t.match(/:\d+$/)?t:t+":"+v(n)}if(typeof n!="function")throw new Error("SignalR: jQuery not found. Please ensure jQuery is referenced before the SignalR.js file.");if(!t.JSON)throw new Error("SignalR: No JSON parser found. Please ensure json2.js is referenced before the SignalR.js file if you need to support clients without native JSON parsing support, e.g. IE<8.");var i,e,o=t.document.readyState==="complete",f=n(t),r={onStart:"onStart",onStarting:"onStarting",onReceived:"onReceived",onError:"onError",onConnectionSlow:"onConnectionSlow",onReconnecting:"onReconnecting",onReconnect:"onReconnect",onStateChanged:"onStateChanged",onDisconnect:"onDisconnect"},h=function(n,i){if(i!==!1){var r;typeof t.console!="undefined"&&(r="["+(new Date).toTimeString()+"] SignalR: "+n,t.console.debug?t.console.debug(r):t.console.log&&t.console.log(r))}},u=function(t,i,u){return i===t.state?(t.state=u,n(t).triggerHandler(r.onStateChanged,[{oldState:i,newState:u}]),!0):!1},c=function(n){return n.state===i.connectionState.disconnected},l=function(n){var r,u;n._.configuredStopReconnectingTimeout||(u=function(n){n.log("Couldn't reconnect within the configured timeout ("+n.disconnectTimeout+"ms), disconnecting."),n.stop(!1,!1)},n.reconnecting(function(){var n=this;n.state===i.connectionState.reconnecting&&(r=t.setTimeout(function(){u(n)},n.disconnectTimeout))}),n.stateChanged(function(n){n.oldState===i.connectionState.reconnecting&&t.clearTimeout(r)}),n._.configuredStopReconnectingTimeout=!0)};i=function(n,t,r){return new i.fn.init(n,t,r)},i.events=r,i.changeState=u,i.isDisconnecting=c,i.connectionState={connecting:0,connected:1,reconnecting:2,disconnected:4},i.hub={start:function(){throw new Error("SignalR: Error loading hubs. Ensure your hubs reference is correct, e.g. <script src='/signalr/hubs'><\/script>.");}},f.load(function(){o=!0}),i.fn=i.prototype={init:function(n,t,i){this.url=n,this.qs=t,this._={},typeof i=="boolean"&&(this.logging=i)},isCrossDomain:function(i,r){var u;return(i=n.trim(i),i.indexOf("http")!==0)?!1:(r=r||t.location,u=t.document.createElement("a"),u.href=i,u.protocol+s(u.protocol,u.host)!==r.protocol+s(r.protocol,r.host))},ajaxDataType:"json",logging:!1,state:i.connectionState.disconnected,keepAliveData:{},reconnectDelay:2e3,disconnectTimeout:3e4,keepAliveWarnAt:2/3,start:function(e,s){var h=this,c={waitForPageLoad:!0,transport:"auto",jsonp:!1},w,v=h._deferral||n.Deferred(),y=t.document.createElement("a"),p;if(n.type(e)==="function"?s=e:n.type(e)==="object"&&(n.extend(c,e),n.type(c.callback)==="function"&&(s=c.callback)),c.transport=a(c.transport,h),!c.transport)throw new Error("SignalR: Invalid transport(s) specified, aborting start.");return!o&&c.waitForPageLoad===!0?(f.load(function(){h._deferral=v,h.start(e,s)}),v.promise()):(l(h),u(h,i.connectionState.disconnected,i.connectionState.connecting)===!1)?(v.resolve(h),v.promise()):(y.href=h.url,y.protocol&&y.protocol!==":"?(h.protocol=y.protocol,h.host=y.host,h.baseUrl=y.protocol+"//"+y.host):(h.protocol=t.document.location.protocol,h.host=t.document.location.host,h.baseUrl=h.protocol+"//"+h.host),h.wsProtocol=h.protocol==="https:"?"wss://":"ws://",c.transport==="auto"&&c.jsonp===!0&&(c.transport="longPolling"),this.isCrossDomain(h.url)&&(h.log("Auto detected cross domain url."),c.transport==="auto"&&(c.transport=["webSockets","longPolling"]),c.jsonp||(c.jsonp=!n.support.cors,c.jsonp&&h.log("Using jsonp because this browser doesn't support CORS"))),h.ajaxDataType=c.jsonp?"jsonp":"json",n(h).bind(r.onStart,function(){n.type(s)==="function"&&s.call(h),v.resolve(h)}),w=function(t,e){if(e=e||0,e>=t.length){h.transport||(n(h).triggerHandler(r.onError,"SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization."),v.reject("SignalR: No transport could be initialized successfully. Try specifying a different transport or none at all for auto initialization."),h.stop());return}var o=t[e],s=n.type(o)==="object"?o:i.transports[o];if(o.indexOf("_")===0){w(t,e+1);return}s.start(h,function(){s.supportsKeepAlive&&h.keepAliveData.activated&&i.transports._logic.monitorKeepAlive(h),h.transport=s,u(h,i.connectionState.connecting,i.connectionState.connected),n(h).triggerHandler(r.onStart),f.unload(function(){h.stop(!1)})},function(){w(t,e+1)})},p=h.url+"/negotiate",p=i.transports._logic.addQs(p,h),h.log("Negotiating with '"+p+"'."),n.ajax({url:p,global:!1,cache:!1,type:"GELine truncated
//@ sourceMappingURL=jQuery-SignalR.min.js.map //@ sourceMappingURL=jQuery-SignalR.min.js.map
@@ -2,7 +2,7 @@
"version":3, "version":3,
"file":"jQuery-SignalR.min.js", "file":"jQuery-SignalR.min.js",
"lineCount":1, "lineCount":1,
"mappings":"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 truncated "mappings":"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 truncated
"sources":["/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-0.5.3.js"], "sources":["/ClientSource/Scripts/Modules/jQuery-SignalR/jquery.signalR-1.0.1.js"],
"names":["$","window","JSON","signalR","_connection","_pageLoaded","_pageWindow","events","log","msg","logging","m","console","Date","toTimeString","debug","isCrossDomain","url","link","trim","indexOf","document","createElement","href","protocol","host","location","changeState","connection","expectedState","newState","state","trigger","onStateChanged","isDisconnecting","connectionState","disconnected","qs","fn","init","hub","start","load","prototype","options","callback","config","initialize","deferred","deferral","Deferred","parser","type","extend","waitForPageLoad","promise","connecting","resolve","baseUrl","wsProtocol","transport","jsonp","support","cors","ajaxDataType","bind","onStart","call","transports","index","length","onError","reject","stop","transportName","connected","unload","ajax","error","responseText","success","res","appRelativeUrl","Url","id","ConnectionId","webSocketServerUrl","WebSocketServerUrl","ProtocolVersion","onStarting","supportedTransports","each","key","TryWebSockets","push","isArray","inArray","starting","$connection","unbind","send","data","sending","onSending","received","onReceived","e","stateChanged","onDisconnect","reconnected","onReconnect","async","abort","messageId","groups","noConflict","signalR.noConflict","jQuery","_logic","addQs","param","escape","toString","getUrl","reconnecting","appendReconnectUrl","stringify","Math","floor","random","ajaxSend","name","result","errData","textStatus","ajaxAbort","processMessages","Disconnect","Messages","MessageId","TransportData","Groups","transportLogic","webSockets","socket","onSuccess","onFailed","opened","that","MozWebSocket","WebSocket","onopen","connection.socket.onopen","onclose","connection.socket.onclose","event","wasClean","reason","reconnect","onmessage","connection.socket.onmessage","parse","setTimeout","reconnectDelay","close","serverSentEvents","connectTimeOut","eventSource","EventSource","Message","readyState","CONNECTING","OPEN","timeOut","addEventListener","clearTimeout","eventPhase","CLOSED","foreverFrame","frameId","count","frame","prop","connections","append","src","receive","cw","frameMessageCount","contentWindow","contentDocument","empty","execCommand","remove","getConnection","started","longPolling","initialConnectFired","pollXhr","poll","instance","raiseReconnect","connect","reconnectTimeOut","reconnectFired","delay","timedOutReceived","LongPollDelay","TimedOut","getArgValue","a","isFunction","hubProxy","hubConnection","hubName","settings","useDefaultPath","callbackId","callbacks","eventNamespace","Array","hasOwnProperty","map","Array.prototype.map","fun","thisp","arr","i","subscribed","on","eventName","self","toLowerCase","apply","invoke","methodName","args","makeArray","arguments","slice","userCallback","methodArgs","argValues","d","State","Error","StackTrace","rejectWith","Result","resolveWith","hubConnection.fn.init","proxies","subscribedHubs","proxy","dataCallbackId","Id","method","scope","Method","Hub","Args","createProxy","hubConnection.fn.createProxy"] "names":["$","window","validateTransport","requestedTransport","connection","i","transport","isArray","length","type","signalR","transports","log","splice","toString","getDefaultPort","protocol","addDefaultPort","url","match","Error","JSON","_connection","_pageLoaded","document","readyState","_pageWindow","events","msg","logging","m","console","Date","toTimeString","debug","changeState","expectedState","newState","state","triggerHandler","onStateChanged","isDisconnecting","connectionState","disconnected","configureStopReconnectingTimeout","stopReconnectingTimeout","onReconnectTimeout","_","configuredStopReconnectingTimeout","disconnectTimeout","stop","reconnecting","setTimeout","stateChanged","data","oldState","clearTimeout","qs","fn","init","hub","start","load","prototype","isCrossDomain","against","link","trim","indexOf","location","createElement","href","host","options","callback","config","initialize","deferred","_deferral","Deferred","parser","extend","waitForPageLoad","promise","connecting","resolve","baseUrl","wsProtocol","jsonp","support","cors","ajaxDataType","bind","onStart","call","index","onError","reject","transportName","supportsKeepAlive","keepAliveData","activated","_logic","monitorKeepAlive","connected","unload","addQs","ajax","error","responseText","success","res","supportedTransports","appRelativeUrl","Url","id","ConnectionId","token","ConnectionToken","webSocketServerUrl","WebSocketServerUrl","DisconnectTimeout","KeepAliveTimeout","timeout","timeoutWarning","keepAliveWarnAt","checkInterval","ProtocolVersion","onStarting","each","key","TryWebSockets","push","inArray","starting","send","received","onReceived","e","onDisconnect","connectionSlow","onConnectionSlow","onReconnecting","reconnected","onReconnect","async","notifyServer","abort","stopMonitoringKeepAlive","messageId","groupsToken","noConflict","signalR.noConflict","jQuery","checkIfAlive","diff","timeElapsed","setTime","lastKeepAlive","getTime","lostConnection","userNotified","monitoring","pingServer","deferral","Response","statusText","appender","firstChar","param","charAt","getUrl","appendReconnectUrl","encodeURIComponent","Math","floor","random","maximizePersistentResponse","minPersistentResponse","C","M","D","T","L","G","updateGroups","ajaxSend","name","result","errData","textStatus","ajaxAbort","processMessages","minData","$connection","updateKeepAlive","Disconnect","GroupsToken","Messages","MessageId","that","reconnectKeepAliveUpdate","connection.keepAliveData.reconnectKeepAliveUpdate","unbind","ensureReconnectingState","transportLogic","webSockets","socket","onSuccess","onFailed","opened","WebSocket","ID","currentSocketID","onopen","connection.socket.onopen","attemptingReconnect","onclose","connection.socket.onclose","event","wasClean","reason","reconnect","onmessage","connection.socket.onmessage","parse","isEmptyObject","reconnectDelay","close","serverSentEvents","connectTimeOut","eventSource","EventSource","currentEventSourceID","Message","CONNECTING","OPEN","timeOut","addEventListener","reconnectTimeout","eventPhase","CLOSED","foreverFrame","frameId","count","frame","append","prop","connections","src","receive","cw","frameMessageCount","contentWindow","contentDocument","empty","execCommand","message","remove","getConnection","started","longPolling","onComplete","pingLoop","pingFail","done","fail","initialConnectedFired","fireConnect","pollXhr","poll","instance","raiseReconnect","connect","delay","LongPollDelay","makeEventName","eventNamespace","getArgValue","a","isFunction","hasMembers","obj","hasOwnProperty","hubProxy","hubConnection","hubName","settings","useDefaultPath","callbackId","callbacks","Array","map","Array.prototype.map","fun","thisp","arr","hasSubscriptions","callbackMap","on","eventName","self","toLowerCase","apply","off","callbackSpace","invoke","methodName","args","makeArray","arguments","slice","argValues","d","minResult","_maximizeHubResponse","State","StackTrace","rejectWith","resolveWith","Result","S","stringify","minHubResponse","R","I","E","hubConnection.fn.init","proxies","proxy","dataCallbackId","method","scope","_maximizeClientHubInvocation","Method","Hub","Args","hubConnection.fn._maximizeClientHubInvocation","minClientHubInvocation","H","A","_registerSubscribedHubs","hubConnection.fn._registerSubscribedHubs","_subscribedToHubs","subscribedHubs","createHubProxy","hubConnection.fn.createHubProxy","version"]
} }
@@ -2163,6 +2163,9 @@ td.subtleHighlight {
.ajaxRemove:hover { .ajaxRemove:hover {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/;
} }
#layout_Page div.hiddenDialog {
display: none;
}
/* float clearing for IE6 */ /* float clearing for IE6 */
* html .clearfix { * html .clearfix {
height: 1%; height: 1%;
+1 -1
View File
@@ -1 +1 @@
.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:.1px;display:block}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted #000}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin-top:2px;padding:.5em .5em .5em .7em;min-height:0}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-noicons{padding-left:.7em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month-year{width:100%}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:49%}.ui-datepicker table{width:1Line truncated .ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:.1px;display:block}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted #000}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin-top:2px;padding:.5em .5em .5em .7em;min-height:0}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-noicons{padding-left:.7em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month-year{width:100%}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:49%}.ui-datepicker table{width:1Line truncated
+3
View File
@@ -987,6 +987,9 @@ td.subtleHighlight {
.ajaxRemove:hover { .ajaxRemove:hover {
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADG0lEQVQ4y3WTCUhUURSG35vlvnnzZsoJQyMo2nTMKdsXEtOcjKxogwhKaDFNysysJooQRzTLbIFScVrIaMEiElqgMjUzsnEWl1apbNG0dCqcJiarv+NEgWEPfnj3nO/+5567cAC4f3XOb5ChfFrkemvMgn0PoufllhkmJZ2R/Mf0xfYanFTr9A/nL77ozT3oxZVrgOUEUFAEHC2AJz3zm8M495KFaUf3aXDaLyCqc+WqdqSZgKRk0iZg/UYgcePv8aYtwFYTWpYu/2CRdMZeBkeYdmTrrDnvEbsIXZNnoInknRqOn5ExQORsdEcY8dI4H54p4UDsQjRNj+g8IFfr/xqUDx5W8iV0Ap4HDoV9xWq8rLWjnsBPukB8JtXPnodmijnj1uBNwBC4Q8JQOnBwqc9gLy/qH+kCvVaFiKogA9xuN3o+V1sbbOOnotYwAR1vW3wxt8eDB/qxcCpUqNEO6DbzKgOXJxcTrjMNjnBynGICGtIz8JPgHnW2tKLjzVvf/w/SY3MWLggqHCP2skyFLF7YwJkV4p58qm7iFMjjZLBQV/a0rXB1dOJTV5dPLpcLzm0mFFOugJhsYgt5hkxeyOVMCjEnUyliMcdjMyWzCCoODsXTujq8ePUKL5qb8ayxEWcN43CYcllUPYm43bwC23lhP5cqV60rZGrEk0EKAXmjx+B+eQUcNKnxyROfHA2NqLlThfywidhJzFpi98iUSO1pIYFj+uMqzbdDlCgcOhyVN26hrLoa1TY7bMkpsG9Ixj27HTer7sBpdaA0bApyiM2XC92JHDP4jnGnUiwpozbOSRrczzCjwmaDPSUVFQRWkhxkVEkm1py9KOnXD1ep+i6ZcPnvPYjj2AiLqG2vkwu4LWNwRkbDSX02kZ6TGmjJDVHRKKfjq6UNLFKKHTQnqNdVXsmz8GJ1/3evmYQWCnuUamBAAOA/CF6VFu0Ua5aLKGZSexzPZvX5mJZxylHpgub8Xb+BX11BofgeFYPvM434GDIWNbqAr2YmlSzjWPB/X+MfLaGNXaeQ4ndo/LNNki47QSnFL+VYSF/sL7crTEWWnWvrAAAAAElFTkSuQmCC) /*Images/Actions/remove.png*/;
} }
#layout_Page div.hiddenDialog {
display: none;
}
/* float clearing for IE6 */ /* float clearing for IE6 */
* html .clearfix { * html .clearfix {
height: 1%; height: 1%;
+4
View File
@@ -1180,6 +1180,10 @@ td.subtleHighlight
} }
} }
#layout_Page div.hiddenDialog {
display: none;
}
// Clearfix // Clearfix
/* float clearing for IE6 */ /* float clearing for IE6 */
* html .clearfix * html .clearfix
+1 -1
View File
@@ -1 +1 @@
.tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}body{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;margin:0;padding:0 10px;color:#333}body.layout{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAFvCAMAAABEoqrSAAADAFBMVEVRUVFUVFRYWFhbW1tfX19iYmJmZmZpaWltbW1wcHB0dHR3d3d7e3t/f3/MzMzNzc3Ozs7Pz8/Q0NDR0dHS0tLT09PU1NTV1dXW1tbX19fY2NjZ2dna2trb29vc3Nzd3d3e3t7f39/g4ODh4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojp6enq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fHy8vLz8/P09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8/Pz9/f3+/v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD28iAmAAAAbklEQVRIx2NUZ4ABlv9kMZkYRrXhYUphMwzZXEYCogQV0FfbUHMOrSxGAoyMBEygM/M/zZnMjFiZDPQEjCYEsin2/EYKk6qGDTVzR7TnRwN1NFBHPT8aqKOBOur5Uc+PBip1zWVkYGCBCv2nhrkAr7hI+jpl4KUAAAAASUVORK5CYII=) left top repeat-x #d1d1d1}.page{max-width:1230px;min-width:750px;margin-left:auto;margin-right:auto}header,#header{position:relative;margin:0;padding:0;height:110px}header #headerMenu,#header #headerMenu{height:24px;padding:4px;line-height:22px;text-align:right}header #headerMenu a,#header #headerMenu a{color:#000;text-decoration:none}header #headerMenu a:hover,#header #headerMenu a:hover{text-decoration:underline}header #heading,#header #heading{float:left;height:75px}header #heading img,#header #heading img{height:75px;width:300px}header nav,#header nav{padding:0;margin:0;font-size:1.1em}header nav ul#menu,#header nav ul#menu{height:29px;padding:3px 6px;margin:0;list-style:none;z-index:100000}header nav ul#menu>li,#header nav ul#menu>li{display:inline-block;z-index:100000;margin-bottom:-4px}header nav ul#menu>li a,#header nav ul#menu>li a{padding:4px 10px;text-decoration:none;color:#fff;display:inline-block;height:21px}header nav ul#menu>li a:hover,#header nav ul#menu>li a:hover{color:#ffd5ba;text-decoration:none}header nav ul#menu>li a:active,#header nav ul#menu>li a:active{text-decoration:none}header nav ul#menu>li.sep,#header nav ul#menu>li.sep{margin-top:4px;height:21px;border-left:1px solid #777}header nav ul#menu>li.moveRight,#header nav ul#menu>li.moveRight{margin-left:40px}header nav ul#menu>li>ul,#header nav ul#menu>li>ul{z-index:100000;display:none;list-style:none;position:absolute;margin:2px 0 0 0;-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0;border-left:1px solid #ecab72;border-bottom:2px solid #ecab72;border-right:1px solid #ecab72;padding:0;min-width:180px}header nav ul#menu>li>ul li,#header nav ul#menu>li>ul li{position:relative;background-color:rgba(242,242,242,.9);background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC);background-position:top;background-repeat:repeat-x}header nav ul#menu>li>ul li:hover,#header nav ul#menu>li>ul li:hover{background-color:rgba(249,228,210,.75)}header nav ul#menu>li>ul li.hasSubmenu,#header nav ul#menu>li>ul li.hasSubmenu{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAYAAACgu+4kAAAAa0lEQVQoz2NgGBRg8uTJO4BYhxIDVgPxHyCeDcQS5BpiAcSHgfgzENcBMRe5BgUC8Line truncated .tableData{border:solid 1px #e8eef4;border-collapse:collapse}.tableData>tbody>tr>td{border:solid 1px #e8eef4;background-color:#fff}.tableData>tbody>tr:nth-child(odd)>td{background-color:#fcfcfd}.tableData>thead>tr>th,.tableData>tbody>tr>th{background-color:#e8eef4;border:solid 1px #e8eef4}.tableData>tbody>tr:hover>td{background-color:#e8eef4}.tableDataDark{border:solid 1px #8db2d8;border-collapse:collapse}.tableDataDark td{border:solid 1px #8db2d8;background-color:#fff}.tableDataDark th{background-color:#8db2d8;border:solid 1px #8db2d8}.tableDataContainer{background-color:#fff}.tableDataVertical{border:solid 1px #e8eef4;border-collapse:collapse}.tableDataVertical>tbody>tr:nth-child(odd){background-color:#e8eef4;margin:0;padding:0}.tableDataVertical>tbody>tr>th.name{width:170px;text-align:right}.tableDataVertical table.sub>tbody>tr:not(:first-child)>th,.tableDataVertical table.sub>tbody>tr:not(:first-child)>td{border-top:1px dashed #aaa}.tableDataVertical table.sub>tbody>tr>th{font-weight:normal;text-align:right}.tableDataVertical table.sub>tbody>tr>th.name{text-align:right}.icon16{display:inline-block;height:16px;width:16px;margin-left:2px;cursor:pointer}.subtleUntilHover{-moz-opacity:.3;opacity:.3}.subtleUntilHover:hover{-moz-opacity:1;opacity:1}body{font-size:12px;font-family:"Segoe UI",Arial,Verdana,Tahoma,sans-serif;margin:0;padding:0 10px;color:#333}body.layout{background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAFvCAMAAABEoqrSAAADAFBMVEVRUVFUVFRYWFhbW1tfX19iYmJmZmZpaWltbW1wcHB0dHR3d3d7e3t/f3/MzMzNzc3Ozs7Pz8/Q0NDR0dHS0tLT09PU1NTV1dXW1tbX19fY2NjZ2dna2trb29vc3Nzd3d3e3t7f39/g4ODh4eHi4uLj4+Pk5OTl5eXm5ubn5+fo6Ojp6enq6urr6+vs7Ozt7e3u7u7v7+/w8PDx8fHy8vLz8/P09PT19fX29vb39/f4+Pj5+fn6+vr7+/v8/Pz9/f3+/v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD28iAmAAAAbklEQVRIx2NUZ4ABlv9kMZkYRrXhYUphMwzZXEYCogQV0FfbUHMOrSxGAoyMBEygM/M/zZnMjFiZDPQEjCYEsin2/EYKk6qGDTVzR7TnRwN1NFBHPT8aqKOBOur5Uc+PBip1zWVkYGCBCv2nhrkAr7hI+jpl4KUAAAAASUVORK5CYII=) left top repeat-x #d1d1d1}.page{max-width:1230px;min-width:750px;margin-left:auto;margin-right:auto}header,#header{position:relative;margin:0;padding:0;height:110px}header #headerMenu,#header #headerMenu{height:24px;padding:4px;line-height:22px;text-align:right}header #headerMenu a,#header #headerMenu a{color:#000;text-decoration:none}header #headerMenu a:hover,#header #headerMenu a:hover{text-decoration:underline}header #heading,#header #heading{float:left;height:75px}header #heading img,#header #heading img{height:75px;width:300px}header nav,#header nav{padding:0;margin:0;font-size:1.1em}header nav ul#menu,#header nav ul#menu{height:29px;padding:3px 6px;margin:0;list-style:none;z-index:100000}header nav ul#menu>li,#header nav ul#menu>li{display:inline-block;z-index:100000;margin-bottom:-4px}header nav ul#menu>li a,#header nav ul#menu>li a{padding:4px 10px;text-decoration:none;color:#fff;display:inline-block;height:21px}header nav ul#menu>li a:hover,#header nav ul#menu>li a:hover{color:#ffd5ba;text-decoration:none}header nav ul#menu>li a:active,#header nav ul#menu>li a:active{text-decoration:none}header nav ul#menu>li.sep,#header nav ul#menu>li.sep{margin-top:4px;height:21px;border-left:1px solid #777}header nav ul#menu>li.moveRight,#header nav ul#menu>li.moveRight{margin-left:40px}header nav ul#menu>li>ul,#header nav ul#menu>li>ul{z-index:100000;display:none;list-style:none;position:absolute;margin:2px 0 0 0;-moz-border-radius:0 0 0 0;-webkit-border-radius:0 0 0 0;border-radius:0 0 0 0;border-left:1px solid #ecab72;border-bottom:2px solid #ecab72;border-right:1px solid #ecab72;padding:0;min-width:180px}header nav ul#menu>li>ul li,#header nav ul#menu>li>ul li{position:relative;background-color:rgba(242,242,242,.9);background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAUCAYAAABMDlehAAAAIUlEQVQI12NgYGBQYGJgYPgLJ/6gciEEMwMDAyMzA1kAAB/mByD2JQzYAAAAAElFTkSuQmCC);background-position:top;background-repeat:repeat-x}header nav ul#menu>li>ul li:hover,#header nav ul#menu>li>ul li:hover{background-color:rgba(249,228,210,.75)}header nav ul#menu>li>ul li.hasSubmenu,#header nav ul#menu>li>ul li.hasSubmenu{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAANCAYAAACgu+4kAAAAa0lEQVQoz2NgGBRg8uTJO4BYhxIDVgPxHyCeDcQS5BpiAcSHgfgzENcBMRe5BgUC8Line truncated
+22 -16
View File
@@ -46,27 +46,33 @@
<Reference Include="DotNet.Highcharts"> <Reference Include="DotNet.Highcharts">
<HintPath>..\packages\DotNet.Highcharts.1.2\lib\DotNet.Highcharts.dll</HintPath> <HintPath>..\packages\DotNet.Highcharts.1.2\lib\DotNet.Highcharts.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.AspNet.SignalR.Core">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Core.1.0.1\lib\net40\Microsoft.AspNet.SignalR.Core.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.Owin">
<HintPath>..\packages\Microsoft.AspNet.SignalR.Owin.1.0.1\lib\net45\Microsoft.AspNet.SignalR.Owin.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SignalR.SystemWeb">
<HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.1.0.1\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Owin.Host.SystemWeb">
<HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.1.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.5.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference> </Reference>
<Reference Include="Quartz, Version=2.0.1.100, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL"> <Reference Include="Quartz, Version=2.0.1.100, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\Resources\Libraries\Quartz\Quartz.dll</HintPath> <HintPath>..\Resources\Libraries\Quartz\Quartz.dll</HintPath>
</Reference> </Reference>
<Reference Include="RazorGenerator.Mvc, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="RazorGenerator.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\RazorGenerator.Mvc.1.5.4.0\lib\net40\RazorGenerator.Mvc.dll</HintPath> <HintPath>..\packages\RazorGenerator.Mvc.2.0.1\lib\net40\RazorGenerator.Mvc.dll</HintPath>
</Reference>
<Reference Include="SignalR">
<HintPath>..\packages\SignalR.Server.0.5.3\lib\net40\SignalR.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.AspNet">
<HintPath>..\packages\SignalR.Hosting.AspNet.0.5.3\lib\net45\SignalR.Hosting.AspNet.dll</HintPath>
</Reference>
<Reference Include="SignalR.Hosting.Common">
<HintPath>..\packages\SignalR.Hosting.Common.0.5.3\lib\net40\SignalR.Hosting.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
@@ -157,7 +163,7 @@
</Reference> </Reference>
<Reference Include="T4MVCExtensions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL"> <Reference Include="T4MVCExtensions, Version=3.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\T4MVCExtensions.3.5.0\lib\net40\T4MVCExtensions.dll</HintPath> <HintPath>..\packages\T4MVCExtensions.3.6.1\lib\net40\T4MVCExtensions.dll</HintPath>
</Reference> </Reference>
<Reference Include="WebActivatorEx"> <Reference Include="WebActivatorEx">
<HintPath>..\packages\WebActivatorEx.2.0.1\lib\net40\WebActivatorEx.dll</HintPath> <HintPath>..\packages\WebActivatorEx.2.0.1\lib\net40\WebActivatorEx.dll</HintPath>
@@ -921,6 +927,7 @@
<None Include="ClientSource\Scripts\Modules\jQueryUI-DynaTree.js"> <None Include="ClientSource\Scripts\Modules\jQueryUI-DynaTree.js">
<DependentUpon>jQueryUI-DynaTree.js.bundle</DependentUpon> <DependentUpon>jQueryUI-DynaTree.js.bundle</DependentUpon>
</None> </None>
<Content Include="ClientSource\Scripts\Modules\jQuery-SignalR\jquery.signalR-1.0.1.js" />
<Content Include="ClientSource\Scripts\Modules\jQueryUI-DynaTree.min.js"> <Content Include="ClientSource\Scripts\Modules\jQueryUI-DynaTree.min.js">
<DependentUpon>jQueryUI-DynaTree.js.bundle</DependentUpon> <DependentUpon>jQueryUI-DynaTree.js.bundle</DependentUpon>
</Content> </Content>
@@ -1372,7 +1379,7 @@
<Content Include="ClientSource\Scripts\Modules\tinymce\utils\form_utils.js" /> <Content Include="ClientSource\Scripts\Modules\tinymce\utils\form_utils.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\utils\mctabs.js" /> <Content Include="ClientSource\Scripts\Modules\tinymce\utils\mctabs.js" />
<Content Include="ClientSource\Scripts\Modules\tinymce\utils\validate.js" /> <Content Include="ClientSource\Scripts\Modules\tinymce\utils\validate.js" />
<None Include="T4MVC.tt.hooks.t4" /> <Content Include="T4MVC.tt.hooks.t4" />
<Content Include="T4MVC.tt"> <Content Include="T4MVC.tt">
<Generator>TextTemplatingFileGenerator</Generator> <Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>T4MVC.cs</LastGenOutput> <LastGenOutput>T4MVC.cs</LastGenOutput>
@@ -1768,7 +1775,6 @@
<None Include="_bin_deployableAssemblies\amd64\sqlceca40.dll" /> <None Include="_bin_deployableAssemblies\amd64\sqlceca40.dll" />
<None Include="_bin_deployableAssemblies\amd64\Microsoft.VC90.CRT\README_ENU.txt" /> <None Include="_bin_deployableAssemblies\amd64\Microsoft.VC90.CRT\README_ENU.txt" />
<None Include="_bin_deployableAssemblies\amd64\Microsoft.VC90.CRT\msvcr90.dll" /> <None Include="_bin_deployableAssemblies\amd64\Microsoft.VC90.CRT\msvcr90.dll" />
<None Include="ClientSource\Scripts\Modules\jQuery-SignalR\jquery.signalR-0.5.3.js" />
<None Include="ClientSource\Scripts\Core\modernizr-2.6.2.js" /> <None Include="ClientSource\Scripts\Core\modernizr-2.6.2.js" />
<None Include="T4MVC.tt.settings.xml" /> <None Include="T4MVC.tt.settings.xml" />
<Content Include="Web.config"> <Content Include="Web.config">
@@ -1853,7 +1859,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile> <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties> </WebProjectProperties>
</FlavorProperties> </FlavorProperties>
<UserProperties BuildVersion_UpdateFileVersion="True" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_DetectChanges="False" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildAction="Both" BuildVersion_StartDate="2011/7/1" /> <UserProperties BuildVersion_StartDate="2011/7/1" BuildVersion_BuildAction="Both" BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="False" BuildVersion_BuildVersioningStyle="None.DeltaBaseYear.MonthAndDayStamp.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_UpdateFileVersion="True" />
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" /> <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+2 -2
View File
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("1.2.0506.1443")] [assembly: AssemblyVersion("1.2.0506.1845")]
[assembly: AssemblyFileVersion("1.2.0506.1443")] [assembly: AssemblyFileVersion("1.2.0506.1845")]
+100 -98
View File
@@ -43,17 +43,17 @@
</td> </td>
</tr> </tr>
</table> </table>
<div id="dialogUpload" title="Upload Attachment"> <div id="dialogUpload" class="hiddenDialog" title="Upload Attachment">
<div id="silverlightHostUploadAttachment"> <div id="silverlightHostUploadAttachment">
</div> </div>
</div> </div>
<div id="dialogRemoveLog" title="Remove this Comment?"> <div id="dialogRemoveLog" class="hiddenDialog" title="Remove this Comment?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
Are you sure? Are you sure?
</p> </p>
</div> </div>
<div id="dialogRemoveAttachment" title="Remove this Attachment?"> <div id="dialogRemoveAttachment" class="hiddenDialog" title="Remove this Attachment?">
<p> <p>
<span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span> <span class="ui-icon ui-icon-alert" style="float: left; margin: 0 7px 20px 0;"></span>
Are you sure? Are you sure?
@@ -74,6 +74,7 @@
var $CommentOutput = $Comments.find('.commentOutput'); var $CommentOutput = $Comments.find('.commentOutput');
var $CommentOutputContainer = $Comments.find('.commentOutputContainer'); var $CommentOutputContainer = $Comments.find('.commentOutputContainer');
var $CommentInput = $Comments.find('textarea.commentInput'); var $CommentInput = $Comments.find('textarea.commentInput');
var $dialogRemoveLog;
window.setTimeout(function () { window.setTimeout(function () {
$CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom $CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
@@ -93,14 +94,6 @@
}); });
$CommentOutput.find('span.remove').click(removePost); $CommentOutput.find('span.remove').click(removePost);
$dialogRemoveLog = $('#dialogRemoveLog');
$dialogRemoveLog.dialog({
resizable: false,
height: 140,
modal: true,
autoOpen: false
});
function postComment() { function postComment() {
var comment = $CommentInput.val(); var comment = $CommentInput.val();
if (comment != '') { if (comment != '') {
@@ -130,8 +123,16 @@
$this = $(this); $this = $(this);
var data = { id: $this.closest('div').attr('data-logid') }; var data = { id: $this.closest('div').attr('data-logid') };
$dialogRemoveLog.dialog("enable"); if (!$dialogRemoveLog) {
$dialogRemoveLog.dialog('option', 'buttons', { $dialogRemoveLog = $('#dialogRemoveLog').dialog({
resizable: false,
height: 140,
modal: true,
autoOpen: false
});
}
$dialogRemoveLog.dialog("enable").dialog('option', 'buttons', {
"Remove": function () { "Remove": function () {
$dialogRemoveLog.dialog("disable"); $dialogRemoveLog.dialog("disable");
$dialogRemoveLog.dialog("option", "buttons", null); $dialogRemoveLog.dialog("option", "buttons", null);
@@ -159,9 +160,7 @@
"Cancel": function () { "Cancel": function () {
$dialogRemoveLog.dialog("close"); $dialogRemoveLog.dialog("close");
} }
}); }).dialog('open');
$dialogRemoveLog.dialog('open');
return false; return false;
} }
@@ -210,30 +209,12 @@
// - Repository notifications now handles this // - Repository notifications now handles this
document.DiscoFunctions.addAttachment = function () { }; document.DiscoFunctions.addAttachment = function () { };
$Attachments = $('#Attachments'); var $Attachments = $('#Attachments');
$attachmentOutput = $Attachments.find('.attachmentOutput'); var $attachmentOutput = $Attachments.find('.attachmentOutput');
var $dialogUpload, $dialogRemoveAttachment;
$attachmentOutput.find('span.remove').click(removeLocalAttachment); $attachmentOutput.find('span.remove').click(removeLocalAttachment);
$('#dialogUpload').dialog({
autoOpen: false,
draggable: false,
modal: true,
resizable: false,
width: 860,
height: 550,
close: function () {
silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
}
});
$('#dialogRemoveAttachment').dialog({
resizable: false,
height: 140,
modal: true,
autoOpen: false
});
var onLoadNavigation = null; var onLoadNavigation = null;
var isLoaded = null; var isLoaded = null;
Silverlight.createObject( Silverlight.createObject(
@@ -252,7 +233,7 @@
'UploadUrl=@(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)))' 'UploadUrl=@(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)))'
); );
$attachmentInput = $Attachments.find('.attachmentInput'); var $attachmentInput = $Attachments.find('.attachmentInput');
$attachmentInput.find('.photo').click(function () { $attachmentInput.find('.photo').click(function () {
showDialog('/WebCam'); showDialog('/WebCam');
}); });
@@ -260,9 +241,22 @@
showDialog('/File'); showDialog('/File');
}); });
silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0); var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
function showDialog(navigationPath) { function showDialog(navigationPath) {
$('#dialogUpload').dialog('open'); if (!$dialogUpload) {
$dialogUpload = $('#dialogUpload').dialog({
autoOpen: false,
draggable: false,
modal: true,
resizable: false,
width: 860,
height: 550,
close: function () {
silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
}
});
}
$dialogUpload.dialog('open');
if (isLoaded) { if (isLoaded) {
silverlightUploadAttachment.content.Navigator.Navigate(navigationPath); silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
} else { } else {
@@ -271,40 +265,41 @@
}; };
function addAttachment(id, quick) { function addAttachment(id, quick) {
var data = { id: id }; var data = { id: id };
$.ajax({ $.ajax({
url: '@Url.Action(MVC.API.Job.Attachment())', url: '@Url.Action(MVC.API.Job.Attachment())',
dataType: 'json', dataType: 'json',
data: data, data: data,
success: function (d) { success: function (d) {
if (d.Result == 'OK') { if (d.Result == 'OK') {
var a = d.Attachment; var a = d.Attachment;
if (parseInt(a.ParentId) == jobId) { if (parseInt(a.ParentId) == jobId) {
var e = $('<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span><span class="remove"></span><span class="timestamp"></span></a>'); var e = $('<a><span class="icon"><img alt="Attachment Thumbnail" /></span><span class="comments"></span><span class="author"></span><span class="remove"></span><span class="timestamp"></span></a>');
e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.Job.AttachmentDownload()))/' + a.Id); e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '@(Url.Action(MVC.API.Job.AttachmentDownload()))/' + a.Id);
e.find('.icon img').attr('src', '@(Url.Action(MVC.API.Job.AttachmentThumbnail()))/' + a.Id); e.find('.icon img').attr('src', '@(Url.Action(MVC.API.Job.AttachmentThumbnail()))/' + a.Id);
e.find('.comments').text(a.Comments); e.find('.comments').text(a.Comments);
e.find('.author').text(a.Author); e.find('.author').text(a.Author);
e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull); e.find('.timestamp').text(a.TimestampFuzzy).attr('title', a.TimestampFull);
e.find('.remove').click(removeLocalAttachment); e.find('.remove').click(removeLocalAttachment);
if (!quick) if (!quick)
e.hide(); e.hide();
$attachmentOutput.append(e); $attachmentOutput.append(e);
if (!quick) if (!quick)
e.show('slow'); e.show('slow');
if (a.MimeType.toLowerCase().indexOf('image/') == 0) if (a.MimeType.toLowerCase().indexOf('image/') == 0)
e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments }); e.shadowbox({ gallery: 'attachments', player: 'img', title: a.Comments });
}
} else {
alert('Unable to add attachment: ' + d.Result);
} }
} else { },
alert('Unable to add attachment: ' + d.Result); error: function (jqXHR, textStatus, errorThrown) {
alert('Unable to add attachment: ' + textStatus);
} }
}, });
error: function (jqXHR, textStatus, errorThrown) { }
alert('Unable to add attachment: ' + textStatus);
}
});
}
function removeAttachment(id) { function removeAttachment(id) {
var $element = $attachmentOutput.find('a[data-attachmentid="' + id + '"]'); var $element = $attachmentOutput.find('a[data-attachmentid="' + id + '"]');
if ($element.length > 0) { if ($element.length > 0) {
@@ -321,9 +316,16 @@
var data = { id: $this.attr('data-attachmentid') }; var data = { id: $this.attr('data-attachmentid') };
var $dialogRemoveAttachment = $('#dialogRemoveAttachment'); if (!$dialogRemoveAttachment) {
$dialogRemoveAttachment.dialog("enable"); $dialogRemoveAttachment = $('#dialogRemoveAttachment').dialog({
$dialogRemoveAttachment.dialog('option', 'buttons', { resizable: false,
height: 140,
modal: true,
autoOpen: false
});
}
$dialogRemoveAttachment.dialog("enable").dialog('option', 'buttons', {
"Remove": function () { "Remove": function () {
$dialogRemoveAttachment.dialog("disable"); $dialogRemoveAttachment.dialog("disable");
$dialogRemoveAttachment.dialog("option", "buttons", null); $dialogRemoveAttachment.dialog("option", "buttons", null);
@@ -354,9 +356,7 @@
"Cancel": function () { "Cancel": function () {
$dialogRemoveAttachment.dialog("close"); $dialogRemoveAttachment.dialog("close");
} }
}); }).dialog('open');
$dialogRemoveAttachment.dialog('open');
return false; return false;
} }
@@ -371,30 +371,32 @@
//#region LiveEvents //#region LiveEvents
function liveMessageRecieved(d) { function liveMessageRecieved(d) {
if (d) { if (d) {
switch (d.EntityTypeName) { window.setTimeout(function () {
case 'JobAttachment': switch (d.EntityTypeName) {
switch (d.EventType) { case 'JobAttachment':
case 0: // Added switch (d.EventType) {
addAttachment(d.EntityKey[0], false); case 0: // Added
break; addAttachment(d.EntityKey[0], false);
case 1: // Removed break;
removeAttachment(d.EntityKey[0]); case 1: // Removed
break; removeAttachment(d.EntityKey[0]);
} break;
break; }
case 'JobLog': break;
switch (d.EventType) { case 'JobLog':
case 0: // Added switch (d.EventType) {
loadLiveComment(d.EntityKey[0]); case 0: // Added
break; loadLiveComment(d.EntityKey[0]);
case 1: // Removed break;
$CommentOutput.children('div[data-logid="' + d.EntityKey[0] + '"]').slideUp(300).delay(300).queue(function () { case 1: // Removed
$(this).remove(); $CommentOutput.children('div[data-logid="' + d.EntityKey[0] + '"]').slideUp(300).delay(300).queue(function () {
}); $(this).remove();
break; });
} break;
break; }
} break;
}
}, 100);
} }
} }
var liveMessagesConnection = $.connection('@(Url.Content("~/API/Repository/Notifications"))') var liveMessagesConnection = $.connection('@(Url.Content("~/API/Repository/Notifications"))')
@@ -375,6 +375,8 @@ WriteLiteral("></span>\r\n </div>\r\n </td>\r\n </tr>\r\n</
WriteLiteral(" id=\"dialogUpload\""); WriteLiteral(" id=\"dialogUpload\"");
WriteLiteral(" class=\"hiddenDialog\"");
WriteLiteral(" title=\"Upload Attachment\""); WriteLiteral(" title=\"Upload Attachment\"");
WriteLiteral(">\r\n <div"); WriteLiteral(">\r\n <div");
@@ -385,6 +387,8 @@ WriteLiteral(">\r\n </div>\r\n</div>\r\n<div");
WriteLiteral(" id=\"dialogRemoveLog\""); WriteLiteral(" id=\"dialogRemoveLog\"");
WriteLiteral(" class=\"hiddenDialog\"");
WriteLiteral(" title=\"Remove this Comment?\""); WriteLiteral(" title=\"Remove this Comment?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <span");
@@ -397,6 +401,8 @@ WriteLiteral("></span>\r\n Are you sure?\r\n </p>\r\n</div>\r\n<div");
WriteLiteral(" id=\"dialogRemoveAttachment\""); WriteLiteral(" id=\"dialogRemoveAttachment\"");
WriteLiteral(" class=\"hiddenDialog\"");
WriteLiteral(" title=\"Remove this Attachment?\""); WriteLiteral(" title=\"Remove this Attachment?\"");
WriteLiteral(">\r\n <p>\r\n <span"); WriteLiteral(">\r\n <p>\r\n <span");
@@ -423,6 +429,7 @@ WriteLiteral(@"');
var $CommentOutput = $Comments.find('.commentOutput'); var $CommentOutput = $Comments.find('.commentOutput');
var $CommentOutputContainer = $Comments.find('.commentOutputContainer'); var $CommentOutputContainer = $Comments.find('.commentOutputContainer');
var $CommentInput = $Comments.find('textarea.commentInput'); var $CommentInput = $Comments.find('textarea.commentInput');
var $dialogRemoveLog;
window.setTimeout(function () { window.setTimeout(function () {
$CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom $CommentOutput[0].scrollTop = $CommentOutput[0].scrollHeight; // Scroll to Bottom
@@ -442,14 +449,6 @@ WriteLiteral(@"');
}); });
$CommentOutput.find('span.remove').click(removePost); $CommentOutput.find('span.remove').click(removePost);
$dialogRemoveLog = $('#dialogRemoveLog');
$dialogRemoveLog.dialog({
resizable: false,
height: 140,
modal: true,
autoOpen: false
});
function postComment() { function postComment() {
var comment = $CommentInput.val(); var comment = $CommentInput.val();
if (comment != '') { if (comment != '') {
@@ -458,46 +457,36 @@ WriteLiteral(@"');
url: '"); url: '");
#line 109 "..\..\Views\Job\JobParts\Resources.cshtml" #line 102 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.CommentPost(Model.Job.Id, null))); Write(Url.Action(MVC.API.Job.CommentPost(Model.Job.Id, null)));
#line default #line default
#line hidden #line hidden
WriteLiteral(@"', WriteLiteral("\',\r\n dataType: \'json\',\r\n data: data,\r\n " +
dataType: 'json', " success: function (d) {\r\n if (d.Result == " +
data: data, "\'OK\') {\r\n // Should be added via Repository Notificat" +
success: function (d) { "ions\r\n // addComment(d.Comment, false);\r\n " +
if (d.Result == 'OK') { " $CommentInput.val(\'\').attr(\'disabled\', false).focus();\r\n " +
// Should be added via Repository Notifications " } else {\r\n alert(\'Unable to post comm" +
// addComment(d.Comment, false); "ent: \' + d.Result);\r\n $CommentInput.attr(\'disabled\', " +
$CommentInput.val('').attr('disabled', false).focus(); "false);\r\n }\r\n },\r\n " +
} else { "error: function (jqXHR, textStatus, errorThrown) {\r\n aler" +
alert('Unable to post comment: ' + d.Result); "t(\'Unable to post comment: \' + textStatus);\r\n $CommentInp" +
$CommentInput.attr('disabled', false); "ut.attr(\'disabled\', false);\r\n }\r\n });\r\n " +
} " }\r\n }\r\n function removePost() {\r\n $this = $(this);" +
}, "\r\n var data = { id: $this.closest(\'div\').attr(\'data-logid\') };\r\n\r\n " +
error: function (jqXHR, textStatus, errorThrown) { " if (!$dialogRemoveLog) {\r\n $dialogRemoveLog = $(\'#dialog" +
alert('Unable to post comment: ' + textStatus); "RemoveLog\').dialog({\r\n resizable: false,\r\n " +
$CommentInput.attr('disabled', false); " height: 140,\r\n modal: true,\r\n autoOpen: f" +
} "alse\r\n });\r\n }\r\n\r\n $dialogRemoveLog.dialog(" +
}); "\"enable\").dialog(\'option\', \'buttons\', {\r\n \"Remove\": function () {" +
} "\r\n $dialogRemoveLog.dialog(\"disable\");\r\n $" +
} "dialogRemoveLog.dialog(\"option\", \"buttons\", null);\r\n $.ajax({" +
function removePost() { "\r\n url: \'");
$this = $(this);
var data = { id: $this.closest('div').attr('data-logid') };
$dialogRemoveLog.dialog(""enable"");
$dialogRemoveLog.dialog('option', 'buttons', {
""Remove"": function () {
$dialogRemoveLog.dialog(""disable"");
$dialogRemoveLog.dialog(""option"", ""buttons"", null);
$.ajax({
url: '");
#line 139 "..\..\Views\Job\JobParts\Resources.cshtml" #line 140 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.CommentRemove())); Write(Url.Action(MVC.API.Job.CommentRemove()));
@@ -526,9 +515,7 @@ WriteLiteral(@"',
""Cancel"": function () { ""Cancel"": function () {
$dialogRemoveLog.dialog(""close""); $dialogRemoveLog.dialog(""close"");
} }
}); }).dialog('open');
$dialogRemoveLog.dialog('open');
return false; return false;
} }
@@ -537,7 +524,7 @@ WriteLiteral(@"',
url: '"); url: '");
#line 170 "..\..\Views\Job\JobParts\Resources.cshtml" #line 169 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.Comment())); Write(Url.Action(MVC.API.Job.Comment()));
@@ -567,35 +554,47 @@ WriteLiteral(@"',
commentHtml = commentHtml.replace(/\#(\d+)/g, '<a href="""); commentHtml = commentHtml.replace(/\#(\d+)/g, '<a href=""");
#line 191 "..\..\Views\Job\JobParts\Resources.cshtml" #line 190 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.Job.Show(null))); Write(Url.Action(MVC.Job.Show(null)));
#line default #line default
#line hidden #line hidden
WriteLiteral("?id=$1\">#$1</a>\');\r\n eComment.html(commentHtml);\r\n\r\n $Comme" + WriteLiteral(@"?id=$1"">#$1</a>');
"ntOutput.append(e);\r\n\r\n if (!quick) {\r\n e.animate({ ba" + eComment.html(commentHtml);
"ckgroundColor: \'#ffff99\' }, 500, function () {\r\n e.animate({ " +
"backgroundColor: \'#f4f4f4\' }, 500);\r\n });\r\n $Comme" + $CommentOutput.append(e);
"ntOutput.animate({ scrollTop: $CommentOutput[0].scrollHeight }, 250)\r\n " +
" }\r\n }\r\n //#endregion\r\n\r\n //#region Attachments\r\n i" + if (!quick) {
"f (!document.DiscoFunctions) {\r\n document.DiscoFunctions = {};\r\n " + e.animate({ backgroundColor: '#ffff99' }, 500, function () {
" }\r\n // For Silverlight Backwards-compatibility\r\n // - Reposito" + e.animate({ backgroundColor: '#f4f4f4' }, 500);
"ry notifications now handles this\r\n document.DiscoFunctions.addAttachment" + });
" = function () { };\r\n\r\n $Attachments = $(\'#Attachments\');\r\n $attac" + $CommentOutput.animate({ scrollTop: $CommentOutput[0].scrollHeight }, 250)
"hmentOutput = $Attachments.find(\'.attachmentOutput\');\r\n\r\n $attachmentOutp" + }
"ut.find(\'span.remove\').click(removeLocalAttachment);\r\n\r\n $(\'#dialogUpload" + }
"\').dialog({\r\n autoOpen: false,\r\n draggable: false,\r\n " + //#endregion
" modal: true,\r\n resizable: false,\r\n width: 860,\r\n " +
" height: 550,\r\n close: function () {\r\n silverli" + //#region Attachments
"ghtUploadAttachment.content.Navigator.Navigate(\'/Hidden\');\r\n }\r\n " + if (!document.DiscoFunctions) {
" });\r\n\r\n $(\'#dialogRemoveAttachment\').dialog({\r\n resizable: " + document.DiscoFunctions = {};
"false,\r\n height: 140,\r\n modal: true,\r\n autoOpen" + }
": false\r\n });\r\n\r\n var onLoadNavigation = null;\r\n var isLoad" + // For Silverlight Backwards-compatibility
"ed = null;\r\n Silverlight.createObject(\r\n \'"); // - Repository notifications now handles this
document.DiscoFunctions.addAttachment = function () { };
var $Attachments = $('#Attachments');
var $attachmentOutput = $Attachments.find('.attachmentOutput');
var $dialogUpload, $dialogRemoveAttachment;
$attachmentOutput.find('span.remove').click(removeLocalAttachment);
var onLoadNavigation = null;
var isLoaded = null;
Silverlight.createObject(
'");
#line 240 "..\..\Views\Job\JobParts\Resources.cshtml" #line 221 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap); Write(Links.ClientBin.Disco_Silverlight_AttachmentUpload_xap);
@@ -616,7 +615,7 @@ WriteLiteral(@"',
'UploadUrl="); 'UploadUrl=");
#line 252 "..\..\Views\Job\JobParts\Resources.cshtml" #line 233 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null))); Write(Url.Action(MVC.API.Job.AttachmentUpload(Model.Job.Id, null)));
@@ -625,7 +624,7 @@ WriteLiteral(@"',
WriteLiteral(@"' WriteLiteral(@"'
); );
$attachmentInput = $Attachments.find('.attachmentInput'); var $attachmentInput = $Attachments.find('.attachmentInput');
$attachmentInput.find('.photo').click(function () { $attachmentInput.find('.photo').click(function () {
showDialog('/WebCam'); showDialog('/WebCam');
}); });
@@ -633,9 +632,22 @@ WriteLiteral(@"'
showDialog('/File'); showDialog('/File');
}); });
silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0); var silverlightUploadAttachment = $('#silverlightUploadAttachment').get(0);
function showDialog(navigationPath) { function showDialog(navigationPath) {
$('#dialogUpload').dialog('open'); if (!$dialogUpload) {
$dialogUpload = $('#dialogUpload').dialog({
autoOpen: false,
draggable: false,
modal: true,
resizable: false,
width: 860,
height: 550,
close: function () {
silverlightUploadAttachment.content.Navigator.Navigate('/Hidden');
}
});
}
$dialogUpload.dialog('open');
if (isLoaded) { if (isLoaded) {
silverlightUploadAttachment.content.Navigator.Navigate(navigationPath); silverlightUploadAttachment.content.Navigator.Navigate(navigationPath);
} else { } else {
@@ -644,75 +656,79 @@ WriteLiteral(@"'
}; };
function addAttachment(id, quick) { function addAttachment(id, quick) {
var data = { id: id }; var data = { id: id };
$.ajax({ $.ajax({
url: '"); url: '");
#line 275 "..\..\Views\Job\JobParts\Resources.cshtml" #line 270 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.Attachment())); Write(Url.Action(MVC.API.Job.Attachment()));
#line default #line default
#line hidden #line hidden
WriteLiteral(@"', WriteLiteral(@"',
dataType: 'json', dataType: 'json',
data: data, data: data,
success: function (d) { success: function (d) {
if (d.Result == 'OK') { if (d.Result == 'OK') {
var a = d.Attachment; var a = d.Attachment;
if (parseInt(a.ParentId) == jobId) { if (parseInt(a.ParentId) == jobId) {
var e = $('<a><span class=""icon""><img alt=""Attachment Thumbnail"" /></span><span class=""comments""></span><span class=""author""></span><span class=""remove""></span><span class=""timestamp""></span></a>'); var e = $('<a><span class=""icon""><img alt=""Attachment Thumbnail"" /></span><span class=""comments""></span><span class=""author""></span><span class=""remove""></span><span class=""timestamp""></span></a>');
e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '"); e.attr('data-attachmentid', a.Id).attr('data-mimetype', a.MimeType).attr('href', '");
#line 285 "..\..\Views\Job\JobParts\Resources.cshtml" #line 280 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentDownload())); Write(Url.Action(MVC.API.Job.AttachmentDownload()));
#line default #line default
#line hidden #line hidden
WriteLiteral("/\' + a.Id);\r\n e.find(\'.icon img\').attr(\'src\', \'"); WriteLiteral("/\' + a.Id);\r\n e.find(\'.icon img\').attr(\'src\', \'");
#line 286 "..\..\Views\Job\JobParts\Resources.cshtml" #line 281 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentThumbnail())); Write(Url.Action(MVC.API.Job.AttachmentThumbnail()));
#line default #line default
#line hidden #line hidden
WriteLiteral("/\' + a.Id);\r\n e.find(\'.comments\').text(a.Comments);\r\n " + WriteLiteral("/\' + a.Id);\r\n e.find(\'.comments\').text(a.Comments)" +
" e.find(\'.author\').text(a.Author);\r\n " + ";\r\n e.find(\'.author\').text(a.Author);\r\n " +
" e.find(\'.timestamp\').text(a.TimestampFuzzy).attr(\'title\', a.TimestampF" + " e.find(\'.timestamp\').text(a.TimestampFuzzy).attr(\'title\', " +
"ull);\r\n e.find(\'.remove\').click(removeLocalAttachment" + "a.TimestampFull);\r\n e.find(\'.remove\').click(remov" +
");\r\n if (!quick)\r\n e.h" + "eLocalAttachment);\r\n if (!quick)\r\n " +
"ide();\r\n $attachmentOutput.append(e);\r\n " + " e.hide();\r\n $attachmentOutpu" +
" if (!quick)\r\n e.show(\'slow\');\r\n " + "t.append(e);\r\n if (!quick)\r\n " +
" if (a.MimeType.toLowerCase().indexOf(\'image/\') == 0)\r\n " + " e.show(\'slow\');\r\n if (a.MimeType.t" +
" e.shadowbox({ gallery: \'attachments\', player: \'img" + "oLowerCase().indexOf(\'image/\') == 0)\r\n e.shad" +
"\', title: a.Comments });\r\n }\r\n } else " + "owbox({ gallery: \'attachments\', player: \'img\', title: a.Comments });\r\n " +
"{\r\n alert(\'Unable to add attachment: \' + d.Result);\r\n " + " }\r\n } else {\r\n " +
" }\r\n },\r\n error: function (jqXHR, t" + " alert(\'Unable to add attachment: \' + d.Result);\r\n }\r\n " +
"extStatus, errorThrown) {\r\n alert(\'Unable to add attachment: " + " },\r\n error: function (jqXHR, textStatus, e" +
"\' + textStatus);\r\n }\r\n });\r\n }\r\n functio" + "rrorThrown) {\r\n alert(\'Unable to add attachment: \' + text" +
"n removeAttachment(id) {\r\n var $element = $attachmentOutput.find(\'a[d" + "Status);\r\n }\r\n });\r\n }\r\n fun" +
"ata-attachmentid=\"\' + id + \'\"]\');\r\n if ($element.length > 0) {\r\n " + "ction removeAttachment(id) {\r\n var $element = $attachmentOutput.find(" +
" $element.hide(300).delay(300).queue(function () {\r\n " + "\'a[data-attachmentid=\"\' + id + \'\"]\');\r\n if ($element.length > 0) {\r\n " +
" if ($element.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n " + " $element.hide(300).delay(300).queue(function () {\r\n " +
" Shadowbox.removeCache(this);\r\n $element.r" + " if ($element.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n" +
"emove();\r\n });\r\n }\r\n }\r\n\r\n function remo" + " Shadowbox.removeCache(this);\r\n $eleme" +
"veLocalAttachment() {\r\n $this = $(this).closest(\'a\');\r\n\r\n " + "nt.remove();\r\n });\r\n }\r\n }\r\n\r\n function " +
"var data = { id: $this.attr(\'data-attachmentid\') };\r\n\r\n var $dialogRe" + "removeLocalAttachment() {\r\n $this = $(this).closest(\'a\');\r\n\r\n " +
"moveAttachment = $(\'#dialogRemoveAttachment\');\r\n $dialogRemoveAttachm" + " var data = { id: $this.attr(\'data-attachmentid\') };\r\n\r\n if (!$dia" +
"ent.dialog(\"enable\");\r\n $dialogRemoveAttachment.dialog(\'option\', \'but" + "logRemoveAttachment) {\r\n $dialogRemoveAttachment = $(\'#dialogRemo" +
"tons\', {\r\n \"Remove\": function () {\r\n $dialogRe" + "veAttachment\').dialog({\r\n resizable: false,\r\n " +
"moveAttachment.dialog(\"disable\");\r\n $dialogRemoveAttachment.d" + " height: 140,\r\n modal: true,\r\n autoOpen" +
"ialog(\"option\", \"buttons\", null);\r\n $.ajax({\r\n " + ": false\r\n });\r\n }\r\n\r\n $dialogRemoveAttachme" +
" url: \'"); "nt.dialog(\"enable\").dialog(\'option\', \'buttons\', {\r\n \"Remove\": fun" +
"ction () {\r\n $dialogRemoveAttachment.dialog(\"disable\");\r\n " +
" $dialogRemoveAttachment.dialog(\"option\", \"buttons\", null);\r\n " +
" $.ajax({\r\n url: \'");
#line 331 "..\..\Views\Job\JobParts\Resources.cshtml" #line 333 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Action(MVC.API.Job.AttachmentRemove())); Write(Url.Action(MVC.API.Job.AttachmentRemove()));
@@ -734,32 +750,34 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n
"to remove attachment: \' + textStatus);\r\n $dialogRemov" + "to remove attachment: \' + textStatus);\r\n $dialogRemov" +
"eAttachment.dialog(\"close\");\r\n }\r\n });" + "eAttachment.dialog(\"close\");\r\n }\r\n });" +
"\r\n },\r\n \"Cancel\": function () {\r\n " + "\r\n },\r\n \"Cancel\": function () {\r\n " +
" $dialogRemoveAttachment.dialog(\"close\");\r\n }\r\n });\r" + " $dialogRemoveAttachment.dialog(\"close\");\r\n }\r\n }).d" +
"\n\r\n $dialogRemoveAttachment.dialog(\'open\');\r\n\r\n return fal" + "ialog(\'open\');\r\n\r\n return false;\r\n }\r\n\r\n $attachmentOut" +
"se;\r\n }\r\n\r\n $attachmentOutput.children(\'a\').each(function () {\r\n " + "put.children(\'a\').each(function () {\r\n $this = $(this);\r\n " +
" $this = $(this);\r\n if ($this.attr(\'data-mimetype\').toLowerC" + "if ($this.attr(\'data-mimetype\').toLowerCase().indexOf(\'image/\') == 0)\r\n " +
"ase().indexOf(\'image/\') == 0)\r\n $this.shadowbox({ gallery: \'attac" + " $this.shadowbox({ gallery: \'attachments\', player: \'img\', title: $this.fin" +
"hments\', player: \'img\', title: $this.find(\'.comments\').text() });\r\n });\r\n" + "d(\'.comments\').text() });\r\n });\r\n //#endregion\r\n\r\n //#regio" +
" //#endregion\r\n\r\n //#region LiveEvents\r\n function liveMessa" + "n LiveEvents\r\n function liveMessageRecieved(d) {\r\n if (d) {\r\n " +
"geRecieved(d) {\r\n if (d) {\r\n switch (d.EntityTypeName)" + " window.setTimeout(function () {\r\n switch (d.En" +
" {\r\n case \'JobAttachment\':\r\n switch (d" + "tityTypeName) {\r\n case \'JobAttachment\':\r\n " +
".EventType) {\r\n case 0: // Added\r\n " + " switch (d.EventType) {\r\n case 0: // A" +
" addAttachment(d.EntityKey[0], false);\r\n " + "dded\r\n addAttachment(d.EntityKey[0], false);\r" +
" break;\r\n case 1: // Removed\r\n " + "\n break;\r\n cas" +
" removeAttachment(d.EntityKey[0]);\r\n b" + "e 1: // Removed\r\n removeAttachment(d.EntityKe" +
"reak;\r\n }\r\n break;\r\n " + "y[0]);\r\n break;\r\n " +
" case \'JobLog\':\r\n switch (d.EventType) {\r\n " + "}\r\n break;\r\n case \'JobLog\':\r\n " +
" case 0: // Added\r\n loadLiveComm" + " switch (d.EventType) {\r\n " +
"ent(d.EntityKey[0]);\r\n break;\r\n " + " case 0: // Added\r\n loadLiveComment(d.Entit" +
" case 1: // Removed\r\n $CommentOutput.chi" + "yKey[0]);\r\n break;\r\n " +
"ldren(\'div[data-logid=\"\' + d.EntityKey[0] + \'\"]\').slideUp(300).delay(300).queue(" + " case 1: // Removed\r\n $CommentOutput.ch" +
"function () {\r\n $(this).remove();\r\n " + "ildren(\'div[data-logid=\"\' + d.EntityKey[0] + \'\"]\').slideUp(300).delay(300).queue" +
" });\r\n break;\r\n " + "(function () {\r\n $(this).remove();\r\n " +
" }\r\n break;\r\n }\r\n }\r\n" + " });\r\n break;\r\n" +
" }\r\n var liveMessagesConnection = $.connection(\'"); " }\r\n break;\r\n " +
" }\r\n }, 100);\r\n }\r\n }\r\n var liveMe" +
"ssagesConnection = $.connection(\'");
#line 400 "..\..\Views\Job\JobParts\Resources.cshtml" #line 402 "..\..\Views\Job\JobParts\Resources.cshtml"
Write(Url.Content("~/API/Repository/Notifications")); Write(Url.Content("~/API/Repository/Notifications"));
+11 -9
View File
@@ -10,6 +10,11 @@
<package id="knockoutjs" version="2.2.1" targetFramework="net45" /> <package id="knockoutjs" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" /> <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
<package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net45" /> <package id="Microsoft.AspNet.Razor" version="2.0.20715.0" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Core" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.JS" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.Owin" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.SignalR.SystemWeb" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi" version="4.0.20710.0" targetFramework="net45" /> <package id="Microsoft.AspNet.WebApi" version="4.0.20710.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net45" /> <package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net45" />
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" /> <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
@@ -18,24 +23,21 @@
<package id="Microsoft.jQuery.Unobtrusive.Ajax" version="2.0.30116.0" targetFramework="net45" /> <package id="Microsoft.jQuery.Unobtrusive.Ajax" version="2.0.30116.0" targetFramework="net45" />
<package id="Microsoft.jQuery.Unobtrusive.Validation" version="2.0.30116.0" targetFramework="net45" /> <package id="Microsoft.jQuery.Unobtrusive.Validation" version="2.0.30116.0" targetFramework="net45" />
<package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" /> <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net45" />
<package id="Microsoft.Owin.Host.SystemWeb" version="1.0.1" targetFramework="net45" />
<package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net45" /> <package id="Microsoft.SqlServer.Compact" version="4.0.8876.1" targetFramework="net45" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" /> <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="Modernizr" version="2.6.2" targetFramework="net45" /> <package id="Modernizr" version="2.6.2" targetFramework="net45" />
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" /> <package id="Newtonsoft.Json" version="5.0.4" targetFramework="net45" />
<package id="RazorGenerator.Mvc" version="1.5.4.0" targetFramework="net45" /> <package id="Owin" version="1.0" targetFramework="net45" />
<package id="RazorGenerator.Mvc" version="2.0.1" targetFramework="net45" />
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" /> <package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" />
<package id="SignalR" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Hosting.AspNet" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Js" version="0.5.3" targetFramework="net45" />
<package id="SignalR.Server" version="0.5.3" targetFramework="net45" />
<package id="SqlServerCompact" version="4.0.8854.1" targetFramework="net45" /> <package id="SqlServerCompact" version="4.0.8854.1" targetFramework="net45" />
<package id="T4MVC" version="3.5.0" targetFramework="net45" /> <package id="T4MVC" version="3.6.1" targetFramework="net45" />
<package id="T4MVCExtensions" version="3.5.0" targetFramework="net45" /> <package id="T4MVCExtensions" version="3.6.1" targetFramework="net45" />
<package id="TinyMCE" version="3.5.8" targetFramework="net45" /> <package id="TinyMCE" version="3.5.8" targetFramework="net45" />
<package id="TinyMCE.JQuery" version="3.5.8" targetFramework="net45" /> <package id="TinyMCE.JQuery" version="3.5.8" targetFramework="net45" />
<package id="WebActivatorEx" version="2.0.1" targetFramework="net45" /> <package id="WebActivatorEx" version="2.0.1" targetFramework="net45" />