mirror of
https://github.com/ansible/awx.git
synced 2026-01-13 19:10:07 -03:30
Merge pull request #2051 from kensible/2009-UI-auditList
Updated audit items
This commit is contained in:
kensible
commit
240b35c8d4
@ -962,6 +962,10 @@ input[type="checkbox"].checkbox-no-label {
|
||||
.checkbox-inline, .radio-inline {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.checkbox-inline.stack-inline {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
|
||||
.checkbox-options {
|
||||
|
||||
@ -178,7 +178,7 @@
|
||||
|
||||
.Form-formGroup--checkbox{
|
||||
display: flex;
|
||||
align-items: flex-end;
|
||||
align-items: flex-start;
|
||||
}
|
||||
|
||||
.Form-subForm {
|
||||
@ -324,6 +324,12 @@
|
||||
|
||||
.select2-dropdown{
|
||||
border:1px solid @field-border;
|
||||
|
||||
}
|
||||
|
||||
.select2-container--open .select2-dropdown--below {
|
||||
margin-top: -1px;
|
||||
border-top: 1px solid @field-border;
|
||||
}
|
||||
|
||||
.Form-dropDown:focus{
|
||||
|
||||
@ -214,7 +214,7 @@
|
||||
}
|
||||
|
||||
#job-detail-container {
|
||||
|
||||
|
||||
.well {
|
||||
overflow: hidden;
|
||||
}
|
||||
@ -276,6 +276,8 @@
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
background-color: @white;
|
||||
min-height: 40px;
|
||||
|
||||
.row {
|
||||
border-top: 1px solid @grey;
|
||||
}
|
||||
@ -318,7 +320,7 @@
|
||||
|
||||
#play-section {
|
||||
.table-detail {
|
||||
height: 150px;
|
||||
min-height: 40px;
|
||||
}
|
||||
}
|
||||
|
||||
@ -421,7 +423,6 @@
|
||||
table-layout: fixed;
|
||||
}
|
||||
#hosts-table-detail {
|
||||
height: 150px;
|
||||
background-color: @white;
|
||||
}
|
||||
#hosts-table-detail table {
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
multiSelectExtended: true,
|
||||
index: false,
|
||||
hover: true,
|
||||
|
||||
emptyListText : 'No Teams exist',
|
||||
fields: {
|
||||
name: {
|
||||
key: true,
|
||||
label: 'name'
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
multiSelectExtended: true,
|
||||
index: false,
|
||||
hover: true,
|
||||
emptyListText : 'No Users exist',
|
||||
|
||||
fields: {
|
||||
first_name: {
|
||||
|
||||
@ -297,6 +297,10 @@ var tower = angular.module('Tower', [
|
||||
controller: ProjectsEdit,
|
||||
data: {
|
||||
activityStreamId: 'id'
|
||||
},
|
||||
ncyBreadcrumb: {
|
||||
parent: 'projects',
|
||||
label: 'EDIT PROJECT'
|
||||
}
|
||||
}).
|
||||
state('projectOrganizations', {
|
||||
@ -340,6 +344,10 @@ var tower = angular.module('Tower', [
|
||||
controller: TeamsEdit,
|
||||
data: {
|
||||
activityStreamId: 'team_id'
|
||||
},
|
||||
ncyBreadcrumb: {
|
||||
parent: "teams",
|
||||
label: "EDIT TEAM"
|
||||
}
|
||||
}).
|
||||
|
||||
|
||||
@ -118,6 +118,7 @@
|
||||
top: auto;
|
||||
box-shadow: none;
|
||||
text-transform: uppercase;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.DashboardGraphs-periodDropdown,
|
||||
|
||||
@ -246,7 +246,7 @@ export default
|
||||
rows: 10,
|
||||
awPopOver: "SSH key description",
|
||||
awPopOverWatch: "key_description",
|
||||
dataTitle: 'Help',
|
||||
dataTitle: 'Private Key',
|
||||
dataPlacement: 'right',
|
||||
dataContainer: "body",
|
||||
subForm: "credentialSubForm"
|
||||
|
||||
@ -204,7 +204,7 @@ export default
|
||||
},
|
||||
job_tags: {
|
||||
label: 'Job Tags',
|
||||
type: 'textarea',
|
||||
type: 'text',
|
||||
rows: 1,
|
||||
addRequired: false,
|
||||
editRequired: false,
|
||||
|
||||
@ -174,7 +174,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
|
||||
dataTitle: 'SCM Clean',
|
||||
dataContainer: 'body',
|
||||
dataPlacement: 'right',
|
||||
labelClass: 'checkbox-options'
|
||||
labelClass: 'checkbox-options stack-inline'
|
||||
}, {
|
||||
name: 'scm_delete_on_update',
|
||||
label: 'Delete on Update',
|
||||
@ -186,7 +186,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
|
||||
dataTitle: 'SCM Delete',
|
||||
dataContainer: 'body',
|
||||
dataPlacement: 'right',
|
||||
labelClass: 'checkbox-options'
|
||||
labelClass: 'checkbox-options stack-inline'
|
||||
}, {
|
||||
name: 'scm_update_on_launch',
|
||||
label: 'Update on Launch',
|
||||
@ -197,7 +197,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
|
||||
dataTitle: 'SCM Update',
|
||||
dataContainer: 'body',
|
||||
dataPlacement: 'right',
|
||||
labelClass: 'checkbox-options'
|
||||
labelClass: 'checkbox-options stack-inline'
|
||||
}]
|
||||
},
|
||||
scm_update_cache_timeout: {
|
||||
@ -273,7 +273,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
|
||||
}
|
||||
},
|
||||
notifications: {
|
||||
include: "NotificationsList"
|
||||
include: "NotificationsList",
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
@ -132,9 +132,10 @@ export default
|
||||
"delete": {
|
||||
label: 'Remove',
|
||||
ngClick: 'deletePermissionFromTeam(team_id, team_obj.name, role.name, role.summary_fields.resource_name, role.related.teams)',
|
||||
class: "List-actionButton--delete",
|
||||
'class': "List-actionButton--delete",
|
||||
iconClass: 'fa fa-times',
|
||||
awToolTip: 'Dissasociate permission from team'
|
||||
awToolTip: 'Dissasociate permission from team',
|
||||
dataPlacement: 'top'
|
||||
}
|
||||
},
|
||||
hideOnSuperuser: true
|
||||
|
||||
@ -138,6 +138,7 @@ export default
|
||||
iterator: 'team',
|
||||
open: false,
|
||||
index: false,
|
||||
suppressEmptyText: true,
|
||||
|
||||
actions: {},
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
</div>
|
||||
<div class="JobDetail-tableToggleContainer form-group">
|
||||
<div class="btn-group" >
|
||||
<button
|
||||
<button
|
||||
ng-click="setFilter('all')"
|
||||
class="JobDetail-tableToggle btn btn-xs" ng-class="{'btn-default': filter === 'failed', 'btn-primary': filter === 'all'}">All</button>
|
||||
<button ng-click="setFilter('failed')"
|
||||
@ -34,7 +34,7 @@
|
||||
</div>
|
||||
|
||||
<div id="hosts-summary-table" class="table-detail" lr-infinite-scroll="getNextPage" scroll-threshold="10" time-threshold="500">
|
||||
<table class="table">
|
||||
<table class="table" ng-class="{'JobDetails-table--noResults': hosts.length === 0}">
|
||||
<tbody>
|
||||
<tr class="List-tableRow" ng-repeat="host in hosts track by $index" id="{{ host.id }}" ng-class-even="'List-tableRow--evenRow'" ng-class-odd="'List-tableRow--oddRow'">
|
||||
<td class="List-tableCell name col-lg-6 col-md-6 col-sm-6 col-xs-6">
|
||||
|
||||
@ -13,9 +13,15 @@
|
||||
.JobDetail-instructions{
|
||||
color: @default-interface-txt;
|
||||
margin: 10px 0 10px 0;
|
||||
|
||||
.badge {
|
||||
background-color: @default-list-header-bg;
|
||||
color: @default-interface-txt;
|
||||
padding: 5px 7px;
|
||||
}
|
||||
}
|
||||
.JobDetail{
|
||||
.OnePlusOne-container(100%, @breakpoint-md);
|
||||
.OnePlusOne-container(100%, @breakpoint-md);
|
||||
}
|
||||
|
||||
.JobDetail-leftSide{
|
||||
@ -151,6 +157,10 @@
|
||||
background-color: @default-link;
|
||||
border: 1px solid @default-link;
|
||||
color: @default-bg;
|
||||
|
||||
&:hover {
|
||||
background-color: @default-link-hov;
|
||||
}
|
||||
}
|
||||
|
||||
.JobDetail-tableToggle--left{
|
||||
@ -185,6 +195,12 @@
|
||||
margin-left: -5px;
|
||||
}
|
||||
|
||||
.JobDetails-table--noResults {
|
||||
tr > td {
|
||||
border-top: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
.JobDetail-statusIcon--results{
|
||||
padding-left: 0px;
|
||||
padding-right: 10px;
|
||||
@ -200,3 +216,7 @@
|
||||
width:0px;
|
||||
padding-right: 0px;
|
||||
}
|
||||
|
||||
.JobDetail-leftSide.JobDetail-stdoutActionButton--active {
|
||||
margin-right: 0px;
|
||||
}
|
||||
|
||||
@ -667,21 +667,9 @@ export default
|
||||
|
||||
scope.lessStatus = false; // close the view more status option
|
||||
|
||||
// Detail table height adjusting. First, put page height back to 'normal'.
|
||||
$('#plays-table-detail').height(80);
|
||||
//$('#plays-table-detail').mCustomScrollbar("update");
|
||||
// $('#tasks-table-detail').height(120);
|
||||
//$('#tasks-table-detail').mCustomScrollbar("update");
|
||||
$('#hosts-table-detail').height(150);
|
||||
//$('#hosts-table-detail').mCustomScrollbar("update");
|
||||
|
||||
height = $(window).height() - $('#main-menu-container .navbar').outerHeight() -
|
||||
$('#job-detail-container').outerHeight() - 20;
|
||||
if (height > 15) {
|
||||
// there's a bunch of white space at the bottom, let's use it
|
||||
$('#plays-table-detail').height(80 + (height * 0.10));
|
||||
$('#tasks-table-detail').height(120 + (height * 0.20));
|
||||
$('#hosts-table-detail').height(150 + (height * 0.10));
|
||||
}
|
||||
scope.$emit('RefreshCompleted');
|
||||
};
|
||||
|
||||
|
||||
@ -189,7 +189,7 @@
|
||||
</div>
|
||||
|
||||
|
||||
<div id="plays-table-header" class="table-header">
|
||||
<div id="plays-table-header" class="table-header" ng-show="plays.length !== 0">
|
||||
<table class="table table-condensed">
|
||||
<thead>
|
||||
<tr>
|
||||
@ -202,7 +202,7 @@
|
||||
</div>
|
||||
<div id="plays-table-detail" class="table-detail" lr-infinite-scroll="playsScrollDown"
|
||||
scroll-threshold="10" time-threshold="500">
|
||||
<table class="table">
|
||||
<table class="table" ng-class="{'JobDetails-table--noResults': plays.length === 0}">
|
||||
<tbody>
|
||||
<tr class="List-tableRow cursor-pointer" ng-repeat="play in plays" ng-class-odd="'List-tableRow--oddRow'" ng-class-even="'List-tableRow--evenRow'" ng-class="play.playActiveClass" ng-click="selectPlay(play.id, $event)">
|
||||
<td class="List-tableCell col-lg-7 col-md-6 col-sm-6 col-xs-4 status-column" aw-tool-tip="{{ play.status_tip }}" data-tip-watch="play.status_tip" data-placement="top"><i class="JobDetail-statusIcon fa icon-job-{{ play.status }}"></i>{{ play.name }}</td>
|
||||
@ -248,7 +248,7 @@
|
||||
</div>
|
||||
|
||||
<div class="table-header">
|
||||
<table id="tasks-table-header" class="table table-condensed">
|
||||
<table id="tasks-table-header" class="table table-condensed" ng-show="taskList.length !== 0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="List-tableHeader col-lg-3 col-md-3 col-sm-6 col-xs-4">Tasks</th>
|
||||
@ -261,7 +261,7 @@
|
||||
</div>
|
||||
<div id="tasks-table-detail" class="table-detail" lr-infinite-scroll="tasksScrollDown"
|
||||
scroll-threshold="10" time-threshold="500">
|
||||
<table class="table">
|
||||
<table class="table" ng-class="{'JobDetails-table--noResults': taskList.length === 0}">
|
||||
<tbody>
|
||||
<tr class="List-tableRow cursor-pointer" ng-class-odd="'List-tableRow--oddRow'" ng-class-even="'List-tableRow--evenRow'" ng-repeat="task in taskList = (tasks) track by $index" ng-class="task.taskActiveClass" ng-click="selectTask(task.id)">
|
||||
<td class="List-tableCell col-lg-3 col-md-3 col-sm-6 col-xs-4 status-column" aw-tool-tip="{{ task.status_tip }}"
|
||||
@ -331,7 +331,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="table-header" id="hosts-table-header">
|
||||
<table class="table table-condensed">
|
||||
<table class="table table-condensed" ng-show="results.length !== 0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="List-tableHeader col-lg-4 col-md-3 col-sm-3 col-xs-3">Hosts</th>
|
||||
@ -343,7 +343,7 @@
|
||||
</div>
|
||||
|
||||
<div id="hosts-table-detail" class="table-detail" lr-infinite-scroll="hostResultsScrollDown" scroll-threshold="10" time-threshold="500">
|
||||
<table class="table">
|
||||
<table class="table" ng-class="{'JobDetails-table--noResults': results.length === 0}">
|
||||
<tbody>
|
||||
<tr class="List-tableRow cursor-pointer" ng-class-odd="'List-tableRow--oddRow'" ng-class-even="'List-tableRow--evenRow'" ng-repeat="result in results = (hostResults) track by $index">
|
||||
<td class="List-tableCell col-lg-4 col-md-3 col-sm-3 col-xs-3 status-column">
|
||||
|
||||
@ -20,6 +20,7 @@ export default
|
||||
index: false,
|
||||
hover: true,
|
||||
well: false,
|
||||
emptyListText: 'No completed jobs',
|
||||
|
||||
fields: {
|
||||
status: {
|
||||
|
||||
@ -15,6 +15,7 @@ export default
|
||||
index: true,
|
||||
hover: true,
|
||||
well: false,
|
||||
emptyListText: 'No schedules exist',
|
||||
|
||||
fields: {
|
||||
status: {
|
||||
|
||||
@ -157,11 +157,11 @@
|
||||
ng-href="/#/portal"
|
||||
ng-if="!licenseMissing"
|
||||
ng-class="{'is-currentRoute' : isCurrentState('portalMode'), 'is-loggedOut' : !$root.current_user.username}"
|
||||
aw-tool-tip="Portal Mode"
|
||||
aw-tool-tip="My View"
|
||||
data-placement="bottom"
|
||||
data-trigger="hover"
|
||||
data-container="body">
|
||||
<i class="MainMenu-itemImage MainMenu-itemImage--settings fa fa-columns"
|
||||
<i class="MainMenu-itemImage MainMenu-itemImage--settings fa fa-tasks"
|
||||
alt="Portal Mode">
|
||||
</i>
|
||||
</a>
|
||||
|
||||
@ -3,7 +3,8 @@
|
||||
|
||||
.MgmtCards {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
flex-flow: row wrap;
|
||||
justify-content: space-between;
|
||||
}
|
||||
|
||||
.MgmtCards-card {
|
||||
@ -11,15 +12,14 @@
|
||||
padding: 20px;
|
||||
border-radius: 5px;
|
||||
border: 1px solid @default-border;
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: baseline;
|
||||
margin-top: 20px;
|
||||
width: 32%;
|
||||
}
|
||||
|
||||
.MgmtCards-card--selected {
|
||||
padding-left: 16px;
|
||||
border-left: 5px solid #337AB7;
|
||||
border-left: 5px solid @default-link;
|
||||
}
|
||||
|
||||
.MgmtCards-card--promptElements{
|
||||
@ -44,7 +44,6 @@
|
||||
font-weight: bold;
|
||||
color: @default-interface-txt;
|
||||
margin-bottom: 25px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
@ -86,46 +85,19 @@
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
@media (min-width: 1179px) {
|
||||
.MgmtCards-card {
|
||||
width: ~"calc(25% - 15px)";
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.MgmtCards-card:nth-child(4n+4) {
|
||||
margin-right: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 901px) and (max-width: 1178px) {
|
||||
.MgmtCards-card {
|
||||
width: ~"calc(33% - 11px)";
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.MgmtCards-card:nth-child(3n+3) {
|
||||
margin-right: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 616px) and (max-width: 900px) {
|
||||
.MgmtCards-card {
|
||||
width: ~"calc(50% - 10px)";
|
||||
margin-right: 20px;
|
||||
}
|
||||
|
||||
.MgmtCards-card:nth-child(2n+2) {
|
||||
margin-right: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (max-width: 615px) {
|
||||
@media (max-width: 840px) {
|
||||
.MgmtCards-card {
|
||||
width: 100%;
|
||||
margin-right: 0px;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 840px) and (max-width: 1240px) {
|
||||
.MgmtCards-card {
|
||||
width: ~"calc(50% - 10px)";
|
||||
}
|
||||
}
|
||||
|
||||
#prompt-for-days-facts, #prompt-for-days {
|
||||
overflow-x: hidden;
|
||||
font-family: "Open Sans";
|
||||
|
||||
@ -243,8 +243,9 @@ export default function() {
|
||||
subForm: 'typeSubForm'
|
||||
},
|
||||
api_url: {
|
||||
label: 'API URL (e.g: https://mycompany.hiptchat.com)',
|
||||
label: 'API URL',
|
||||
type: 'text',
|
||||
placeholder: 'https://mycompany.hipchat.com',
|
||||
awRequiredWhen: {
|
||||
reqExpression: "hipchat_required",
|
||||
init: "false"
|
||||
|
||||
@ -13,6 +13,7 @@ export default function(){
|
||||
iterator: 'notification_template',
|
||||
index: false,
|
||||
hover: false,
|
||||
emptyListText: 'No notifications exist',
|
||||
|
||||
fields: {
|
||||
status: {
|
||||
|
||||
@ -14,6 +14,7 @@ export default function(){
|
||||
iterator: 'notification',
|
||||
index: false,
|
||||
hover: false,
|
||||
emptyListText: 'No Notifications exist',
|
||||
basePath: 'notifications',
|
||||
fields: {
|
||||
name: {
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<div id="scheduled_jobs_link" class="Form-tab"
|
||||
ng-class="{'is-selected': schedulesSelected }"
|
||||
ng-click="toggleTab('scheduled')">
|
||||
Schedule
|
||||
Schedules
|
||||
</div>
|
||||
</div>
|
||||
<div id="jobs-tab-content" class="Form-tabSection"
|
||||
|
||||
@ -8,7 +8,7 @@ export default {
|
||||
name: 'portalMode',
|
||||
url: '/portal',
|
||||
ncyBreadcrumb: {
|
||||
label: "PORTAL MODE"
|
||||
label: "MY VIEW"
|
||||
},
|
||||
resolve: {
|
||||
features: ['FeaturesService', function(FeaturesService) {
|
||||
@ -30,4 +30,4 @@ export default {
|
||||
controller: PortalModeJobsController
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
@ -37,19 +37,28 @@ export default
|
||||
name: 'projectSchedules',
|
||||
route: '/projects/:id/schedules',
|
||||
templateUrl: templateUrl("scheduler/scheduler"),
|
||||
controller: 'schedulerController'
|
||||
controller: 'schedulerController',
|
||||
ncyBreadcrumb: {
|
||||
label: 'PROJECT SCHEDULES'
|
||||
}
|
||||
});
|
||||
$stateExtender.addState({
|
||||
name: 'projectSchedules.add',
|
||||
route: '/add',
|
||||
templateUrl: templateUrl("scheduler/schedulerForm"),
|
||||
controller: 'schedulerAddController'
|
||||
controller: 'schedulerAddController',
|
||||
ncyBreadcrumb: {
|
||||
label: 'PROJECT SCHEDULES ADD'
|
||||
}
|
||||
});
|
||||
$stateExtender.addState({
|
||||
name: 'projectSchedules.edit',
|
||||
route: '/:schedule_id',
|
||||
templateUrl: templateUrl("scheduler/schedulerForm"),
|
||||
controller: 'schedulerEditController'
|
||||
controller: 'schedulerEditController',
|
||||
ncyBreadcrumb: {
|
||||
label: 'PROJECT SCHEDULES EDIT'
|
||||
}
|
||||
});
|
||||
$stateExtender.addState({
|
||||
name: 'inventoryManage.schedules',
|
||||
|
||||
@ -509,7 +509,7 @@
|
||||
Please provide a valid date.
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group SchedulerForm-formGroup"
|
||||
<div class="form-group SchedulerForm-formGroup"
|
||||
ng-if="schedulerEnd && schedulerEnd.value == 'on'">
|
||||
<label class="Form-inputLabel">
|
||||
<span class="red-text">*</span>
|
||||
@ -583,7 +583,7 @@
|
||||
<div class="SchedulerFormDetail-container"
|
||||
ng-show="schedulerIsValid">
|
||||
<label class="SchedulerFormDetail-label">
|
||||
Description
|
||||
Schedule Description
|
||||
</label>
|
||||
<div class="SchedulerFormDetail-nlp">
|
||||
{{ rrule_nlp_description }}
|
||||
@ -651,7 +651,7 @@
|
||||
<blockquote>---<br />somevar: somevalue<br />password: magic<br /></blockquote>"
|
||||
data-placement="right" data-container="body" over-title="Extra Variables" class="help-link" data-original-title="" title="" tabindex="-1">
|
||||
<i class="fa fa-question-circle"></i>
|
||||
</a>
|
||||
</a>
|
||||
|
||||
<div class="parse-selection">
|
||||
<input type="radio" ng-model="parseType" ng-change="parseTypeChange()" value="yaml"><span class="parse-label">YAML</span>
|
||||
|
||||
@ -31,7 +31,6 @@
|
||||
align-items: center;
|
||||
max-height: 400px;
|
||||
width: 120px;
|
||||
overflow-y: scroll;
|
||||
cursor: pointer;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ export default {
|
||||
name: 'setup',
|
||||
route: '/setup',
|
||||
ncyBreadcrumb: {
|
||||
label: "SETUP"
|
||||
label: "SETTINGS"
|
||||
},
|
||||
templateUrl: templateUrl('setup-menu/setup-menu')
|
||||
};
|
||||
|
||||
@ -59,7 +59,7 @@ angular.module('ModalDialog', ['Utilities', 'ParseHelper'])
|
||||
callback = params.callback,
|
||||
beforeDestroy = params.beforeDestroy,
|
||||
closeOnEscape = (params.closeOnEscape === undefined) ? false : params.closeOnEscape,
|
||||
resizable = (params.resizable === undefined) ? true : params.resizable,
|
||||
resizable = (params.resizable === undefined) ? false : params.resizable,
|
||||
draggable = (params.draggable === undefined) ? true : params.draggable,
|
||||
dialogClass = params.dialogClass,
|
||||
forms = _.chain([params.form]).flatten().compact().value(),
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
|
||||
// buttons
|
||||
@btn-bg: @default-bg;
|
||||
@btn-bord: @default-border;
|
||||
@btn-bord: @d7grey;
|
||||
@btn-txt: @default-interface-txt;
|
||||
@btn-bg-hov: @default-tertiary-bg;
|
||||
@btn-bg-sel: @default-icon-hov;
|
||||
|
||||
@ -1838,7 +1838,11 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
|
||||
`;
|
||||
|
||||
// Show the "no items" box when loading is done and the user isn't actively searching and there are no results
|
||||
html += "<div class=\"List-noItems\" ng-show=\"" + collection.iterator + "Loading == false && " + collection.iterator + "_active_search == false && " + collection.iterator + "_total_rows < 1\">PLEASE ADD ITEMS TO THIS LIST</div>";
|
||||
// Allow for the suppression of the empty list text to avoid duplication between form generator and list generator
|
||||
if(!collection.suppressEmptyText || collection.suppressEmptyText === false) {
|
||||
var emptyListText = (collection.emptyListText) ? collection.emptyListText : "PLEASE ADD ITEMS TO THIS LIST";
|
||||
html += "<div class=\"List-noItems\" ng-show=\"" + collection.iterator + "Loading == false && " + collection.iterator + "_active_search == false && " + collection.iterator + "_total_rows < 1\">" + emptyListText + "</div>";
|
||||
}
|
||||
|
||||
html += `
|
||||
<div class=\"List-noItems\" ng-show=\"is_superuser\">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user