2
0
Эх сурвалжийг харах

update web client packager

Luke Pulverenti 10 жил өмнө
parent
commit
931bf29c3e

+ 2 - 1
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json

@@ -74,7 +74,8 @@
     "ButtonMarkTheseRead": "Mark these read",
     "ButtonClose": "Close",
     "LabelAllPlaysSentToPlayer": "All plays will be sent to the selected player.",
-    "MessageInvalidUser": "Invalid user or password.",
+    "MessageInvalidUser": "Invalid username or password. Please try again.",
+    "HeaderLoginFailure":  "Login Failure",
     "HeaderAllRecordings": "All Recordings",
     "RecommendationBecauseYouLike": "Because you like {0}",
     "RecommendationBecauseYouWatched": "Because you watched {0}",

+ 3 - 1
MediaBrowser.Server.Implementations/Localization/Server/server.json

@@ -1252,5 +1252,7 @@
     "HeaderTrailerReel": "Trailer Reel",
     "OptionPlayUnwatchedTrailersOnly": "Play only unwatched trailers",
     "HeaderTrailerReelHelp": "Start a trailer reel to play a long running playlist of trailers.",
-    "MessageNoTrailersFound": "No trailers found. Install the Trailer channel plugin to import a library of internet trailers."
+    "MessageNoTrailersFound": "No trailers found. Install the Trailer channel plugin to import a library of internet trailers.",
+    "HeaderNewUsers": "New Users",
+    "ButtonSignUp": "Sign up"
 }

+ 3 - 2
MediaBrowser.WebDashboard/Api/DashboardService.cs

@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Extensions;
+using System.Globalization;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
@@ -286,7 +287,7 @@ namespace MediaBrowser.WebDashboard.Api
 
             var culture = "en-US";
 
-            var appVersion = _appHost.ApplicationVersion.ToString();
+            var appVersion = DateTime.UtcNow.Ticks.ToString(CultureInfo.InvariantCulture);
 
             await DumpHtml(creator.DashboardUIPath, path, culture, appVersion);
             await DumpJs(creator.DashboardUIPath, path, culture, appVersion);

+ 2 - 0
MediaBrowser.WebDashboard/Api/PackageCreator.cs

@@ -246,6 +246,7 @@ namespace MediaBrowser.WebDashboard.Api
             await AppendResource(memoryStream, "thirdparty/jquery.unveil-custom.js", newLineBytes).ConfigureAwait(false);
 
             await AppendResource(memoryStream, "thirdparty/cast_sender.js", newLineBytes).ConfigureAwait(false);
+            await AppendResource(memoryStream, "thirdparty/md5.js", newLineBytes).ConfigureAwait(false);
 
             await AppendLocalization(memoryStream, culture).ConfigureAwait(false);
             await memoryStream.WriteAsync(newLineBytes, 0, newLineBytes.Length).ConfigureAwait(false);
@@ -344,6 +345,7 @@ namespace MediaBrowser.WebDashboard.Api
                                 "channelslatest.js",
                                 "channelitems.js",
                                 "channelsettings.js",
+                                "connectlogin.js",
                                 "dashboardgeneral.js",
                                 "dashboardpage.js",
                                 "dashboardsync.js",

+ 9 - 0
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -104,6 +104,9 @@
     <Content Include="dashboard-ui\cinemamodeconfiguration.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\connectlogin.html">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\css\chromecast.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -695,6 +698,9 @@
     <Content Include="dashboard-ui\scripts\cinemamodeconfiguration.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\connectlogin.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\dashboardgeneral.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1535,6 +1541,9 @@
     <Content Include="dashboard-ui\livetvsuggested.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\thirdparty\md5.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\thirdparty\swipebox-master\css\swipebox.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>