From 95dadd98297cc57b56baf9f5e21d3bf6eb750816 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 9 Feb 2016 13:44:07 -0500 Subject: [PATCH] update auto-organize popup --- dashboard-ui/autoorganizelog.html | 39 ++++++-------- dashboard-ui/encodingsettings.html | 2 - dashboard-ui/playbackconfiguration.html | 54 ++++++++----------- dashboard-ui/scripts/autoorganizelog.js | 1 - dashboard-ui/scripts/site.js | 1 + dashboard-ui/streamingsettings.html | 12 ++--- dashboard-ui/strings/html/en-US.json | 2 +- dashboard-ui/strings/html/server.json | 2 +- .../thirdparty/paper-button-style.css | 5 ++ 9 files changed, 51 insertions(+), 67 deletions(-) diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html index 47f529f61a..419774564e 100644 --- a/dashboard-ui/autoorganizelog.html +++ b/dashboard-ui/autoorganizelog.html @@ -4,7 +4,7 @@ ${TitleAutoOrganize} -
+
@@ -55,45 +55,40 @@
-
+

${HeaderEpisodeOrganization}

-
+

- +
- - +
- - +
- - +
${LabelEndingEpisodeNumberHelp}
-
- - +
+
+ ${OptionRememberOrganizeCorrection}
- -

- - -

+
+ +
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html index 7443a7ee3d..90b22d4843 100644 --- a/dashboard-ui/encodingsettings.html +++ b/dashboard-ui/encodingsettings.html @@ -71,8 +71,6 @@ - - ${ButtonCancel} diff --git a/dashboard-ui/playbackconfiguration.html b/dashboard-ui/playbackconfiguration.html index fee39531bd..5cbc5e0d59 100644 --- a/dashboard-ui/playbackconfiguration.html +++ b/dashboard-ui/playbackconfiguration.html @@ -4,7 +4,7 @@ ${TitlePlayback} -
+
@@ -17,34 +17,28 @@
-
-

${HeaderResumeSettings}

-
-
-
    -
  • - - -
    - ${LabelMinResumePercentageHelp} -
    -
    • -
  • - - -
    - ${LabelMaxResumePercentageHelp} -
    -
    • -
  • - - -
    - ${LabelMinResumeDurationHelp} -
    -
    • -
-
+

${HeaderResumeSettings}

+
+
    +
  • + +
    + ${LabelMinResumePercentageHelp} +
    +
    • +
  • + +
    + ${LabelMaxResumePercentageHelp} +
    +
    • +
  • + +
    + ${LabelMinResumeDurationHelp} +
    +
    • +

    @@ -52,8 +46,6 @@ - - ${ButtonCancel}
diff --git a/dashboard-ui/scripts/autoorganizelog.js b/dashboard-ui/scripts/autoorganizelog.js index eb0e904b5c..bbc243b0c0 100644 --- a/dashboard-ui/scripts/autoorganizelog.js +++ b/dashboard-ui/scripts/autoorganizelog.js @@ -77,7 +77,6 @@ $('#txtEndingEpisode', popup).val(item.ExtractedEndingEpisodeNumber); $('#chkRememberCorrection', popup).val(false); - $('.extractedName', popup).html(item.ExtractedName); $('#hfResultId', popup).val(item.Id); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 28cb97ebee..8c3910612d 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1940,6 +1940,7 @@ var AppInfo = {}; define("paper-slider", ["html!" + bowerPath + "/paper-slider/paper-slider.html"]); define("paper-tabs", ["html!" + bowerPath + "/paper-tabs/paper-tabs.html"]); define("paper-menu", ["html!" + bowerPath + "/paper-menu/paper-menu.html"]); + define("paper-material", ["html!" + bowerPath + "/paper-material/paper-material.html"]); define("paper-dialog", ["html!" + bowerPath + "/paper-dialog/paper-dialog.html"]); define("paper-dialog-scrollable", ["html!" + bowerPath + "/paper-dialog-scrollable/paper-dialog-scrollable.html"]); define("paper-button", ["html!" + bowerPath + "/paper-button/paper-button.html"]); diff --git a/dashboard-ui/streamingsettings.html b/dashboard-ui/streamingsettings.html index 4b24401dd8..bc557e8588 100644 --- a/dashboard-ui/streamingsettings.html +++ b/dashboard-ui/streamingsettings.html @@ -25,15 +25,9 @@ -
    -
  • - - - ${ButtonCancel} -
    • -
+
diff --git a/dashboard-ui/strings/html/en-US.json b/dashboard-ui/strings/html/en-US.json index 500df296d9..24e90f8b73 100644 --- a/dashboard-ui/strings/html/en-US.json +++ b/dashboard-ui/strings/html/en-US.json @@ -1,7 +1,7 @@ { "HeaderTaskTriggers": "Task Triggers", "TabSmartMatches": "Smart Matches", - "LabelOrganizeSmartMatchOption": "In the future, organize all files into the selected series if the name contains", + "OptionRememberOrganizeCorrection": "Save and apply this correction to future files with similiar names.", "TabSmartMatchInfo": "Manage your smart matches that were added using the Auto-Organize correction dialog", "LabelExit": "Exit", "LabelVisitCommunity": "Visit Community", diff --git a/dashboard-ui/strings/html/server.json b/dashboard-ui/strings/html/server.json index cbf942b24b..5ebdac45e7 100644 --- a/dashboard-ui/strings/html/server.json +++ b/dashboard-ui/strings/html/server.json @@ -595,7 +595,7 @@ "LabelEpisodeNumber": "Episode number:", "LabelEndingEpisodeNumber": "Ending episode number:", "LabelEndingEpisodeNumberHelp": "Only required for multi-episode files", - "LabelOrganizeSmartMatchOption": "In the future, organize all files into the selected series if the name contains", + "OptionRememberOrganizeCorrection": "Save and apply this correction to future files with similiar names.", "HeaderSupportTheTeam": "Support the Emby Team", "LabelSupportAmount": "Amount (USD)", "HeaderSupportTheTeamHelp": "Help ensure the continued development of this project by purchasing Emby Premiere. A portion of all income will be contributed to other free tools we depend on.", diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index d8108045eb..ba5d439ac4 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -550,6 +550,11 @@ div.dialogHeader { color: #fff; } +.background-theme-a .pageContentPaperMaterial { + background-color: #fff; + padding: 1.5em; +} + .background-theme-b div.dialogHeader { background-color: #101010; }