From e8e1978bb445fb4e9bf0e3d210184c1f8dcd2601 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 3 Jan 2014 15:43:44 -0500
Subject: [PATCH] use collection terminology

---
 dashboard-ui/boxsets.html                | 2 +-
 dashboard-ui/itembynamedetails.html      | 6 +++---
 dashboard-ui/itemdetails.html            | 6 +++---
 dashboard-ui/moviegenres.html            | 2 +-
 dashboard-ui/moviepeople.html            | 2 +-
 dashboard-ui/movies.html                 | 2 +-
 dashboard-ui/moviesrecommended.html      | 2 +-
 dashboard-ui/moviestudios.html           | 2 +-
 dashboard-ui/movietrailers.html          | 2 +-
 dashboard-ui/scripts/edititemmetadata.js | 6 +++---
 dashboard-ui/scripts/itemdetailpage.js   | 2 +-
 dashboard-ui/scripts/librarymenu.js      | 2 +-
 dashboard-ui/scripts/medialibrarypage.js | 2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dashboard-ui/boxsets.html b/dashboard-ui/boxsets.html
index 4a50e46c8..063a90af8 100644
--- a/dashboard-ui/boxsets.html
+++ b/dashboard-ui/boxsets.html
@@ -9,7 +9,7 @@
         <div class="libraryViewNav">
             <a href="moviesrecommended.html">Suggested</a>
             <a href="movies.html">Movies</a>
-            <a href="boxsets.html" class="ui-btn-active">Box Sets</a>
+            <a href="boxsets.html" class="ui-btn-active">Collections</a>
             <a href="movietrailers.html">Trailers</a>
             <a href="moviegenres.html">Genres</a>
             <a href="moviepeople.html">People</a>
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index aeb62aa49..c6f4f4a71 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -9,7 +9,7 @@
             <div class="libraryViewNav">
                 <a href="moviesrecommended.html">Suggested</a>
                 <a href="movies.html">Movies</a>
-                <a href="boxsets.html">Box Sets</a>
+                <a href="boxsets.html">Collections</a>
                 <a href="movietrailers.html">Trailers</a>
                 <a href="moviegenres.html" class="ui-btn-active">Genres</a>
                 <a href="moviepeople.html">People</a>
@@ -20,7 +20,7 @@
             <div class="libraryViewNav">
                 <a href="moviesrecommended.html">Suggested</a>
                 <a href="movies.html">Movies</a>
-                <a href="boxsets.html">Box Sets</a>
+                <a href="boxsets.html">Collections</a>
                 <a href="movietrailers.html">Trailers</a>
                 <a href="moviegenres.html">Genres</a>
                 <a href="moviepeople.html" class="ui-btn-active">People</a>
@@ -31,7 +31,7 @@
             <div class="libraryViewNav">
                 <a href="moviesrecommended.html">Suggested</a>
                 <a href="movies.html">Movies</a>
-                <a href="boxsets.html">Box Sets</a>
+                <a href="boxsets.html">Collections</a>
                 <a href="movietrailers.html">Trailers</a>
                 <a href="moviegenres.html">Genres</a>
                 <a href="moviepeople.html">People</a>
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 383f6f074..b76e36474 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -9,7 +9,7 @@
             <div class="libraryViewNav">
                 <a href="moviesrecommended.html">Suggested</a>
                 <a href="movies.html" class="ui-btn-active">Movies</a>
-                <a href="boxsets.html">Box Sets</a>
+                <a href="boxsets.html">Collections</a>
                 <a href="movietrailers.html">Trailers</a>
                 <a href="moviegenres.html">Genres</a>
                 <a href="moviepeople.html">People</a>
@@ -20,7 +20,7 @@
             <div class="libraryViewNav">
                 <a href="moviesrecommended.html">Suggested</a>
                 <a href="movies.html">Movies</a>
-                <a href="boxsets.html" class="ui-btn-active">Box Sets</a>
+                <a href="boxsets.html" class="ui-btn-active">Collections</a>
                 <a href="movietrailers.html">Trailers</a>
                 <a href="moviegenres.html">Genres</a>
                 <a href="moviepeople.html">People</a>
@@ -31,7 +31,7 @@
             <div class="libraryViewNav">
                 <a href="moviesrecommended.html">Suggested</a>
                 <a href="movies.html">Movies</a>
-                <a href="boxsets.html">Box Sets</a>
+                <a href="boxsets.html">Collections</a>
                 <a href="movietrailers.html" class="ui-btn-active">Trailers</a>
                 <a href="moviegenres.html">Genres</a>
                 <a href="moviepeople.html">People</a>
diff --git a/dashboard-ui/moviegenres.html b/dashboard-ui/moviegenres.html
index 2c6f8ae06..a77ee4fe3 100644
--- a/dashboard-ui/moviegenres.html
+++ b/dashboard-ui/moviegenres.html
@@ -9,7 +9,7 @@
         <div class="libraryViewNav">
             <a href="moviesrecommended.html">Suggested</a>
             <a href="movies.html">Movies</a>
-            <a href="boxsets.html">Box Sets</a>
+            <a href="boxsets.html">Collections</a>
             <a href="movietrailers.html">Trailers</a>
             <a href="moviegenres.html" class="ui-btn-active">Genres</a>
             <a href="moviepeople.html">People</a>
diff --git a/dashboard-ui/moviepeople.html b/dashboard-ui/moviepeople.html
index a5432efab..66df12d0b 100644
--- a/dashboard-ui/moviepeople.html
+++ b/dashboard-ui/moviepeople.html
@@ -9,7 +9,7 @@
         <div class="libraryViewNav">
             <a href="moviesrecommended.html">Suggested</a>
             <a href="movies.html">Movies</a>
