Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

dashboard-ui/games.html

@@ -94,11 +94,21 @@
                     <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-theme="c" data-filter="Dislikes" data-mini="true">
                     <label for="chkDislikes">Dislikes</label>
                 </fieldset>
+
                 <fieldset data-role="controlgroup">
                     <legend>
-                        <strong>Game System:</strong>
+                        <strong>Features:</strong>
                     </legend>
 
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkTrailer" id="chkTrailer" data-mini="true">
+                    <label for="chkTrailer">Trailer</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkThemeSong" id="chkThemeSong" data-mini="true">
+                    <label for="chkThemeSong">Theme song</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkThemeVideo" id="chkThemeVideo" data-mini="true">
+                    <label for="chkThemeVideo">Theme video</label>
+
                 </fieldset>
             </form>
         </div>

dashboard-ui/movies.html

@@ -41,31 +41,31 @@
                         <strong>Sort By:</strong>
                     </legend>
 
-                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true">
+                    <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioSortName" value="on" checked="checked" data-sortby="SortName" data-mini="true">
                     <label for="radioSortName">Name</label>
 
-                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioBudget" value="off" data-sortby="Budget" data-mini="true">
+                    <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioBudget" value="off" data-sortby="Budget" data-mini="true">
                     <label for="radioBudget">Budget</label>
 
-                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
+                    <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioCommunityRating" value="off" data-sortby="CommunityRating" data-mini="true">
                     <label for="radioCommunityRating">Community Rating</label>
 
-                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true">
+                    <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDateCreated" value="off" data-sortby="DateCreated" data-mini="true">
                     <label for="radioDateCreated">Date Added</label>
 
-                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioDatePlayed" value="off" data-sortby="DatePlayed" data-mini="true">
+                    <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioDatePlayed" value="off" data-sortby="DatePlayed" data-mini="true">
                     <label for="radioDatePlayed">Date Played</label>
 
-                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioPremiereDate" value="off" data-sortby="PremiereDate" data-mini="true">
+                    <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPremiereDate" value="off" data-sortby="PremiereDate" data-mini="true">
                     <label for="radioPremiereDate">Date Released</label>
 
-                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioPlayCount" value="off" data-sortby="PlayCount" data-mini="true">
+                    <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioPlayCount" value="off" data-sortby="PlayCount" data-mini="true">
                     <label for="radioPlayCount">Play Count</label>
 
-                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioRevenue" value="off" data-sortby="Revenue" data-mini="true">
+                    <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioRevenue" value="off" data-sortby="Revenue" data-mini="true">
                     <label for="radioRevenue">Revenue</label>
 
-                    <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioRuntime" value="off" data-sortby="Runtime" data-mini="true">
+                    <input class="radioSortBy" type="radio" name="radioSortBy" data-theme="c" id="radioRuntime" value="off" data-sortby="Runtime" data-mini="true">
                     <label for="radioRuntime">Runtime</label>
                 </fieldset>
 
@@ -74,10 +74,10 @@
                         <strong>Sort Order:</strong>
                     </legend>
 
-                    <input class="radioSortOrder" data-theme="c" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
+                    <input class="radioSortOrder" type="radio" name="radioSortOrder" data-theme="c" id="radioAscending" value="on" checked="checked" data-sortorder="Ascending" data-mini="true">
                     <label for="radioAscending">Ascending</label>
 
-                    <input class="radioSortOrder" data-theme="c" type="radio" name="radioSortOrder" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
+                    <input class="radioSortOrder" type="radio" name="radioSortOrder" data-theme="c" id="radioDescending" value="off" data-sortorder="Descending" data-mini="true">
                     <label for="radioDescending">Descending</label>
                 </fieldset>
             </form>
@@ -88,22 +88,22 @@
                     <legend>
                         <strong>Filters:</strong>
                     </legend>
-                    <input class="chkStandardFilter" type="checkbox" name="chkPlayed" id="chkPlayed" data-theme="c" data-filter="IsPlayed" data-mini="true">
+                    <input class="chkStandardFilter" type="checkbox" data-theme="c" name="chkPlayed" id="chkPlayed" data-filter="IsPlayed" data-mini="true">
                     <label for="chkPlayed">Watched</label>
 
-                    <input class="chkStandardFilter" type="checkbox" name="chkUnplayed" id="chkUnplayed" data-theme="c" data-filter="IsUnPlayed" data-mini="true">
+                    <input class="chkStandardFilter" type="checkbox" data-theme="c" name="chkUnplayed" id="chkUnplayed" data-filter="IsUnPlayed" data-mini="true">
                     <label for="chkUnplayed">Unwatched</label>
 
-                    <input class="chkStandardFilter" type="checkbox" name="chkResumable" id="chkResumable" data-theme="c" data-filter="IsResumable" data-mini="true">
+                    <input class="chkStandardFilter" type="checkbox" data-theme="c" name="chkResumable" id="chkResumable" data-filter="IsResumable" data-mini="true">
                     <label for="chkResumable">Resumable</label>
 
