AC-1292 Fixed inventory edit page sizing, column widths and margins.

This commit is contained in:
chouseknecht
2014-05-19 14:02:28 -04:00
parent 210d5fa4be
commit fc7e887da6
3 changed files with 27 additions and 21 deletions

View File

@@ -26,7 +26,7 @@ angular.module('InventoryGroupsDefinition', [])
columnClick: "showHosts(group.id,group.group_id, false)", columnClick: "showHosts(group.id,group.group_id, false)",
ngClass: "group.selected_class", ngClass: "group.selected_class",
hasChildren: true, hasChildren: true,
columnClass: 'col-lg-9 col-md-9 col-sm-7 col-xs-7', columnClass: 'col-lg-10 col-md-10 col-sm-10 col-xs-8',
nosort: true, nosort: true,
awDroppable: "{{ group.isDroppable }}", awDroppable: "{{ group.isDroppable }}",
awDraggable: "{{ group.isDraggable }}", awDraggable: "{{ group.isDraggable }}",
@@ -37,10 +37,7 @@ angular.module('InventoryGroupsDefinition', [])
} }
}, },
actions: { actions: {
columnClass: 'col-lg-3 col-md-3 col-sm-5 col-xs-5',
create: { create: {
mode: 'all', mode: 'all',
ngClick: "createGroup()", ngClick: "createGroup()",
@@ -51,18 +48,6 @@ angular.module('InventoryGroupsDefinition', [])
awToolTip: "Edit inventory properties", awToolTip: "Edit inventory properties",
ngClick: 'editInventoryProperties()' ngClick: 'editInventoryProperties()'
}, },
/*refresh: {
mode: 'all',
awToolTip: "Refresh the page",
ngClick: "refreshGroups()"
},*/
socket: {
mode: 'all',
iconClass: "{{ 'fa fa-power-off fa-lg socket-' + socketStatus }}",
awToolTip: "{{ socketTip }}",
dataTipWatch: "socketTip",
ngClick: "socketToggle()",
},
stream: { stream: {
ngClick: "showGroupActivity()", ngClick: "showGroupActivity()",
awToolTip: "View Activity Stream", awToolTip: "View Activity Stream",
@@ -77,6 +62,9 @@ angular.module('InventoryGroupsDefinition', [])
}, },
fieldActions: { fieldActions: {
columnClass: 'col-lg-2 col-md-2 col-sm-2 col-xs-4',
sync_status: { sync_status: {
mode: 'all', mode: 'all',
ngClick: "viewUpdateStatus(group.id, group.group_id)", ngClick: "viewUpdateStatus(group.id, group.group_id)",

View File

@@ -28,7 +28,7 @@ angular.module('InventoryHostsDefinition', [])
label: 'Hosts', label: 'Hosts',
ngClick: "editHost(host.id)", ngClick: "editHost(host.id)",
searchPlaceholder: "search_place_holder", searchPlaceholder: "search_place_holder",
columnClass: 'col-lg-9 col-md-9 col-sm-7 col-xs-7', columnClass: 'col-lg-10 col-md-10 col-sm-10 col-xs-8',
dataHostId: "{{ host.id }}", dataHostId: "{{ host.id }}",
dataType: "host", dataType: "host",
awDraggable: "true" awDraggable: "true"
@@ -50,6 +50,9 @@ angular.module('InventoryHostsDefinition', [])
}, },
fieldActions: { fieldActions: {
columnClass: 'col-lg-2 col-md-2 col-sm-2 col-xs-4',
enabled_flag: { enabled_flag: {
iconClass: "{{ 'fa icon-enabled-' + host.enabled }}", iconClass: "{{ 'fa icon-enabled-' + host.enabled }}",
dataPlacement: 'top', dataPlacement: 'top',
@@ -83,9 +86,6 @@ angular.module('InventoryHostsDefinition', [])
}, },
actions: { actions: {
columnClass: 'col-lg-3 col-md-3 col-sm-5 col-xs-5',
create: { create: {
mode: 'all', mode: 'all',
ngClick: "createHost()", ngClick: "createHost()",

View File

@@ -1703,6 +1703,15 @@ tr td button i {
width: 80%; width: 80%;
} }
#groups-container.col-lg-6 {
padding-right: 15px;
}
#hosts-container.col-lg-6 {
padding-left: 15px;
padding-right: 15px;
}
} }
@@ -1786,4 +1795,13 @@ tr td button i {
display: none; display: none;
} }
#groups-container.col-lg-6 {
padding-right: 15px;
}
#hosts-container.col-lg-6 {
padding-left: 15px;
padding-right: 15px;
}
} }