External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 12:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

WIP - Show only two panels at a time

Browse Source
This commit is contained in:
Marliana Lara
2017-07-26 09:34:53 -04:00
parent 669cf79898
commit be39c483b4
5 changed files with 53 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,7 +258,7 @@ export default
}; };
$scope.configureSchedule = function(id) { $scope.configureSchedule = function(id) {
$state.transitionTo('managementJobSchedules', { $state.transitionTo('managementJobsList.schedule', {
id: id id: id
}); });
}; };

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

@@ -1,42 +1,45 @@
<div ui-view></div> <div class="tab-pane" id="management-jobs-panel">
<div class="tab-pane Panel" id="management_jobs"> <aw-limit-panels max-panels="2" panel-container="management-jobs-panel"></aw-limit-panels>
<div class="List-title"> <div ui-view></div>
<div class="List-titleText" translate> <div class="tab-pane Panel" id="management_jobs">
MANAGEMENT JOBS <div class="List-title">
</div> <div class="List-titleText" translate>
<span class="badge List-titleBadge ng-binding"> MANAGEMENT JOBS
{{ mgmtCards.length }}
</span>
</div>
<div class="MgmtCards">
<div class="MgmtCards-card"
ng-repeat="card in mgmtCards track by card.id" ng-class="{'MgmtCards-card--selected': activeCard === card.id}">
<!-- Begin Card Header -->
<div class="MgmtCards-header">
<h3 class="MgmtCards-label"> {{ card.name }}</h3>
<div class="MgmtCards-actionItems">
<button class="MgmtCards-actionItem List-actionButton"
ng-click='chooseRunJob(card.id, card.name)'
ng-show='current_user.is_superuser'
data-placement="top" aw-tool-tip="{{'Launch Management Job'|translate}}" data-original-title="" title="">
<i class="MgmtCards-actionItemIcon icon-launch"></i>
</button>
<button class="MgmtCards-actionItem List-actionButton"
ng-click='configureSchedule(card.id)'
data-placement="top" aw-tool-tip="{{'Schedule Management Job'|translate}}" data-original-title="" title="">
<i class="MgmtCards-actionItemIcon fa fa-calendar"></i>
</button>
<button class="MgmtCards-actionItem List-actionButton"
ng-click='goToNotifications(card, card.id)'
ng-show='current_user.is_superuser'
data-placement="top" aw-tool-tip="{{'Configure Notifications'|translate}}" data-original-title="" title="" ng-class="{'List-editButton--selected': activeCard === card.id && cardAction === 'notifications'}">
<i class="MgmtCards-actionItemIcon fa fa-bell-o"></i>
</button>
</div>
</div> </div>
<!-- End Card Header --> <span class="badge List-titleBadge ng-binding">
<!-- Begin Card Body --> {{ mgmtCards.length }}
<p>{{card.description || "Place organization description here"}}</p> </span>
<!-- End Card Body -->
</div> </div>
<div class="MgmtCards">
<div class="MgmtCards-card"
ng-repeat="card in mgmtCards track by card.id" ng-class="{'MgmtCards-card--selected': activeCard === card.id}">
<!-- Begin Card Header -->
<div class="MgmtCards-header">
<h3 class="MgmtCards-label"> {{ card.name }}</h3>
<div class="MgmtCards-actionItems">
<button class="MgmtCards-actionItem List-actionButton"
ng-click='chooseRunJob(card.id, card.name)'
ng-show='current_user.is_superuser'
data-placement="top" aw-tool-tip="{{'Launch Management Job'|translate}}" data-original-title="" title="">
<i class="MgmtCards-actionItemIcon icon-launch"></i>
</button>
<button class="MgmtCards-actionItem List-actionButton"
ng-click='configureSchedule(card.id)'
data-placement="top" aw-tool-tip="{{'Schedule Management Job'|translate}}" data-original-title="" title="">
<i class="MgmtCards-actionItemIcon fa fa-calendar"></i>
</button>
<button class="MgmtCards-actionItem List-actionButton"
ng-click='goToNotifications(card, card.id)'
ng-show='current_user.is_superuser'
data-placement="top" aw-tool-tip="{{'Configure Notifications'|translate}}" data-original-title="" title="" ng-class="{'List-editButton--selected': activeCard === card.id && cardAction === 'notifications'}">
<i class="MgmtCards-actionItemIcon fa fa-bell-o"></i>
</button>
</div>
</div>
<!-- End Card Header -->
<!-- Begin Card Body -->
<p>{{card.description || "Place organization description here"}}</p>
<!-- End Card Body -->
</div>
</div>
</div> </div>

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

