Enable SideBar toggle and add setting to hide it per default

This commit is contained in:
brb 2014-11-19 21:42:43 +01:00
parent d58cc1d0bc
commit 05ec31b624
5 changed files with 23 additions and 6 deletions

View file

@ -108,14 +108,17 @@
} }
}; };
$rootScope.showQueue = function () { $rootScope.showQueue = function () {
$.fancybox.open(); //$.fancybox.open();
$('#SideBar').css('display', '').fadeIn(400);
$('#right-component').css('margin-right', "350px");
}; };
$rootScope.hideQueue = function () { $rootScope.hideQueue = function () {
$.fancybox.close(); //$.fancybox.close();
$('#SideBar').fadeOut();
$('#right-component').css('margin-right', '0px');
}; };
$scope.toggleQueue = function () { $scope.toggleQueue = function () {
var submenu = $('#QueuePreview'); if ($('#SideBar').css('display') == 'none') {
if (submenu.css('display') == 'none') {
$rootScope.showQueue(); $rootScope.showQueue();
} else { } else {
$rootScope.hideQueue(); $rootScope.hideQueue();
@ -531,6 +534,11 @@
/* Launch on Startup */ /* Launch on Startup */
$scope.loadSettings(); $scope.loadSettings();
utils.switchTheme(globals.settings.Theme); utils.switchTheme(globals.settings.Theme);
if(!globals.settings.ShowQueue) {
$rootScope.hideQueue();
}
if ($scope.loggedIn()) { if ($scope.loggedIn()) {
//$scope.ping(); //$scope.ping();
if (globals.settings.SaveTrackPosition) { if (globals.settings.SaveTrackPosition) {

View file

@ -27,7 +27,7 @@
<a id="jslogo" title="Jamstash" class="showQueue" href=""></a> <a id="jslogo" title="Jamstash" class="showQueue" href=""></a>
<a id="sslogo" target="_blank" ng-show="settings.Server" ng-href="{{settings.Server}}" title="{{settings.Server}}"></a> <a id="sslogo" target="_blank" ng-show="settings.Server" ng-href="{{settings.Server}}" title="{{settings.Server}}"></a>
<div id="globalactions"> <div id="globalactions">
<a href="" class="button" id="action_ToggleSideBar" title="Toggle Side Bar"><img src="images/arrow_right_gl_8x8.png" /></a> <a href="" class="button" id="action_ToggleSideBar" ng-click="toggleQueue()" title="Toggle Side Bar"><img src="images/arrow_right_gl_8x8.png" /></a>
</div> </div>
<div id="nav"> <div id="nav">
<ul class="tabs"> <ul class="tabs">

View file

@ -58,7 +58,8 @@ angular.module('jamstash.settings', [])
AutoPlay: false, AutoPlay: false,
LoopQueue: false, LoopQueue: false,
Repeat: false, Repeat: false,
Debug: false Debug: false,
ShowQueue: true
}; };
this.SavedCollections = []; this.SavedCollections = [];
this.SavedGenres = []; this.SavedGenres = [];

View file

@ -44,6 +44,9 @@
<div class="inputwrap"><input type="checkbox" id="ScrollTitle" name="ScrollTitle" value="1" title="Scroll the Title Once" ng-model="settings.ScrollTitle" /></div> <div class="inputwrap"><input type="checkbox" id="ScrollTitle" name="ScrollTitle" value="1" title="Scroll the Title Once" ng-model="settings.ScrollTitle" /></div>
<label for="ScrollTitle">Scroll Title</label> <label for="ScrollTitle">Scroll Title</label>
<div class="clear"></div> <div class="clear"></div>
<div class="inputwrap"><input type="checkbox" id="ShowQueue" name="ShowQueue" value="1" title="Show Queue" ng-model="settings.ShowQueue" /></div>
<label for="ShowQueue">Show Queue</label>
<div class="clear"></div>
<label for="DefaultLibraryLayout">Default Library Layout</label> <label for="DefaultLibraryLayout">Default Library Layout</label>
<div class="clear"></div> <div class="clear"></div>
<select id="DefaultLibraryLayout" name="DefaultLibraryLayout" class="" ng-model="settings.DefaultLibraryLayout.id" ng-options="o.id as o.name for o in Layouts" title="Library Layout"></select> <select id="DefaultLibraryLayout" name="DefaultLibraryLayout" class="" ng-model="settings.DefaultLibraryLayout.id" ng-options="o.id as o.name for o in Layouts" title="Library Layout"></select>

View file

@ -53,6 +53,11 @@
if ($scope.settings.Theme) { if ($scope.settings.Theme) {
utils.switchTheme(globals.settings.Theme); utils.switchTheme(globals.settings.Theme);
} }
if($scope.settings.ShowQueue) {
$rootScope.showQueue();
} else {
$rootScope.hideQueue();
}
utils.setValue('Settings', $scope.settings, true); utils.setValue('Settings', $scope.settings, true);
notifications.updateMessage('Settings Updated!', true); notifications.updateMessage('Settings Updated!', true);
$scope.loadSettings(); $scope.loadSettings();