diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less index 7d8dc7ae0c..d8f705e1ad 100644 --- a/awx/ui/client/legacy-styles/forms.less +++ b/awx/ui/client/legacy-styles/forms.less @@ -40,7 +40,6 @@ .Form-title{ flex: 0 1 auto; - text-transform: uppercase; color: @list-header-txt; font-size: 14px; font-weight: bold; @@ -50,6 +49,10 @@ margin-bottom: 20px; } +.Form-title--uppercase { + text-transform: uppercase; +} + .Form-secondaryTitle{ color: @default-icon; padding-bottom: 20px; diff --git a/awx/ui/client/legacy-styles/lists.less b/awx/ui/client/legacy-styles/lists.less index 8807fc5f93..4e007e5bea 100644 --- a/awx/ui/client/legacy-styles/lists.less +++ b/awx/ui/client/legacy-styles/lists.less @@ -147,7 +147,6 @@ table, tbody { font-size: 14px; font-weight: bold; margin-right: 10px; - text-transform: uppercase; } .List-actionHolder { diff --git a/awx/ui/client/src/configuration/configuration.partial.html b/awx/ui/client/src/configuration/configuration.partial.html index 7ba0e4289b..67731f6699 100644 --- a/awx/ui/client/src/configuration/configuration.partial.html +++ b/awx/ui/client/src/configuration/configuration.partial.html @@ -7,7 +7,7 @@
-
Configure Tower
+
CONFIGURE TOWER
diff --git a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js index b9162dccac..fefc0fe834 100644 --- a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js +++ b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js @@ -10,8 +10,8 @@ export default [ 'i18n', function(i18n){ name: 'hosts', iterator: 'host', selectTitle: i18n._('Add Existing Hosts'), - editTitle: i18n._('Hosts'), - listTitle: i18n._('Hosts'), + editTitle: i18n._('HOSTS'), + listTitle: i18n._('HOSTS'), index: false, hover: true, well: true, diff --git a/awx/ui/client/src/forms/ActivityDetail.js b/awx/ui/client/src/forms/ActivityDetail.js index d56225a0ab..3c80f5b263 100644 --- a/awx/ui/client/src/forms/ActivityDetail.js +++ b/awx/ui/client/src/forms/ActivityDetail.js @@ -22,7 +22,7 @@ export default return { name: 'activity', - editTitle: i18n._('Activity Detail'), + editTitle: i18n._('ACTIVITY DETAIL'), well: false, 'class': 'horizontal-narrow', formFieldSize: 'col-lg-10', diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js index 1ff9f5e6d4..8242043acb 100644 --- a/awx/ui/client/src/forms/Credentials.js +++ b/awx/ui/client/src/forms/Credentials.js @@ -15,7 +15,7 @@ export default .factory('CredentialForm', ['i18n', function(i18n) { return { - addTitle: i18n._('Create Credential'), //Legend in add mode + addTitle: i18n._('CREATE CREDENTIAL'), //Legend in add mode editTitle: '{{ name }}', //Legend in edit mode name: 'credential', // the top-most node of generated state tree diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js index cc9d6f081e..506d66d1b2 100644 --- a/awx/ui/client/src/forms/Groups.js +++ b/awx/ui/client/src/forms/Groups.js @@ -14,7 +14,7 @@ export default angular.module('GroupFormDefinition', []) .value('GroupFormObject', { - addTitle: 'Create Group', + addTitle: 'CREATE GROUP', editTitle: '{{ name }}', showTitle: true, name: 'group', diff --git a/awx/ui/client/src/forms/HostGroups.js b/awx/ui/client/src/forms/HostGroups.js index 2c920e79f5..16479fee2b 100644 --- a/awx/ui/client/src/forms/HostGroups.js +++ b/awx/ui/client/src/forms/HostGroups.js @@ -14,7 +14,7 @@ export default angular.module('HostGroupsFormDefinition', []) .value('HostGroupsForm', { - editTitle: 'Host Groups', + editTitle: 'HOST GROUPS', name: 'host', well: false, formLabelSize: 'col-lg-3', diff --git a/awx/ui/client/src/forms/Hosts.js b/awx/ui/client/src/forms/Hosts.js index ef9c7d62d0..55c7da509e 100644 --- a/awx/ui/client/src/forms/Hosts.js +++ b/awx/ui/client/src/forms/Hosts.js @@ -15,7 +15,7 @@ export default .factory('HostForm', ['i18n', function(i18n) { return { - addTitle: i18n._('Create Host'), + addTitle: i18n._('CREATE HOST'), editTitle: '{{ host.name }}', name: 'host', basePath: 'hosts', diff --git a/awx/ui/client/src/forms/Inventories.js b/awx/ui/client/src/forms/Inventories.js index 6899224ea2..e010679c7b 100644 --- a/awx/ui/client/src/forms/Inventories.js +++ b/awx/ui/client/src/forms/Inventories.js @@ -15,7 +15,7 @@ angular.module('InventoryFormDefinition', []) .factory('InventoryForm', ['i18n', function(i18n) { return { - addTitle: i18n._('New Inventory'), + addTitle: i18n._('NEW INVENTORY'), editTitle: '{{ inventory_name }}', name: 'inventory', basePath: 'inventory', diff --git a/awx/ui/client/src/forms/InventoryStatus.js b/awx/ui/client/src/forms/InventoryStatus.js index a8937db74b..274c96a4d0 100644 --- a/awx/ui/client/src/forms/InventoryStatus.js +++ b/awx/ui/client/src/forms/InventoryStatus.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name forms.function:InventoryStatus @@ -14,7 +14,7 @@ export default .value('InventoryStatusForm', { name: 'inventory_update', - editTitle: 'Inventory Status', + editTitle: 'INVENTORY STATUS', well: false, 'class': 'horizontal-narrow', diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js index af2379ae93..63369d320a 100644 --- a/awx/ui/client/src/forms/JobTemplates.js +++ b/awx/ui/client/src/forms/JobTemplates.js @@ -17,7 +17,7 @@ export default .factory('JobTemplateFormObject', ['i18n', function(i18n) { return { - addTitle: i18n._('New Job Template'), + addTitle: i18n._('NEW JOB TEMPLATE'), editTitle: '{{ name }}', name: 'job_template', breadcrumbName: i18n._('JOB TEMPLATE'), diff --git a/awx/ui/client/src/forms/Organizations.js b/awx/ui/client/src/forms/Organizations.js index bfd17b8cea..49ce02afa9 100644 --- a/awx/ui/client/src/forms/Organizations.js +++ b/awx/ui/client/src/forms/Organizations.js @@ -15,7 +15,7 @@ export default .factory('OrganizationFormObject', ['i18n', function(i18n) { return { - addTitle: i18n._('New Organization'), //Title in add mode + addTitle: i18n._('NEW ORGANIZATION'), //Title in add mode editTitle: '{{ name }}', //Title in edit mode name: 'organization', //entity or model name in singular form stateTree: 'organizations', diff --git a/awx/ui/client/src/forms/ProjectStatus.js b/awx/ui/client/src/forms/ProjectStatus.js index 44314b0233..8d193b6826 100644 --- a/awx/ui/client/src/forms/ProjectStatus.js +++ b/awx/ui/client/src/forms/ProjectStatus.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name forms.function:ProjectStatus @@ -15,7 +15,7 @@ export default .value('ProjectStatusForm', { name: 'project_update', - editTitle: 'SCM Status', + editTitle: 'SCM STATUS', well: false, 'class': 'horizontal-narrow', diff --git a/awx/ui/client/src/forms/Projects.js b/awx/ui/client/src/forms/Projects.js index 6a16dd675a..3b2a69c044 100644 --- a/awx/ui/client/src/forms/Projects.js +++ b/awx/ui/client/src/forms/Projects.js @@ -15,7 +15,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition']) .factory('ProjectsFormObject', ['i18n', function(i18n) { return { - addTitle: i18n._('New Project'), + addTitle: i18n._('NEW PROJECT'), editTitle: '{{ name }}', name: 'project', basePath: 'projects', diff --git a/awx/ui/client/src/forms/Teams.js b/awx/ui/client/src/forms/Teams.js index a4252cb0a9..121ae4be1e 100644 --- a/awx/ui/client/src/forms/Teams.js +++ b/awx/ui/client/src/forms/Teams.js @@ -15,7 +15,7 @@ export default .factory('TeamForm', ['i18n', function(i18n) { return { - addTitle: i18n._('New Team'), //Legend in add mode + addTitle: i18n._('NEW TEAM'), //Legend in add mode editTitle: '{{ name }}', //Legend in edit mode name: 'team', // the top-most node of generated state tree diff --git a/awx/ui/client/src/forms/Users.js b/awx/ui/client/src/forms/Users.js index 5db4a06c67..0b4f366443 100644 --- a/awx/ui/client/src/forms/Users.js +++ b/awx/ui/client/src/forms/Users.js @@ -15,7 +15,7 @@ export default .factory('UserForm', ['i18n', function(i18n) { return { - addTitle: i18n._('New User'), + addTitle: i18n._('NEW USER'), editTitle: '{{ username }}', name: 'user', // the top-most node of generated state tree diff --git a/awx/ui/client/src/forms/Workflows.js b/awx/ui/client/src/forms/Workflows.js index cff4d8bb8a..874f176ae3 100644 --- a/awx/ui/client/src/forms/Workflows.js +++ b/awx/ui/client/src/forms/Workflows.js @@ -16,7 +16,7 @@ export default .factory('WorkflowFormObject', ['i18n', function(i18n) { return { - addTitle: i18n._('New Workflow Job Template'), + addTitle: i18n._('NEW WORKFLOW JOB TEMPLATE'), editTitle: '{{ name }}', name: 'workflow_job_template', breadcrumbName: i18n._('WORKFLOW'), diff --git a/awx/ui/client/src/inventories/main.js b/awx/ui/client/src/inventories/main.js index 5abd9c99eb..42ea1d6a4e 100644 --- a/awx/ui/client/src/inventories/main.js +++ b/awx/ui/client/src/inventories/main.js @@ -97,7 +97,7 @@ angular.module('inventory', [ '@': { templateProvider: function(ScheduleList, generateList, ParentObject) { // include name of parent resource in listTitle - ScheduleList.listTitle = `${ParentObject.name}
` + N_('Schedules'); + ScheduleList.listTitle = `${ParentObject.name}
` + N_('SCHEDULES'); let html = generateList.build({ list: ScheduleList, mode: 'edit' diff --git a/awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js b/awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js index c509da35d3..f3233cac50 100644 --- a/awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js +++ b/awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js @@ -12,7 +12,7 @@ export default function() { return { - addTitle: 'Execute Command', + addTitle: 'EXECUTE COMMAND', name: 'adhoc', well: true, forceListeners: true, diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js index 05ab6b42ca..644f4ecdee 100644 --- a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js +++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js @@ -13,7 +13,7 @@ export default ['i18n', function(i18n) { return { - addTitle: i18n._('New Custom Inventory'), + addTitle: i18n._('NEW CUSTOM INVENTORY'), editTitle: '{{ name }}', name: 'inventory_script', basePath: 'inventory_scripts', diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js index 10ab6d5d06..519b718a53 100644 --- a/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js +++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js @@ -9,7 +9,7 @@ export default ['i18n', function(i18n){ return { name: 'inventory_scripts' , - listTitle: i18n._('Inventory Scripts'), + listTitle: i18n._('INVENTORY SCRIPTS'), iterator: 'inventory_script', index: false, hover: false, diff --git a/awx/ui/client/src/job-detail/job-detail.block.less b/awx/ui/client/src/job-detail/job-detail.block.less index c23b8d321d..db69b8bdc0 100644 --- a/awx/ui/client/src/job-detail/job-detail.block.less +++ b/awx/ui/client/src/job-detail/job-detail.block.less @@ -57,7 +57,6 @@ font-size: 14px; font-weight: bold; margin-right: 10px; - text-transform: uppercase; } .JobDetail-panelHeaderText:hover{ diff --git a/awx/ui/client/src/job-submission/job-submission.block.less b/awx/ui/client/src/job-submission/job-submission.block.less index 2597d04f4e..f99fd0ae1f 100644 --- a/awx/ui/client/src/job-submission/job-submission.block.less +++ b/awx/ui/client/src/job-submission/job-submission.block.less @@ -37,7 +37,6 @@ font-size: 14px; font-weight: bold; margin-right: 10px; - text-transform: uppercase; } .JobSubmission-titleLockup { margin-left: 4px; diff --git a/awx/ui/client/src/lists/AllJobs.js b/awx/ui/client/src/lists/AllJobs.js index b611cb47d6..24521d9c32 100644 --- a/awx/ui/client/src/lists/AllJobs.js +++ b/awx/ui/client/src/lists/AllJobs.js @@ -13,7 +13,7 @@ export default name: 'jobs', basePath: 'unified_jobs', iterator: 'job', - editTitle: i18n._('All Jobs'), + editTitle: i18n._('ALL JOBS'), index: false, hover: true, well: false, diff --git a/awx/ui/client/src/lists/CloudCredentials.js b/awx/ui/client/src/lists/CloudCredentials.js index 297225b7d3..0010390436 100644 --- a/awx/ui/client/src/lists/CloudCredentials.js +++ b/awx/ui/client/src/lists/CloudCredentials.js @@ -14,7 +14,7 @@ export default name: 'cloudcredentials', iterator: 'cloudcredential', selectTitle: 'Add Cloud Credentials', - editTitle: 'Cloud Credentials', + editTitle: 'CLOUD CREDENTIALS', selectInstructions: '

Select existing credentials by clicking each credential or checking the related checkbox. When finished, click the blue ' + 'Select button, located bottom right.

Create a brand new credential by clicking the button.

', index: false, diff --git a/awx/ui/client/src/lists/CompletedJobs.js b/awx/ui/client/src/lists/CompletedJobs.js index 1c0436240c..3978f7619b 100644 --- a/awx/ui/client/src/lists/CompletedJobs.js +++ b/awx/ui/client/src/lists/CompletedJobs.js @@ -15,7 +15,7 @@ export default name: 'completed_jobs', basePath: 'api/v1/job_templates/{{$stateParams.job_template_id}}/jobs/?or__status=successful&or__status=failed&or__status=error&or__status=canceled', iterator: 'completed_job', - editTitle: i18n._('Completed Jobs'), + editTitle: i18n._('COMPLETED JOBS'), index: false, hover: true, well: false, diff --git a/awx/ui/client/src/lists/Credentials.js b/awx/ui/client/src/lists/Credentials.js index c6e8d6bbae..152e182b35 100644 --- a/awx/ui/client/src/lists/Credentials.js +++ b/awx/ui/client/src/lists/Credentials.js @@ -15,8 +15,8 @@ export default name: 'credentials', iterator: 'credential', selectTitle: i18n._('Add Credentials'), - editTitle: i18n._('Credentials'), - listTitle: i18n._('Credentials'), + editTitle: i18n._('CREDENTIALS'), + listTitle: i18n._('CREDENTIALS'), selectInstructions: "

Select existing credentials by clicking each credential or checking the related checkbox. When " + "finished, click the blue Select button, located bottom right.

Create a brand new credential by clicking ", index: false, diff --git a/awx/ui/client/src/lists/Inventories.js b/awx/ui/client/src/lists/Inventories.js index 4ae755cfb6..d2ec51afc1 100644 --- a/awx/ui/client/src/lists/Inventories.js +++ b/awx/ui/client/src/lists/Inventories.js @@ -13,8 +13,8 @@ export default name: 'inventories', iterator: 'inventory', selectTitle: i18n._('Add Inventories'), - editTitle: i18n._('Inventories'), - listTitle: i18n._('Inventories'), + editTitle: i18n._('INVENTORIES'), + listTitle: i18n._('INVENTORIES'), selectInstructions: i18n.sprintf(i18n._("Click on a row to select it, and click Finished when done. Click the %s button to create a new inventory."), " "), index: false, hover: true, diff --git a/awx/ui/client/src/lists/InventoryGroups.js b/awx/ui/client/src/lists/InventoryGroups.js index 2445a1f3ba..1a5d0b989a 100644 --- a/awx/ui/client/src/lists/InventoryGroups.js +++ b/awx/ui/client/src/lists/InventoryGroups.js @@ -11,7 +11,7 @@ export default name: 'groups', iterator: 'group', editTitle: '{{ inventory.name }}', - listTitle: 'Groups', + listTitle: 'GROUPS', searchSize: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', showTitle: false, well: true, diff --git a/awx/ui/client/src/lists/InventoryHosts.js b/awx/ui/client/src/lists/InventoryHosts.js index a9e65357c9..f65c818893 100644 --- a/awx/ui/client/src/lists/InventoryHosts.js +++ b/awx/ui/client/src/lists/InventoryHosts.js @@ -11,7 +11,7 @@ export default name: 'hosts', iterator: 'host', editTitle: '{{ selected_group }}', - listTitle: 'Hosts', + listTitle: 'HOSTS', searchSize: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', showTitle: false, well: true, diff --git a/awx/ui/client/src/lists/InventorySources.js b/awx/ui/client/src/lists/InventorySources.js index 0b822b516c..e8643da9f8 100644 --- a/awx/ui/client/src/lists/InventorySources.js +++ b/awx/ui/client/src/lists/InventorySources.js @@ -12,7 +12,7 @@ export default name: 'workflow_inventory_sources', iterator: 'inventory_source', basePath: 'inventory_sources', - listTitle: 'Inventory Sources', + listTitle: 'INVENTORY SOURCES', index: false, hover: true, diff --git a/awx/ui/client/src/lists/JobEvents.js b/awx/ui/client/src/lists/JobEvents.js index 742fa354b6..97fc68cc61 100644 --- a/awx/ui/client/src/lists/JobEvents.js +++ b/awx/ui/client/src/lists/JobEvents.js @@ -12,7 +12,7 @@ export default name: 'jobevents', iterator: 'jobevent', - editTitle: i18n._('Job Events'), + editTitle: i18n._('JOB EVENTS'), index: false, hover: true, "class": "condensed", diff --git a/awx/ui/client/src/lists/JobHosts.js b/awx/ui/client/src/lists/JobHosts.js index 0bf0b48899..a38e621a53 100644 --- a/awx/ui/client/src/lists/JobHosts.js +++ b/awx/ui/client/src/lists/JobHosts.js @@ -11,7 +11,7 @@ export default name: 'jobhosts', iterator: 'jobhost', - editTitle: 'All summaries', + editTitle: 'ALL SUMMARIES', "class": "table-condensed", index: false, hover: true, diff --git a/awx/ui/client/src/lists/Jobs.js b/awx/ui/client/src/lists/Jobs.js index f31ee8a971..455ce26175 100644 --- a/awx/ui/client/src/lists/Jobs.js +++ b/awx/ui/client/src/lists/Jobs.js @@ -11,7 +11,7 @@ export default name: 'jobs', iterator: 'job', - editTitle: 'Jobs', + editTitle: 'JOBS', 'class': 'table-condensed', index: false, hover: true, diff --git a/awx/ui/client/src/lists/Organizations.js b/awx/ui/client/src/lists/Organizations.js index 45525675a7..b0eff989c6 100644 --- a/awx/ui/client/src/lists/Organizations.js +++ b/awx/ui/client/src/lists/Organizations.js @@ -15,7 +15,7 @@ export default selectInstructions: '

Select existing organizations by clicking each organization or checking the related checkbox. When finished, ' + 'click the blue Select button, located bottom right.

Create a new organization by clicking the ' + ' button.

', - editTitle: 'Organizations', + editTitle: 'ORGANIZATIONS', hover: true, index: false, diff --git a/awx/ui/client/src/lists/PortalJobTemplates.js b/awx/ui/client/src/lists/PortalJobTemplates.js index b542ac1181..234b1b6a45 100644 --- a/awx/ui/client/src/lists/PortalJobTemplates.js +++ b/awx/ui/client/src/lists/PortalJobTemplates.js @@ -12,8 +12,8 @@ export default name: 'job_templates', iterator: 'job_template', - editTitle: i18n._('Job Templates'), - listTitle: i18n._('Job Templates'), + editTitle: i18n._('JOB TEMPLATES'), + listTitle: i18n._('JOB TEMPLATES'), index: false, hover: true, well: true, diff --git a/awx/ui/client/src/lists/PortalJobs.js b/awx/ui/client/src/lists/PortalJobs.js index 93dba21112..57a17b1e5d 100644 --- a/awx/ui/client/src/lists/PortalJobs.js +++ b/awx/ui/client/src/lists/PortalJobs.js @@ -12,11 +12,11 @@ export default name: 'jobs', iterator: 'job', - editTitle: i18n._('Jobs'), + editTitle: i18n._('JOBS'), index: false, hover: true, well: true, - listTitle: i18n._('Jobs'), + listTitle: i18n._('JOBS'), emptyListText: i18n._('There are no jobs to display at this time'), fields: { diff --git a/awx/ui/client/src/lists/Projects.js b/awx/ui/client/src/lists/Projects.js index 4dac279846..80bcaab1f2 100644 --- a/awx/ui/client/src/lists/Projects.js +++ b/awx/ui/client/src/lists/Projects.js @@ -13,8 +13,8 @@ export default iterator: 'project', basePath: 'projects', selectTitle: i18n._('Add Project'), - editTitle: i18n._('Projects'), - listTitle: i18n._('Projects'), + editTitle: i18n._('PROJECTS'), + listTitle: i18n._('PROJECTS'), selectInstructions: '

Select existing projects by clicking each project or checking the related checkbox. When finished, click the blue ' + 'Select button, located bottom right.

Create a new project by clicking the button.

', index: false, diff --git a/awx/ui/client/src/lists/ScheduledJobs.js b/awx/ui/client/src/lists/ScheduledJobs.js index 8c016cfb9f..7d0acd4c25 100644 --- a/awx/ui/client/src/lists/ScheduledJobs.js +++ b/awx/ui/client/src/lists/ScheduledJobs.js @@ -12,7 +12,7 @@ export default name: 'schedules', iterator: 'schedule', - editTitle: i18n._('Scheduled Jobs'), + editTitle: i18n._('SCHEDULED JOBS'), hover: true, well: false, emptyListText: i18n._('No schedules exist'), diff --git a/awx/ui/client/src/lists/Schedules.js b/awx/ui/client/src/lists/Schedules.js index 4d54ba8247..126650b5b4 100644 --- a/awx/ui/client/src/lists/Schedules.js +++ b/awx/ui/client/src/lists/Schedules.js @@ -13,8 +13,8 @@ export default name: 'schedules', iterator: 'schedule', selectTitle: '', - editTitle: 'Schedules', - listTitle: '{{parentObject}} || Schedules', + editTitle: 'SCHEDULES', + listTitle: '{{parentObject}} || SCHEDULES', index: false, hover: true, diff --git a/awx/ui/client/src/lists/Streams.js b/awx/ui/client/src/lists/Streams.js index bb2258a22e..12ae770ee8 100644 --- a/awx/ui/client/src/lists/Streams.js +++ b/awx/ui/client/src/lists/Streams.js @@ -13,8 +13,8 @@ export default name: 'activities', iterator: 'activity', basePath: 'activity_stream', - editTitle: i18n._('Activity Stream'), - listTitle: i18n._('Activity Stream') + '
{{streamSubTitle}}', + editTitle: i18n._('ACTIVITY STREAM'), + listTitle: i18n._('ACTIVITY STREAM') + '
{{streamSubTitle}}', listTitleBadge: false, emptyListText: i18n._('There are no events to display at this time'), selectInstructions: '', diff --git a/awx/ui/client/src/lists/Teams.js b/awx/ui/client/src/lists/Teams.js index 0048be52d0..ea8bce2419 100644 --- a/awx/ui/client/src/lists/Teams.js +++ b/awx/ui/client/src/lists/Teams.js @@ -13,8 +13,8 @@ export default name: 'teams', iterator: 'team', selectTitle: i18n._('Add Team'), - editTitle: i18n._('Teams'), - listTitle: i18n._('Teams'), + editTitle: i18n._('TEAMS'), + listTitle: i18n._('TEAMS'), selectInstructions: i18n.sprintf(i18n._("Click on a row to select it, and click Finished when done. Click the %s button to create a new team."), " "), index: false, hover: true, diff --git a/awx/ui/client/src/lists/Templates.js b/awx/ui/client/src/lists/Templates.js index c19d7a7052..4608406c0e 100644 --- a/awx/ui/client/src/lists/Templates.js +++ b/awx/ui/client/src/lists/Templates.js @@ -14,8 +14,8 @@ export default iterator: 'template', basePath: 'unified_job_templates', selectTitle: i18n._('Template'), - editTitle: i18n._('Templates'), - listTitle: i18n._('Templates'), + editTitle: i18n._('TEMPLATES'), + listTitle: i18n._('TEMPLATES'), selectInstructions: i18n.sprintf(i18n._("Click on a row to select it, and click Finished when done. Use the %s button to create a new job template."), " "), index: false, hover: true, diff --git a/awx/ui/client/src/lists/Users.js b/awx/ui/client/src/lists/Users.js index fb84286bfb..6f9e8ecbe6 100644 --- a/awx/ui/client/src/lists/Users.js +++ b/awx/ui/client/src/lists/Users.js @@ -17,8 +17,8 @@ export default }, iterator: 'user', selectTitle: i18n._('Add Users'), - editTitle: i18n._('Users'), - listTitle: i18n._('Users'), + editTitle: i18n._('USERS'), + listTitle: i18n._('USERS'), selectInstructions: '

Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' + 'Select button, located bottom right.

When available, a brand new user can be created by clicking the ' + ' button.

', diff --git a/awx/ui/client/src/management-jobs/card/card.partial.html b/awx/ui/client/src/management-jobs/card/card.partial.html index b8a370916d..b2d9be4812 100644 --- a/awx/ui/client/src/management-jobs/card/card.partial.html +++ b/awx/ui/client/src/management-jobs/card/card.partial.html @@ -2,7 +2,7 @@
- Management Jobs + MANAGEMENT JOBS
{{ mgmtCards.length }} diff --git a/awx/ui/client/src/management-jobs/card/mgmtcards.block.less b/awx/ui/client/src/management-jobs/card/mgmtcards.block.less index bed4ec69cb..f79a0f3038 100644 --- a/awx/ui/client/src/management-jobs/card/mgmtcards.block.less +++ b/awx/ui/client/src/management-jobs/card/mgmtcards.block.less @@ -39,7 +39,6 @@ .MgmtCards-label { margin-top: 0px; - text-transform: uppercase; font-size: 14px; font-weight: bold; color: @default-interface-txt; diff --git a/awx/ui/client/src/management-jobs/management-jobs.list.js b/awx/ui/client/src/management-jobs/management-jobs.list.js index 0c5f3cefff..fb071687f9 100644 --- a/awx/ui/client/src/management-jobs/management-jobs.list.js +++ b/awx/ui/client/src/management-jobs/management-jobs.list.js @@ -10,7 +10,7 @@ export default function(){ iterator: 'configure_job', index: false, hover: true, - listTitle: 'Management Jobs', + listTitle: 'MANAGEMENT JOBS', fields: { name: { diff --git a/awx/ui/client/src/management-jobs/scheduler/main.js b/awx/ui/client/src/management-jobs/scheduler/main.js index 16078bae36..e924150ef7 100644 --- a/awx/ui/client/src/management-jobs/scheduler/main.js +++ b/awx/ui/client/src/management-jobs/scheduler/main.js @@ -29,7 +29,7 @@ angular.module('managementJobScheduler', []) '@': { templateProvider: function(ScheduleList, generateList, ParentObject) { // include name of parent resource in listTitle - ScheduleList.listTitle = `${ParentObject.name}
` + N_('Schedules'); + ScheduleList.listTitle = `${ParentObject.name}
` + N_('SCHEDULES'); let html = generateList.build({ list: ScheduleList, mode: 'edit' diff --git a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html index 581e34d0c2..a4704cc3de 100644 --- a/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html +++ b/awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html @@ -1,7 +1,7 @@
-
{{ schedulerName || "Add Schedule"}}
-
{{ schedulerName || "Edit Schedule"}}
+
{{ schedulerName || "ADD SCHEDULE"}}
+
{{ schedulerName || "EDIT SCHEDULE"}}