@@ -19,14 +19,14 @@ angular.module('managementJobScheduler', [])
.run(['$stateExtender', function($stateExtender) { .run(['$stateExtender', function($stateExtender) {
$stateExtender.addState({ $stateExtender.addState({
searchPrefix: 'schedule', searchPrefix: 'schedule',
name: 'managementJobSchedules', name: 'managementJobsList.schedule',
route: '/management_jobs/:id/schedules', route: '/management_jobs/:id/schedules',
ncyBreadcrumb: { ncyBreadcrumb: {
parent: 'managementJobsList', parent: 'managementJobsList',
label: N_('SCHEDULES') label: N_('SCHEDULES')
}, },
views: { views: {
'@': { '@managementJobsList': {
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');
@@ -74,10 +74,10 @@ angular.module('managementJobScheduler', [])
} }
}); });
$stateExtender.addState({ $stateExtender.addState({
name: 'managementJobSchedules.add', name: 'managementJobsList.schedule.add',
route: '/add', route: '/add',
ncyBreadcrumb: { ncyBreadcrumb: {
parent: 'managementJobSchedules', parent: 'managementJobsList.schedule',
label: N_('CREATE SCHEDULED JOB') label: N_('CREATE SCHEDULED JOB')
}, },
views: { views: {
@@ -88,10 +88,10 @@ angular.module('managementJobScheduler', [])
} }
}); });
$stateExtender.addState({ $stateExtender.addState({
name: 'managementJobSchedules.edit', name: 'managementJobsList.schedule.edit',
route: '/edit/:schedule_id', route: '/edit/:schedule_id',
ncyBreadcrumb: { ncyBreadcrumb: {
parent: 'managementJobSchedules', parent: 'managementJobsList.schedule',
label: N_('EDIT SCHEDULED JOB') label: N_('EDIT SCHEDULED JOB')
}, },
views: { views: {

2
awx/ui/client/src/scheduler/schedulerEdit.controller.js
View File

@@ -91,7 +91,7 @@ function($filter, $state, $stateParams, EditSchedule, Wait, $scope, $rootScope,
}; };
// extra_data field is not manifested in the UI when scheduling a Management Job // extra_data field is not manifested in the UI when scheduling a Management Job
if ($state.current.name !== 'managementJobSchedules.add' && $state.current.name !== 'managementJobSchedules.edit'){ if ($state.current.name !== 'managementJobsList.schedule.add' && $state.current.name !== 'managementJobsList.schedule.edit'){
$scope.$on('ScheduleFound', function(){ $scope.$on('ScheduleFound', function(){
let readOnly = !$scope.schedule_obj.summary_fields.user_capabilities let readOnly = !$scope.schedule_obj.summary_fields.user_capabilities
.edit; .edit;

2
awx/ui/client/src/scheduler/schedulerList.controller.js
View File

@@ -183,7 +183,7 @@ export default [
case 'system_job': case 'system_job':
deferred.resolve({ deferred.resolve({
name: 'managementJobSchedules.edit', name: 'managementJobsList.schedule.edit',
params: { params: {
id: schedule.unified_job_template, id: schedule.unified_job_template,
schedule_id: schedule.id schedule_id: schedule.id