-                    <input class="chkStandardFilter" type="checkbox" name="chkIsFavorite" id="chkIsFavorite" data-theme="c" data-filter="IsFavorite" data-mini="true">
+                    <input class="chkStandardFilter" type="checkbox" data-theme="c" name="chkIsFavorite" id="chkIsFavorite" data-filter="IsFavorite" data-mini="true">
                     <label for="chkIsFavorite">Favorite</label>
 
-                    <input class="chkStandardFilter" type="checkbox" name="chkLikes" id="chkLikes" data-theme="c" data-filter="Likes" data-mini="true">
+                    <input class="chkStandardFilter" type="checkbox" data-theme="c" name="chkLikes" id="chkLikes" data-filter="Likes" data-mini="true">
                     <label for="chkLikes">Likes</label>
 
-                    <input class="chkStandardFilter" type="checkbox" name="chkDislikes" id="chkDislikes" data-theme="c" data-filter="Dislikes" data-mini="true">
+                    <input class="chkStandardFilter" type="checkbox" data-theme="c" name="chkDislikes" id="chkDislikes" data-filter="Dislikes" data-mini="true">
                     <label for="chkDislikes">Dislikes</label>
                 </fieldset>
                 <fieldset data-role="controlgroup">
@@ -111,18 +111,41 @@
                         <strong>Type:</strong>
                     </legend>
 
-                    <input class="chkVideoTypeFilter" type="checkbox" name="chkBluray" id="chkBluray" data-theme="c" data-filter="Bluray" data-mini="true">
+                    <input class="chkVideoTypeFilter" type="checkbox" data-theme="c" name="chkBluray" id="chkBluray" data-filter="Bluray" data-mini="true">
                     <label for="chkBluray">Bluray</label>
 
-                    <input class="chkVideoTypeFilter" type="checkbox" name="chkDvd" id="chkDvd" data-theme="c" data-filter="Dvd" data-mini="true">
+                    <input class="chkVideoTypeFilter" type="checkbox" data-theme="c" name="chkDvd" id="chkDvd" data-filter="Dvd" data-mini="true">
                     <label for="chkDvd">Dvd</label>
 
-                    <input class="chkVideoTypeFilter" type="checkbox" name="chkIso" id="chkIso" data-theme="c" data-filter="Iso" data-mini="true">
+                    <input class="chkVideoTypeFilter" type="checkbox" data-theme="c" name="chkIso" id="chkIso" data-filter="Iso" data-mini="true">
                     <label for="chkIso">Iso</label>
 
-                    <input class="chk3DFilter" type="checkbox" name="chk3D" id="chk3D" data-theme="c" data-filter="Digital3D,Sbs3D" data-mini="true">
+                    <input class="chk3DFilter" type="checkbox" data-theme="c" name="chk3D" id="chk3D" data-filter="Digital3D,Sbs3D" data-mini="true">
                     <label for="chk3D">3D</label>
                 </fieldset>
+
+                <fieldset data-role="controlgroup">
+                    <legend>
+                        <strong>Features:</strong>
+                    </legend>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkSubtitle" id="chkSubtitle" data-mini="true">
+                    <label for="chkSubtitle">Subtitles</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkTrailer" id="chkTrailer" data-mini="true">
+                    <label for="chkTrailer">Trailer</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkSpecialFeature" id="chkSpecialFeature" data-mini="true">
+                    <label for="chkSpecialFeature">Special features</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkThemeSong" id="chkThemeSong" data-mini="true">
+                    <label for="chkThemeSong">Theme song</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkThemeVideo" id="chkThemeVideo" data-mini="true">
+                    <label for="chkThemeVideo">Theme video</label>
+
+                </fieldset>
+
             </form>
         </div>
     </div>

dashboard-ui/scripts/gamespage.js

@@ -110,6 +110,29 @@
             reloadItems(page);
         });
 
+        $('#chkTrailer', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasTrailer = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
+        $('#chkThemeSong', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasThemeSong = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
+        $('#chkThemeVideo', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasThemeVideo = this.checked ? true : null;
+
+            reloadItems(page);
+        });
 
     }).on('pagebeforeshow', "#gamesPage", function () {
 
@@ -143,6 +166,9 @@
 
         $('#selectView', this).val(view).selectmenu('refresh');
 
+        $('#chkTrailer', this).checked(query.HasTrailer == true).checkboxradio('refresh');
+        $('#chkThemeSong', this).checked(query.HasThemeSong == true).checkboxradio('refresh');
+        $('#chkThemeVideo', this).checked(query.HasThemeVideo == true).checkboxradio('refresh');
     });
 
 })(jQuery, document);

dashboard-ui/scripts/librarybrowser.js

