diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html index 0ef2d882de..7db93174a7 100644 --- a/dashboard-ui/advanced.html +++ b/dashboard-ui/advanced.html @@ -4,7 +4,7 @@ ${TitleAdvanced} -
+
@@ -26,63 +26,68 @@
  • ${LabelEnableDebugLogging}
    • +
  • + ${OptionEnableAnonymousUsageReporting} +
    + ${OptionEnableAnonymousUsageReportingHelp} + +
    +
    • -
    -

    ${HeaderAutomaticUpdates}

    + +
    +
      +
    • +
      + + +
      +
      • +
    • + + + +
      • + +
    +     + + +
    -
    -
      -
    • -
      - - -
      -
      • -
    • - - - -
      • - -
    + ${OptionEnableWebClientResponseCache}
    -
    -
    -

    ${HeaderDeveloperOptions}

    +
    -
    -
    - ${OptionEnableWebClientResponseCache} -
    -
    -
    - ${OptionEnableWebClientResourceMinification} -
    -
    - ${OptionDisableForDevelopmentHelp} -
    -

    -
      -
    • - - -
      ${LabelDashboardSourcePathHelp}
      -
      • -
    + ${OptionEnableWebClientResourceMinification}
    -
    +
    + ${OptionDisableForDevelopmentHelp} +
    +

    +
      +
    • + + +
      ${LabelDashboardSourcePathHelp}
      +
      • +
    + +
    • diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html index 57860df80d..19f87ccc3d 100644 --- a/dashboard-ui/autoorganizetv.html +++ b/dashboard-ui/autoorganizetv.html @@ -4,7 +4,7 @@ ${TitleAutoOrganize} -
      +
      @@ -43,102 +43,99 @@

    -
    -

    ${HeaderEpisodeFilePattern}

    + + +
    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -

    ${HeaderSupportedPatterns}

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ${HeaderTerm}${HeaderPattern}${HeaderResult}
    ${LabelSeriesNamePlain}%sn${LabelSeriesNamePlain}
    ${LabelSeriesNamePlain}%s.n${ValueSeriesNamePeriod}
    ${LabelSeriesNamePlain}%s_n${ValueSeriesNameUnderscore}
    ${LabelSeasonNumberPlain}%s1
    ${LabelSeasonNumberPlain}%0s01
    ${LabelEpisodeNumberPlain}%e4
    ${LabelEpisodeNumberPlain}%0e04
    ${LabelEndingEpisodeNumberPlain}%ed5
    ${LabelEndingEpisodeNumberPlain}%0ed05
    ${LabelEpisodeNamePlain}%en${LabelEpisodeNamePlain}
    ${LabelEpisodeNamePlain}%e.n${ValueEpisodeNamePeriod}
    ${LabelEpisodeNamePlain}%e_n${ValueEpisodeNameUnderscore}
    ${FileExtension}%extmkv
    - + +
    -
    +
    +
    + +
    +
    + +
    +

    ${HeaderSupportedPatterns}

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ${HeaderTerm}${HeaderPattern}${HeaderResult}
    ${LabelSeriesNamePlain}%sn${LabelSeriesNamePlain}
    ${LabelSeriesNamePlain}%s.n${ValueSeriesNamePeriod}
    ${LabelSeriesNamePlain}%s_n${ValueSeriesNameUnderscore}
    ${LabelSeasonNumberPlain}%s1
    ${LabelSeasonNumberPlain}%0s01
    ${LabelEpisodeNumberPlain}%e4
    ${LabelEpisodeNumberPlain}%0e04
    ${LabelEndingEpisodeNumberPlain}%ed5
    ${LabelEndingEpisodeNumberPlain}%0ed05
    ${LabelEpisodeNamePlain}%en${LabelEpisodeNamePlain}
    ${LabelEpisodeNamePlain}%e.n${ValueEpisodeNamePeriod}
    ${LabelEpisodeNamePlain}%e_n${ValueEpisodeNameUnderscore}
    ${FileExtension}%extmkv
    +

    • diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 7c2658ec44..076133e2e9 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -1892,7 +1892,7 @@ emby-collapsible>.style-scope { .ui-body-a .emby-collapsible-title { margin: .25em 0; color: #000; - padding: 0 0 0 .25em; + padding: 0 0 0 .5em; font-weight: 500; } diff --git a/dashboard-ui/scripts/advancedconfigurationpage.js b/dashboard-ui/scripts/advancedconfigurationpage.js index d55bb89913..2784a0f5ae 100644 --- a/dashboard-ui/scripts/advancedconfigurationpage.js +++ b/dashboard-ui/scripts/advancedconfigurationpage.js @@ -26,6 +26,7 @@ $('#chkEnableAutomaticServerUpdates', page).checked(config.EnableAutoUpdate); $('#chkEnableAutomaticRestart', page).checked(config.EnableAutomaticRestart); + $('#chkUsageData', page).checked(config.EnableAnonymousUsageReporting); if (systemInfo.CanSelfRestart) { $('#fldEnableAutomaticRestart', page).show(); @@ -58,6 +59,7 @@ config.SystemUpdateLevel = $('#selectAutomaticUpdateLevel', form).val(); config.EnableAutomaticRestart = $('#chkEnableAutomaticRestart', form).checked(); config.EnableAutoUpdate = $('#chkEnableAutomaticServerUpdates', form).checked(); + config.EnableAnonymousUsageReporting = $('#chkUsageData', form).checked(); config.EnableDashboardResourceMinification = $('#chkEnableMinification', form).checked(); config.EnableDashboardResponseCaching = $('#chkEnableDashboardResponseCache', form).checked(); diff --git a/dashboard-ui/strings/en-US.json b/dashboard-ui/strings/en-US.json index 310232287e..8d42e372fe 100644 --- a/dashboard-ui/strings/en-US.json +++ b/dashboard-ui/strings/en-US.json @@ -2505,5 +2505,7 @@ "ButtonAddMissingData": "Add missing data only", "ButtonFullRefresh": "Full refresh", "ValueExample": "1:00 PM", - "ButtonGotIt": "Got It" + "ButtonGotIt": "Got It", + "OptionEnableAnonymousUsageReporting": "Enable anonymous usage reporting", + "OptionEnableAnonymousUsageReportingHelp": "Allow Emby to collect anonymous data such as installed plugins, the version numbers of your Emby apps, etc. This information is only used for the purpose of improving the software." } diff --git a/dashboard-ui/strings/server.json b/dashboard-ui/strings/server.json index 310232287e..4101ad0c70 100644 --- a/dashboard-ui/strings/server.json +++ b/dashboard-ui/strings/server.json @@ -40,9 +40,9 @@ "ButtonPrivacyPolicy": "Privacy policy", "ButtonTermsOfService": "Terms of Service", "HeaderDeveloperOptions": "Developer Options", - "OptionEnableWebClientResponseCache": "Enable web client response caching", - "OptionDisableForDevelopmentHelp": "Configure these as needed for web client development purposes.", - "OptionEnableWebClientResourceMinification": "Enable web client resource minification", + "OptionEnableWebClientResponseCache": "Enable web response caching", + "OptionDisableForDevelopmentHelp": "Configure these as needed for web development purposes.", + "OptionEnableWebClientResourceMinification": "Enable web resource minification", "LabelDashboardSourcePath": "Web client source path:", "LabelDashboardSourcePathHelp": "If running the server from source, specify the path to the dashboard-ui folder. All web client files will be served from this location.", "ButtonConvertMedia": "Convert media", @@ -2505,5 +2505,7 @@ "ButtonAddMissingData": "Add missing data only", "ButtonFullRefresh": "Full refresh", "ValueExample": "1:00 PM", - "ButtonGotIt": "Got It" + "ButtonGotIt": "Got It", + "OptionEnableAnonymousUsageReporting": "Enable anonymous usage reporting", + "OptionEnableAnonymousUsageReportingHelp": "Allow Emby to collect anonymous data such as installed plugins, the version numbers of your Emby apps, etc. This information is only used for the purpose of improving the software." }