removed base kernel and ikernel

5 files changed, 21 insertions, 23 deletions

diff --git a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs b/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs
index 93b23b9439..cdcdb49dc4 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardInfoWebSocketListener.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Common.Kernel;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Common.ScheduledTasks;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Library;
@@ -23,10 +23,7 @@ namespace MediaBrowser.WebDashboard.Api
             get { return "DashboardInfo"; }
         }
 
-        /// <summary>
-        /// The _kernel
-        /// </summary>
-        private readonly Kernel _kernel;
+        private readonly IServerApplicationHost _appHost;
 
         /// <summary>
         /// Gets or sets the task manager.
@@ -42,14 +39,13 @@ namespace MediaBrowser.WebDashboard.Api
         /// <summary>
         /// Initializes a new instance of the <see cref="DashboardInfoWebSocketListener" /> class.
         /// </summary>
-        /// <param name="kernel">The kernel.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="taskManager">The task manager.</param>
         /// <param name="userManager">The user manager.</param>
-        public DashboardInfoWebSocketListener(Kernel kernel, ILogger logger, ITaskManager taskManager, IUserManager userManager)
+        public DashboardInfoWebSocketListener(IServerApplicationHost appHost, ILogger logger, ITaskManager taskManager, IUserManager userManager)
             : base(logger)
         {
-            _kernel = kernel;
+            _appHost = appHost;
             _taskManager = taskManager;
             _userManager = userManager;
         }
@@ -61,7 +57,7 @@ namespace MediaBrowser.WebDashboard.Api
         /// <returns>Task{IEnumerable{TaskInfo}}.</returns>
         protected override Task<DashboardInfo> GetDataToSend(object state)
         {
-            return Task.FromResult(DashboardService.GetDashboardInfo(_kernel, Logger, _taskManager, _userManager));
+            return Task.FromResult(DashboardService.GetDashboardInfo(_appHost, Logger, _taskManager, _userManager));
         }
     }
 }
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 0c63e00b21..136a9170ea 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -1,5 +1,4 @@
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Implementations.HttpServer;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.ScheduledTasks;
 using MediaBrowser.Controller;
@@ -7,6 +6,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Tasks;
+using MediaBrowser.Server.Implementations.HttpServer;
 using ServiceStack.ServiceHost;
 using System;
 using System.Collections.Generic;
@@ -89,15 +89,18 @@ namespace MediaBrowser.WebDashboard.Api
         /// </summary>
         private readonly IUserManager _userManager;
 
+        private readonly IServerApplicationHost _appHost;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="DashboardService" /> class.
         /// </summary>
         /// <param name="taskManager">The task manager.</param>
         /// <param name="userManager">The user manager.</param>
-        public DashboardService(ITaskManager taskManager, IUserManager userManager)
+        public DashboardService(ITaskManager taskManager, IUserManager userManager, IServerApplicationHost appHost)
         {
             _taskManager = taskManager;
             _userManager = userManager;
+            _appHost = appHost;
         }
 
         /// <summary>
@@ -107,18 +110,17 @@ namespace MediaBrowser.WebDashboard.Api
         /// <returns>System.Object.</returns>
         public object Get(GetDashboardInfo request)
         {
-            return GetDashboardInfo(Kernel.Instance, Logger, _taskManager, _userManager);
+            return GetDashboardInfo(_appHost, Logger, _taskManager, _userManager);
         }
 
         /// <summary>
         /// Gets the dashboard info.
         /// </summary>
-        /// <param name="kernel">The kernel.</param>
         /// <param name="logger">The logger.</param>
         /// <param name="taskManager">The task manager.</param>
         /// <param name="userManager">The user manager.</param>
         /// <returns>DashboardInfo.</returns>
-        public static DashboardInfo GetDashboardInfo(Kernel kernel, ILogger logger, ITaskManager taskManager, IUserManager userManager)
+        public static DashboardInfo GetDashboardInfo(IServerApplicationHost appHost, ILogger logger, ITaskManager taskManager, IUserManager userManager)
         {
             var connections = userManager.ConnectedUsers.ToArray();
 
@@ -126,7 +128,7 @@ namespace MediaBrowser.WebDashboard.Api
 
             return new DashboardInfo
             {
-                SystemInfo = kernel.GetSystemInfo(),
+                SystemInfo = appHost.GetSystemInfo(),
 
                 RunningTasks = taskManager.ScheduledTasks.Where(i => i.State == TaskState.Running || i.State == TaskState.Cancelling)
                                      .Select(ScheduledTaskHelpers.GetTaskInfo)
diff --git a/MediaBrowser.WebDashboard/Html/css/site.css b/MediaBrowser.WebDashboard/Html/css/site.css
index 7fb09381f9..6b7081b90d 100644
--- a/MediaBrowser.WebDashboard/Html/css/site.css
+++ b/MediaBrowser.WebDashboard/Html/css/site.css
@@ -82,7 +82,7 @@ pre, textarea.pre {
     background-attachment: fixed;

 }

 

-.libraryPage, .libraryPage .ui-content {

+.libraryPage, .itemListContent {

     background: #262626!important;

     background-attachment: fixed!important;

 }

diff --git a/MediaBrowser.WebDashboard/Html/itemList.html b/MediaBrowser.WebDashboard/Html/itemList.html
index 728f38a28a..4be44b8215 100644
--- a/MediaBrowser.WebDashboard/Html/itemList.html
+++ b/MediaBrowser.WebDashboard/Html/itemList.html
@@ -5,10 +5,10 @@
 </head>
 <body>
     <div id="itemListPage" data-role="page" class="page libraryPage" data-theme="a">
-        <div data-role="content">
-<!--            <div style="text-align: right;">
+        <div data-role="content" class="itemListContent">
+            <div style="text-align: right;">
                 <button type="button" onclick="$( '#optionsPanel', $.mobile.activePage ).panel( 'open' );" data-mini="true" data-inline="true">Options</button>
-            </div>-->
+            </div>
             <h1 id="itemName" class="listHeader"></h1>
 
 
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 7132cd7920..e57d7ad2fd 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -88,10 +88,6 @@
     <Compile Include="ServerEntryPoint.cs" />

   </ItemGroup>

   <ItemGroup>

-    <ProjectReference Include="..\MediaBrowser.Common.Implementations\MediaBrowser.Common.Implementations.csproj">

-      <Project>{c4d2573a-3fd3-441f-81af-174ac4cd4e1d}</Project>

-      <Name>MediaBrowser.Common.Implementations</Name>

-    </ProjectReference>

     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">

       <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>

       <Name>MediaBrowser.Common</Name>

@@ -104,6 +100,10 @@
       <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>

       <Name>MediaBrowser.Model</Name>

     </ProjectReference>

+    <ProjectReference Include="..\MediaBrowser.Server.Implementations\MediaBrowser.Server.Implementations.csproj">

+      <Project>{2e781478-814d-4a48-9d80-bff206441a65}</Project>

+      <Name>MediaBrowser.Server.Implementations</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <EmbeddedResource Include="Html\index.html" />