diff --git a/dashboard-ui/advancedserversettings.html b/dashboard-ui/advancedserversettings.html index cbe39b4aa4..2791240a81 100644 --- a/dashboard-ui/advancedserversettings.html +++ b/dashboard-ui/advancedserversettings.html @@ -19,31 +19,31 @@ diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html index 6b012f88b6..a91c0f9af8 100644 --- a/dashboard-ui/collections.html +++ b/dashboard-ui/collections.html @@ -16,30 +16,30 @@
- +
-

New Collection

+

${HeaderNewCollection}


- + -
Example: Star Wars Collection
+
${NewCollectionNameExample}

- +

- +

@@ -49,11 +49,12 @@
- Sort By: + + ${HeaderSortBy} - + @@ -63,7 +64,8 @@
- Sort Order: + + ${HeaderSortOrder} diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index a65d8a37dc..cbb232c96d 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -602,7 +602,7 @@ a.itemTag:hover { } .libraryPanelHeader { - margin: 10px 0 20px 0; + margin: 5px 0 25px 0; } .libraryPanelHeader a { diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 474acd4297..232898f141 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -299,7 +299,6 @@ h1 .imageLink { padding: .75em .5em .75em 1.25em; display: block; text-decoration: none; - font-size: 14px; color: #fff!important; font-weight: normal !important; } diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index 0f4ab8be87..ed2dc6071b 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -1,7 +1,7 @@  - Dashboard + ${TitleDashboard}
@@ -10,9 +10,9 @@
- Home + ${TabHome} ${TabGeneral} - Info + ${TabInfo}
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html index 3b5d3e5f7b..e42b9d797b 100644 --- a/dashboard-ui/dashboardgeneral.html +++ b/dashboard-ui/dashboardgeneral.html @@ -1,7 +1,7 @@  - Dashboard + ${TitleDashboard}
@@ -10,33 +10,38 @@
- Home + ${TabHome} ${TabGeneral} - Info + ${TabInfo}
  • - + -
    This name will be used to identify this server. If left blank, the computer name will be used.
    +
    ${LabelFriendlyServerNameHelp}
  • - + -
    Translating Media Browser is an ongoing project and is not yet complete. Read about how you can contribute.
    +
    +
    ${LabelPreferredDisplayLanguageHelp}
    + +
    • diff --git a/dashboard-ui/dashboardinfopage.html b/dashboard-ui/dashboardinfopage.html index 6110335735..547565204e 100644 --- a/dashboard-ui/dashboardinfopage.html +++ b/dashboard-ui/dashboardinfopage.html @@ -1,7 +1,7 @@  - Dashboard + ${TitleDashboard}
    @@ -11,22 +11,22 @@
    - Home + ${TabHome} ${TabGeneral} - Info + ${TabInfo}
    -

    System Paths

    +

    ${HeaderSystemPaths}

    Cache:

    Images by name:

    diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html index b12387604f..7fb3014f6d 100644 --- a/dashboard-ui/dlnaprofile.html +++ b/dashboard-ui/dlnaprofile.html @@ -11,7 +11,7 @@
    ${TabSettings} - Profiles + ${TabProfiles}
    @@ -365,7 +365,7 @@
    -
    Separated by comma. This can be left empty to apply to all containers
    +
    Separated by comma. This can be left empty to apply to all codecs

    @@ -407,13 +407,13 @@

    -
    Separated by comma. This can be left empty to apply to all containers
    +
    Separated by comma. This can be left empty to apply to all codecs
    -
    Separated by comma. This can be left empty to apply to all containers
    +
    Separated by comma. This can be left empty to apply to all codecs

    diff --git a/dashboard-ui/dlnaprofiles.html b/dashboard-ui/dlnaprofiles.html index 4d1a3a9b58..3d159d6021 100644 --- a/dashboard-ui/dlnaprofiles.html +++ b/dashboard-ui/dlnaprofiles.html @@ -11,26 +11,26 @@

    ${TabSettings} - Profiles + ${TabProfiles}
    -

    Custom Profiles

    +

    ${HeaderCustomDlnaProfiles}

    -

    Create a custom profile to target a new device or override a system profile.

    +

    ${CustomDlnaProfilesHelp}


    -

    System Profiles

    +

    ${HeaderSystemDlnaProfiles}

    -

    System profiles are read-only. To override a system profile, create a custom profile targeting the same device.

    +

    ${SystemDlnaProfilesHelp}

    diff --git a/dashboard-ui/dlnasettings.html b/dashboard-ui/dlnasettings.html index 8c832be7fa..78ee4299b3 100644 --- a/dashboard-ui/dlnasettings.html +++ b/dashboard-ui/dlnasettings.html @@ -11,33 +11,33 @@
    ${TabSettings} - Profiles + ${TabProfiles}
    • - + -
      Media Browser can detect devices within your network and offer the ability to remote control them.
      +
      ${LabelEnableDlnaPlayToHelp}
    • - + -
      This will create large log files and should only be used as needed for troubleshooting purposes.
      +
      ${LabelEnableDlnaDebugLoggingHelp}
    • - + -
      Determines the duration in seconds of the interval between SSDP searches performed by Media Browser.
      +
      ${LabelEnableDlnaClientDiscoveryIntervalHelp}
    diff --git a/dashboard-ui/editcollectionitems.html b/dashboard-ui/editcollectionitems.html index 0036ecab86..98e4e388d1 100644 --- a/dashboard-ui/editcollectionitems.html +++ b/dashboard-ui/editcollectionitems.html @@ -17,19 +17,19 @@

     


    - Metadata + ${TabMetadata} - Titles - Images + ${TabCollectionTitles} + ${TabImages}

    - Add or remove any movies, series, albums, books or games you wish to group within this collection. + ${EditCollectionItemsHelp}

    - - + +

    @@ -39,7 +39,7 @@
    -

    Add Titles +

    ${HeaderAddTitles}

    @@ -48,14 +48,14 @@
    - +
    @@ -63,7 +63,7 @@
    diff --git a/dashboard-ui/edititemimages.html b/dashboard-ui/edititemimages.html index b7aee94133..3c3120f056 100644 --- a/dashboard-ui/edititemimages.html +++ b/dashboard-ui/edititemimages.html @@ -17,10 +17,10 @@

     


    - Metadata + ${TabMetadata} - - Images + + ${TabImages}
    diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html index d659da9be6..ae3f29f5c0 100644 --- a/dashboard-ui/edititemmetadata.html +++ b/dashboard-ui/edititemmetadata.html @@ -16,10 +16,10 @@

     


    - Metadata + ${TabMetadata} - - Images + + ${TabImages}
    diff --git a/dashboard-ui/edititempeople.html b/dashboard-ui/edititempeople.html index 8829bafa7c..8eeb8eb58a 100644 --- a/dashboard-ui/edititempeople.html +++ b/dashboard-ui/edititempeople.html @@ -16,13 +16,13 @@

     


    - Metadata + ${TabMetadata} ${TabPeople} - - Images + + ${TabImages}
    diff --git a/dashboard-ui/scripts/extensions.js b/dashboard-ui/scripts/extensions.js index da81f7ea1f..09d9892322 100644 --- a/dashboard-ui/scripts/extensions.js +++ b/dashboard-ui/scripts/extensions.js @@ -220,11 +220,31 @@ function humane_elapsed(firstDateStr, secondDateStr) { } +function getWindowUrl(win) { + return (win || window).location.href; +} + +function getWindowLocationSearch(win) { + + var search = (win || window).location.search; + + if (!search) { + + var index = window.location.href.indexOf('?'); + if (index != -1) { + search = window.location.href.substring(index); + } + } + alert(); + return search || ''; +} + function getParameterByName(name, url) { name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]"); var regexS = "[\\?&]" + name + "=([^&#]*)"; var regex = new RegExp(regexS, "i"); - var results = regex.exec(url || window.location.search); + + var results = regex.exec(url || getWindowLocationSearch()); if (results == null) return ""; else diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js index a32e90b137..9310224b65 100644 --- a/dashboard-ui/scripts/itembynamedetailpage.js +++ b/dashboard-ui/scripts/itembynamedetailpage.js @@ -87,7 +87,7 @@ $('#playButtonContainer', page).hide(); } - var editImagesHref = user.Configuration.IsAdministrator ? 'edititemimages.html' + window.location.search : null; + var editImagesHref = user.Configuration.IsAdministrator ? 'edititemimages.html' + getWindowLocationSearch() : null; $('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item, editImagesHref)); if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") { @@ -524,7 +524,7 @@ reload(page); - $('#btnEdit', page).attr('href', 'edititemmetadata.html' + window.location.search); + $('#btnEdit', page).attr('href', 'edititemmetadata.html' + getWindowLocationSearch()); }).on('pagehide', "#itemByNameDetailPage", function () { diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 5569a461e2..66d94bd5aa 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -649,7 +649,7 @@ } // Just use the first audio stream - return audioStreams[0]; + return audioStreams[0].Index; } function getVideoQualityOptions(mediaStreams) { diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 79b298ef05..d7afb9e2cb 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -344,7 +344,7 @@ var Dashboard = { navigate: function (url, preserveQueryString) { - var queryString = window.location.search; + var queryString = getWindowLocationSearch(); if (preserveQueryString && queryString) { url += queryString; }