Merge remote-tracking branch 'dbsnurr/master' into develop

js/controllers/library.js

@@ -20,10 +20,11 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
         { id: "frequent", name: "Most Played" },
         { id: "recent", name: "Recently Played" }
     ];
+    $scope.DefaultSearchType = globals.settings.DefaultSearchType;
     $scope.selectedAutoAlbum;
     $scope.selectedArtist;
     $scope.selectedAlbum;
-    $scope.selectedSubsonicAlbumSort = 'default';
+    $scope.selectedSubsonicAlbumSort = globals.settings.DefaultSubsonicAlbumSort;
     $scope.SubsonicAlbumSort = [
         { id: "default", name: "Default Sort" },
         { id: "artist", name: "Artist" },
@@ -35,6 +36,11 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
             $scope.sortSubsonicAlbums(newValue);
         }
     });
+    $scope.SearchType = globals.settings.DefaultSearchType;
+    $scope.SearchTypeLayout = [
+        { id: "song", name: "Song" },
+        { id: "album", name: "Album" },
+    ];
     $scope.selectedLayout = globals.settings.DefaultLibraryLayout;
     //not sure how to just grab the layouts hash from the settings controller
     $scope.Layouts = [
@@ -361,7 +367,8 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
                     if (data["subsonic-response"].searchResult2 !== "") {
                         var header;
                         var items = [];
-                        if (type === 'song') {
+                        if (type === '0') {
+                            type = 'song'; //this could be done better if a way to share data between controllers was implemented
                             if (data["subsonic-response"].searchResult2.song !== undefined) {
                                 if (data["subsonic-response"].searchResult2.song.length > 0) {
                                     items = data["subsonic-response"].searchResult2.song;
@@ -375,7 +382,8 @@ function SubsonicCtrl($scope, $rootScope, $location, $window, $routeParams, util
                                 $scope.$apply();
                             }
                         }
-                        if (type === 'album') {
+                        if (type === '1') {
+                            type = 'album';
                             if (data["subsonic-response"].searchResult2.album !== undefined) {
                                 if (data["subsonic-response"].searchResult2.album.length > 0) {
                                     items = data["subsonic-response"].searchResult2.album;

js/controllers/settings.js

@@ -13,11 +13,23 @@ function SettingsCtrl($scope, $routeParams, $location, utils, globals, json, not
     ];
     $scope.Protocols = ["json", "jsonp"];
     $scope.Themes = ["Default", "Dark"];
+    $scope.SearchTypeLayout = [
+        { id: "song", name: "Song" },
+        { id: "album", name: "Album" },
+    ];
+    $scope.DefaultSearchType = 'song';
     $scope.LibraryLayouts = [
         { id: "list", name: "List" },
         { id: "grid", name: "Grid" },
     ];
     $scope.DefaultLibraryLayout = 'grid';
+    $scope.DefaultSubsonicAlbumSort = 'list';
+    $scope.SubsonicAlbumSort = [
+        { id: "default", name: "Default Sort" },
+        { id: "artist", name: "Artist" },
+        { id: "album", name: "Album" },
+        { id: "createdate desc", name: "Created Date - Desc" },
+    ];
     $scope.$watch('settings.HideAZ', function () {
         if (globals.settings.HideAZ) {
             $('#AZIndex').hide();

js/partials/library.html

@@ -7,10 +7,7 @@
         </div>
         <div id="search">
             <input type="text" id="Search" class="medium" title="Wildcards (*) supported" placeholder="Search..." ng-enter="search()"/>
-            <select id="SearchType" name="SearchType">
+                <select id="SearchType" name="SearchType"  ng-model="SearchType" ng-options="o.id as o.name for o in SearchTypeLayout"></select>
-                <option value="song">Song</option>
-                <option value="album">Album</option>
-            </select>
             <a href="" class="button" id="action_Search" title="Search" ng-click="search()"><img class="pad" src="images/magnifying_glass_alt_12x12.png" /></a>
         </div>
         <div class="subactions">
@@ -114,4 +111,4 @@
     </div>
 <div class="clear"></div>
 </div>
-<!-- End: Library Tab -->
+<!-- End: Library Tab -->

js/partials/settingsForm.html

@@ -46,6 +46,14 @@
         <div class="clear"></div>
         <select id="DefaultLibraryLayout" name="DefaultLibraryLayout" class="" ng-model="settings.DefaultLibraryLayout" ng-options="o.id as o.name for o in LibraryLayouts" title="AJAX Request Library Layout"></select>
         <div class="clear"></div>
+        <label for="DefaultSubsonicAlbumSort">Default Album Sort Order</label>
+        <div class="clear"></div>
+        <select id="DefaultSubsonicAlbumSort" name="DefaultSubsonicAlbumSort" class="" ng-model="settings.DefaultSubsonicAlbumSort" ng-options="o.id as o.name for o in SubsonicAlbumSort" title="Subsonic Album Layout"></select>
+        <div class="clear"></div>
+        <label for="DefaultSearchType">Default Search Type</label>
+        <div class="clear"></div>
+        <select id="DefaultSearchType" name="DefaultSearchType" class="" ng-model="settings.DefaultSearchType" ng-options="o.id as o.name for o in SearchTypeLayout" title="Subsonic Album Layout"></select>
+        <div class="clear"></div>
         </fieldset>
         <div class="clear"></div>
         <fieldset id="HTML5">