From 9de66e9e874bd6c18b4305687ab0dd364b472c53 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Wed, 9 Jan 2019 23:35:05 +0900
Subject: [PATCH 1/2] add jellyfin-web as submodule

---
 .gitignore                                                 | 1 -
 .gitmodules                                                | 3 +++
 MediaBrowser.Controller/IServerApplicationPaths.cs         | 1 -
 MediaBrowser.WebDashboard/Api/DashboardService.cs          | 6 +++---
 MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 2 +-
 MediaBrowser.WebDashboard/jellyfin-web                     | 1 +
 6 files changed, 8 insertions(+), 6 deletions(-)
 create mode 160000 MediaBrowser.WebDashboard/jellyfin-web

diff --git a/.gitignore b/.gitignore
index befba5a20e..880e63a7f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -234,7 +234,6 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
-MediaBrowser.WebDashboard/dashboard-ui/.idea/
 /.vs
 
 ##########
diff --git a/.gitmodules b/.gitmodules
index 31a58ecf1a..7aeb94dfca 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "ThirdParty/taglib-sharp"]
 	path = ThirdParty/taglib-sharp
 	url = https://github.com/mono/taglib-sharp.git
+[submodule "MediaBrowser.WebDashboard/jellyfin-web"]
+	path = MediaBrowser.WebDashboard/jellyfin-web
+	url = https://github.com/jellyfin/jellyfin-web.git
diff --git a/MediaBrowser.Controller/IServerApplicationPaths.cs b/MediaBrowser.Controller/IServerApplicationPaths.cs
index 5fb7968dd9..e97943cbee 100644
--- a/MediaBrowser.Controller/IServerApplicationPaths.cs
+++ b/MediaBrowser.Controller/IServerApplicationPaths.cs
@@ -12,7 +12,6 @@ namespace MediaBrowser.Controller
 
         /// <summary>
         /// Gets the application resources path. This is the path to the folder containing resources that are deployed as part of the application
-        /// For example, this folder contains dashboard-ui and swagger-ui
         /// </summary>
         /// <value>The application resources path.</value>
         string ApplicationResourcesPath { get; }
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 58d02ef044..1c57ac27aa 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -138,9 +138,9 @@ namespace MediaBrowser.WebDashboard.Api
         }
 
         /// <summary>
-        /// Gets the dashboard UI path.
+        /// Gets the path for the web interface.
         /// </summary>
-        /// <value>The dashboard UI path.</value>
+        /// <value>The path for the web interface.</value>
         public string DashboardUIPath
         {
             get
@@ -150,7 +150,7 @@ namespace MediaBrowser.WebDashboard.Api
                     return _serverConfigurationManager.Configuration.DashboardSourcePath;
                 }
 
-                return Path.Combine(_serverConfigurationManager.ApplicationPaths.ApplicationResourcesPath, "dashboard-ui");
+                return Path.Combine(_serverConfigurationManager.ApplicationPaths.ApplicationResourcesPath, "jellyfin-web/src");
             }
         }
 
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 855b8b627d..c5367ba753 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="dashboard-ui\**\*.*">
+    <None Include="jellyfin-web\src\**\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
diff --git a/MediaBrowser.WebDashboard/jellyfin-web b/MediaBrowser.WebDashboard/jellyfin-web
new file mode 160000
index 0000000000..4678528d00
--- /dev/null
+++ b/MediaBrowser.WebDashboard/jellyfin-web
@@ -0,0 +1 @@
+Subproject commit 4678528d0028685b45c7c6daa2e24b72a363535b

From f454b753f2a6e4e63d8f22ab0c354d5fa1c16e26 Mon Sep 17 00:00:00 2001
From: Bond-009 <bond.009@outlook.com>
Date: Thu, 10 Jan 2019 00:23:44 +0900
Subject: [PATCH 2/2] separate path with comma

Co-Authored-By: dkanada <dkanada@users.noreply.github.com>
---
 MediaBrowser.WebDashboard/Api/DashboardService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 1c57ac27aa..38a789580d 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -150,7 +150,7 @@ namespace MediaBrowser.WebDashboard.Api
                     return _serverConfigurationManager.Configuration.DashboardSourcePath;
                 }
 
-                return Path.Combine(_serverConfigurationManager.ApplicationPaths.ApplicationResourcesPath, "jellyfin-web/src");
+                return Path.Combine(_serverConfigurationManager.ApplicationPaths.ApplicationResourcesPath, "jellyfin-web", "src");
             }
         }