diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index 1f01037f28..b538aaad04 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -781,7 +781,7 @@ input[type="submit"] { } .sidenav .list-group-item.active { - background-color: #ddd; + background-color: #bbab8b; border-color: #ccc; } diff --git a/InvenTree/InvenTree/static/treegrid/examples/bootstrap-2.3.2/css/bootstrap.css b/InvenTree/InvenTree/static/treegrid/examples/bootstrap-2.3.2/css/bootstrap.css index 5b7fe7e856..c3de0d956c 100644 --- a/InvenTree/InvenTree/static/treegrid/examples/bootstrap-2.3.2/css/bootstrap.css +++ b/InvenTree/InvenTree/static/treegrid/examples/bootstrap-2.3.2/css/bootstrap.css @@ -4678,7 +4678,7 @@ input[type="submit"].btn.btn-mini { .navbar .btn-navbar:active, .navbar .btn-navbar.active { - background-color: #cccccc \9; + background-color: #ba8; } .navbar .btn-navbar .icon-bar { diff --git a/InvenTree/templates/js/api.js b/InvenTree/templates/js/api.js index 93fa5a41e4..8169671836 100644 --- a/InvenTree/templates/js/api.js +++ b/InvenTree/templates/js/api.js @@ -3,6 +3,14 @@ var jQuery = window.$; +$.urlParam = function(name){ + var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(window.location.href); + if (results==null) { + return null; + } + return decodeURI(results[1]) || 0; +} + // using jQuery function getCookie(name) { var cookieValue = null; diff --git a/InvenTree/templates/js/nav.js b/InvenTree/templates/js/nav.js index e8207f9251..7dc562b8ef 100644 --- a/InvenTree/templates/js/nav.js +++ b/InvenTree/templates/js/nav.js @@ -23,8 +23,12 @@ function attachNavCallbacks(options={}) { var panelClass = options.name || 'unknown'; - // Look for a default panel to initialize - var defaultPanel = localStorage.getItem(`inventree-selected-panel-${panelClass}`) || options.default; + /* Look for a default panel to initialize + * First preference = URL parameter e.g. ?display=part-stock + * Second preference = localStorage + * Third preference = default + */ + var defaultPanel = $.urlParam('display') || localStorage.getItem(`inventree-selected-panel-${panelClass}`) || options.default; if (defaultPanel) { activatePanel(defaultPanel); @@ -63,6 +67,9 @@ function activatePanel(panelName, options={}) { console.log("found match -", panel_name); panelName = panel_name; } + + panel = `#panel-${panelName}`; + select = `#select-${panelName}`; }); }