Home Explore Help
Sign In
mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

update menus

Luke Pulverenti 10 years ago
parent
95ac98d5d4
commit
72752fc559
4 changed files with 30 additions and 18 deletions
Split View Show Diff Stats
  1. 1 0
      MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
  2. 0 1
      MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
  3. 1 2
      MediaBrowser.WebDashboard/Api/PackageCreator.cs
  4. 28 15
      MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

+ 1 - 0
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File 

@@ -38,6 +38,7 @@
 
     "HeaderSupportTheTeam": "Support the Emby Team",
 
     "TextEnjoyBonusFeatures": "Enjoy Bonus Features",
 
     "TitleLiveTV": "Live TV",
 
+    "ButtonCancelSyncJob":  "Cancel sync job",
 
     "TitleSync": "Sync",
 
     "HeaderSelectDate": "Select Date",
 
     "ButtonDonate": "Donate",

+ 0 - 1
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File 

@@ -99,7 +99,6 @@
 
     <Compile Include="BackgroundServiceInstaller.cs">
 
       <SubType>Component</SubType>
 
     </Compile>
 
-    <Compile Include="EntryPoints\ResourceEntryPoint.cs" />
 
     <Compile Include="Native\NativeFileSystem.cs" />
 
     <Compile Include="MainForm.cs">
 
       <SubType>Form</SubType>

+ 1 - 2
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File 

@@ -262,7 +262,7 @@ namespace MediaBrowser.WebDashboard.Api
 
 
                         html = html.Replace("<html>", "<html lang=\"" + lang + "\">")
 
                             .Replace("<body>", "<body><paper-drawer-panel class=\"mainDrawerPanel mainDrawerPanelPreInit\" forceNarrow><div class=\"mainDrawer\" drawer></div><div main><div class=\"pageContainer\">")
 
-                            .Replace("</body>", "</div></div></body>");
 
+                            .Replace("</body>", "</div></div></paper-drawer-panel></body>");
 
                     }
 
 
                     if (enableMinification)
 
@@ -666,7 +666,6 @@ namespace MediaBrowser.WebDashboard.Api
 
                                       "pluginupdates.css",
 
                                       "remotecontrol.css",
 
                                       "userimage.css",
 
-                                      "livetv.css",
 
                                       "nowplaying.css",
 
                                       "materialize.css"
 
                                   };

+ 28 - 15
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File 

@@ -178,6 +178,18 @@
 
     <Content Include="dashboard-ui\bower_components\iron-media-query\iron-media-query.html" />

     <Content Include="dashboard-ui\bower_components\iron-media-query\test\basic.html" />

     <Content Include="dashboard-ui\bower_components\iron-media-query\test\index.html" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\.gitignore" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\demo\index.html" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\demo\simple-menu.html" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\demo\simple-menubar.html" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\index.html" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\iron-menu-behavior.html" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\iron-menubar-behavior.html" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\test\index.html" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\test\iron-menu-behavior.html" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\test\iron-menubar-behavior.html" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\test\test-menu.html" />

+    <Content Include="dashboard-ui\bower_components\iron-menu-behavior\test\test-menubar.html" />

     <Content Include="dashboard-ui\bower_components\iron-meta\.gitignore" />

     <Content Include="dashboard-ui\bower_components\iron-meta\demo\index.html" />

     <Content Include="dashboard-ui\bower_components\iron-meta\hero.svg" />

@@ -421,6 +433,13 @@
 
     </Content>

     <Content Include="dashboard-ui\bower_components\paper-material\test\index.html" />

     <Content Include="dashboard-ui\bower_components\paper-material\test\paper-material.html" />

+    <Content Include="dashboard-ui\bower_components\paper-menu\.gitignore" />

+    <Content Include="dashboard-ui\bower_components\paper-menu\demo\index.html" />

+    <Content Include="dashboard-ui\bower_components\paper-menu\hero.svg" />

+    <Content Include="dashboard-ui\bower_components\paper-menu\index.html" />

+    <Content Include="dashboard-ui\bower_components\paper-menu\paper-menu.html" />

+    <Content Include="dashboard-ui\bower_components\paper-menu\test\index.html" />

+    <Content Include="dashboard-ui\bower_components\paper-menu\test\paper-menu.html" />

     <Content Include="dashboard-ui\bower_components\paper-ripple\.gitignore" />

     <Content Include="dashboard-ui\bower_components\paper-ripple\demo\index.html" />

     <Content Include="dashboard-ui\bower_components\paper-ripple\hero.svg" />

@@ -541,6 +560,9 @@
 
     <Content Include="dashboard-ui\css\images\splash.jpg">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

+    <Content Include="dashboard-ui\css\images\splash720.jpg">

+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+    </Content>

     <Content Include="dashboard-ui\css\images\touchicon144.png">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

@@ -634,18 +656,6 @@
 
     <Content Include="dashboard-ui\thirdparty\paper-button-style.css">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\thirdparty\polymer\LICENSE.txt">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\thirdparty\polymer\polymer-micro.html">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

-    <Content Include="dashboard-ui\thirdparty\polymer\polymer-mini.html">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

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

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

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

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

@@ -2750,6 +2760,9 @@
 
     <None Include="dashboard-ui\bower_components\iron-media-query\.bower.json" />

     <None Include="dashboard-ui\bower_components\iron-media-query\bower.json" />

     <None Include="dashboard-ui\bower_components\iron-media-query\README.md" />

+    <None Include="dashboard-ui\bower_components\iron-menu-behavior\.bower.json" />

+    <None Include="dashboard-ui\bower_components\iron-menu-behavior\bower.json" />

+    <None Include="dashboard-ui\bower_components\iron-menu-behavior\README.md" />

     <None Include="dashboard-ui\bower_components\iron-meta\.bower.json" />

     <None Include="dashboard-ui\bower_components\iron-meta\bower.json" />

     <None Include="dashboard-ui\bower_components\iron-meta\README.md" />

@@ -2793,6 +2806,9 @@
 
     <None Include="dashboard-ui\bower_components\paper-material\.bower.json" />

     <None Include="dashboard-ui\bower_components\paper-material\bower.json" />

     <None Include="dashboard-ui\bower_components\paper-material\README.md" />

+    <None Include="dashboard-ui\bower_components\paper-menu\.bower.json" />

+    <None Include="dashboard-ui\bower_components\paper-menu\bower.json" />

+    <None Include="dashboard-ui\bower_components\paper-menu\README.md" />

     <None Include="dashboard-ui\bower_components\paper-ripple\.bower.json" />

     <None Include="dashboard-ui\bower_components\paper-ripple\bower.json" />

     <None Include="dashboard-ui\bower_components\paper-ripple\README.md" />

@@ -2933,9 +2949,6 @@
 
     <None Include="dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.woff2">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </None>

-    <None Include="dashboard-ui\thirdparty\polymer\bower.json">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </None>

     <None Include="packages.config" />

   </ItemGroup>

   <ItemGroup />