-            <a href="boxsets.html">Box Sets</a>
+            <a href="boxsets.html">Collections</a>
             <a href="movietrailers.html">Trailers</a>
             <a href="moviegenres.html">Genres</a>
             <a href="moviepeople.html" class="ui-btn-active">People</a>
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index e6c5c26ea..b4709f50d 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -9,7 +9,7 @@
         <div class="libraryViewNav">
             <a href="moviesrecommended.html">Suggested</a>
             <a href="movies.html" class="ui-btn-active">Movies</a>
-            <a href="boxsets.html">Box Sets</a>
+            <a href="boxsets.html">Collections</a>
             <a href="movietrailers.html">Trailers</a>
             <a href="moviegenres.html">Genres</a>
             <a href="moviepeople.html">People</a>
diff --git a/dashboard-ui/moviesrecommended.html b/dashboard-ui/moviesrecommended.html
index 8c5a1ef2a..c242832b5 100644
--- a/dashboard-ui/moviesrecommended.html
+++ b/dashboard-ui/moviesrecommended.html
@@ -9,7 +9,7 @@
         <div class="libraryViewNav">
             <a href="moviesrecommended.html" class="ui-btn-active">Suggested</a>
             <a href="movies.html">Movies</a>
-            <a href="boxsets.html">Box Sets</a>
+            <a href="boxsets.html">Collections</a>
             <a href="movietrailers.html">Trailers</a>
             <a href="moviegenres.html">Genres</a>
             <a href="moviepeople.html">People</a>
diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html
index d88cc0d2e..608a42011 100644
--- a/dashboard-ui/moviestudios.html
+++ b/dashboard-ui/moviestudios.html
@@ -9,7 +9,7 @@
         <div class="libraryViewNav">
             <a href="moviesrecommended.html">Suggested</a>
             <a href="movies.html">Movies</a>
-            <a href="boxsets.html">Box Sets</a>
+            <a href="boxsets.html">Collections</a>
             <a href="movietrailers.html">Trailers</a>
             <a href="moviegenres.html">Genres</a>
             <a href="moviepeople.html">People</a>
diff --git a/dashboard-ui/movietrailers.html b/dashboard-ui/movietrailers.html
index c5075498f..2585cb5be 100644
--- a/dashboard-ui/movietrailers.html
+++ b/dashboard-ui/movietrailers.html
@@ -9,7 +9,7 @@
         <div class="libraryViewNav">
             <a href="moviesrecommended.html">Suggested</a>
             <a href="movies.html">Movies</a>
-            <a href="boxsets.html">Box Sets</a>
+            <a href="boxsets.html">Collections</a>
             <a href="movietrailers.html" class="ui-btn-active">Trailers</a>
             <a href="moviegenres.html">Genres</a>
             <a href="moviepeople.html">People</a>
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 42c9bd18a..598b8445c 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -784,8 +784,8 @@
         if (item.Type == "BoxSet") {
             $('#fldDisplayOrder', page).show();
 
-            $('#labelDisplayOrder', page).html('Movie display order:');
-            $('#selectDisplayOrder', page).html('<option></option><option value="SortName">Sort Name</option><option value="PremiereDate">Release Date</option>').selectmenu('refresh');
+            $('#labelDisplayOrder', page).html('Title display order:');
+            $('#selectDisplayOrder', page).html('<option value="SortName">Sort Name</option><option value="PremiereDate">Release Date</option>').selectmenu('refresh');
         } else {
             $('#fldDisplayOrder', page).hide();
         }
@@ -870,7 +870,7 @@
         $('#txtAlbum', page).val(item.Album || "");
         $('#txtAlbumArtist', page).val(item.AlbumArtist || "");
 
-        $('#selectDisplayOrder', page).val(item.DisplayOrder || "").selectmenu('refresh');
+        $('#selectDisplayOrder', page).val(item.DisplayOrder).selectmenu('refresh');
 
         var artists = item.Artists || [];
         $('#txtArtist', page).val(artists.join(';'));
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index c4724755b..9e0f9c606 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -612,7 +612,7 @@
             $('#childrenTitle', page).html('Seasons');
         }
         else if (item.Type == "BoxSet") {
-            $('#childrenTitle', page).html('Movies');
+            $('#childrenTitle', page).html('Titles');
         }
         else if (item.Type == "MusicAlbum") {
             $('#childrenTitle', page).html('Tracks');
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index ee50d9632..eb11e6fad 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -124,7 +124,7 @@
 
                     { text: 'Suggested', href: 'moviesrecommended.html' },
                     { text: 'Movies', href: 'movies.html' },
-                    { text: 'Box Sets', href: 'boxsets.html' },
+                    { text: 'Collections', href: 'boxsets.html' },
                     { text: 'Trailers', href: 'movietrailers.html' },
                     { text: 'Genres', href: 'moviegenres.html' },
                     { text: 'People', href: 'moviepeople.html' },
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index 0b4dcc0be..32c71ee7c 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -304,7 +304,7 @@
             { name: "Music", value: "music" },
             { name: "TV shows", value: "tvshows" },
             { name: "Books*", value: "books" },
-            { name: "Box sets", value: "boxsets" },
+            { name: "Collections", value: "boxsets" },
             { name: "Games*", value: "games" },
             { name: "Home videos", value: "homevideos" },
             { name: "Music videos", value: "musicvideos" },