move user image into profile settings

2 files changed, 23 insertions, 9 deletions

diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 69bf1a0f38..1b8e21e201 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -483,13 +483,21 @@ namespace MediaBrowser.WebDashboard.Api
 
             var builder = new StringBuilder();
 
-            using (var fs = _fileSystem.GetFileStream(GetDashboardResourcePath("thirdparty/mediabrowser.apiclient.js"), FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))
+            foreach (var file in new[]
             {
-                using (var streamReader = new StreamReader(fs))
+                "thirdparty/apiclient/sha1.js",
+                "thirdparty/apiclient/mediabrowser.apiclient.js",
+                "thirdparty/apiclient/connectionmanager.js"
+            })
+            {
+                using (var fs = _fileSystem.GetFileStream(GetDashboardResourcePath(file), FileMode.Open, FileAccess.Read, FileShare.ReadWrite, true))
                 {
-                    var text = await streamReader.ReadToEndAsync().ConfigureAwait(false);
-                    builder.Append(text);
-                    builder.Append(Environment.NewLine);
+                    using (var streamReader = new StreamReader(fs))
+                    {
+                        var text = await streamReader.ReadToEndAsync().ConfigureAwait(false);
+                        builder.Append(text);
+                        builder.Append(Environment.NewLine);
+                    }
                 }
             }
 
@@ -668,7 +676,7 @@ namespace MediaBrowser.WebDashboard.Api
                                 "tvupcoming.js",
                                 "useredit.js",
                                 "userpassword.js",
-                                "userimagepage.js",
+                                "myprofile.js",
                                 "userprofilespage.js",
                                 "userparentalcontrol.js",
                                 "userlibraryaccess.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 5eb8a200e5..3f9ef8db7d 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -85,7 +85,7 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <EmbeddedResource Include="dashboard-ui\thirdparty\mediabrowser.apiclient.js">

+    <EmbeddedResource Include="dashboard-ui\thirdparty\apiclient\mediabrowser.apiclient.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </EmbeddedResource>

     <Content Include="dashboard-ui\channelitems.html">

@@ -898,6 +898,12 @@
     <Content Include="dashboard-ui\serversecurity.html">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

+    <Content Include="dashboard-ui\thirdparty\apiclient\connectionmanager.js">

+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+    </Content>

+    <Content Include="dashboard-ui\thirdparty\apiclient\sha1.js">

+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+    </Content>

     <Content Include="dashboard-ui\thirdparty\cast_sender.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

@@ -1896,7 +1902,7 @@
     </Content>

   </ItemGroup>

   <ItemGroup>

-    <Content Include="dashboard-ui\userimage.html">

+    <Content Include="dashboard-ui\myprofile.html">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

   </ItemGroup>

@@ -1952,7 +1958,7 @@
     <Content Include="dashboard-ui\scripts\useredit.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\scripts\userimagepage.js">

+    <Content Include="dashboard-ui\scripts\myprofile.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

     <Content Include="dashboard-ui\scripts\userprofilespage.js">