shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Dashboard job widget styles

Browse Source 
Fixed search widget responsiveness. Applied same ellipsis styling used on Jobs page.
This commit is contained in:
Chris Houseknecht 2014-07-03 09:49:58 -04:00
parent d44ab97232
commit 7db48fbe27
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
awx/ui/static/js/helpers/Schedules.js
View File

@ -11,11 +11,11 @@
angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', 'SearchHelper', 'PaginationHelpers', 'ListGenerator', 'ModalDialog', angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelper', 'SearchHelper', 'PaginationHelpers', 'ListGenerator', 'ModalDialog',
'GeneratorHelpers']) 'GeneratorHelpers'])
.factory('ShowSchedulerModal', ['Wait', 'CreateDialog', function(Wait, CreateDialog) { .factory('ShowSchedulerModal', ['Wait', 'CreateDialog', function(Wait, CreateDialog) {
return function(params) { return function(params) {
// Set modal dimensions based on viewport width // Set modal dimensions based on viewport width
var buttons, var buttons,
scope = params.scope, scope = params.scope,
callback = params.callback; callback = params.callback;
@ -73,7 +73,7 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe
callback = params.callback, callback = params.callback,
schedule, scheduler, schedule, scheduler,
url = GetBasePath('schedules') + id + '/'; url = GetBasePath('schedules') + id + '/';
if (scope.removeDialogReady) { if (scope.removeDialogReady) {
scope.removeDialogReady(); scope.removeDialogReady();
} }
@ -230,7 +230,7 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe
schedule = (params.schedule) ? params.schedule : {}, schedule = (params.schedule) ? params.schedule : {},
callback = params.callback, callback = params.callback,
newSchedule, rrule; newSchedule, rrule;
if (scheduler.isValid()) { if (scheduler.isValid()) {
Wait('start'); Wait('start');
newSchedule = scheduler.getValue(); newSchedule = scheduler.getValue();
@ -277,17 +277,17 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe
}]) }])
/** /**
* Inject the scheduler_dialog.html wherever needed * Inject the scheduler_dialog.html wherever needed
*/ */
.factory('LoadDialogPartial', ['Rest', '$compile', 'ProcessErrors', function(Rest, $compile, ProcessErrors) { .factory('LoadDialogPartial', ['Rest', '$compile', 'ProcessErrors', function(Rest, $compile, ProcessErrors) {
return function(params) { return function(params) {
var scope = params.scope, var scope = params.scope,
element_id = params.element_id, element_id = params.element_id,
callback = params.callback, callback = params.callback,
url; url;
// Add the schedule_dialog.html partial // Add the schedule_dialog.html partial
url = '/static/partials/schedule_dialog.html'; url = '/static/partials/schedule_dialog.html';
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
@ -320,7 +320,7 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe
id = params.id, id = params.id,
callback = params.callback, callback = params.callback,
url = GetBasePath('schedules') + id +'/'; url = GetBasePath('schedules') + id +'/';
// Perform the update // Perform the update
if (scope.removeScheduleFound) { if (scope.removeScheduleFound) {
scope.removeScheduleFound(); scope.removeScheduleFound();
@ -538,7 +538,7 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe
}]) }])
/** /**
* *
* Called from a controller to setup the scope for a schedules list * Called from a controller to setup the scope for a schedules list
* *
*/ */
@ -578,7 +578,7 @@ angular.module('SchedulesHelper', [ 'Utilities', 'RestServices', 'SchedulesHelpe
id: id, id: id,
breadCrumbs: false, breadCrumbs: false,
scope: scope, scope: scope,
searchSize: 'col-lg-4 col-md-6 col-sm-12 col-xs-12', searchSize: 'col-lg-6 col-md-6 col-sm-6 col-xs-12',
showSearch: true showSearch: true
}); });
} }

2
awx/ui/static/js/widgets/DashboardJobs.js
View File

@ -33,7 +33,7 @@ angular.module('DashboardJobsWidget', ['RestServices', 'Utilities'])
html += "<div class=\"tab-content\">\n"; html += "<div class=\"tab-content\">\n";
html += "<div class=\"tab-pane active\" id=\"active-jobs-tab\">\n"; html += "<div class=\"tab-pane active\" id=\"active-jobs-tab\">\n";
html += "<div class=\"row search-row\">\n"; html += "<div class=\"row search-row\">\n";
html += "<div class=\"col-md-4\" id=\"active-jobs-search-container\"></div>\n"; html += "<div class=\"col-lg-6 col-md-6 col-sm-6\" id=\"active-jobs-search-container\"></div>\n";
html += "</div>\n"; //row html += "</div>\n"; //row
html += "<div class=\"job-list\" id=\"active-jobs-container\">\n"; html += "<div class=\"job-list\" id=\"active-jobs-container\">\n";
html += "<div id=\"active-jobs\" class=\"job-list-target\"></div>\n"; html += "<div id=\"active-jobs\" class=\"job-list-target\"></div>\n";

2
awx/ui/static/less/jobs.less
View File

@ -51,7 +51,7 @@
#schedules_table .name-column, #schedules_table .name-column,
#running_jobs_table .name-column, #running_jobs_table .name-column,
#queued_jobs_table .name-column, #queued_jobs_table .name-column,
{ {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

13
awx/ui/static/less/new-dashboard.less
View File

@ -51,6 +51,19 @@
background-image: none background-image: none
} }
.dashboard-jobs-list-container {
#jobs_table,
#schedules_table {
table-layout:fixed;
}
#jobs_table .name-column,
#schedules_table .name-column {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
@media (min-width: 1024px) { @media (min-width: 1024px) {
.left-side { .left-side {
padding-right: 7px; padding-right: 7px;