Merge branch 'global-player-selector' into dev-build

src/app/index.html

@@ -31,6 +31,7 @@
     <script id="show-detail-tpl" src="templates/show-detail.tpl" type="text/x-template"></script>
     <script id="player-tpl" src="templates/player.tpl" type="text/x-template"></script>
     <script id="player-chooser-tpl" src="templates/player-chooser.tpl" type="text/x-template"></script>
+    <script id="player-chooser-top-tpl" src="templates/player-chooser-top.tpl" type="text/x-template"></script>
     <script id="loading-tpl" src="templates/loading.tpl" type="text/x-template" ></script>
     <script id="initializing-tpl" src="templates/initializing.tpl" type="text/x-template" ></script>
     <script id="about-tpl" src="templates/about.tpl" type="text/x-template" ></script>

src/app/lib/device/generic.js

@@ -153,17 +153,24 @@
       $('.imgplayerchoice').attr('src', el.children('img').attr('src'));
     }
   });
-
-  var createChooserView = function(el) {
-    return new ChooserView({
-      collection: collection,
-      el: el
-    });
-  };
+  var ChooserViewTop = ChooserView.extend({
+    template: '#player-chooser-top-tpl',
+  });
 
   App.Device = {
     Generic: Device,
     Collection: collection,
-    ChooserView: createChooserView
+    ChooserView: function(el) {
+      return new ChooserView({
+        collection: collection,
+        el: el
+      });
+    },
+    ChooserViewTop: function(el) {
+      return new ChooserViewTop({
+        collection: collection,
+        el: el
+      });
+    },
   };
 })(window.App);

src/app/lib/views/browser/filter_bar.js

@@ -24,6 +24,7 @@
       'click .genres .dropdown-menu a': 'changeGenre',
       'click .types .dropdown-menu a': 'changeType',
       'click .ratings .dropdown-menu a': 'changeRating',
+      'click .playerchoicemenu li a': 'selectPlayer',
       'click #filterbar-settings': 'settings',
       'click #filterbar-tempf': 'tempf',
       'click .movieTabShow': 'movieTabShow',
@@ -41,6 +42,7 @@
       App.vent.on('filter-bar:render', () => {
         this.render();
         this.setActive(App.currentview);
+        this.playerChoicerDropdown();
       });
     },
 
@@ -203,6 +205,8 @@
         }
       });
 
+      this.playerChoicerDropdown();
+
       $('.providerinfo').tooltip({
         delay: {
           'show': 2400,
@@ -216,6 +220,20 @@
       }
     },
 
+    playerChoicerDropdown: function() {
+      if (Settings.activateTopPlayerSelector) {
+        App.Device.Collection.setDevice(Settings.chosenPlayer);
+        App.Device.ChooserViewTop('#player-chooser-top').render();
+      }
+    },
+
+    selectPlayer: function (e) {
+      var player = $(e.currentTarget).parent('li').attr('id').replace('player-', '');
+      if (!player.match(/[0-9]+.[0-9]+.[0-9]+.[0-9]/ig)) {
+        AdvSettings.set('chosenPlayer', player);
+      }
+    },
+
     focusSearch: function() {
       this.$('.search input').focus();
     },

src/app/lib/views/settings_container.js

@@ -350,6 +350,7 @@
                 case 'alwaysFullscreen':
                 case 'minimizeToTray':
                 case 'activateTorrentCollection':
+                case 'activateTopPlayerSelector':
                 case 'activateSeedbox':
                 case 'activateWatchlist':
                 case 'activateTempf':

src/app/settings.js

@@ -168,6 +168,7 @@ Settings.enableTgxtorrentSearch = true;
 Settings.enableNyaaSearch = true;
 Settings.activateSeedbox = true;
 Settings.activateTempf = true;
+Settings.activateTopPlayerSelector = true;
 
 // Remote Control
 Settings.httpApiEnabled = false;

src/app/styl/views/filter_bar.styl

@@ -38,6 +38,18 @@
     .nav.right
         margin-right: 5px
 
+    #player-chooser-top
+        .button
+            cursor: default
+            background: transparent
+            &:hover
+                background: transparent
+        .playerchoice
+            padding-left 15px
+            margin-left 8px
+            margin-right -5px
+            border-left none
+
     .filter
         padding: 10px 0 0
         margin-left: 20px

src/app/templates/browser/filter-bar.tpl

@@ -95,3 +95,10 @@
         <i id="filterbar-settings" class="fa fa-cog settings tooltipped" data-toggle="tooltip" data-placement="left" title="<%= i18n.__("Settings") %>"></i>
     </li>
 </ul>
+<% if (Settings.activateTopPlayerSelector) { %>
+<ul class="nav nav-hor right">
+    <li style="display:block">
+        <div id="player-chooser-top"></div>
+    </li>
+</ul>
+<% } %>

src/app/templates/player-chooser-top.tpl

@@ -0,0 +1,15 @@
+<div class="button dropdown">
+    <div class="dropdown-toggle left playerchoice" data-toggle="dropdown">
+        <img class="imgplayerchoice" src="images/icons/local-icon.png"/>
+        <span class="caret"></span>
+    </div>
+    <ul class="dropdown-menu playerchoicemenu" role="menu">
+        <% _.each(items, function(item){ %>
+        <li id ="player-<%= item.id %>">
+            <a href="#"> <%= item.name %>
+                <img class="playerchoiceicon" src="images/icons/<%= item.type %>-icon.png"/>
+            </a>
+        </li>
+        <% }); %>
+    </ul>
+</div>

src/app/templates/settings-container.tpl

@@ -101,6 +101,10 @@
                 <input class="settings-checkbox" name="expandedSearch" id="expandedSearch" type="checkbox" <%=(Settings.expandedSearch? "checked='checked'":"")%>>
                 <label class="settings-label" for="expandedSearch"><%= i18n.__("Search field always expanded") %></label>
             </span>
+            <span>
+                <input class="settings-checkbox" name="activateTopPlayerSelector" id="activateTopPlayerSelector" type="checkbox" <%=(Settings.activateTopPlayerSelector? "checked='checked'":"")%>>
+                <label class="settings-label" for="activateTopPlayerSelector"><%= i18n.__("Show global player selector") %></label>
+            </span>
             <span>
                 <div class="dropdown defaultFilters">
                     <p><%= i18n.__("Default Filters") %></p>