2
0
Luke Pulverenti 12 жил өмнө
parent
commit
5f27ffb642

+ 31 - 32
MediaBrowser.WebDashboard/Api/DashboardService.cs

@@ -444,42 +444,41 @@ namespace MediaBrowser.WebDashboard.Api
         /// <returns>Task{Stream}.</returns>
         /// <returns>Task{Stream}.</returns>
         private async Task<Stream> GetAllJavascript()
         private async Task<Stream> GetAllJavascript()
         {
         {
-            const string resourcePrefix = "MediaBrowser.WebDashboard.Html.scripts.";
             var assembly = GetType().Assembly;
             var assembly = GetType().Assembly;
 
 
             var scriptFiles = new[]
             var scriptFiles = new[]
                                   {
                                   {
-                                      "Extensions.js",
-                                      "Site.js",
-                                      "AboutPage.js",
-                                      "AddPluginPage.js",
-                                      "AdvancedConfigurationPage.js",
-                                      "AdvancedMetadataConfigurationPage.js",
-                                      "PluginCatalogPage.js",
-                                      "DashboardPage.js",
-                                      "DisplaySettingsPage.js",
-                                      "EditUserPage.js",
-                                      "IndexPage.js",
-                                      "ItemDetailPage.js",
-                                      "ItemListPage.js",
-                                      "LoginPage.js",
-                                      "LogPage.js",
-                                      "MediaLibraryPage.js",
-                                      "MediaPlayer.js",
-                                      "MetadataConfigurationPage.js",
-                                      "MetadataImagesPage.js",
-                                      "PluginsPage.js",
-                                      "PluginUpdatesPage.js",
-                                      "ScheduledTaskPage.js",
-                                      "ScheduledTasksPage.js",
-                                      "UpdatePasswordPage.js",
-                                      "UserImagePage.js",
-                                      "UserProfilesPage.js",
-                                      "WizardFinishPage.js",
-                                      "WizardStartPage.js",
-                                      "WizardUserPage.js",
-                                      "SupporterKeyPage.js",
-                                      "SupporterPage.js"
+                                      "extensions.js",
+                                      "site.js",
+                                      "aboutpage.js",
+                                      "addpluginpage.js",
+                                      "advancedconfigurationpage.js",
+                                      "advancedmetadataconfigurationpage.js",
+                                      "plugincatalogpage.js",
+                                      "dashboardpage.js",
+                                      "displaysettingspage.js",
+                                      "edituserpage.js",
+                                      "indexpage.js",
+                                      "itemdetailpage.js",
+                                      "itemlistpage.js",
+                                      "loginpage.js",
+                                      "logpage.js",
+                                      "medialibrarypage.js",
+                                      "mediaplayer.js",
+                                      "metadataconfigurationpage.js",
+                                      "metadataimagespage.js",
+                                      "pluginspage.js",
+                                      "pluginupdatespage.js",
+                                      "scheduledtaskpage.js",
+                                      "scheduledtaskspage.js",
+                                      "updatepasswordpage.js",
+                                      "userimagepage.js",
+                                      "userprofilespage.js",
+                                      "wizardfinishpage.js",
+                                      "wizardstartpage.js",
+                                      "wizarduserpage.js",
+                                      "supporterkeypage.js",
+                                      "supporterpage.js"
                                   };
                                   };
 
 
             var memoryStream = new MemoryStream();
             var memoryStream = new MemoryStream();

+ 31 - 31
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -102,7 +102,7 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\Site.js">
+    <Content Include="dashboard-ui\scripts\site.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -183,7 +183,7 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\IndexPage.js">
+    <Content Include="dashboard-ui\scripts\indexpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -208,46 +208,46 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\MediaLibraryPage.js">
+    <Content Include="dashboard-ui\scripts\medialibrarypage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\DisplaySettingsPage.js">
+    <Content Include="dashboard-ui\scripts\displaysettingspage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\PluginsPage.js">
+    <Content Include="dashboard-ui\scripts\pluginspage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\MetadataConfigurationPage.js">
+    <Content Include="dashboard-ui\scripts\metadataconfigurationpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\LoginPage.js">
+    <Content Include="dashboard-ui\scripts\loginpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\UpdatePasswordPage.js">
+    <Content Include="dashboard-ui\scripts\updatepasswordpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\AdvancedConfigurationPage.js">
+    <Content Include="dashboard-ui\scripts\advancedconfigurationpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
-    <Content Include="dashboard-ui\scripts\EditUserPage.js">
+    <Content Include="dashboard-ui\scripts\edituserpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
-    <Content Include="dashboard-ui\scripts\UserImagePage.js">
+    <Content Include="dashboard-ui\scripts\userimagepage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
-    <Content Include="dashboard-ui\scripts\UserProfilesPage.js">
+    <Content Include="dashboard-ui\scripts\userprofilespage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -257,7 +257,7 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\AdvancedMetadataConfigurationPage.js">
+    <Content Include="dashboard-ui\scripts\advancedmetadataconfigurationpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -267,7 +267,7 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\PluginUpdatesPage.js">
+    <Content Include="dashboard-ui\scripts\pluginupdatespage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -275,7 +275,7 @@
     <Content Include="dashboard-ui\addplugin.html">
     <Content Include="dashboard-ui\addplugin.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
-    <Content Include="dashboard-ui\scripts\AddPluginPage.js">
+    <Content Include="dashboard-ui\scripts\addpluginpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -288,7 +288,7 @@
     <Content Include="dashboard-ui\plugincatalog.html">
     <Content Include="dashboard-ui\plugincatalog.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
-    <Content Include="dashboard-ui\scripts\PluginCatalogPage.js">
+    <Content Include="dashboard-ui\scripts\plugincatalogpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -313,7 +313,7 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\ScheduledTasksPage.js">
+    <Content Include="dashboard-ui\scripts\scheduledtaskspage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -321,7 +321,7 @@
     <Content Include="dashboard-ui\scheduledtask.html">
     <Content Include="dashboard-ui\scheduledtask.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
-    <Content Include="dashboard-ui\scripts\ScheduledTaskPage.js">
+    <Content Include="dashboard-ui\scripts\scheduledtaskpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -344,12 +344,12 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\WizardStartPage.js">
+    <Content Include="dashboard-ui\scripts\wizardstartpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\WizardUserPage.js">
+    <Content Include="dashboard-ui\scripts\wizarduserpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -364,7 +364,7 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\LogPage.js">
+    <Content Include="dashboard-ui\scripts\logpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -374,12 +374,12 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\MetadataImagesPage.js">
+    <Content Include="dashboard-ui\scripts\metadataimagespage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\DashboardPage.js">
+    <Content Include="dashboard-ui\scripts\dashboardpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -425,7 +425,7 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\Extensions.js">
+    <Content Include="dashboard-ui\scripts\extensions.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -435,7 +435,7 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\SupporterPage.js">
+    <Content Include="dashboard-ui\scripts\supporterpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -460,7 +460,7 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\SupporterKeyPage.js">
+    <Content Include="dashboard-ui\scripts\supporterkeypage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
@@ -573,24 +573,24 @@
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\ItemDetailPage.js">
+    <Content Include="dashboard-ui\scripts\itemdetailpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
-    <Content Include="dashboard-ui\scripts\AboutPage.js">
+    <Content Include="dashboard-ui\scripts\aboutpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="dashboard-ui\css\images\supporter\supporterflag.png">
     <Content Include="dashboard-ui\css\images\supporter\supporterflag.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
-    <Content Include="dashboard-ui\scripts\ItemListPage.js">
+    <Content Include="dashboard-ui\scripts\itemlistpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="dashboard-ui\itemlist.html">
     <Content Include="dashboard-ui\itemlist.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
-    <Content Include="dashboard-ui\scripts\WizardFinishPage.js">
+    <Content Include="dashboard-ui\scripts\wizardfinishpage.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
     <Content Include="dashboard-ui\css\images\media\playcircle.png">
     <Content Include="dashboard-ui\css\images\media\playcircle.png">
@@ -638,7 +638,7 @@
     <Content Include="dashboard-ui\css\images\stars.png">
     <Content Include="dashboard-ui\css\images\stars.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
-    <Content Include="dashboard-ui\scripts\MediaPlayer.js">
+    <Content Include="dashboard-ui\scripts\mediaplayer.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     </Content>
   </ItemGroup>
   </ItemGroup>