@@ -215,7 +215,7 @@
 
             html += '<th></th>';
 
-            html += '<th class="tabletColumn">Track</th>';
+            html += '<th>Track</th>';
 
             if (options.showAlbum) {
                 html += '<th>Album</th>';
@@ -241,7 +241,7 @@
                 if (num && item.ParentIndexNumber) {
                     num = item.ParentIndexNumber + "." + num;
                 }
-                html += '<td class="tabletColumn">' + (num || "") + '</td>';
+                html += '<td>' + (num || "") + '</td>';
 
                 html += '<td><a href="' + LibraryBrowser.getHref(item, "music") + '">' + (item.Name || "") + '</a></td>';
 

dashboard-ui/scripts/movies.js

@@ -135,6 +135,47 @@
             reloadItems(page);
         });
         
+        $('#chkSubtitle', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasSubtitles = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+        
+        $('#chkTrailer', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasTrailer = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+        
+        $('#chkSpecialFeature', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasSpecialFeature = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+        
+        $('#chkThemeSong', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasThemeSong = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+        
+        $('#chkThemeVideo', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasThemeVideo = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
+
     }).on('pagebeforeshow', "#moviesPage", function () {
 
         reloadItems(this);
@@ -175,6 +216,13 @@
         $('#selectView', this).val(view).selectmenu('refresh');
 
         $('#chk3D', this).checked(query.VideoFormats == "Digital3D,Sbs3D").checkboxradio('refresh');
+
+        $('#chkSubtitle', this).checked(query.HasSubtitles == true).checkboxradio('refresh');
+        $('#chkTrailer', this).checked(query.HasTrailer == true).checkboxradio('refresh');
+        $('#chkSpecialFeature', this).checked(query.HasSpecialFeature == true).checkboxradio('refresh');
+        $('#chkThemeSong', this).checked(query.HasThemeSong == true).checkboxradio('refresh');
+        $('#chkThemeVideo', this).checked(query.HasThemeVideo == true).checkboxradio('refresh');
+
     });
 
 })(jQuery, document);

dashboard-ui/scripts/songs.js

@@ -8,7 +8,7 @@
         IncludeItemTypes: "Audio",
         Recursive: true,
         Fields: "ItemCounts,DateCreated,UserData,AudioInfo,ParentId",
-        Limit: 200,
+        Limit: 300,
         StartIndex: 0
     };
 

dashboard-ui/scripts/tvshows.js

@@ -138,6 +138,30 @@
             reloadItems(page);
         });
 
+        $('#chkTrailer', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasTrailer = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
+        $('#chkThemeSong', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasThemeSong = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
+        $('#chkThemeVideo', this).on('change', function () {
+
+            query.StartIndex = 0;
+            query.HasThemeVideo = this.checked ? true : null;
+
+            reloadItems(page);
+        });
+
     }).on('pagebeforeshow', "#tvShowsPage", function () {
 
         reloadItems(this);
@@ -185,6 +209,10 @@
         }).checkboxradio('refresh');
 
         $('#selectView', this).val(view).selectmenu('refresh');
+
+        $('#chkTrailer', this).checked(query.HasTrailer == true).checkboxradio('refresh');
+        $('#chkThemeSong', this).checked(query.HasThemeSong == true).checkboxradio('refresh');
+        $('#chkThemeVideo', this).checked(query.HasThemeVideo == true).checkboxradio('refresh');
     });
 
 })(jQuery, document);

dashboard-ui/tvshows.html

@@ -113,6 +113,22 @@
                     <input class="chkAirDays" type="checkbox" name="chkSaturday" id="chkSaturday" data-theme="c" data-filter="Saturday" data-mini="true">
                     <label for="chkSaturday">Saturday</label>
                 </fieldset>
+
+                <fieldset data-role="controlgroup">
+                    <legend>
+                        <strong>Features:</strong>
+                    </legend>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkTrailer" id="chkTrailer" data-mini="true">
+                    <label for="chkTrailer">Trailer</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkThemeSong" id="chkThemeSong" data-mini="true">
+                    <label for="chkThemeSong">Theme song</label>
+
+                    <input class="chkFeatureFilter" type="checkbox" data-theme="c" name="chkThemeVideo" id="chkThemeVideo" data-mini="true">
+                    <label for="chkThemeVideo">Theme video</label>
+
+                </fieldset>
             </form>
         </div>
     </div>

dashboard-ui/userimage.html

@@ -31,7 +31,7 @@
                             <input type="file" accept="image/*" id="uploadUserImage" name="uploadUserImage" onchange="UserImagePage.onFileUploadChange(this);" />
 
                             <div id="userImageDropZone" class="imageDropZone">
-                                <h3>Drop Image Here (Chrome / Firefox / Safari)</h3>
+                                <h3>Drop Image Here</h3>
                                 <output id="userImageOutput"></output>
                             </div>