External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-24 12:25:01 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100 from marshmalien/ux/fix/orgs

Browse Source 
Fix UX items related to Organizations
This commit is contained in:
Marliana Lara
2017-07-28 12:46:44 -04:00
committed by GitHub
parent 86fc441d68 a2563031f8
commit 103118b551
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
View File

@@ -104,6 +104,7 @@ export default [{
delete list.actions.add; delete list.actions.add;
// @issue Why is the delete action unavailable in this view? // @issue Why is the delete action unavailable in this view?
delete list.fieldActions.delete; delete list.fieldActions.delete;
list.listTitle = N_('Teams') + ` | {{ name }}`;
list.basePath = `${GetBasePath('organizations')}${$stateParams.organization_id}/teams`; list.basePath = `${GetBasePath('organizations')}${$stateParams.organization_id}/teams`;
list.emptyListText = "This list is populated by teams added from the&nbsp;<a ui-sref='teams.add'>Teams</a>&nbsp;section"; list.emptyListText = "This list is populated by teams added from the&nbsp;<a ui-sref='teams.add'>Teams</a>&nbsp;section";
return list; return list;
@@ -149,6 +150,8 @@ export default [{
delete list.actions.add; delete list.actions.add;
// @issue Why is the delete action unavailable in this view? // @issue Why is the delete action unavailable in this view?
delete list.fieldActions.delete; delete list.fieldActions.delete;
list.title = true;
list.listTitle = N_('Inventories') + ` | {{ name }}`;
list.basePath = `${GetBasePath('organizations')}${$stateParams.organization_id}/inventories`; list.basePath = `${GetBasePath('organizations')}${$stateParams.organization_id}/inventories`;
list.emptyListText = "This list is populated by inventories added from the&nbsp;<a ui-sref='inventories.add'>Inventories</a>&nbsp;section"; list.emptyListText = "This list is populated by inventories added from the&nbsp;<a ui-sref='inventories.add'>Inventories</a>&nbsp;section";
return list; return list;
@@ -199,6 +202,7 @@ export default [{
delete list.actions; delete list.actions;
// @issue Why is the delete action unavailable in this view? // @issue Why is the delete action unavailable in this view?
delete list.fieldActions.delete; delete list.fieldActions.delete;
list.listTitle = N_('Projects') + ` | {{ name }}`;
list.basePath = `${GetBasePath('organizations')}${$stateParams.organization_id}/projects`; list.basePath = `${GetBasePath('organizations')}${$stateParams.organization_id}/projects`;
list.emptyListText = "This list is populated by projects added from the&nbsp;<a ui-sref='projects.add'>Projects</a>&nbsp;section"; list.emptyListText = "This list is populated by projects added from the&nbsp;<a ui-sref='projects.add'>Projects</a>&nbsp;section";
return list; return list;
@@ -259,7 +263,7 @@ export default [{
// @issue Why is the delete action unavailable in this view? // @issue Why is the delete action unavailable in this view?
delete list.fieldActions.delete; delete list.fieldActions.delete;
delete list.fields.type; delete list.fields.type;
list.listTitle = N_('Job Templates'); list.listTitle = N_('Job Templates') + ` | {{ name }}`;
list.emptyListText = "This list is populated by job templates added from the&nbsp;<a ui-sref='templates.addJobTemplate'>Job Templates</a>&nbsp;section"; list.emptyListText = "This list is populated by job templates added from the&nbsp;<a ui-sref='templates.addJobTemplate'>Job Templates</a>&nbsp;section";
list.iterator = 'template'; list.iterator = 'template';
list.name = 'job_templates'; list.name = 'job_templates';
@@ -344,7 +348,7 @@ export default [{
ngClick: 'addUsers()' ngClick: 'addUsers()'
} }
}; };
list.listTitle = 'Admins'; list.listTitle = N_('Admins') + ` | {{ name }}`;
return list; return list;
}] }]
} }

3
awx/ui/client/src/organizations/list/organizations-list.partial.html
View File

@@ -52,7 +52,8 @@
ng-repeat="card in orgCards track by card.id"> ng-repeat="card in orgCards track by card.id">
<div class="OrgCards-header"> <div class="OrgCards-header">
<h3 class="OrgCards-label" <h3 class="OrgCards-label"
aw-tool-tip="{{ (card.description || 'Place organization description here') | sanitize }}" ng-click="editOrganization(card.id)"
aw-tool-tip="{{ (card.description || '') | sanitize }}"
aw-tip-placement="top"> aw-tip-placement="top">
{{ card.name }} {{ card.name }}
</h3> </h3>

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

@@ -54,6 +54,7 @@
} }
.OrgCards-label { .OrgCards-label {
cursor: pointer;
margin-top: 0px; margin-top: 0px;
font-size: 14px; font-size: 14px;
height: 17px; height: 17px;