shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-28 10:55:30 +03:00
Code Releases Activity

Removed uppercasing from resource names in titles

Browse Source
This commit is contained in:
Michael Abashian 2017-03-08 17:35:20 -05:00
parent 3679e9b00c
commit d65d505862
63 changed files with 77 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/legacy-styles/forms.less
View File

@ -40,7 +40,6 @@
.Form-title{ .Form-title{
flex: 0 1 auto; flex: 0 1 auto;
text-transform: uppercase;
color: @list-header-txt; color: @list-header-txt;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
@ -50,6 +49,10 @@
margin-bottom: 20px; margin-bottom: 20px;
} }
.Form-title--uppercase {
text-transform: uppercase;
}
.Form-secondaryTitle{ .Form-secondaryTitle{
color: @default-icon; color: @default-icon;
padding-bottom: 20px; padding-bottom: 20px;

1
awx/ui/client/legacy-styles/lists.less
View File

@ -147,7 +147,6 @@ table, tbody {
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
margin-right: 10px; margin-right: 10px;
text-transform: uppercase;
} }
.List-actionHolder { .List-actionHolder {

2
awx/ui/client/src/configuration/configuration.partial.html
View File

@ -7,7 +7,7 @@
<div class="tab-pane" id="configuration-panel"> <div class="tab-pane" id="configuration-panel">
<div ng-cloak id="htmlTemplate" class="Panel"> <div ng-cloak id="htmlTemplate" class="Panel">
<div class="Form-header"> <div class="Form-header">
<div class="Form-title" translate>Configure Tower</div> <div class="Form-title" translate>CONFIGURE TOWER</div>
</div> </div>
<div class="row Form-tabRow"> <div class="row Form-tabRow">
<div class="col-lg-12"> <div class="col-lg-12">

4
awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js
View File

@ -10,8 +10,8 @@ export default [ 'i18n', function(i18n){
name: 'hosts', name: 'hosts',
iterator: 'host', iterator: 'host',
selectTitle: i18n._('Add Existing Hosts'), selectTitle: i18n._('Add Existing Hosts'),
editTitle: i18n._('Hosts'), editTitle: i18n._('HOSTS'),
listTitle: i18n._('Hosts'), listTitle: i18n._('HOSTS'),
index: false, index: false,
hover: true, hover: true,
well: true, well: true,

2
awx/ui/client/src/forms/ActivityDetail.js
View File

@ -22,7 +22,7 @@ export default
return { return {
name: 'activity', name: 'activity',
editTitle: i18n._('Activity Detail'), editTitle: i18n._('ACTIVITY DETAIL'),
well: false, well: false,
'class': 'horizontal-narrow', 'class': 'horizontal-narrow',
formFieldSize: 'col-lg-10', formFieldSize: 'col-lg-10',

2
awx/ui/client/src/forms/Credentials.js
View File

@ -15,7 +15,7 @@ export default
.factory('CredentialForm', ['i18n', function(i18n) { .factory('CredentialForm', ['i18n', function(i18n) {
return { return {
addTitle: i18n._('Create Credential'), //Legend in add mode addTitle: i18n._('CREATE CREDENTIAL'), //Legend in add mode
editTitle: '{{ name }}', //Legend in edit mode editTitle: '{{ name }}', //Legend in edit mode
name: 'credential', name: 'credential',
// the top-most node of generated state tree // the top-most node of generated state tree

2
awx/ui/client/src/forms/Groups.js
View File

@ -14,7 +14,7 @@ export default
angular.module('GroupFormDefinition', []) angular.module('GroupFormDefinition', [])
.value('GroupFormObject', { .value('GroupFormObject', {
addTitle: 'Create Group', addTitle: 'CREATE GROUP',
editTitle: '{{ name }}', editTitle: '{{ name }}',
showTitle: true, showTitle: true,
name: 'group', name: 'group',

2
awx/ui/client/src/forms/HostGroups.js
View File

@ -14,7 +14,7 @@ export default
angular.module('HostGroupsFormDefinition', []) angular.module('HostGroupsFormDefinition', [])
.value('HostGroupsForm', { .value('HostGroupsForm', {
editTitle: 'Host Groups', editTitle: 'HOST GROUPS',
name: 'host', name: 'host',
well: false, well: false,
formLabelSize: 'col-lg-3', formLabelSize: 'col-lg-3',

2
awx/ui/client/src/forms/Hosts.js
View File

@ -15,7 +15,7 @@ export default
.factory('HostForm', ['i18n', function(i18n) { .factory('HostForm', ['i18n', function(i18n) {
return { return {
addTitle: i18n._('Create Host'), addTitle: i18n._('CREATE HOST'),
editTitle: '{{ host.name }}', editTitle: '{{ host.name }}',
name: 'host', name: 'host',
basePath: 'hosts', basePath: 'hosts',

2
awx/ui/client/src/forms/Inventories.js
View File

@ -15,7 +15,7 @@ angular.module('InventoryFormDefinition', [])
.factory('InventoryForm', ['i18n', function(i18n) { .factory('InventoryForm', ['i18n', function(i18n) {
return { return {
addTitle: i18n._('New Inventory'), addTitle: i18n._('NEW INVENTORY'),
editTitle: '{{ inventory_name }}', editTitle: '{{ inventory_name }}',
name: 'inventory', name: 'inventory',
basePath: 'inventory', basePath: 'inventory',

2
awx/ui/client/src/forms/InventoryStatus.js
View File

@ -14,7 +14,7 @@ export default
.value('InventoryStatusForm', { .value('InventoryStatusForm', {
name: 'inventory_update', name: 'inventory_update',
editTitle: 'Inventory Status', editTitle: 'INVENTORY STATUS',
well: false, well: false,
'class': 'horizontal-narrow', 'class': 'horizontal-narrow',

2
awx/ui/client/src/forms/JobTemplates.js
View File

@ -17,7 +17,7 @@ export default
.factory('JobTemplateFormObject', ['i18n', function(i18n) { .factory('JobTemplateFormObject', ['i18n', function(i18n) {
return { return {
addTitle: i18n._('New Job Template'), addTitle: i18n._('NEW JOB TEMPLATE'),
editTitle: '{{ name }}', editTitle: '{{ name }}',
name: 'job_template', name: 'job_template',
breadcrumbName: i18n._('JOB TEMPLATE'), breadcrumbName: i18n._('JOB TEMPLATE'),

2
awx/ui/client/src/forms/Organizations.js
View File

@ -15,7 +15,7 @@ export default
.factory('OrganizationFormObject', ['i18n', function(i18n) { .factory('OrganizationFormObject', ['i18n', function(i18n) {
return { return {
addTitle: i18n._('New Organization'), //Title in add mode addTitle: i18n._('NEW ORGANIZATION'), //Title in add mode
editTitle: '{{ name }}', //Title in edit mode editTitle: '{{ name }}', //Title in edit mode
name: 'organization', //entity or model name in singular form name: 'organization', //entity or model name in singular form
stateTree: 'organizations', stateTree: 'organizations',

2
awx/ui/client/src/forms/ProjectStatus.js
View File

@ -15,7 +15,7 @@ export default
.value('ProjectStatusForm', { .value('ProjectStatusForm', {
name: 'project_update', name: 'project_update',
editTitle: 'SCM Status', editTitle: 'SCM STATUS',
well: false, well: false,
'class': 'horizontal-narrow', 'class': 'horizontal-narrow',

2
awx/ui/client/src/forms/Projects.js
View File

@ -15,7 +15,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
.factory('ProjectsFormObject', ['i18n', function(i18n) { .factory('ProjectsFormObject', ['i18n', function(i18n) {
return { return {
addTitle: i18n._('New Project'), addTitle: i18n._('NEW PROJECT'),
editTitle: '{{ name }}', editTitle: '{{ name }}',
name: 'project', name: 'project',
basePath: 'projects', basePath: 'projects',

2
awx/ui/client/src/forms/Teams.js
View File

@ -15,7 +15,7 @@ export default
.factory('TeamForm', ['i18n', function(i18n) { .factory('TeamForm', ['i18n', function(i18n) {
return { return {
addTitle: i18n._('New Team'), //Legend in add mode addTitle: i18n._('NEW TEAM'), //Legend in add mode
editTitle: '{{ name }}', //Legend in edit mode editTitle: '{{ name }}', //Legend in edit mode
name: 'team', name: 'team',
// the top-most node of generated state tree // the top-most node of generated state tree

2
awx/ui/client/src/forms/Users.js
View File

@ -15,7 +15,7 @@ export default
.factory('UserForm', ['i18n', function(i18n) { .factory('UserForm', ['i18n', function(i18n) {
return { return {
addTitle: i18n._('New User'), addTitle: i18n._('NEW USER'),
editTitle: '{{ username }}', editTitle: '{{ username }}',
name: 'user', name: 'user',
// the top-most node of generated state tree // the top-most node of generated state tree

2
awx/ui/client/src/forms/Workflows.js
View File

@ -16,7 +16,7 @@ export default
.factory('WorkflowFormObject', ['i18n', function(i18n) { .factory('WorkflowFormObject', ['i18n', function(i18n) {
return { return {
addTitle: i18n._('New Workflow Job Template'), addTitle: i18n._('NEW WORKFLOW JOB TEMPLATE'),
editTitle: '{{ name }}', editTitle: '{{ name }}',
name: 'workflow_job_template', name: 'workflow_job_template',
breadcrumbName: i18n._('WORKFLOW'), breadcrumbName: i18n._('WORKFLOW'),

2
awx/ui/client/src/inventories/main.js
View File

@ -97,7 +97,7 @@ angular.module('inventory', [
'@': { '@': {
templateProvider: function(ScheduleList, generateList, ParentObject) { templateProvider: function(ScheduleList, generateList, ParentObject) {
// include name of parent resource in listTitle // include name of parent resource in listTitle
ScheduleList.listTitle = `${ParentObject.name}<div class='List-titleLockup'></div>` + N_('Schedules'); ScheduleList.listTitle = `${ParentObject.name}<div class='List-titleLockup'></div>` + N_('SCHEDULES');
let html = generateList.build({ let html = generateList.build({
list: ScheduleList, list: ScheduleList,
mode: 'edit' mode: 'edit'

2
awx/ui/client/src/inventories/manage/adhoc/adhoc.form.js
View File

@ -12,7 +12,7 @@
export default function() { export default function() {
return { return {
addTitle: 'Execute Command', addTitle: 'EXECUTE COMMAND',
name: 'adhoc', name: 'adhoc',
well: true, well: true,
forceListeners: true, forceListeners: true,

2
awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
View File

@ -13,7 +13,7 @@
export default ['i18n', function(i18n) { export default ['i18n', function(i18n) {
return { return {
addTitle: i18n._('New Custom Inventory'), addTitle: i18n._('NEW CUSTOM INVENTORY'),
editTitle: '{{ name }}', editTitle: '{{ name }}',
name: 'inventory_script', name: 'inventory_script',
basePath: 'inventory_scripts', basePath: 'inventory_scripts',

2
awx/ui/client/src/inventory-scripts/inventory-scripts.list.js
View File

@ -9,7 +9,7 @@
export default ['i18n', function(i18n){ export default ['i18n', function(i18n){
return { return {
name: 'inventory_scripts' , name: 'inventory_scripts' ,
listTitle: i18n._('Inventory Scripts'), listTitle: i18n._('INVENTORY SCRIPTS'),
iterator: 'inventory_script', iterator: 'inventory_script',
index: false, index: false,
hover: false, hover: false,

1
awx/ui/client/src/job-detail/job-detail.block.less
View File

@ -57,7 +57,6 @@
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
margin-right: 10px; margin-right: 10px;
text-transform: uppercase;
} }
.JobDetail-panelHeaderText:hover{ .JobDetail-panelHeaderText:hover{

1
awx/ui/client/src/job-submission/job-submission.block.less
View File

@ -37,7 +37,6 @@
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
margin-right: 10px; margin-right: 10px;
text-transform: uppercase;
} }
.JobSubmission-titleLockup { .JobSubmission-titleLockup {
margin-left: 4px; margin-left: 4px;

2
awx/ui/client/src/lists/AllJobs.js
View File

@ -13,7 +13,7 @@ export default
name: 'jobs', name: 'jobs',
basePath: 'unified_jobs', basePath: 'unified_jobs',
iterator: 'job', iterator: 'job',
editTitle: i18n._('All Jobs'), editTitle: i18n._('ALL JOBS'),
index: false, index: false,
hover: true, hover: true,
well: false, well: false,

2
awx/ui/client/src/lists/CloudCredentials.js
View File

@ -14,7 +14,7 @@ export default
name: 'cloudcredentials', name: 'cloudcredentials',
iterator: 'cloudcredential', iterator: 'cloudcredential',
selectTitle: 'Add Cloud Credentials', selectTitle: 'Add Cloud Credentials',
editTitle: 'Cloud Credentials', editTitle: 'CLOUD CREDENTIALS',
selectInstructions: '<p>Select existing credentials by clicking each credential or checking the related checkbox. When finished, click the blue ' + selectInstructions: '<p>Select existing credentials by clicking each credential or checking the related checkbox. When finished, click the blue ' +
'<em>Select</em> button, located bottom right.</p> <p>Create a brand new credential by clicking the <i class=\"fa fa-plus"></i> button.</p>', '<em>Select</em> button, located bottom right.</p> <p>Create a brand new credential by clicking the <i class=\"fa fa-plus"></i> button.</p>',
index: false, index: false,

2
awx/ui/client/src/lists/CompletedJobs.js
View File

@ -15,7 +15,7 @@ export default
name: 'completed_jobs', 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', 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', iterator: 'completed_job',
editTitle: i18n._('Completed Jobs'), editTitle: i18n._('COMPLETED JOBS'),
index: false, index: false,
hover: true, hover: true,
well: false, well: false,

4
awx/ui/client/src/lists/Credentials.js
View File

@ -15,8 +15,8 @@ export default
name: 'credentials', name: 'credentials',
iterator: 'credential', iterator: 'credential',
selectTitle: i18n._('Add Credentials'), selectTitle: i18n._('Add Credentials'),
editTitle: i18n._('Credentials'), editTitle: i18n._('CREDENTIALS'),
listTitle: i18n._('Credentials'), listTitle: i18n._('CREDENTIALS'),
selectInstructions: "<p>Select existing credentials by clicking each credential or checking the related checkbox. When " + selectInstructions: "<p>Select existing credentials by clicking each credential or checking the related checkbox. When " +
"finished, click the blue <em>Select</em> button, located bottom right.</p> <p>Create a brand new credential by clicking ", "finished, click the blue <em>Select</em> button, located bottom right.</p> <p>Create a brand new credential by clicking ",
index: false, index: false,

4
awx/ui/client/src/lists/Inventories.js
View File

@ -13,8 +13,8 @@ export default
name: 'inventories', name: 'inventories',
iterator: 'inventory', iterator: 'inventory',
selectTitle: i18n._('Add Inventories'), selectTitle: i18n._('Add Inventories'),
editTitle: i18n._('Inventories'), editTitle: i18n._('INVENTORIES'),
listTitle: 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."), "<i class=\"icon-plus\"></i> "), 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."), "<i class=\"icon-plus\"></i> "),
index: false, index: false,
hover: true, hover: true,

2
awx/ui/client/src/lists/InventoryGroups.js
View File

@ -11,7 +11,7 @@ export default
name: 'groups', name: 'groups',
iterator: 'group', iterator: 'group',
editTitle: '{{ inventory.name }}', editTitle: '{{ inventory.name }}',
listTitle: 'Groups', listTitle: 'GROUPS',
searchSize: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', searchSize: 'col-lg-12 col-md-12 col-sm-12 col-xs-12',
showTitle: false, showTitle: false,
well: true, well: true,

2
awx/ui/client/src/lists/InventoryHosts.js
View File

@ -11,7 +11,7 @@ export default
name: 'hosts', name: 'hosts',
iterator: 'host', iterator: 'host',
editTitle: '{{ selected_group }}', editTitle: '{{ selected_group }}',
listTitle: 'Hosts', listTitle: 'HOSTS',
searchSize: 'col-lg-12 col-md-12 col-sm-12 col-xs-12', searchSize: 'col-lg-12 col-md-12 col-sm-12 col-xs-12',
showTitle: false, showTitle: false,
well: true, well: true,

2
awx/ui/client/src/lists/InventorySources.js
View File

@ -12,7 +12,7 @@ export default
name: 'workflow_inventory_sources', name: 'workflow_inventory_sources',
iterator: 'inventory_source', iterator: 'inventory_source',
basePath: 'inventory_sources', basePath: 'inventory_sources',
listTitle: 'Inventory Sources', listTitle: 'INVENTORY SOURCES',
index: false, index: false,
hover: true, hover: true,

2
awx/ui/client/src/lists/JobEvents.js
View File

@ -12,7 +12,7 @@ export default
name: 'jobevents', name: 'jobevents',
iterator: 'jobevent', iterator: 'jobevent',
editTitle: i18n._('Job Events'), editTitle: i18n._('JOB EVENTS'),
index: false, index: false,
hover: true, hover: true,
"class": "condensed", "class": "condensed",

2
awx/ui/client/src/lists/JobHosts.js
View File

@ -11,7 +11,7 @@ export default
name: 'jobhosts', name: 'jobhosts',
iterator: 'jobhost', iterator: 'jobhost',
editTitle: 'All summaries', editTitle: 'ALL SUMMARIES',
"class": "table-condensed", "class": "table-condensed",
index: false, index: false,
hover: true, hover: true,

2
awx/ui/client/src/lists/Jobs.js
View File

@ -11,7 +11,7 @@ export default
name: 'jobs', name: 'jobs',
iterator: 'job', iterator: 'job',
editTitle: 'Jobs', editTitle: 'JOBS',
'class': 'table-condensed', 'class': 'table-condensed',
index: false, index: false,
hover: true, hover: true,

2
awx/ui/client/src/lists/Organizations.js
View File

@ -15,7 +15,7 @@ export default
selectInstructions: '<p>Select existing organizations by clicking each organization or checking the related checkbox. When finished, ' + selectInstructions: '<p>Select existing organizations by clicking each organization or checking the related checkbox. When finished, ' +
'click the blue <em>Select</em> button, located bottom right.</p><p>Create a new organization by clicking the ' + 'click the blue <em>Select</em> button, located bottom right.</p><p>Create a new organization by clicking the ' +
'<i class=\"fa fa-plus\"></i> button.</p>', '<i class=\"fa fa-plus\"></i> button.</p>',
editTitle: 'Organizations', editTitle: 'ORGANIZATIONS',
hover: true, hover: true,
index: false, index: false,

4
awx/ui/client/src/lists/PortalJobTemplates.js
View File

@ -12,8 +12,8 @@ export default
name: 'job_templates', name: 'job_templates',
iterator: 'job_template', iterator: 'job_template',
editTitle: i18n._('Job Templates'), editTitle: i18n._('JOB TEMPLATES'),
listTitle: i18n._('Job Templates'), listTitle: i18n._('JOB TEMPLATES'),
index: false, index: false,
hover: true, hover: true,
well: true, well: true,

4
awx/ui/client/src/lists/PortalJobs.js
View File

@ -12,11 +12,11 @@ export default
name: 'jobs', name: 'jobs',
iterator: 'job', iterator: 'job',
editTitle: i18n._('Jobs'), editTitle: i18n._('JOBS'),
index: false, index: false,
hover: true, hover: true,
well: true, well: true,
listTitle: i18n._('Jobs'), listTitle: i18n._('JOBS'),
emptyListText: i18n._('There are no jobs to display at this time'), emptyListText: i18n._('There are no jobs to display at this time'),
fields: { fields: {

4
awx/ui/client/src/lists/Projects.js
View File

@ -13,8 +13,8 @@ export default
iterator: 'project', iterator: 'project',
basePath: 'projects', basePath: 'projects',
selectTitle: i18n._('Add Project'), selectTitle: i18n._('Add Project'),
editTitle: i18n._('Projects'), editTitle: i18n._('PROJECTS'),
listTitle: i18n._('Projects'), listTitle: i18n._('PROJECTS'),
selectInstructions: '<p>Select existing projects by clicking each project or checking the related checkbox. When finished, click the blue ' + selectInstructions: '<p>Select existing projects by clicking each project or checking the related checkbox. When finished, click the blue ' +
'<em>Select</em> button, located bottom right.</p><p>Create a new project by clicking the <i class=\"fa fa-plus\"></i> button.</p>', '<em>Select</em> button, located bottom right.</p><p>Create a new project by clicking the <i class=\"fa fa-plus\"></i> button.</p>',
index: false, index: false,

2
awx/ui/client/src/lists/ScheduledJobs.js
View File

@ -12,7 +12,7 @@ export default
name: 'schedules', name: 'schedules',
iterator: 'schedule', iterator: 'schedule',
editTitle: i18n._('Scheduled Jobs'), editTitle: i18n._('SCHEDULED JOBS'),
hover: true, hover: true,
well: false, well: false,
emptyListText: i18n._('No schedules exist'), emptyListText: i18n._('No schedules exist'),

4
awx/ui/client/src/lists/Schedules.js
View File

@ -13,8 +13,8 @@ export default
name: 'schedules', name: 'schedules',
iterator: 'schedule', iterator: 'schedule',
selectTitle: '', selectTitle: '',
editTitle: 'Schedules', editTitle: 'SCHEDULES',
listTitle: '{{parentObject}} || Schedules', listTitle: '{{parentObject}} || SCHEDULES',
index: false, index: false,
hover: true, hover: true,

4
awx/ui/client/src/lists/Streams.js
View File

@ -13,8 +13,8 @@ export default
name: 'activities', name: 'activities',
iterator: 'activity', iterator: 'activity',
basePath: 'activity_stream', basePath: 'activity_stream',
editTitle: i18n._('Activity Stream'), editTitle: i18n._('ACTIVITY STREAM'),
listTitle: i18n._('Activity Stream') + '<span ng-show="streamSubTitle"><div class="List-titleLockup"></div>{{streamSubTitle}}<span>', listTitle: i18n._('ACTIVITY STREAM') + '<span ng-show="streamSubTitle"><div class="List-titleLockup"></div>{{streamSubTitle}}<span>',
listTitleBadge: false, listTitleBadge: false,
emptyListText: i18n._('There are no events to display at this time'), emptyListText: i18n._('There are no events to display at this time'),
selectInstructions: '', selectInstructions: '',

4
awx/ui/client/src/lists/Teams.js
View File

@ -13,8 +13,8 @@ export default
name: 'teams', name: 'teams',
iterator: 'team', iterator: 'team',
selectTitle: i18n._('Add Team'), selectTitle: i18n._('Add Team'),
editTitle: i18n._('Teams'), editTitle: i18n._('TEAMS'),
listTitle: 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."), "<i class=\"icon-plus\"></i> "), 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."), "<i class=\"icon-plus\"></i> "),
index: false, index: false,
hover: true, hover: true,

4
awx/ui/client/src/lists/Templates.js
View File

@ -14,8 +14,8 @@ export default
iterator: 'template', iterator: 'template',
basePath: 'unified_job_templates', basePath: 'unified_job_templates',
selectTitle: i18n._('Template'), selectTitle: i18n._('Template'),
editTitle: i18n._('Templates'), editTitle: i18n._('TEMPLATES'),
listTitle: 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."), "<i class=\"icon-plus\"></i> "), 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."), "<i class=\"icon-plus\"></i> "),
index: false, index: false,
hover: true, hover: true,

4
awx/ui/client/src/lists/Users.js
View File

@ -17,8 +17,8 @@ export default
}, },
iterator: 'user', iterator: 'user',
selectTitle: i18n._('Add Users'), selectTitle: i18n._('Add Users'),
editTitle: i18n._('Users'), editTitle: i18n._('USERS'),
listTitle: i18n._('Users'), listTitle: i18n._('USERS'),
selectInstructions: '<p>Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' + selectInstructions: '<p>Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' +
'<em>Select</em> button, located bottom right.</p> <p>When available, a brand new user can be created by clicking the ' + '<em>Select</em> button, located bottom right.</p> <p>When available, a brand new user can be created by clicking the ' +
'<i class=\"fa fa-plus\"></i> button.</p>', '<i class=\"fa fa-plus\"></i> button.</p>',

2
awx/ui/client/src/management-jobs/card/card.partial.html
View File

@ -2,7 +2,7 @@
<div class="tab-pane Panel" id="management_jobs"> <div class="tab-pane Panel" id="management_jobs">
<div class="List-title"> <div class="List-title">
<div class="List-titleText" translate> <div class="List-titleText" translate>
Management Jobs MANAGEMENT JOBS
</div> </div>
<span class="badge List-titleBadge ng-binding"> <span class="badge List-titleBadge ng-binding">
{{ mgmtCards.length }} {{ mgmtCards.length }}

1
awx/ui/client/src/management-jobs/card/mgmtcards.block.less
View File

@ -39,7 +39,6 @@
.MgmtCards-label { .MgmtCards-label {
margin-top: 0px; margin-top: 0px;
text-transform: uppercase;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
color: @default-interface-txt; color: @default-interface-txt;

2
awx/ui/client/src/management-jobs/management-jobs.list.js
View File

@ -10,7 +10,7 @@ export default function(){
iterator: 'configure_job', iterator: 'configure_job',
index: false, index: false,
hover: true, hover: true,
listTitle: 'Management Jobs', listTitle: 'MANAGEMENT JOBS',
fields: { fields: {
name: { name: {

2
awx/ui/client/src/management-jobs/scheduler/main.js
View File

@ -29,7 +29,7 @@ angular.module('managementJobScheduler', [])
'@': { '@': {
templateProvider: function(ScheduleList, generateList, ParentObject) { templateProvider: function(ScheduleList, generateList, ParentObject) {
// include name of parent resource in listTitle // include name of parent resource in listTitle
ScheduleList.listTitle = `${ParentObject.name}<div class='List-titleLockup'></div>` + N_('Schedules'); ScheduleList.listTitle = `${ParentObject.name}<div class='List-titleLockup'></div>` + N_('SCHEDULES');
let html = generateList.build({ let html = generateList.build({
list: ScheduleList, list: ScheduleList,
mode: 'edit' mode: 'edit'

4
awx/ui/client/src/management-jobs/scheduler/schedulerForm.partial.html
View File

@ -1,7 +1,7 @@
<div id="htmlTemplate" class=" SchedulerFormPanel Panel" ng-hide="hideForm"> <div id="htmlTemplate" class=" SchedulerFormPanel Panel" ng-hide="hideForm">
<div class="Form-header"> <div class="Form-header">
<div class="Form-title" ng-show="!isEdit">{{ schedulerName || "Add Schedule"}}</div> <div class="Form-title" ng-show="!isEdit">{{ schedulerName || "ADD SCHEDULE"}}</div>
<div class="Form-title" ng-show="isEdit">{{ schedulerName || "Edit Schedule"}}</div> <div class="Form-title" ng-show="isEdit">{{ schedulerName || "EDIT SCHEDULE"}}</div>
<div class="Form-header--fields"></div> <div class="Form-header--fields"></div>
<div class="Form-exitHolder"> <div class="Form-exitHolder">
<button class="Form-exit" ng-click="formCancel()"> <button class="Form-exit" ng-click="formCancel()">

2
awx/ui/client/src/notifications/notificationTemplates.form.js
View File

@ -13,7 +13,7 @@
export default ['i18n', function(i18n) { export default ['i18n', function(i18n) {
return { return {
addTitle: i18n._('New Notification Template'), addTitle: i18n._('NEW NOTIFICATION TEMPLATE'),
editTitle: '{{ name }}', editTitle: '{{ name }}',
name: 'notification_template', name: 'notification_template',
// I18N for "CREATE NOTIFICATION_TEMPLATE" // I18N for "CREATE NOTIFICATION_TEMPLATE"

2
awx/ui/client/src/notifications/notificationTemplates.list.js
View File

@ -11,7 +11,7 @@
export default ['i18n', function(i18n){ export default ['i18n', function(i18n){
return { return {
name: 'notification_templates' , name: 'notification_templates' ,
listTitle: i18n._('Notification Templates'), listTitle: i18n._('NOTIFICATION TEMPLATES'),
iterator: 'notification_template', iterator: 'notification_template',
index: false, index: false,
hover: false, hover: false,

2
awx/ui/client/src/organizations/linkout/addUsers/addUsers.partial.html
View File

@ -5,7 +5,7 @@
<div class="AddUsers-header"> <div class="AddUsers-header">
<div class="List-header"> <div class="List-header">
<div class="List-title"> <div class="List-title">
<div class="List-titleText ng-binding">{{ $parent.organization_name }}<div class="List-titleLockup"></div><span translate>Add</span> {{ addType | capitalize}} <div class="List-titleText ng-binding">{{ $parent.organization_name }}<div class="List-titleLockup"></div><span translate>ADD</span> {{ addType | capitalize}}
</div> </div>
</div> </div>
<div class="Form-exitHolder"> <div class="Form-exitHolder">

2
awx/ui/client/src/organizations/orgcards.block.less
View File

@ -58,8 +58,8 @@
.OrgCards-label { .OrgCards-label {
margin-top: 0px; margin-top: 0px;
text-transform: uppercase;
font-size: 14px; font-size: 14px;
height: 17px;
font-weight: bold; font-weight: bold;
color: @default-interface-txt; color: @default-interface-txt;
margin-bottom: 25px; margin-bottom: 25px;

2
awx/ui/client/src/partials/organizations.html
View File

@ -4,7 +4,7 @@
<div class="List-header"> <div class="List-header">
<div class="List-title"> <div class="List-title">
<div class="List-titleText"> <div class="List-titleText">
organizations ORGANIZATIONS
</div> </div>
<span class="badge List-titleBadge"> <span class="badge List-titleBadge">
{{ orgCount }} {{ orgCount }}

6
awx/ui/client/src/scheduler/main.js
View File

@ -71,7 +71,7 @@ export default
'@': { '@': {
templateProvider: function(ScheduleList, generateList, ParentObject){ templateProvider: function(ScheduleList, generateList, ParentObject){
// include name of parent resource in listTitle // include name of parent resource in listTitle
ScheduleList.listTitle = `${ParentObject.name}<div class='List-titleLockup'></div>` + N_('Schedules'); ScheduleList.listTitle = `${ParentObject.name}<div class='List-titleLockup'></div>` + N_('SCHEDULES');
let html = generateList.build({ let html = generateList.build({
list: ScheduleList, list: ScheduleList,
mode: 'edit' mode: 'edit'
@ -164,7 +164,7 @@ export default
'@': { '@': {
templateProvider: function(ScheduleList, generateList, ParentObject){ templateProvider: function(ScheduleList, generateList, ParentObject){
// include name of parent resource in listTitle // include name of parent resource in listTitle
ScheduleList.listTitle = `${ParentObject.name}<div class='List-titleLockup'></div>` + N_('Schedules'); ScheduleList.listTitle = `${ParentObject.name}<div class='List-titleLockup'></div>` + N_('SCHEDULES');
let html = generateList.build({ let html = generateList.build({
list: ScheduleList, list: ScheduleList,
mode: 'edit' mode: 'edit'
@ -254,7 +254,7 @@ export default
'@': { '@': {
templateProvider: function(ScheduleList, generateList, ParentObject){ templateProvider: function(ScheduleList, generateList, ParentObject){
// include name of parent resource in listTitle // include name of parent resource in listTitle
ScheduleList.listTitle = `${ParentObject.name}<div class='List-titleLockup'></div>` + N_('Schedules'); ScheduleList.listTitle = `${ParentObject.name}<div class='List-titleLockup'></div>` + N_('SCHEDULES');
let html = generateList.build({ let html = generateList.build({
list: ScheduleList, list: ScheduleList,
mode: 'edit' mode: 'edit'

4
awx/ui/client/src/scheduler/schedulerForm.partial.html
View File

@ -1,7 +1,7 @@
<div id="htmlTemplate" class=" SchedulerFormPanel Panel" ng-hide="hideForm"> <div id="htmlTemplate" class=" SchedulerFormPanel Panel" ng-hide="hideForm">
<div class="Form-header"> <div class="Form-header">
<div class="Form-title" ng-show="!isEdit">{{ schedulerName || "Add Schedule"}}</div> <div class="Form-title" ng-show="!isEdit">{{ schedulerName || "ADD SCHEDULE"}}</div>
<div class="Form-title" ng-show="isEdit">{{ schedulerName || "Edit Schedule"}}</div> <div class="Form-title" ng-show="isEdit">{{ schedulerName || "EDIT SCHEDULE"}}</div>
<div class="Form-header--fields"></div> <div class="Form-header--fields"></div>
<div class="Form-exitHolder"> <div class="Form-exitHolder">
<button class="Form-exit" ng-click="formCancel()"> <button class="Form-exit" ng-click="formCancel()">

1
awx/ui/client/src/shared/layouts/one-plus-one.less
View File

@ -52,6 +52,5 @@
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
margin-right: 10px; margin-right: 10px;
text-transform: uppercase;
display: flex; display: flex;
} }

1
awx/ui/client/src/shared/layouts/one-plus-two.less
View File

@ -48,7 +48,6 @@
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
margin-right: 10px; margin-right: 10px;
text-transform: uppercase;
display: flex; display: flex;
} }

2
awx/ui/client/src/shared/lookup/lookup-modal.partial.html
View File

@ -2,7 +2,7 @@
<div class="modal-dialog"> <div class="modal-dialog">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header Form-header"> <div class="modal-header Form-header">
<div class="Form-title">Select {{list.iterator}}</div> <div class="Form-title Form-title--uppercase">Select {{list.iterator}}</div>
<!-- optional: transclude header fields --> <!-- optional: transclude header fields -->
<div class="Form-header--fields"></div> <div class="Form-header--fields"></div>
<div class="Form-exitHolder"> <div class="Form-exitHolder">

4
awx/ui/client/src/templates/survey-maker/shared/question-definition.form.js
View File

@ -13,8 +13,8 @@
export default export default
{ {
addTitle: 'Add Survey Prompt', addTitle: 'ADD SURVEY PROMPT',
editTitle: 'Edit Survey Prompt', editTitle: 'EDIT SURVEY PROMPT',
titleClass: 'Form-secondaryTitle', titleClass: 'Form-secondaryTitle',
base: 'survey_question', base: 'survey_question',
name: 'survey_question', name: 'survey_question',

1
awx/ui/client/src/templates/survey-maker/survey-maker.block.less
View File

@ -24,7 +24,6 @@
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
margin-right: 10px; margin-right: 10px;
text-transform: uppercase;
max-width: 75%; max-width: 75%;
} }
.SurveyMaker-titleLockup { .SurveyMaker-titleLockup {

1
awx/ui/client/src/templates/workflows/workflow-maker/workflow-maker.block.less
View File

@ -15,7 +15,6 @@
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
margin-right: 10px; margin-right: 10px;
text-transform: uppercase;
} }
.WorkflowMaker-exitHolder { .WorkflowMaker-exitHolder {
justify-content: flex-end; justify-content: flex-end;