Added custom scroll bar to inventory groups container. Moved group container auto-resize and height calc function to helper methods. Now using full window height, pushing footer off the page. Changed custom sroll directive to use the dark-thin theme.

This commit is contained in:
chouseknecht
2014-05-20 14:04:54 -04:00
parent 77ccfc49f2
commit 2055919322
2 changed files with 6 additions and 3 deletions

View File

@@ -14,18 +14,18 @@ angular.module('InventoryHelper', ['RestServices', 'Utilities', 'OrganizationLis
'InventoryHelper', 'InventoryFormDefinition', 'ParseHelper', 'SearchHelper', 'VariablesHelper', 'InventoryHelper', 'InventoryFormDefinition', 'ParseHelper', 'SearchHelper', 'VariablesHelper',
]) ])
.factory('GetContainerHeight', [ function() { .factory('GetGroupContainerHeight', [ function() {
return function() { return function() {
return $(window).height() - $('.main-menu').outerHeight() - $('#main_tabs').outerHeight() - $('#breadcrumbs').outerHeight() - return $(window).height() - $('.main-menu').outerHeight() - $('#main_tabs').outerHeight() - $('#breadcrumbs').outerHeight() -
$('.site-footer').outerHeight() - $('#groups-container .list-actions').outerHeight() - $('#groups-table-header').height() - 15; $('.site-footer').outerHeight() - $('#groups-container .list-actions').outerHeight() - $('#groups-table-header').height() - 15;
}; };
}]) }])
.factory('SetGroupContainerHeight', [ 'GetContainerHeight', function(GetContainerHeight) { .factory('SetGroupContainerHeight', [ 'GetGroupContainerHeight', function(GetGroupContainerHeight) {
return function() { return function() {
var height; var height;
if ($(window).width() > 1210) { if ($(window).width() > 1210) {
height = GetContainerHeight(); height = GetGroupContainerHeight();
$('#groups-container .list-table-container').height(height); $('#groups-container .list-table-container').height(height);
} }
else { else {

View File

@@ -1332,6 +1332,9 @@ input[type="checkbox"].checkbox-no-label {
.list-table-container { .list-table-container {
overflow: auto; overflow: auto;
} }
.list-actions {
margin-bottom: 0;
}
} }
#inventories_table i[class*="icon-job-"], #inventories_table i[class*="icon-job-"],