From dda9cbda2d8377dbb6cefd4b110eea51886b0ce1 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Fri, 25 Apr 2014 09:36:58 -0400 Subject: [PATCH] Fixed main tabs to respond correctly, or at least better, to medium and small viewports. --- awx/ui/static/js/lists/Credentials.js | 9 ++++++--- awx/ui/static/js/lists/Inventories.js | 6 ++++-- awx/ui/static/js/lists/Organizations.js | 3 ++- awx/ui/static/js/lists/Teams.js | 9 ++++++--- awx/ui/static/js/lists/Users.js | 9 ++++++--- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/awx/ui/static/js/lists/Credentials.js b/awx/ui/static/js/lists/Credentials.js index 829b46b040..12addac507 100644 --- a/awx/ui/static/js/lists/Credentials.js +++ b/awx/ui/static/js/lists/Credentials.js @@ -25,18 +25,21 @@ angular.module('CredentialsListDefinition', []) fields: { name: { key: true, - label: 'Name' + label: 'Name', + columnClass: 'col-md-3 col-sm-9 col-xs-9' }, description: { label: 'Description', - excludeModal: true + excludeModal: true, + columnClass: 'col-md-3 hidden-sm hidden-xs' }, kind: { label: 'Type', searchType: 'select', searchOptions: [], // will be set by Options call to credentials resource excludeModal: true, - nosort: true + nosort: true, + columnClass: 'col-md-3 hidden-sm hidden-xs' } }, diff --git a/awx/ui/static/js/lists/Inventories.js b/awx/ui/static/js/lists/Inventories.js index 88c8cc4948..d35b6704e1 100644 --- a/awx/ui/static/js/lists/Inventories.js +++ b/awx/ui/static/js/lists/Inventories.js @@ -44,7 +44,8 @@ angular.module('InventoriesListDefinition', []) }, name: { key: true, - label: 'Name' + label: 'Name', + columnClass: 'col-md-4 col-sm-6 col-xs-6' }, organization: { label: 'Organization', @@ -52,7 +53,8 @@ angular.module('InventoriesListDefinition', []) linkTo: '/#/organizations/{{ inventory.organization }}', sourceModel: 'organization', sourceField: 'name', - excludeModal: true + excludeModal: true, + columnClass: 'col-md-4 hidden-sm hidden-xs' }, has_inventory_sources: { label: 'Cloud sourced?', diff --git a/awx/ui/static/js/lists/Organizations.js b/awx/ui/static/js/lists/Organizations.js index 872e4b7d91..7c315b6d8d 100644 --- a/awx/ui/static/js/lists/Organizations.js +++ b/awx/ui/static/js/lists/Organizations.js @@ -22,7 +22,8 @@ angular.module('OrganizationListDefinition', []) fields: { name: { key: true, - label: 'Name' + label: 'Name', + columnClass: 'col-sm-8 col-xs-8' }, description: { label: 'Description', diff --git a/awx/ui/static/js/lists/Teams.js b/awx/ui/static/js/lists/Teams.js index 7c8e3a1149..0d736031d7 100644 --- a/awx/ui/static/js/lists/Teams.js +++ b/awx/ui/static/js/lists/Teams.js @@ -23,16 +23,19 @@ angular.module('TeamsListDefinition', []) fields: { name: { key: true, - label: 'Name' + label: 'Name', + columnClass: 'col-md-4 col-sm-9 col-xs-9' }, description: { - label: 'Description' + label: 'Description', + columnClass: 'col-md-3 hidden-sm hidden-xs' }, organization: { label: 'Organization', ngBind: 'team.organization_name', sourceModel: 'organization', - sourceField: 'name' + sourceField: 'name', + columnClass: 'col-md-3 hidden-sm hidden-xs' } }, diff --git a/awx/ui/static/js/lists/Users.js b/awx/ui/static/js/lists/Users.js index 022fc5ace7..fac3be7815 100644 --- a/awx/ui/static/js/lists/Users.js +++ b/awx/ui/static/js/lists/Users.js @@ -24,13 +24,16 @@ angular.module('UserListDefinition', []) fields: { username: { key: true, - label: 'Username' + label: 'Username', + columnClass: 'col-md-3 col-sm-3 col-xs-9' }, first_name: { - label: 'First Name' + label: 'First Name', + columnClass: 'col-md-3 col-sm-3 hidden-xs' }, last_name: { - label: 'Last Name' + label: 'Last Name', + columnClass: 'col-md-3 col-sm-3 hidden-xs' } },